Revision 9781

View differences:

org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.app/org.gvsig.online.app.mainplugin/src/main/java/org/gvsig/online/app/mainplugin/OnlineExtension.java
71 71
import org.gvsig.tools.swing.api.ToolsSwingLocator;
72 72
import org.gvsig.tools.swing.api.ToolsSwingUtils;
73 73
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager;
74
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
75
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
74 76

  
75 77

  
76 78
/**
......
858 860

  
859 861
    private void showSimpleSearchDialog(FeatureStore store, Arguments arguments) {
860 862
        OnlineSwingManager swingManager = OnlineSwingLocator.getOnlineSwingManager();
861

  
862
        final OnlineDialogInfo dialog = this.dialogsHelper.getOrCreateDialog(
863
                "_Simple_search",
864
                swingManager.createSimpleSearchPanel(store, arguments),
865
                "_Online_Simple_search"
866
        );
867
        Dimension screensize = ApplicationLocator.getApplicationManager().getUIManager().getInternalSize();
868
        Dimension panelsize = dialog.getPanel().asJComponent().getPreferredSize();
869
        ToolsSwingUtils.ensureHeightWitdh(
870
                dialog.getPanel().asJComponent(), 
871
                Math.max(3*(screensize.height/4), panelsize.height),
872
                Math.max(2*(screensize.width/4), panelsize.width), 
873
                7*(screensize.height/8), 
874
                3*(screensize.width/4)
875
        );                    
876
        dialog.show(
863
        WindowManager_v2 winmanager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();
864
        winmanager.showWindow(
865
                swingManager.createSimpleSearchPanel(store, arguments).asJComponent(),
866
                ToolsSwingUtils.makeTitle("_Online_Simple_search", store.getLabel(), null),
867
                WindowManager.MODE.WINDOW,
877 868
                Collections.singletonMap("align", GridBagConstraints.CENTER)
878 869
        );
879 870
    }
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.api/src/main/java/org/gvsig/online/swing/api/SimpleSearch.java
41 41

  
42 42
    int download();
43 43

  
44
    int download(SimpleTaskStatus status);
44
    int download(Expression filter, SimpleTaskStatus status);
45 45

  
46
    Envelope getEnvelope(SimpleTaskStatus status);
46
    public Envelope getEnvelope(Expression filter, SimpleTaskStatus status);
47 47

  
48 48
    FeatureType getFeatureType();
49 49

  
......
55 55
    
56 56
    boolean isProcessing();
57 57

  
58
    Thread runCalculateEnvelopeTask(Runnable postProcessingAction, MessageStatus message);
58
    Thread runCalculateEnvelopeTask(Expression filter, Runnable postProcessingAction, MessageStatus message);
59 59

  
60
    Thread runDownloadTask(Runnable postProcessingAction, MessageStatus message);
60
    Thread runDownloadTask(Expression filter, Runnable postProcessingAction, MessageStatus message);
61 61

  
62 62
    Thread runSearchTask(Expression filter, Runnable postProcessingAction, MessageStatus message);
63 63

  
......
66 66
    List<Feature> search(Expression filter, SimpleTaskStatus status);
67 67

  
68 68
    void setSelection();
69
    
70
    void setSelection(Expression filter);
69 71

  
70
    void zoom();
72
    void zoom(Expression filter);
71 73

  
72
    void zoom(SimpleTaskStatus status);
74
    public void zoom(Expression filter, SimpleTaskStatus status);
73 75
    
74 76
}
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/simplesearch/OnlineJSimpleSearchImpl.java
76 76
        onlineSymbolTable.addFunction(symbolTable.function(ExpressionBuilder.OPERATOR_NE));
77 77
        onlineSymbolTable.addFunction(symbolTable.function(ExpressionBuilder.OPERATOR_NOT));
78 78
        this.pickerFilter.getConfig().addSymbolTable(onlineSymbolTable);
79
        dataSwingManager.configureExpressionBuilder(
80
                this.pickerFilter.getConfig(), 
81
                this.simpleSearch.getFeatureStore()
82
        );
79 83
        this.pickerFilter.getConfig().addElement(
80 84
            new OnlineFeatureStoreElement(
81 85
                this.simpleSearch.getWorkingcopy(),
......
104 108
            doSelectAndZoom();
105 109
        });
106 110
        
111
        this.lblStoreName.setText("");//this.simpleSearch.getFeatureStore().getLabel());
112
        
107 113
        doUpdateComponents();
108 114
        
109 115
        SwingUtilities.invokeLater(() -> { message.clear(); });
......
171 177
    }
172 178

  
173 179
    private void doDownloadAndZoom() {
180
        Expression filter;
181
        SimpleFeaturesTableModel model = (SimpleFeaturesTableModel) this.tblSearchResult.getModel();
182
        int[] selectedRows = this.tblSearchResult.getSelectedRows();
183
        filter = model.getFeaturesFilter(selectedRows);
174 184
        this.simpleSearch.runDownloadTask(
175
            ()->{ this.simpleSearch.zoom(); }, 
185
            filter,
186
            ()->{ this.simpleSearch.zoom(null); }, 
176 187
            this.message
177 188
        );
178 189
    }
179 190

  
180 191
    private void doSelectAndZoom() {
192
        Expression filter;
193
        SimpleFeaturesTableModel model = (SimpleFeaturesTableModel) this.tblSearchResult.getModel();
194
        int[] selectedRows = this.tblSearchResult.getSelectedRows();
195
        filter = model.getFeaturesFilter(selectedRows);
181 196
        this.simpleSearch.runCalculateEnvelopeTask(
197
            filter,
182 198
            () -> {
183
                this.simpleSearch.setSelection();
184
                this.simpleSearch.zoom();
199
                this.simpleSearch.setSelection(filter);
200
                this.simpleSearch.zoom(null);
185 201
            },
186 202
            this.message
187 203
        );
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/simplesearch/SimpleSearchImpl.java
153 153
    
154 154
    @Override
155 155
    public int download() {
156
        return download(null);
156
        return download(null, null);
157 157
    }
158 158
    
159 159
    @Override
160
    public int download(SimpleTaskStatus status) {
160
    public int download(Expression filter, SimpleTaskStatus status) {
161 161
        if(!isSearched()){
162 162
            return ERR_OK;
163 163
        }
164 164
        if(status == null){
165 165
            status = SimpleTaskStatus.FAKE_STATUS;
166 166
        }
167
        FeatureSet set = null;
167 168
        try {
168 169
            IProjection proj4326 = CRSFactory.getCRS("EPSG:4326");
169 170
            ICoordTrans ct = proj4326.getCT(this.entity.getCRSAsProjection());
170 171

  
171 172
            this.fullEnv = GeometryLocator.getGeometryManager().createEnvelope(Geometry.SUBTYPES.GEOM2D);
172
            Iterator<Feature> it = feats.iterator();
173
            Iterator<Feature> it;
174
            if( filter == null ) {
175
                it = feats.iterator();
176
            } else {
177
                set = feats.getFeatureStore().getFeatureSet(filter);
178
                it = set.fastIterator();
179
            }
173 180
            Iterator<Geometry> geoms = new Iterator<Geometry>() {
174 181
                @Override
175 182
                public boolean hasNext() {
......
188 195
            int n = wc.download(entity.getEntityName(), geoms, status);
189 196
            
190 197
            SwingUtilities.invokeLater(() -> {
191
                setSelection();
198
                setSelection(filter);
192 199
                OnlineSwingServices services = OnlineSwingLocator.getOnlineSwingManager().getDefaultServices();
193 200
                services.refreshDocument(getFeatureStore());
194 201
            });
......
197 204
        } catch (Exception ex) {
198 205
            LOGGER.warn("Can't download.", ex);
199 206
            return ERR_EXCEPTION;
207
        } finally {
208
            DisposeUtils.dispose(set);
200 209
        }
201 210
    }
202 211
    
......
206 215
    }
207 216
    
208 217
    @Override
209
    public Envelope getEnvelope(SimpleTaskStatus status) {
210
        if (fullEnv == null) {
218
    public Envelope getEnvelope(Expression filter, SimpleTaskStatus status) {
219
        if (fullEnv == null || filter!=null) {
220
            FeatureSet set = null;
211 221
            try {
212 222
                I18nManager i18n = ToolsLocator.getI18nManager();
213 223
                IProjection proj4326 = CRSFactory.getCRS("EPSG:4326");
214 224
                ICoordTrans ct = proj4326.getCT(this.entity.getCRSAsProjection());
215 225

  
216 226
                this.fullEnv = GeometryLocator.getGeometryManager().createEnvelope(Geometry.SUBTYPES.GEOM2D);
217
                Iterator<Feature> it = feats.iterator();
227
                Iterator<Feature> it;
228
                if( filter == null ) {
229
                    it = feats.iterator();
230
                } else {
231
                    set = feats.getFeatureStore().getFeatureSet(filter);
232
                    it = set.fastIterator();
233
                }                
218 234
                Iterator<Geometry> geoms = new Iterator<Geometry>() {
219 235
                    @Override
220 236
                    public boolean hasNext() {
......
237 253
                }
238 254
            } catch (Exception ex) {
239 255
                LOGGER.warn("Can't get envelope.", ex);
256
            } finally {
257
                DisposeUtils.dispose(set);
240 258
            }
241 259

  
242 260
        }
......
282 300
    }
283 301
  
284 302
    @Override
285
    public void zoom() {
286
        this.zoom(SimpleTaskStatus.FAKE_STATUS);
303
    public void zoom(Expression filter) {
304
        this.zoom(filter, SimpleTaskStatus.FAKE_STATUS);
287 305
    }
288 306
    
289 307
    @Override
290
    public void zoom(SimpleTaskStatus status) {
291
        Envelope env = this.getEnvelope(status);
308
    public void zoom(Expression filter, SimpleTaskStatus status) {
309
        Envelope env = this.getEnvelope(filter, status);
292 310
        if(env == null){
293 311
            return;
294 312
        }
......
315 333
    }
316 334
    
317 335
    @Override
336
    public void setSelection(Expression filter) {
337
        if( filter == null ) {
338
            this.setSelection();
339
            return;
340
        }
341
        FeatureSet set = null;
342
        try {
343
            set = this.getFeatureStore().getFeatureSet(filter);
344
            this.getFeatureStore().setSelection(set);
345
        } catch (DataException ex) {
346
            LOGGER.warn("Can't set selection", ex);
347
        }
348
    }
349
    
350
    @Override
318 351
    public Thread runSearchTask(Expression filter, Runnable postProcessingAction, MessageStatus message) {
319 352
        SimpleTaskStatus status = message.createTaskStatus("_Search");
320 353
        message.setVisible(true);
......
360 393
    }
361 394

  
362 395
    @Override
363
    public Thread runDownloadTask(Runnable postProcessingAction, MessageStatus message) {
396
    public Thread runDownloadTask(Expression filter, Runnable postProcessingAction, MessageStatus message) {
364 397
        if(!isSearched()){
365 398
            return null;
366 399
        }
......
370 403
        Thread task = new Thread(() -> {
371 404
            this.processing = true;
372 405
            try {
373
                this.download(status);
406
                this.download(filter, status);
374 407
            } catch (Exception ex) {
375 408
                //FIXME: 
376 409

  
......
393 426
    }
394 427

  
395 428
    @Override
396
    public Thread runCalculateEnvelopeTask(Runnable postProcessingAction, MessageStatus message) {
429
    public Thread runCalculateEnvelopeTask(Expression filter, Runnable postProcessingAction, MessageStatus message) {
397 430
        if(!isSearched()){
398 431
            return null;
399 432
        }
......
404 437
        Thread task = new Thread(() -> {
405 438
            this.processing = true;
406 439
            try {
407
                this.getEnvelope(status);
440
                this.getEnvelope(filter, status);
408 441
                message.clear();
409 442
            } catch (Exception ex) {
410 443
                //FIXME: 
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/simplesearch/OnlineJSimpleSearchView.xml
24 24
    </at>
25 25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26 26
   </super>
27
   <at name="id">/home/fdiaz/projects/gvSIG/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/simplesearch/OnlineJSimpleSearchView.xml</at>
28
   <at name="path">org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/simplesearch/OnlineJSimpleSearchView.xml</at>
29
   <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
27
   <at name="id">/home/jjdelcerro/datos/devel/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/simplesearch/OnlineJSimpleSearchView.xml</at>
28
   <at name="path">datos/devel/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/simplesearch/OnlineJSimpleSearchView.xml</at>
29
   <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
30 30
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
31 31
   <at name="components">
32 32
    <object classname="java.util.LinkedList">
......
37 37
         <at name="cellconstraints">
38 38
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
39 39
           <at name="column">2</at>
40
           <at name="row">4</at>
40
           <at name="row">6</at>
41 41
           <at name="colspan">1</at>
42 42
           <at name="rowspan">1</at>
43 43
           <at name="halign">right</at>
......
76 76
            </at>
77 77
            <at name="actionCommand">_Search</at>
78 78
            <at name="name">btnSearch</at>
79
            <at name="width">78</at>
79
            <at name="width">72</at>
80 80
            <at name="text">_Search</at>
81
            <at name="height">22</at>
81
            <at name="height">24</at>
82 82
           </object>
83 83
          </at>
84 84
         </object>
......
93 93
         <at name="cellconstraints">
94 94
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
95 95
           <at name="column">2</at>
96
           <at name="row">6</at>
96
           <at name="row">8</at>
97 97
           <at name="colspan">1</at>
98 98
           <at name="rowspan">1</at>
99 99
           <at name="halign">default</at>
......
131 131
             </object>
132 132
            </at>
133 133
            <at name="name">tblSearchResult</at>
134
            <at name="width">1309</at>
134
            <at name="width">771</at>
135 135
            <at name="scollBars">
136 136
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
137 137
              <at name="name">scollBars</at>
......
174 174
         <at name="cellconstraints">
175 175
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
176 176
           <at name="column">2</at>
177
           <at name="row">2</at>
177
           <at name="row">4</at>
178 178
           <at name="colspan">1</at>
179 179
           <at name="rowspan">1</at>
180 180
           <at name="halign">default</at>
......
184 184
         </at>
185 185
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
186 186
        </super>
187
        <at name="id">embedded.1499095186</at>
187
        <at name="id">embedded.239752206</at>
188 188
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
189 189
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
190 190
        <at name="components">
......
234 234
                  </object>
235 235
                 </at>
236 236
                 <at name="name">txtFilter</at>
237
                 <at name="width">1225</at>
238
                 <at name="height">20</at>
237
                 <at name="width">699</at>
238
                 <at name="height">22</at>
239 239
                </object>
240 240
               </at>
241 241
              </object>
......
294 294
                 <at name="actionCommand">...</at>
295 295
                 <at name="opaque">false</at>
296 296
                 <at name="name">btnFilterBookmarks</at>
297
                 <at name="width">16</at>
297
                 <at name="width">13</at>
298 298
                 <at name="text">...</at>
299
                 <at name="height">18</at>
299
                 <at name="height">20</at>
300 300
                </object>
301 301
               </at>
302 302
              </object>
......
355 355
                 <at name="actionCommand">...</at>
356 356
                 <at name="opaque">false</at>
357 357
                 <at name="name">btnFilterHistory</at>
358
                 <at name="width">16</at>
358
                 <at name="width">13</at>
359 359
                 <at name="text">...</at>
360
                 <at name="height">18</at>
360
                 <at name="height">20</at>
361 361
                </object>
362 362
               </at>
363 363
              </object>
......
416 416
                 <at name="actionCommand">...</at>
417 417
                 <at name="opaque">false</at>
418 418
                 <at name="name">btnFilter</at>
419
                 <at name="width">16</at>
419
                 <at name="width">13</at>
420 420
                 <at name="text">...</at>
421
                 <at name="height">18</at>
421
                 <at name="height">20</at>
422 422
                </object>
423 423
               </at>
424 424
              </object>
......
443 443
              </at>
444 444
             </object>
445 445
            </at>
446
            <at name="name"/>
446
            <at name="name"></at>
447 447
            <at name="fill">
448 448
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
449 449
              <at name="name">fill</at>
......
515 515
         <at name="cellconstraints">
516 516
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
517 517
           <at name="column">2</at>
518
           <at name="row">8</at>
518
           <at name="row">10</at>
519 519
           <at name="colspan">1</at>
520 520
           <at name="rowspan">1</at>
521 521
           <at name="halign">default</at>
......
525 525
         </at>
526 526
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
527 527
        </super>
528
        <at name="id">embedded.1938550891</at>
528
        <at name="id">embedded.1874195900</at>
529 529
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
530 530
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
531 531
        <at name="components">
......
576 576
                 </at>
577 577
                 <at name="actionCommand">_Download_and_center</at>
578 578
                 <at name="name">btnDownloadSelectAndZoom</at>
579
                 <at name="width">196</at>
579
                 <at name="width">184</at>
580 580
                 <at name="text">_Download_select_and_zoom</at>
581
                 <at name="height">22</at>
581
                 <at name="height">24</at>
582 582
                </object>
583 583
               </at>
584 584
              </object>
......
632 632
                 </at>
633 633
                 <at name="actionCommand">_Download_and_center</at>
634 634
                 <at name="name">btnSelectAndZoom</at>
635
                 <at name="width">136</at>
635
                 <at name="width">126</at>
636 636
                 <at name="text">_Select_and_zoom</at>
637
                 <at name="height">22</at>
637
                 <at name="height">24</at>
638 638
                </object>
639 639
               </at>
640 640
              </object>
......
731 731
         <at name="cellconstraints">
732 732
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
733 733
           <at name="column">2</at>
734
           <at name="row">10</at>
734
           <at name="row">12</at>
735 735
           <at name="colspan">1</at>
736 736
           <at name="rowspan">1</at>
737 737
           <at name="halign">default</at>
......
741 741
         </at>
742 742
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
743 743
        </super>
744
        <at name="id">embedded.1087153438</at>
744
        <at name="id">embedded.1477954402</at>
745 745
        <at name="rowspecs">CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE</at>
746 746
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE</at>
747 747
        <at name="components">
......
791 791
                  </object>
792 792
                 </at>
793 793
                 <at name="name">lblStatusCaption</at>
794
                 <at name="width">1290</at>
794
                 <at name="width">752</at>
795 795
                 <at name="fill">
796 796
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
797 797
                   <at name="name">fill</at>
......
850 850
                  </object>
851 851
                 </at>
852 852
                 <at name="name">lblStatusMessages</at>
853
                 <at name="width">1290</at>
853
                 <at name="width">752</at>
854 854
                 <at name="fill">
855 855
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
856 856
                   <at name="name">fill</at>
......
909 909
                  </object>
910 910
                 </at>
911 911
                 <at name="name">pbStatus</at>
912
                 <at name="width">1290</at>
912
                 <at name="width">752</at>
913 913
                 <at name="percentComplete">0.25</at>
914 914
                 <at name="value">25</at>
915 915
                 <at name="height">12</at>
......
964 964
                   </at>
965 965
                  </object>
966 966
                 </at>
967
                 <at name="name"></at>
968 967
                 <at name="width">12</at>
968
                 <at name="name"/>
969 969
                 <at name="text"> </at>
970 970
                 <at name="fill">
971 971
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
1024 1024
                   </at>
1025 1025
                  </object>
1026 1026
                 </at>
1027
                 <at name="name"></at>
1028 1027
                 <at name="width">12</at>
1028
                 <at name="name"/>
1029 1029
                 <at name="text"> </at>
1030 1030
                 <at name="fill">
1031 1031
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
1084 1084
                   </at>
1085 1085
                  </object>
1086 1086
                 </at>
1087
                 <at name="name"></at>
1088 1087
                 <at name="width">12</at>
1088
                 <at name="name"/>
1089 1089
                 <at name="text"> </at>
1090 1090
                 <at name="fill">
1091 1091
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
1117 1117
              </at>
1118 1118
             </object>
1119 1119
            </at>
1120
            <at name="name"></at>
1120
            <at name="name"/>
1121 1121
            <at name="fill">
1122 1122
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1123 1123
              <at name="name">fill</at>
......
1188 1188
       </object>
1189 1189
      </at>
1190 1190
     </item>
1191
     <item >
1192
      <at name="value">
1193
       <object classname="com.jeta.forms.store.memento.BeanMemento">
1194
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
1195
         <at name="cellconstraints">
1196
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1197
           <at name="column">2</at>
1198
           <at name="row">2</at>
1199
           <at name="colspan">1</at>
1200
           <at name="rowspan">1</at>
1201
           <at name="halign">default</at>
1202
           <at name="valign">default</at>
1203
           <at name="insets" object="insets">0,0,0,0</at>
1204
          </object>
1205
         </at>
1206
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1207
        </super>
1208
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1209
        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
1210
        <at name="beanproperties">
1211
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1212
          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
1213
          <at name="properties">
1214
           <object classname="com.jeta.forms.store.support.PropertyMap">
1215
            <at name="border">
1216
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1217
              <super classname="com.jeta.forms.store.properties.BorderProperty">
1218
               <at name="name">border</at>
1219
              </super>
1220
              <at name="borders">
1221
               <object classname="java.util.LinkedList">
1222
                <item >
1223
                 <at name="value">
1224
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1225
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1226
                    <at name="name">border</at>
1227
                   </super>
1228
                  </object>
1229
                 </at>
1230
                </item>
1231
               </object>
1232
              </at>
1233
             </object>
1234
            </at>
1235
            <at name="name">lblStoreName</at>
1236
            <at name="width">773</at>
1237
            <at name="text">&lt;Store_name&gt;</at>
1238
            <at name="fill">
1239
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1240
              <at name="name">fill</at>
1241
             </object>
1242
            </at>
1243
            <at name="height">16</at>
1244
           </object>
1245
          </at>
1246
         </object>
1247
        </at>
1248
       </object>
1249
      </at>
1250
     </item>
1191 1251
    </object>
1192 1252
   </at>
1193 1253
   <at name="properties">
......
1245 1305
   <at name="cellpainters">
1246 1306
    <object classname="com.jeta.forms.store.support.Matrix">
1247 1307
     <at name="rows">
1248
      <object classname="[Ljava.lang.Object;" size="11">
1308
      <object classname="[Ljava.lang.Object;" size="13">
1249 1309
       <at name="item" index="0">
1250 1310
        <object classname="[Ljava.lang.Object;" size="3"/>
1251 1311
       </at>
......
1279 1339
       <at name="item" index="10">
1280 1340
        <object classname="[Ljava.lang.Object;" size="3"/>
1281 1341
       </at>
1342
       <at name="item" index="11">
1343
        <object classname="[Ljava.lang.Object;" size="3"/>
1344
       </at>
1345
       <at name="item" index="12">
1346
        <object classname="[Ljava.lang.Object;" size="3"/>
1347
       </at>
1282 1348
      </object>
1283 1349
     </at>
1284 1350
    </object>
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/simplesearch/OnlineJSimpleSearchView.java
33 33
   JLabel lblStatusCaption = new JLabel();
34 34
   JLabel lblStatusMessages = new JLabel();
35 35
   JProgressBar pbStatus = new JProgressBar();
36
   JLabel lblStoreName = new JLabel();
36 37

  
37 38
   /**
38 39
    * Default constructor
......
124 125
   public JPanel createPanel()
125 126
   {
126 127
      JPanel jpanel1 = new JPanel();
127
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
128
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
128 129
      CellConstraints cc = new CellConstraints();
129 130
      jpanel1.setLayout(formlayout1);
130 131

  
131 132
      btnSearch.setActionCommand("_Search");
132 133
      btnSearch.setName("btnSearch");
133 134
      btnSearch.setText("_Search");
134
      jpanel1.add(btnSearch,new CellConstraints(2,4,1,1,CellConstraints.RIGHT,CellConstraints.DEFAULT));
135
      jpanel1.add(btnSearch,new CellConstraints(2,6,1,1,CellConstraints.RIGHT,CellConstraints.DEFAULT));
135 136

  
136 137
      tblSearchResult.setName("tblSearchResult");
137 138
      JScrollPane jscrollpane1 = new JScrollPane();
138 139
      jscrollpane1.setViewportView(tblSearchResult);
139 140
      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
140 141
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
141
      jpanel1.add(jscrollpane1,new CellConstraints(2,6,1,1,CellConstraints.DEFAULT,CellConstraints.FILL));
142
      jpanel1.add(jscrollpane1,new CellConstraints(2,8,1,1,CellConstraints.DEFAULT,CellConstraints.FILL));
142 143

  
143
      jpanel1.add(createPanel1(),cc.xy(2,2));
144
      jpanel1.add(createPanel2(),cc.xy(2,8));
145
      jpanel1.add(createPanel3(),cc.xy(2,10));
146
      addFillComponents(jpanel1,new int[]{ 1,2,3 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11 });
144
      jpanel1.add(createPanel1(),cc.xy(2,4));
145
      jpanel1.add(createPanel2(),cc.xy(2,10));
146
      jpanel1.add(createPanel3(),cc.xy(2,12));
147
      lblStoreName.setName("lblStoreName");
148
      lblStoreName.setText("<Store_name>");
149
      jpanel1.add(lblStoreName,cc.xy(2,2));
150

  
151
      addFillComponents(jpanel1,new int[]{ 1,2,3 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13 });
147 152
      return jpanel1;
148 153
   }
149 154

  

Also available in: Unified diff