Revision 44079

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/DefaultExpressionPickerController.java
96 96

  
97 97
    @Override
98 98
    public void set(Expression value) {
99
        this.value = value;
100
        this.text.setText(this.value.getPhrase());
99
        this.value = value; 
100
        if( value==null ) {
101
            this.text.setText("");
102
        } else {
103
            this.text.setText(this.value.getPhrase());
104
        }
101 105
    }
102 106

  
103 107
    @Override
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/test/java/org/gvsig/fmap/dal/swing/impl/featuretype/Test.java
1 1
package org.gvsig.fmap.dal.swing.impl.featuretype;
2 2

  
3
import java.io.File;
4
import java.net.URL;
5
import org.gvsig.fmap.crs.CRSFactory;
6
import org.gvsig.fmap.dal.DALLocator;
7
import org.gvsig.fmap.dal.DataManager;
8
import org.gvsig.fmap.dal.feature.FeatureStore;
3 9
import org.gvsig.fmap.dal.swing.DALSwingLocator;
4 10
import org.gvsig.fmap.dal.swing.DataSwingManager;
5
import org.gvsig.fmap.dal.swing.impl.featuretype.DefaultFeatureTypePanel;
6 11
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
7
import org.gvsig.tools.swing.api.Component;
8 12
import org.gvsig.tools.swing.api.ToolsSwingLocator;
9 13
import org.gvsig.tools.swing.api.windowmanager.Dialog;
10 14
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
......
19 23
    /**
20 24
     * @param args the command line arguments
21 25
     */
22
    public static void main(String[] args) {
26
    public static void main(String[] args) throws Exception {
23 27
        Test test = new Test();
24 28
        new DefaultLibrariesInitializer().fullInitialize();
25 29
        test.run();
26 30
    }
27 31
    
28
    public void run() {
32
    public void run() throws Exception {
29 33
        WindowManager_v2 windowManager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();
30 34
        DataSwingManager manager = DALSwingLocator.getSwingManager();
31 35
        
32
        Component panel = new DefaultFeatureTypePanel();
36
        URL resource = this.getClass().getResource("/org/gvsig/esp_comaut/esp_comaut.dbf");
37
        FeatureStore store = openShape(resource);
38
        FeatureTypePanel panel = new DefaultFeatureTypePanel();
39
        panel.put(store.getDefaultFeatureType());
40
        
33 41
        Dialog dialog = windowManager.createDialog(
34 42
                panel.asJComponent(),
35 43
                "Test", 
......
38 46
        );
39 47
        dialog.show(WindowManager.MODE.WINDOW);        
40 48
    }
41
    
49
  
50
    public FeatureStore openShape(URL resource) throws Exception {
51
        DataManager dataManager = DALLocator.getDataManager();
52
        FeatureStore store = (FeatureStore) dataManager.openStore(
53
                "DBF", 
54
                "dbffile", new File(resource.toURI())
55
//                "CRS", CRSFactory.getCRS("EPSG:23030")
56
        );
57
        return store;
58
    }
42 59
}
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/resources/org/gvsig/esp_comaut/esp_comaut.txt
1
Capa shp de las comunidades auutonomas de España.
2
Nombre: esp_comaut
3
Tipo: Polígono
4
EPSG: 23030
5
Nº archivos de la capa: 5
6
Formatos de los archivos: .dbf, .sbn, .sbx, .shp, .shx.
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/DefaultFeatureTypeAttributePanel.java
210 210
        this.pickerFieldName.set(descriptor.getName());
211 211
        RelativeInterval interval = (RelativeInterval) descriptor.getInterval();
212 212
        if( interval==null ) {
213
            this.pickerIntervalEnd.set(null);
214
            this.pickerIntervalStart.set(null);
213
//            this.pickerIntervalEnd.set(null);
214
//            this.pickerIntervalStart.set(null);
215 215
        } else {
216 216
            this.pickerIntervalEnd.set(interval.getEnd().toDate());
217 217
            this.pickerIntervalStart.set(interval.getStart().toDate());
......
245 245
        this.pickerCRS.set(descriptor.getSRS());
246 246
        
247 247
        ListElement.setSelected(cboFieldType, descriptor.getType());
248
        ListElement.setSelected(cboGeometryType, descriptor.getGeomType().getType());
249
        ListElement.setSelected(cboGeometrySubtype, descriptor.getGeomType().getSubType());
248
        if( descriptor.getType()==DataTypes.GEOMETRY ) {
249
            ListElement.setSelected(cboGeometryType, descriptor.getGeomType().getType());
250
            ListElement.setSelected(cboGeometrySubtype, descriptor.getGeomType().getSubType());
251
            this.cboGeometryType.setEnabled(true);
252
            this.cboGeometrySubtype.setEnabled(true);
253
        } else {
254
            this.cboGeometryType.setEnabled(false);
255
            this.cboGeometrySubtype.setEnabled(false);
256
        }
250 257
        
251 258
    }
252 259

  
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/pom.xml
111 111
        </dependency>      
112 112
        <dependency>
113 113
            <groupId>org.gvsig</groupId>
114
            <artifactId>org.gvsig.projection.cresques.impl</artifactId>
114
            <artifactId>org.gvsig.proj.lib.api</artifactId>
115 115
            <scope>test</scope>
116 116
        </dependency>
117 117
        <dependency>
118 118
            <groupId>org.gvsig</groupId>
119
            <artifactId>org.gvsig.proj.lib.proj4j</artifactId>
120
            <scope>test</scope>
121
        </dependency>
122
        <dependency>
123
            <groupId>org.gvsig</groupId>
124
            <artifactId>org.gvsig.proj.swing.api</artifactId>
125
            <scope>test</scope>
126
        </dependency>
127
        <dependency>
128
            <groupId>org.gvsig</groupId>
129
            <artifactId>org.gvsig.proj.swing.impl</artifactId>
130
            <scope>test</scope>
131
        </dependency>
132
        <dependency>
133
            <groupId>org.gvsig</groupId>
119 134
            <artifactId>org.gvsig.timesupport.lib.impl</artifactId>
120 135
            <scope>test</scope>
121 136
        </dependency>
......
134 149
            <artifactId>org.gvsig.tools.swing.impl</artifactId>
135 150
            <scope>test</scope>
136 151
        </dependency>
152
        <dependency>
153
            <groupId>org.gvsig</groupId>
154
            <artifactId>org.gvsig.fmap.dal.impl</artifactId>
155
            <scope>runtime</scope>
156
        </dependency>
157
        <dependency>
158
            <groupId>org.gvsig</groupId>
159
            <artifactId>org.gvsig.fmap.dal.file.shp</artifactId>
160
            <scope>runtime</scope>
161
        </dependency>
137 162
    </dependencies>
138 163

  
139 164
</project>

Also available in: Unified diff