Revision 9592

View differences:

org.gvsig.republicadominicana.catastro/trunk/org.gvsig.republicadominicana.catastro/org.gvsig.republicadominicana.catastro.swing/org.gvsig.republicadominicana.catastro.swing.impl/src/main/java/org/gvsig/republicadominicana/catastro/swing/impl/cadastralsearch/RDCatastroJSearchByCadastralReferenceView.java
25 25
   JLabel lblStatusMessages = new JLabel();
26 26
   JProgressBar pbStatus = new JProgressBar();
27 27
   JTextField txtCadastralReference = new JTextField();
28
   JLabel lblCadastralReference = new JLabel();
28 29

  
29 30
   /**
30 31
    * Default constructor
......
116 117
   public JPanel createPanel()
117 118
   {
118 119
      JPanel jpanel1 = new JPanel();
119
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
120
      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:NONE,CENTER:2DLU:NONE");
120 121
      CellConstraints cc = new CellConstraints();
121 122
      jpanel1.setLayout(formlayout1);
122 123

  
123
      jpanel1.add(createPanel1(),cc.xy(2,5));
124
      jpanel1.add(createPanel2(),cc.xy(2,7));
124
      jpanel1.add(createPanel1(),cc.xy(2,6));
125
      jpanel1.add(createPanel2(),cc.xy(2,8));
125 126
      txtCadastralReference.setName("txtCadastralReference");
126
      jpanel1.add(txtCadastralReference,cc.xy(2,2));
127
      jpanel1.add(txtCadastralReference,cc.xy(2,4));
127 128

  
128
      addFillComponents(jpanel1,new int[]{ 1,2,3 },new int[]{ 1,2,3,4,5,6,7,8 });
129
      lblCadastralReference.setName("lblCadastralReference");
130
      lblCadastralReference.setText("_Cadastral_reference");
131
      jpanel1.add(lblCadastralReference,cc.xy(2,2));
132

  
133
      addFillComponents(jpanel1,new int[]{ 1,2,3 },new int[]{ 1,2,3,4,5,6,7,8,9 });
129 134
      return jpanel1;
130 135
   }
131 136

  
org.gvsig.republicadominicana.catastro/trunk/org.gvsig.republicadominicana.catastro/org.gvsig.republicadominicana.catastro.swing/org.gvsig.republicadominicana.catastro.swing.impl/src/main/java/org/gvsig/republicadominicana/catastro/swing/impl/cadastralsearch/RDCatastroJSearchByCadastralReferenceImpl.java
8 8
import org.apache.commons.lang3.mutable.MutableObject;
9 9
import org.gvsig.expressionevaluator.Expression;
10 10
import org.gvsig.expressionevaluator.ExpressionUtils;
11
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator;
12
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager;
13 11
import org.gvsig.fmap.dal.feature.FeatureStore;
14
import org.gvsig.fmap.dal.swing.DALSwingLocator;
15
import org.gvsig.fmap.dal.swing.DataSwingManager;
16 12
import org.gvsig.online.swing.api.MessageStatus;
17 13
import org.gvsig.online.swing.api.OnlineSwingLocator;
18 14
import org.gvsig.online.swing.api.SimpleSearch;
......
46 42
        this.message = OnlineSwingLocator.getOnlineSwingManager().createMessageStatus(lblStatusCaption, pbStatus, lblStatusMessages);
47 43
        translate();
48 44
        
49
        DataSwingManager dataSwingManager = DALSwingLocator.getDataSwingManager();
50
        ExpressionEvaluatorSwingManager expressionSwingManager = ExpressionEvaluatorSwingLocator.getManager();
45
//        DataSwingManager dataSwingManager = DALSwingLocator.getDataSwingManager();
46
//        ExpressionEvaluatorSwingManager expressionSwingManager = ExpressionEvaluatorSwingLocator.getManager();
51 47

  
52 48
        this.txtCadastralReference.getDocument().addDocumentListener(new DocumentListener() {
53 49
            @Override
......
81 77
        doUpdateComponents();
82 78
        
83 79
        SwingUtilities.invokeLater(() -> { message.clear(); });
84
        ToolsSwingUtils.ensureRowsCols(this, 15, 40, 25, 100);
80
        ToolsSwingUtils.ensureRowsCols(this, 6, 60, 8, 100);
85 81
    }
86 82
    
87
    private void doBuildFilter() {
83
    private Expression doBuildFilter() {
88 84
        String refCat = txtCadastralReference.getText();
89 85
        Expression filter = ExpressionUtils.createExpression();
90 86
        filter.setPhrase("refcat= '"+refCat+"'");
91
        this.simpleSearch.setFilter(filter);
87
        return filter; //this.simpleSearch.setFilter(filter);
92 88
    }
93 89
    
94 90
    private void doUpdateComponents() {
......
133 129
    }
134 130
    
135 131
    private void doDownloadAndZoom() {
132
        this.simpleSearch.search(doBuildFilter());
136 133
        this.simpleSearch.runDownloadTask(
137 134
            ()->{ this.simpleSearch.zoom(); }, 
138 135
            this.message
......
140 137
    }
141 138

  
142 139
    private void doSelectAndZoom() {
140
        this.simpleSearch.search(doBuildFilter());
143 141
        this.simpleSearch.runCalculateEnvelopeTask(
144 142
            () -> {
145 143
                this.simpleSearch.setSelection();
......
151 149

  
152 150
    private void translate() {
153 151
        ToolsSwingManager swingManager = ToolsSwingLocator.getToolsSwingManager();
152
        swingManager.translate(this.lblCadastralReference);
154 153
        swingManager.translate(this.btnDownloadSelectAndZoom);
155 154
        swingManager.translate(this.btnSelectAndZoom);
156 155
    }
org.gvsig.republicadominicana.catastro/trunk/org.gvsig.republicadominicana.catastro/org.gvsig.republicadominicana.catastro.swing/org.gvsig.republicadominicana.catastro.swing.impl/src/main/java/org/gvsig/republicadominicana/catastro/swing/impl/cadastralsearch/RDCatastroJSearchByCadastralReferenceView.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/republicadominicana/catastro/swing/impl/cadastralsearch/RDCatastroJSearchByCadastralReference.xml</at>
28
   <at name="path">org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/republicadominicana/catastro/swing/impl/cadastralsearch/RDCatastroJSearchByCadastralReference.xml</at>
29
   <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,FILL: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/fdiaz/projects/gvSIG/org.gvsig.republicadominicana.catastro/org.gvsig.republicadominicana.catastro.swing/org.gvsig.republicadominicana.catastro.swing.impl/src/main/java/org/gvsig/republicadominicana/catastro/swing/impl/cadastralsearch/RDCatastroJSearchByCadastralReferenceView.xml</at>
28
   <at name="path">org.gvsig.republicadominicana.catastro/org.gvsig.republicadominicana.catastro.swing/org.gvsig.republicadominicana.catastro.swing.impl/src/main/java/org/gvsig/republicadominicana/catastro/swing/impl/cadastralsearch/RDCatastroJSearchByCadastralReferenceView.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: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">5</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">default</at>
......
47 47
         </at>
48 48
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
49 49
        </super>
50
        <at name="id">embedded.1307892817</at>
50
        <at name="id">embedded.1323023426</at>
51 51
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
52 52
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
53 53
        <at name="components">
......
253 253
         <at name="cellconstraints">
254 254
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
255 255
           <at name="column">2</at>
256
           <at name="row">7</at>
256
           <at name="row">8</at>
257 257
           <at name="colspan">1</at>
258 258
           <at name="rowspan">1</at>
259 259
           <at name="halign">default</at>
......
263 263
         </at>
264 264
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
265 265
        </super>
266
        <at name="id">embedded.1267132361</at>
266
        <at name="id">embedded.682631400</at>
267 267
        <at name="rowspecs">CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE</at>
268 268
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE</at>
269 269
        <at name="components">
......
313 313
                  </object>
314 314
                 </at>
315 315
                 <at name="name">lblStatusCaption</at>
316
                 <at name="width">343</at>
316
                 <at name="width">1290</at>
317 317
                 <at name="fill">
318 318
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
319 319
                   <at name="name">fill</at>
......
372 372
                  </object>
373 373
                 </at>
374 374
                 <at name="name">lblStatusMessages</at>
375
                 <at name="width">343</at>
375
                 <at name="width">1290</at>
376 376
                 <at name="fill">
377 377
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
378 378
                   <at name="name">fill</at>
......
431 431
                  </object>
432 432
                 </at>
433 433
                 <at name="name">pbStatus</at>
434
                 <at name="width">343</at>
434
                 <at name="width">1290</at>
435 435
                 <at name="percentComplete">0.25</at>
436 436
                 <at name="value">25</at>
437 437
                 <at name="height">12</at>
......
639 639
              </at>
640 640
             </object>
641 641
            </at>
642
            <at name="name"/>
642
            <at name="name"></at>
643 643
            <at name="fill">
644 644
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
645 645
              <at name="name">fill</at>
......
717 717
         <at name="cellconstraints">
718 718
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
719 719
           <at name="column">2</at>
720
           <at name="row">2</at>
720
           <at name="row">4</at>
721 721
           <at name="colspan">1</at>
722 722
           <at name="rowspan">1</at>
723 723
           <at name="halign">default</at>
......
755 755
             </object>
756 756
            </at>
757 757
            <at name="name">txtCadastralReference</at>
758
            <at name="width">364</at>
758
            <at name="width">1311</at>
759 759
            <at name="height">20</at>
760 760
           </object>
761 761
          </at>
......
764 764
       </object>
765 765
      </at>
766 766
     </item>
767
     <item >
768
      <at name="value">
769
       <object classname="com.jeta.forms.store.memento.BeanMemento">
770
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
771
         <at name="cellconstraints">
772
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
773
           <at name="column">2</at>
774
           <at name="row">2</at>
775
           <at name="colspan">1</at>
776
           <at name="rowspan">1</at>
777
           <at name="halign">default</at>
778
           <at name="valign">default</at>
779
           <at name="insets" object="insets">0,0,0,0</at>
780
          </object>
781
         </at>
782
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
783
        </super>
784
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
785
        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
786
        <at name="beanproperties">
787
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
788
          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
789
          <at name="properties">
790
           <object classname="com.jeta.forms.store.support.PropertyMap">
791
            <at name="border">
792
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
793
              <super classname="com.jeta.forms.store.properties.BorderProperty">
794
               <at name="name">border</at>
795
              </super>
796
              <at name="borders">
797
               <object classname="java.util.LinkedList">
798
                <item >
799
                 <at name="value">
800
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
801
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
802
                    <at name="name">border</at>
803
                   </super>
804
                  </object>
805
                 </at>
806
                </item>
807
               </object>
808
              </at>
809
             </object>
810
            </at>
811
            <at name="name">lblCadastralReference</at>
812
            <at name="width">1311</at>
813
            <at name="text">_Cadastral_reference</at>
814
            <at name="fill">
815
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
816
              <at name="name">fill</at>
817
             </object>
818
            </at>
819
            <at name="height">14</at>
820
           </object>
821
          </at>
822
         </object>
823
        </at>
824
       </object>
825
      </at>
826
     </item>
767 827
    </object>
768 828
   </at>
769 829
   <at name="properties">
......
781 841
         </at>
782 842
        </object>
783 843
       </at>
784
       <at name="name"/>
844
       <at name="name"></at>
785 845
       <at name="fill">
786 846
        <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
787 847
         <at name="name">fill</at>
......
821 881
   <at name="cellpainters">
822 882
    <object classname="com.jeta.forms.store.support.Matrix">
823 883
     <at name="rows">
824
      <object classname="[Ljava.lang.Object;" size="8">
884
      <object classname="[Ljava.lang.Object;" size="9">
825 885
       <at name="item" index="0">
826 886
        <object classname="[Ljava.lang.Object;" size="3"/>
827 887
       </at>
......
846 906
       <at name="item" index="7">
847 907
        <object classname="[Ljava.lang.Object;" size="3"/>
848 908
       </at>
909
       <at name="item" index="8">
910
        <object classname="[Ljava.lang.Object;" size="3"/>
911
       </at>
849 912
      </object>
850 913
     </at>
851 914
    </object>
852 915

  
org.gvsig.republicadominicana.catastro/trunk/org.gvsig.republicadominicana.catastro/org.gvsig.republicadominicana.catastro.app/org.gvsig.republicadominicana.catastro.app.mainplugin/src/main/resources-plugin/config.xml
22 22
        
23 23
      <action 
24 24
          name="tools-rdcatastro-searchbycadastralreference" 
25
          label="_RD_catastro_Search_by_cadastral_reference" 
26
          tooltip="_RD_catastro_Search_by_cadastral_reference"
27
          position="900700240" 
25
          label="_RDCatastro_Search_by_cadastral_reference" 
26
          tooltip="_RDCatastro_Search_by_cadastral_reference"
27
          position="909000240" 
28 28
          action-command="tools-rdcatastro-searchbycadastralreference" 
29 29
          icon="tools-rdcatastro-searchbycadastralreference"
30 30
          accelerator="" 
31 31
      />
32
<!--      
33
      <menu text="tools/_Cadastre_RD" tooltip="_RD_catastro" position="909000000" is_separator="true"/>
34
-->
35
      
36
      <menu text="tools/_Cadastre_RD/_Search_by_cadastral_reference" name="tools-rdcatastro-searchbycadastralreference" />
32 37

  
33
      <menu text="tools/_RD_catastro/_Search_by_cadastral_reference" name="tools-rdcatastro-searchbycadastralreference" />
34

  
35 38
      </extension>
36 39

  
37 40

  
org.gvsig.republicadominicana.catastro/trunk/org.gvsig.republicadominicana.catastro/org.gvsig.republicadominicana.catastro.app/org.gvsig.republicadominicana.catastro.app.mainplugin/src/main/resources-plugin/i18n/text.properties
1
_RDCatastro_Search_by_cadastral_reference=Rep. Dom. - B\u00fasqueda por referencia catastral
2
_Cadastral_reference=Referencia catastral
3
_Search_by_cadastral_reference=B\u00fasqueda por referencia catastral
4
_RD_catastro=Rep\u00fablica Dominicana - Catastro
5
_Calculating_envelope=Calculando envolvente
6
_Cadastre_RD=Catastro (R.D.)
org.gvsig.republicadominicana.catastro/trunk/org.gvsig.republicadominicana.catastro/org.gvsig.republicadominicana.catastro.app/org.gvsig.republicadominicana.catastro.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
1
_RDCatastro_Search_by_cadastral_reference=Rep. Dom. - Search by cadastral reference
2
_Cadastral_reference=Cadastral reference
3
_Search_by_cadastral_reference=Search by cadastral reference
4
_RD_catastro=Rep\u00fablica Dominicana - Cadastre
5
_Calculating_envelope=Calculating envelope
6
_Cadastre_RD=Catastro (R.D.)
7

  
org.gvsig.republicadominicana.catastro/trunk/org.gvsig.republicadominicana.catastro/org.gvsig.republicadominicana.catastro.app/org.gvsig.republicadominicana.catastro.app.mainplugin/src/main/java/org/gvsig/republicadominicana/catastro/app/mainplugin/RDCatastroExtension.java
250 250
                swingManager.createSearchByCadastralReferencePanel(store, arguments),
251 251
                "_RDCatastro_Search_by_cadastral_reference"
252 252
        );
253
        Dimension screensize = ApplicationLocator.getApplicationManager().getUIManager().getInternalSize();
254
        Dimension panelsize = dialog.getPanel().asJComponent().getPreferredSize();
255
        ToolsSwingUtils.ensureHeightWitdh(
256
                dialog.getPanel().asJComponent(), 
257
                Math.max(3*(screensize.height/4), panelsize.height),
258
                Math.max(2*(screensize.width/4), panelsize.width), 
259
                7*(screensize.height/8), 
260
                3*(screensize.width/4)
261
        );                    
253
//        Dimension screensize = ApplicationLocator.getApplicationManager().getUIManager().getInternalSize();
254
//        Dimension panelsize = dialog.getPanel().asJComponent().getPreferredSize();
255
//        ToolsSwingUtils.ensureHeightWitdh(
256
//                dialog.getPanel().asJComponent(), 
257
//                Math.max(3*(screensize.height/4), panelsize.height),
258
//                Math.max(2*(screensize.width/4), panelsize.width), 
259
//                7*(screensize.height/8), 
260
//                3*(screensize.width/4)
261
//        );                    
262 262
        dialog.show(
263 263
                Collections.singletonMap("align", GridBagConstraints.CENTER)
264 264
        );
265 265

  

Also available in: Unified diff