Revision 47733

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/extension/evalexpression/EvaluateExpressionPanelView.xml
31 31
    <object classname="java.util.LinkedList">
32 32
     <item >
33 33
      <at name="value">
34
       <object classname="com.jeta.forms.store.memento.BeanMemento">
35
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
36
         <at name="cellconstraints">
37
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
38
           <at name="column">4</at>
39
           <at name="row">2</at>
40
           <at name="colspan">1</at>
41
           <at name="rowspan">1</at>
42
           <at name="halign">default</at>
43
           <at name="valign">default</at>
44
           <at name="insets" object="insets">0,0,0,0</at>
45
          </object>
46
         </at>
47
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
48
        </super>
49
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
50
        <at name="beanclass">javax.swing.JButton</at>
51
        <at name="beanproperties">
52
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
53
          <at name="classname">javax.swing.JButton</at>
54
          <at name="properties">
55
           <object classname="com.jeta.forms.store.support.PropertyMap">
56
            <at name="border">
57
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
58
              <super classname="com.jeta.forms.store.properties.BorderProperty">
59
               <at name="name">border</at>
60
              </super>
61
              <at name="borders">
62
               <object classname="java.util.LinkedList">
63
                <item >
64
                 <at name="value">
65
                  <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
66
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
67
                    <at name="name">border</at>
68
                   </super>
69
                   <at name="top">2</at>
70
                   <at name="left">2</at>
71
                   <at name="bottom">2</at>
72
                   <at name="right">2</at>
73
                  </object>
74
                 </at>
75
                </item>
76
               </object>
77
              </at>
78
             </object>
79
            </at>
80
            <at name="actionCommand">...</at>
81
            <at name="name">btnExpression</at>
82
            <at name="width">13</at>
83
            <at name="text">...</at>
84
            <at name="height">295</at>
85
           </object>
86
          </at>
87
         </object>
88
        </at>
89
       </object>
90
      </at>
91
     </item>
92
     <item >
93
      <at name="value">
94
       <object classname="com.jeta.forms.store.memento.BeanMemento">
95
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
96
         <at name="cellconstraints">
97
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
98
           <at name="column">4</at>
99
           <at name="row">4</at>
100
           <at name="colspan">1</at>
101
           <at name="rowspan">1</at>
102
           <at name="halign">default</at>
103
           <at name="valign">default</at>
104
           <at name="insets" object="insets">0,0,0,0</at>
105
          </object>
106
         </at>
107
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
108
        </super>
109
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
110
        <at name="beanclass">javax.swing.JButton</at>
111
        <at name="beanproperties">
112
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
113
          <at name="classname">javax.swing.JButton</at>
114
          <at name="properties">
115
           <object classname="com.jeta.forms.store.support.PropertyMap">
116
            <at name="border">
117
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
118
              <super classname="com.jeta.forms.store.properties.BorderProperty">
119
               <at name="name">border</at>
120
              </super>
121
              <at name="borders">
122
               <object classname="java.util.LinkedList">
123
                <item >
124
                 <at name="value">
125
                  <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
126
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
127
                    <at name="name">border</at>
128
                   </super>
129
                   <at name="top">2</at>
130
                   <at name="left">2</at>
131
                   <at name="bottom">2</at>
132
                   <at name="right">2</at>
133
                  </object>
134
                 </at>
135
                </item>
136
               </object>
137
              </at>
138
             </object>
139
            </at>
140
            <at name="actionCommand">...</at>
141
            <at name="name">btnExpressionHistory</at>
142
            <at name="width">13</at>
143
            <at name="text">...</at>
144
            <at name="height">20</at>
145
           </object>
146
          </at>
147
         </object>
148
        </at>
149
       </object>
150
      </at>
151
     </item>
152
     <item >
153
      <at name="value">
154
       <object classname="com.jeta.forms.store.memento.BeanMemento">
155
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
156
         <at name="cellconstraints">
157
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
158
           <at name="column">4</at>
159
           <at name="row">6</at>
160
           <at name="colspan">1</at>
161
           <at name="rowspan">1</at>
162
           <at name="halign">default</at>
163
           <at name="valign">default</at>
164
           <at name="insets" object="insets">0,0,0,0</at>
165
          </object>
166
         </at>
167
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
168
        </super>
169
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
170
        <at name="beanclass">javax.swing.JButton</at>
171
        <at name="beanproperties">
172
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
173
          <at name="classname">javax.swing.JButton</at>
174
          <at name="properties">
175
           <object classname="com.jeta.forms.store.support.PropertyMap">
176
            <at name="border">
177
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
178
              <super classname="com.jeta.forms.store.properties.BorderProperty">
179
               <at name="name">border</at>
180
              </super>
181
              <at name="borders">
182
               <object classname="java.util.LinkedList">
183
                <item >
184
                 <at name="value">
185
                  <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
186
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
187
                    <at name="name">border</at>
188
                   </super>
189
                   <at name="top">2</at>
190
                   <at name="left">2</at>
191
                   <at name="bottom">2</at>
192
                   <at name="right">2</at>
193
                  </object>
194
                 </at>
195
                </item>
196
               </object>
197
              </at>
198
             </object>
199
            </at>
200
            <at name="actionCommand">...</at>
201
            <at name="name">btnExpressionBookmarks</at>
202
            <at name="width">13</at>
203
            <at name="text">...</at>
204
            <at name="height">20</at>
205
           </object>
206
          </at>
207
         </object>
208
        </at>
209
       </object>
210
      </at>
211
     </item>
212
     <item >
213
      <at name="value">
214 34
       <object classname="com.jeta.forms.store.memento.FormMemento">
215 35
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
216 36
         <at name="cellconstraints">
217 37
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
218 38
           <at name="column">2</at>
219 39
           <at name="row">8</at>
220
           <at name="colspan">1</at>
40
           <at name="colspan">3</at>
221 41
           <at name="rowspan">1</at>
222 42
           <at name="halign">default</at>
223 43
           <at name="valign">default</at>
......
226 46
         </at>
227 47
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
228 48
        </super>
229
        <at name="id">embedded.152396244</at>
49
        <at name="id">embedded.1625389879</at>
230 50
        <at name="rowspecs">CENTER:DEFAULT: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</at>
231 51
        <at name="colspecs">FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
232 52
        <at name="components">
......
276 96
                  </object>
277 97
                 </at>
278 98
                 <at name="name">lblLaunchOnChangeBBox</at>
279
                 <at name="width">285</at>
280
                 <at name="text">Actualizar cuando cambie el encuadre de la vista activa</at>
99
                 <at name="width">103</at>
100
                 <at name="text">Actualizar cuando:</at>
281 101
                 <at name="fill">
282 102
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
283 103
                   <at name="name">fill</at>
......
297 117
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
298 118
              <at name="cellconstraints">
299 119
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
300
                <at name="column">3</at>
301
                <at name="row">1</at>
302
                <at name="colspan">1</at>
303
                <at name="rowspan">1</at>
304
                <at name="halign">default</at>
305
                <at name="valign">default</at>
306
                <at name="insets" object="insets">0,0,0,0</at>
307
               </object>
308
              </at>
309
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
310
             </super>
311
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
312
             <at name="beanclass">javax.swing.JCheckBox</at>
313
             <at name="beanproperties">
314
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
315
               <at name="classname">javax.swing.JCheckBox</at>
316
               <at name="properties">
317
                <object classname="com.jeta.forms.store.support.PropertyMap">
318
                 <at name="border">
319
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
320
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
321
                    <at name="name">border</at>
322
                   </super>
323
                   <at name="borders">
324
                    <object classname="java.util.LinkedList">
325
                     <item >
326
                      <at name="value">
327
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
328
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
329
                         <at name="name">border</at>
330
                        </super>
331
                       </object>
332
                      </at>
333
                     </item>
334
                    </object>
335
                   </at>
336
                  </object>
337
                 </at>
338
                 <at name="name">chkLaunchOnChangeBBox</at>
339
                 <at name="width">500</at>
340
                 <at name="height">15</at>
341
                </object>
342
               </at>
343
              </object>
344
             </at>
345
            </object>
346
           </at>
347
          </item>
348
          <item >
349
           <at name="value">
350
            <object classname="com.jeta.forms.store.memento.BeanMemento">
351
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
352
              <at name="cellconstraints">
353
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
354 120
                <at name="column">1</at>
355 121
                <at name="row">7</at>
356 122
                <at name="colspan">1</at>
......
390 156
                  </object>
391 157
                 </at>
392 158
                 <at name="name">lblWindowType</at>
393
                 <at name="width">285</at>
159
                 <at name="width">103</at>
394 160
                 <at name="text">Tipo de ventana</at>
395 161
                 <at name="fill">
396 162
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
463 229
                  </object>
464 230
                 </at>
465 231
                 <at name="name">cboWindowType</at>
466
                 <at name="width">500</at>
232
                 <at name="width">1473</at>
467 233
                 <at name="items">
468 234
                  <object classname="com.jeta.forms.store.properties.ItemsProperty">
469 235
                   <at name="name">items</at>
......
572 338
                  </object>
573 339
                 </at>
574 340
                 <at name="name">lblContentType</at>
575
                 <at name="width">285</at>
341
                 <at name="width">103</at>
576 342
                 <at name="text">Tipo de contenido</at>
577 343
                 <at name="fill">
578 344
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
645 411
                  </object>
646 412
                 </at>
647 413
                 <at name="name">cboContentType</at>
648
                 <at name="width">500</at>
414
                 <at name="width">1473</at>
649 415
                 <at name="items">
650 416
                  <object classname="com.jeta.forms.store.properties.ItemsProperty">
651 417
                   <at name="name">items</at>
......
754 520
                  </object>
755 521
                 </at>
756 522
                 <at name="name">lblTitle</at>
757
                 <at name="width">285</at>
523
                 <at name="width">103</at>
758 524
                 <at name="text">Titulo de la ventana</at>
759 525
                 <at name="fill">
760 526
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
814 580
                  </object>
815 581
                 </at>
816 582
                 <at name="name">txtTitle</at>
817
                 <at name="width">500</at>
583
                 <at name="width">1473</at>
818 584
                 <at name="height">22</at>
819 585
                </object>
820 586
               </at>
......
831 597
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
832 598
                <at name="column">1</at>
833 599
                <at name="row">3</at>
834
                <at name="colspan">1</at>
600
                <at name="colspan">3</at>
835 601
                <at name="rowspan">1</at>
836 602
                <at name="halign">default</at>
837 603
                <at name="valign">default</at>
......
841 607
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
842 608
             </super>
843 609
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
844
             <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
610
             <at name="beanclass">javax.swing.JList</at>
845 611
             <at name="beanproperties">
846 612
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
847
               <at name="classname">com.jeta.forms.components.label.JETALabel</at>
613
               <at name="classname">javax.swing.JList</at>
848 614
               <at name="properties">
849 615
                <object classname="com.jeta.forms.store.support.PropertyMap">
850 616
                 <at name="border">
......
867 633
                   </at>
868 634
                  </object>
869 635
                 </at>
870
                 <at name="name">lblLaunchOnChangeBBox</at>
871
                 <at name="width">285</at>
872
                 <at name="text">Actualizar cuando cambie la seleccion de la capa activa</at>
873
                 <at name="fill">
874
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
875
                   <at name="name">fill</at>
636
                 <at name="scrollableTracksViewportHeight">true</at>
637
                 <at name="scrollableTracksViewportWidth">true</at>
638
                 <at name="name">lstUpdaters</at>
639
                 <at name="width">1584</at>
640
                 <at name="items">
641
                  <object classname="com.jeta.forms.store.properties.ItemsProperty">
642
                   <at name="name">items</at>
876 643
                  </object>
877 644
                 </at>
878
                 <at name="height">16</at>
879
                </object>
880
               </at>
881
              </object>
882
             </at>
883
            </object>
884
           </at>
885
          </item>
886
          <item >
887
           <at name="value">
888
            <object classname="com.jeta.forms.store.memento.BeanMemento">
889
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
890
              <at name="cellconstraints">
891
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
892
                <at name="column">3</at>
893
                <at name="row">3</at>
894
                <at name="colspan">1</at>
895
                <at name="rowspan">1</at>
896
                <at name="halign">default</at>
897
                <at name="valign">default</at>
898
                <at name="insets" object="insets">0,0,0,0</at>
899
               </object>
900
              </at>
901
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
902
             </super>
903
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
904
             <at name="beanclass">javax.swing.JCheckBox</at>
905
             <at name="beanproperties">
906
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
907
               <at name="classname">javax.swing.JCheckBox</at>
908
               <at name="properties">
909
                <object classname="com.jeta.forms.store.support.PropertyMap">
910
                 <at name="border">
911
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
912
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
913
                    <at name="name">border</at>
914
                   </super>
915
                   <at name="borders">
916
                    <object classname="java.util.LinkedList">
917
                     <item >
918
                      <at name="value">
919
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
920
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
921
                         <at name="name">border</at>
922
                        </super>
923
                       </object>
924
                      </at>
925
                     </item>
926
                    </object>
927
                   </at>
645
                 <at name="scollBars">
646
                  <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
647
                   <at name="name">scollBars</at>
648
                   <at name="verticalpolicy">20</at>
649
                   <at name="horizontalpolicy">30</at>
928 650
                  </object>
929 651
                 </at>
930
                 <at name="name">chkLaunchOnChangeSelection</at>
931
                 <at name="width">500</at>
932
                 <at name="height">15</at>
652
                 <at name="height">78</at>
933 653
                </object>
934 654
               </at>
935 655
              </object>
......
954 674
              </at>
955 675
             </object>
956 676
            </at>
957
            <at name="name"/>
677
            <at name="name"></at>
958 678
            <at name="fill">
959 679
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
960 680
              <at name="name">fill</at>
......
1050 770
         <at name="cellconstraints">
1051 771
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1052 772
           <at name="column">2</at>
1053
           <at name="row">10</at>
773
           <at name="row">2</at>
1054 774
           <at name="colspan">1</at>
1055
           <at name="rowspan">1</at>
1056
           <at name="halign">right</at>
775
           <at name="rowspan">5</at>
776
           <at name="halign">default</at>
1057 777
           <at name="valign">default</at>
1058 778
           <at name="insets" object="insets">0,0,0,0</at>
1059 779
          </object>
......
1061 781
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1062 782
        </super>
1063 783
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1064
        <at name="beanclass">javax.swing.JButton</at>
784
        <at name="beanclass">javax.swing.JTextArea</at>
1065 785
        <at name="beanproperties">
1066 786
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1067
          <at name="classname">javax.swing.JButton</at>
787
          <at name="classname">javax.swing.JTextArea</at>
1068 788
          <at name="properties">
1069 789
           <object classname="com.jeta.forms.store.support.PropertyMap">
1070 790
            <at name="border">
......
1087 807
              </at>
1088 808
             </object>
1089 809
            </at>
1090
            <at name="actionCommand">Ejecutar</at>
1091
            <at name="name">btnExecute</at>
1092
            <at name="width">74</at>
1093
            <at name="text">Ejecutar</at>
1094
            <at name="height">24</at>
810
            <at name="scrollableTracksViewportHeight">true</at>
811
            <at name="scrollableTracksViewportWidth">true</at>
812
            <at name="name">txtExpression</at>
813
            <at name="width">1539</at>
814
            <at name="scollBars">
815
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
816
              <at name="name">scollBars</at>
817
              <at name="verticalpolicy">20</at>
818
              <at name="horizontalpolicy">30</at>
819
              <at name="border">
820
               <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
821
                <super classname="com.jeta.forms.store.properties.BorderProperty">
822
                 <at name="name">border</at>
823
                </super>
824
                <at name="borders">
825
                 <object classname="java.util.LinkedList">
826
                  <item >
827
                   <at name="value">
828
                    <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
829
                     <super classname="com.jeta.forms.store.properties.BorderProperty">
830
                      <at name="name">border</at>
831
                     </super>
832
                    </object>
833
                   </at>
834
                  </item>
835
                 </object>
836
                </at>
837
               </object>
838
              </at>
839
             </object>
840
            </at>
841
            <at name="height">598</at>
1095 842
           </object>
1096 843
          </at>
1097 844
         </object>
......
1101 848
     </item>
1102 849
     <item >
1103 850
      <at name="value">
1104
       <object classname="com.jeta.forms.store.memento.BeanMemento">
851
       <object classname="com.jeta.forms.store.memento.FormMemento">
1105 852
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
1106 853
         <at name="cellconstraints">
1107 854
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1108
           <at name="column">2</at>
855
           <at name="column">4</at>
1109 856
           <at name="row">2</at>
1110 857
           <at name="colspan">1</at>
1111
           <at name="rowspan">5</at>
858
           <at name="rowspan">1</at>
1112 859
           <at name="halign">default</at>
1113 860
           <at name="valign">default</at>
1114 861
           <at name="insets" object="insets">0,0,0,0</at>
1115 862
          </object>
1116 863
         </at>
1117
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
864
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1118 865
        </super>
1119
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1120
        <at name="beanclass">javax.swing.JTextArea</at>
1121
        <at name="beanproperties">
866
        <at name="id">embedded.P6c20198aM18e728a3bc8AY7fff</at>
867
        <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
868
        <at name="colspecs">FILL:DEFAULT:NONE</at>
869
        <at name="components">
870
         <object classname="java.util.LinkedList">
871
          <item >
872
           <at name="value">
873
            <object classname="com.jeta.forms.store.memento.BeanMemento">
874
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
875
              <at name="cellconstraints">
876
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
877
                <at name="column">1</at>
878
                <at name="row">1</at>
879
                <at name="colspan">1</at>
880
                <at name="rowspan">1</at>
881
                <at name="halign">default</at>
882
                <at name="valign">default</at>
883
                <at name="insets" object="insets">0,0,0,0</at>
884
               </object>
885
              </at>
886
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
887
             </super>
888
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
889
             <at name="beanclass">javax.swing.JButton</at>
890
             <at name="beanproperties">
891
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
892
               <at name="classname">javax.swing.JButton</at>
893
               <at name="properties">
894
                <object classname="com.jeta.forms.store.support.PropertyMap">
895
                 <at name="border">
896
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
897
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
898
                    <at name="name">border</at>
899
                   </super>
900
                   <at name="borders">
901
                    <object classname="java.util.LinkedList">
902
                     <item >
903
                      <at name="value">
904
                       <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
905
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
906
                         <at name="name">border</at>
907
                        </super>
908
                        <at name="top">2</at>
909
                        <at name="left">2</at>
910
                        <at name="bottom">2</at>
911
                        <at name="right">2</at>
912
                       </object>
913
                      </at>
914
                     </item>
915
                    </object>
916
                   </at>
917
                  </object>
918
                 </at>
919
                 <at name="actionCommand">...</at>
920
                 <at name="name">btnExpression</at>
921
                 <at name="width">13</at>
922
                 <at name="text">...</at>
923
                 <at name="height">20</at>
924
                </object>
925
               </at>
926
              </object>
927
             </at>
928
            </object>
929
           </at>
930
          </item>
931
          <item >
932
           <at name="value">
933
            <object classname="com.jeta.forms.store.memento.BeanMemento">
934
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
935
              <at name="cellconstraints">
936
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
937
                <at name="column">1</at>
938
                <at name="row">3</at>
939
                <at name="colspan">1</at>
940
                <at name="rowspan">1</at>
941
                <at name="halign">default</at>
942
                <at name="valign">default</at>
943
                <at name="insets" object="insets">0,0,0,0</at>
944
               </object>
945
              </at>
946
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
947
             </super>
948
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
949
             <at name="beanclass">javax.swing.JButton</at>
950
             <at name="beanproperties">
951
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
952
               <at name="classname">javax.swing.JButton</at>
953
               <at name="properties">
954
                <object classname="com.jeta.forms.store.support.PropertyMap">
955
                 <at name="border">
956
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
957
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
958
                    <at name="name">border</at>
959
                   </super>
960
                   <at name="borders">
961
                    <object classname="java.util.LinkedList">
962
                     <item >
963
                      <at name="value">
964
                       <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
965
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
966
                         <at name="name">border</at>
967
                        </super>
968
                        <at name="top">2</at>
969
                        <at name="left">2</at>
970
                        <at name="bottom">2</at>
971
                        <at name="right">2</at>
972
                       </object>
973
                      </at>
974
                     </item>
975
                    </object>
976
                   </at>
977
                  </object>
978
                 </at>
979
                 <at name="actionCommand">...</at>
980
                 <at name="name">btnExpressionHistory</at>
981
                 <at name="width">13</at>
982
                 <at name="text">...</at>
983
                 <at name="height">20</at>
984
                </object>
985
               </at>
986
              </object>
987
             </at>
988
            </object>
989
           </at>
990
          </item>
991
          <item >
992
           <at name="value">
993
            <object classname="com.jeta.forms.store.memento.BeanMemento">
994
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
995
              <at name="cellconstraints">
996
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
997
                <at name="column">1</at>
998
                <at name="row">5</at>
999
                <at name="colspan">1</at>
1000
                <at name="rowspan">1</at>
1001
                <at name="halign">default</at>
1002
                <at name="valign">default</at>
1003
                <at name="insets" object="insets">0,0,0,0</at>
1004
               </object>
1005
              </at>
1006
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1007
             </super>
1008
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1009
             <at name="beanclass">javax.swing.JButton</at>
1010
             <at name="beanproperties">
1011
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1012
               <at name="classname">javax.swing.JButton</at>
1013
               <at name="properties">
1014
                <object classname="com.jeta.forms.store.support.PropertyMap">
1015
                 <at name="border">
1016
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1017
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1018
                    <at name="name">border</at>
1019
                   </super>
1020
                   <at name="borders">
1021
                    <object classname="java.util.LinkedList">
1022
                     <item >
1023
                      <at name="value">
1024
                       <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
1025
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
1026
                         <at name="name">border</at>
1027
                        </super>
1028
                        <at name="top">2</at>
1029
                        <at name="left">2</at>
1030
                        <at name="bottom">2</at>
1031
                        <at name="right">2</at>
1032
                       </object>
1033
                      </at>
1034
                     </item>
1035
                    </object>
1036
                   </at>
1037
                  </object>
1038
                 </at>
1039
                 <at name="actionCommand">...</at>
1040
                 <at name="name">btnExpressionBookmarks</at>
1041
                 <at name="width">13</at>
1042
                 <at name="text">...</at>
1043
                 <at name="height">20</at>
1044
                </object>
1045
               </at>
1046
              </object>
1047
             </at>
1048
            </object>
1049
           </at>
1050
          </item>
1051
         </object>
1052
        </at>
1053
        <at name="properties">
1122 1054
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1123
          <at name="classname">javax.swing.JTextArea</at>
1055
          <at name="classname">com.jeta.forms.gui.form.GridView</at>
1124 1056
          <at name="properties">
1125 1057
           <object classname="com.jeta.forms.store.support.PropertyMap">
1126 1058
            <at name="border">
......
1129 1061
               <at name="name">border</at>
1130 1062
              </super>
1131 1063
              <at name="borders">
1132
               <object classname="java.util.LinkedList">
1133
                <item >
1134
                 <at name="value">
1135
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1064
               <object classname="java.util.LinkedList"/>
1065
              </at>
1066
             </object>
1067
            </at>
1068
            <at name="name"></at>
1069
            <at name="fill">
1070
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1071
              <at name="name">fill</at>
1072
             </object>
1073
            </at>
1074
            <at name="scollBars">
1075
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
1076
              <at name="name">scollBars</at>
1077
              <at name="verticalpolicy">21</at>
1078
              <at name="horizontalpolicy">31</at>
1079
             </object>
1080
            </at>
1081
           </object>
1082
          </at>
1083
         </object>
1084
        </at>
1085
        <at name="cellpainters">
1086
         <object classname="com.jeta.forms.store.support.Matrix">
1087
          <at name="rows">
1088
           <object classname="[Ljava.lang.Object;" size="5">
1089
            <at name="item" index="0">
1090
             <object classname="[Ljava.lang.Object;" size="1"/>
1091
            </at>
1092
            <at name="item" index="1">
1093
             <object classname="[Ljava.lang.Object;" size="1"/>
1094
            </at>
1095
            <at name="item" index="2">
1096
             <object classname="[Ljava.lang.Object;" size="1"/>
1097
            </at>
1098
            <at name="item" index="3">
1099
             <object classname="[Ljava.lang.Object;" size="1"/>
1100
            </at>
1101
            <at name="item" index="4">
1102
             <object classname="[Ljava.lang.Object;" size="1"/>
1103
            </at>
1104
           </object>
1105
          </at>
1106
         </object>
1107
        </at>
1108
        <at name="rowgroups">
1109
         <object classname="com.jeta.forms.store.memento.FormGroupSet">
1110
          <at name="groups">
1111
           <object classname="java.util.HashMap"/>
1112
          </at>
1113
         </object>
1114
        </at>
1115
        <at name="colgroups">
1116
         <object classname="com.jeta.forms.store.memento.FormGroupSet">
1117
          <at name="groups">
1118
           <object classname="java.util.HashMap"/>
1119
          </at>
1120
         </object>
1121
        </at>
1122
       </object>
1123
      </at>
1124
     </item>
1125
     <item >
1126
      <at name="value">
1127
       <object classname="com.jeta.forms.store.memento.FormMemento">
1128
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
1129
         <at name="cellconstraints">
1130
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1131
           <at name="column">2</at>
1132
           <at name="row">10</at>
1133
           <at name="colspan">3</at>
1134
           <at name="rowspan">1</at>
1135
           <at name="halign">right</at>
1136
           <at name="valign">default</at>
1137
           <at name="insets" object="insets">0,0,0,0</at>
1138
          </object>
1139
         </at>
1140
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1141
        </super>
1142
        <at name="id">embedded.V6c20198aE18e728a3bc8WL7ffe</at>
1143
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1144
        <at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE</at>
1145
        <at name="components">
1146
         <object classname="java.util.LinkedList">
1147
          <item >
1148
           <at name="value">
1149
            <object classname="com.jeta.forms.store.memento.BeanMemento">
1150
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
1151
              <at name="cellconstraints">
1152
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1153
                <at name="column">3</at>
1154
                <at name="row">1</at>
1155
                <at name="colspan">1</at>
1156
                <at name="rowspan">1</at>
1157
                <at name="halign">default</at>
1158
                <at name="valign">default</at>
1159
                <at name="insets" object="insets">0,0,0,0</at>
1160
               </object>
1161
              </at>
1162
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1163
             </super>
1164
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1165
             <at name="beanclass">javax.swing.JButton</at>
1166
             <at name="beanproperties">
1167
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1168
               <at name="classname">javax.swing.JButton</at>
1169
               <at name="properties">
1170
                <object classname="com.jeta.forms.store.support.PropertyMap">
1171
                 <at name="border">
1172
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1136 1173
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1137 1174
                    <at name="name">border</at>
1138 1175
                   </super>
1176
                   <at name="borders">
1177
                    <object classname="java.util.LinkedList">
1178
                     <item >
1179
                      <at name="value">
1180
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1181
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
1182
                         <at name="name">border</at>
1183
                        </super>
1184
                       </object>
1185
                      </at>
1186
                     </item>
1187
                    </object>
1188
                   </at>
1139 1189
                  </object>
1140 1190
                 </at>
1141
                </item>
1191
                 <at name="actionCommand">Ejecutar</at>
1192
                 <at name="name">btnExecute</at>
1193
                 <at name="width">74</at>
1194
                 <at name="text">Ejecutar</at>
1195
                 <at name="height">24</at>
1196
                </object>
1197
               </at>
1198
              </object>
1199
             </at>
1200
            </object>
1201
           </at>
1202
          </item>
1203
          <item >
1204
           <at name="value">
1205
            <object classname="com.jeta.forms.store.memento.BeanMemento">
1206
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
1207
              <at name="cellconstraints">
1208
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1209
                <at name="column">1</at>
1210
                <at name="row">1</at>
1211
                <at name="colspan">1</at>
1212
                <at name="rowspan">1</at>
1213
                <at name="halign">default</at>
1214
                <at name="valign">default</at>
1215
                <at name="insets" object="insets">0,0,0,0</at>
1142 1216
               </object>
1143 1217
              </at>
1218
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1219
             </super>
1220
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1221
             <at name="beanclass">javax.swing.JButton</at>
1222
             <at name="beanproperties">
1223
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1224
               <at name="classname">javax.swing.JButton</at>
1225
               <at name="properties">
1226
                <object classname="com.jeta.forms.store.support.PropertyMap">
1227
                 <at name="border">
1228
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1229
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1230
                    <at name="name">border</at>
1231
                   </super>
1232
                   <at name="borders">
1233
                    <object classname="java.util.LinkedList">
1234
                     <item >
1235
                      <at name="value">
1236
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1237
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
1238
                         <at name="name">border</at>
1239
                        </super>
1240
                       </object>
1241
                      </at>
1242
                     </item>
1243
                    </object>
1244
                   </at>
1245
                  </object>
1246
                 </at>
1247
                 <at name="actionCommand">Generar script</at>
1248
                 <at name="name">btnMakeScript</at>
1249
                 <at name="width">107</at>
1250
                 <at name="text">Generar script</at>
1251
                 <at name="height">24</at>
1252
                </object>
1253
               </at>
1254
              </object>
1255
             </at>
1256
            </object>
1257
           </at>
1258
          </item>
1259
         </object>
1260
        </at>
1261
        <at name="properties">
1262
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1263
          <at name="classname">com.jeta.forms.gui.form.GridView</at>
1264
          <at name="properties">
1265
           <object classname="com.jeta.forms.store.support.PropertyMap">
1266
            <at name="border">
1267
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1268
              <super classname="com.jeta.forms.store.properties.BorderProperty">
1269
               <at name="name">border</at>
1270
              </super>
1271
              <at name="borders">
1272
               <object classname="java.util.LinkedList"/>
1273
              </at>
1144 1274
             </object>
1145 1275
            </at>
1146
            <at name="scrollableTracksViewportHeight">true</at>
1147
            <at name="scrollableTracksViewportWidth">true</at>
1148
            <at name="name">txtExpression</at>
1149
            <at name="width">798</at>
1276
            <at name="name"></at>
1277
            <at name="fill">
1278
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1279
              <at name="name">fill</at>
1280
             </object>
1281
            </at>
1150 1282
            <at name="scollBars">
1151 1283
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
1152 1284
              <at name="name">scollBars</at>
1153
              <at name="verticalpolicy">20</at>
1154
              <at name="horizontalpolicy">30</at>
1155
              <at name="border">
1156
               <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1157
                <super classname="com.jeta.forms.store.properties.BorderProperty">
1158
                 <at name="name">border</at>
1159
                </super>
1160
                <at name="borders">
1161
                 <object classname="java.util.LinkedList">
1162
                  <item >
1163
                   <at name="value">
1164
                    <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1165
                     <super classname="com.jeta.forms.store.properties.BorderProperty">
1166
                      <at name="name">border</at>
1167
                     </super>
1168
                    </object>
1169
                   </at>
1170
                  </item>
1171
                 </object>
1172
                </at>
1173
               </object>
1174
              </at>
1285
              <at name="verticalpolicy">21</at>
1286
              <at name="horizontalpolicy">31</at>
1175 1287
             </object>
1176 1288
            </at>
1177
            <at name="height">347</at>
1178 1289
           </object>
1179 1290
          </at>
1180 1291
         </object>
1181 1292
        </at>
1293
        <at name="cellpainters">
1294
         <object classname="com.jeta.forms.store.support.Matrix">
1295
          <at name="rows">
1296
           <object classname="[Ljava.lang.Object;" size="1">
1297
            <at name="item" index="0">
1298
             <object classname="[Ljava.lang.Object;" size="3"/>
1299
            </at>
1300
           </object>
1301
          </at>
1302
         </object>
1303
        </at>
1304
        <at name="rowgroups">
1305
         <object classname="com.jeta.forms.store.memento.FormGroupSet">
1306
          <at name="groups">
1307
           <object classname="java.util.HashMap"/>
1308
          </at>
1309
         </object>
1310
        </at>
1311
        <at name="colgroups">
1312
         <object classname="com.jeta.forms.store.memento.FormGroupSet">
1313
          <at name="groups">
1314
           <object classname="java.util.HashMap"/>
1315
          </at>
1316
         </object>
1317
        </at>
1182 1318
       </object>
1183 1319
      </at>
1184 1320
     </item>
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/extension/evalexpression/EvaluateExpressionPanelView.java
10 10
import javax.swing.Box;
11 11
import javax.swing.ImageIcon;
12 12
import javax.swing.JButton;
13
import javax.swing.JCheckBox;
14 13
import javax.swing.JComboBox;
15 14
import javax.swing.JFrame;
16 15
import javax.swing.JLabel;
16
import javax.swing.JList;
17 17
import javax.swing.JPanel;
18 18
import javax.swing.JScrollPane;
19 19
import javax.swing.JTextArea;
......
23 23

  
24 24
public class EvaluateExpressionPanelView extends JPanel
25 25
{
26
   JButton btnExpression = new JButton();
27
   JButton btnExpressionHistory = new JButton();
28
   JButton btnExpressionBookmarks = new JButton();
29 26
   JLabel lblLaunchOnChangeBBox = new JLabel();
30
   JCheckBox chkLaunchOnChangeBBox = new JCheckBox();
31 27
   JLabel lblWindowType = new JLabel();
32 28
   JComboBox cboWindowType = new JComboBox();
33 29
   JLabel lblContentType = new JLabel();
34 30
   JComboBox cboContentType = new JComboBox();
35 31
   JLabel lblTitle = new JLabel();
36 32
   JTextField txtTitle = new JTextField();
37
   JLabel lblLaunchOnChangeBBox1 = new JLabel();
38
   JCheckBox chkLaunchOnChangeSelection = new JCheckBox();
33
   JList lstUpdaters = new JList();
34
   JTextArea txtExpression = new JTextArea();
35
   JButton btnExpression = new JButton();
36
   JButton btnExpressionHistory = new JButton();
37
   JButton btnExpressionBookmarks = new JButton();
39 38
   JButton btnExecute = new JButton();
40
   JTextArea txtExpression = new JTextArea();
39
   JButton btnMakeScript = new JButton();
41 40

  
42 41
   /**
43 42
    * Default constructor
......
133 132
      CellConstraints cc = new CellConstraints();
134 133
      jpanel1.setLayout(formlayout1);
135 134

  
136
      btnExpression.setActionCommand("...");
137
      btnExpression.setName("btnExpression");
138
      btnExpression.setText("...");
139
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
140
      btnExpression.setBorder(emptyborder1);
141
      jpanel1.add(btnExpression,cc.xy(4,2));
142

  
143
      btnExpressionHistory.setActionCommand("...");
144
      btnExpressionHistory.setName("btnExpressionHistory");
145
      btnExpressionHistory.setText("...");
146
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
147
      btnExpressionHistory.setBorder(emptyborder2);
148
      jpanel1.add(btnExpressionHistory,cc.xy(4,4));
149

  
150
      btnExpressionBookmarks.setActionCommand("...");
151
      btnExpressionBookmarks.setName("btnExpressionBookmarks");
152
      btnExpressionBookmarks.setText("...");
153
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
154
      btnExpressionBookmarks.setBorder(emptyborder3);
155
      jpanel1.add(btnExpressionBookmarks,cc.xy(4,6));
156

  
157
      jpanel1.add(createPanel1(),cc.xy(2,8));
158
      btnExecute.setActionCommand("Ejecutar");
159
      btnExecute.setName("btnExecute");
160
      btnExecute.setText("Ejecutar");
161
      jpanel1.add(btnExecute,new CellConstraints(2,10,1,1,CellConstraints.RIGHT,CellConstraints.DEFAULT));
162

  
135
      jpanel1.add(createPanel1(),cc.xywh(2,8,3,1));
163 136
      txtExpression.setName("txtExpression");
164 137
      JScrollPane jscrollpane1 = new JScrollPane();
165 138
      jscrollpane1.setViewportView(txtExpression);
......
167 140
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
168 141
      jpanel1.add(jscrollpane1,cc.xywh(2,2,1,5));
169 142

  
143
      jpanel1.add(createPanel2(),cc.xy(4,2));
144
      jpanel1.add(createPanel3(),new CellConstraints(2,10,3,1,CellConstraints.RIGHT,CellConstraints.DEFAULT));
170 145
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11 });
171 146
      return jpanel1;
172 147
   }
......
179 154
      jpanel1.setLayout(formlayout1);
180 155

  
181 156
      lblLaunchOnChangeBBox.setName("lblLaunchOnChangeBBox");
182
      lblLaunchOnChangeBBox.setText("Actualizar cuando cambie el encuadre de la vista activa");
157
      lblLaunchOnChangeBBox.setText("Actualizar cuando:");
183 158
      jpanel1.add(lblLaunchOnChangeBBox,cc.xy(1,1));
184 159

  
185
      chkLaunchOnChangeBBox.setName("chkLaunchOnChangeBBox");
186
      jpanel1.add(chkLaunchOnChangeBBox,cc.xy(3,1));
187

  
188 160
      lblWindowType.setName("lblWindowType");
189 161
      lblWindowType.setText("Tipo de ventana");
190 162
      jpanel1.add(lblWindowType,cc.xy(1,7));
......
212 184
      txtTitle.setName("txtTitle");
213 185
      jpanel1.add(txtTitle,cc.xy(3,5));
214 186

  
215
      lblLaunchOnChangeBBox1.setName("lblLaunchOnChangeBBox");
216
      lblLaunchOnChangeBBox1.setText("Actualizar cuando cambie la seleccion de la capa activa");
217
      jpanel1.add(lblLaunchOnChangeBBox1,cc.xy(1,3));
187
      lstUpdaters.setName("lstUpdaters");
188
      JScrollPane jscrollpane1 = new JScrollPane();
189
      jscrollpane1.setViewportView(lstUpdaters);
190
      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
191
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
192
      jpanel1.add(jscrollpane1,cc.xywh(1,3,3,1));
218 193

  
219
      chkLaunchOnChangeSelection.setName("chkLaunchOnChangeSelection");
220
      jpanel1.add(chkLaunchOnChangeSelection,cc.xy(3,3));
194
      addFillComponents(jpanel1,new int[]{ 2,3 },new int[]{ 2,4,6,8 });
195
      return jpanel1;
196
   }
221 197

  
222
      addFillComponents(jpanel1,new int[]{ 2 },new int[]{ 2,4,6,8 });
198
   public JPanel createPanel2()
199
   {
200
      JPanel jpanel1 = new JPanel();
201
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE");
202
      CellConstraints cc = new CellConstraints();
203
      jpanel1.setLayout(formlayout1);
204

  
205
      btnExpression.setActionCommand("...");
206
      btnExpression.setName("btnExpression");
207
      btnExpression.setText("...");
208
      EmptyBorder emptyborder1 = new EmptyBorder(2,2,2,2);
209
      btnExpression.setBorder(emptyborder1);
210
      jpanel1.add(btnExpression,cc.xy(1,1));
211

  
212
      btnExpressionHistory.setActionCommand("...");
213
      btnExpressionHistory.setName("btnExpressionHistory");
214
      btnExpressionHistory.setText("...");
215
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
216
      btnExpressionHistory.setBorder(emptyborder2);
217
      jpanel1.add(btnExpressionHistory,cc.xy(1,3));
218

  
219
      btnExpressionBookmarks.setActionCommand("...");
220
      btnExpressionBookmarks.setName("btnExpressionBookmarks");
221
      btnExpressionBookmarks.setText("...");
222
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
223
      btnExpressionBookmarks.setBorder(emptyborder3);
224
      jpanel1.add(btnExpressionBookmarks,cc.xy(1,5));
225

  
226
      addFillComponents(jpanel1,new int[0],new int[]{ 2,4 });
223 227
      return jpanel1;
224 228
   }
225 229

  
230
   public JPanel createPanel3()
231
   {
232
      JPanel jpanel1 = new JPanel();
233
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
234
      CellConstraints cc = new CellConstraints();
235
      jpanel1.setLayout(formlayout1);
236

  
237
      btnExecute.setActionCommand("Ejecutar");
238
      btnExecute.setName("btnExecute");
239
      btnExecute.setText("Ejecutar");
240
      jpanel1.add(btnExecute,cc.xy(3,1));
241

  
242
      btnMakeScript.setActionCommand("Generar script");
243
      btnMakeScript.setName("btnMakeScript");
244
      btnMakeScript.setText("Generar script");
245
      jpanel1.add(btnMakeScript,cc.xy(1,1));
246

  
247
      addFillComponents(jpanel1,new int[]{ 2 },new int[0]);
248
      return jpanel1;
249
   }
250

  
226 251
   /**
227 252
    * Initializer
228 253
    */
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/extension/evalexpression/EvaluateExpressionExtension.java
1 1
package org.gvsig.app.extension.evalexpression;
2 2

  
3
import java.awt.event.ActionEvent;
4
import java.awt.event.ActionListener;
3
import java.util.HashSet;
4
import java.util.Set;
5 5
import org.gvsig.andami.plugins.Extension;
6 6
import org.gvsig.app.ApplicationLocator;
7
import org.gvsig.app.ApplicationManager;
7
import org.gvsig.app.extension.evalexpression.notifierfactory.AbstractUpdaterFactory;
8
import org.gvsig.app.extension.evalexpression.notifierfactory.CurrentLayerSelectionChangedFactory;
9
import org.gvsig.app.extension.evalexpression.notifierfactory.UpdaterFactory;
10
import org.gvsig.app.extension.evalexpression.notifierfactory.ViewExtentChangedFactory;
8 11
import org.gvsig.fmap.dal.feature.FeatureStore;
9
import org.gvsig.fmap.mapcontext.layers.FLayer;
10 12
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
11
import org.gvsig.tools.swing.api.ActionListenerSupport;
13
import org.gvsig.tools.arguments.Arguments;
14
import org.gvsig.tools.observer.Observer;
12 15
import org.gvsig.tools.swing.api.ToolsSwingLocator;
13 16
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
14 17

  
......
16 19
 *
17 20
 * @author jjdelcerro
18 21
 */
19
public class EvaluateExpressionExtension extends Extension implements ActionListenerSupport {
22
public class EvaluateExpressionExtension extends Extension { 
20 23

  
21
    private ActionListenerSupport listenerHelper;
24
    private WindowFocusChangedUpdaterFactory windowFocusChangedFactory;
22 25

  
23 26
    @Override
24 27
    public void initialize() {
25
        this.listenerHelper = ToolsSwingLocator.getToolsSwingManager().createActionListenerSupport();
28
        this.windowFocusChangedFactory = new WindowFocusChangedUpdaterFactory();
29
        EvaluateExpressionPanel.registerUpdater(windowFocusChangedFactory);
30
        EvaluateExpressionPanel.registerUpdater(new ViewExtentChangedFactory());
31
        EvaluateExpressionPanel.registerUpdater(new CurrentLayerSelectionChangedFactory());
26 32
    }
27 33

  
28 34
    @Override
29 35
    public void execute(String actionCommand) {
36
        execute(actionCommand,null);
37
    }
38
    public void execute(String actionCommand, Object[] args) {
39
        Arguments arguments = Arguments.create(args);
30 40
        switch(actionCommand) {
31 41
            case "tools-scripting-evaluateexpression":
32
                doEvaluateExpression();
42
                doEvaluateExpression(arguments);
33 43
                break;
34 44
        }
35 45
    }
36 46

  
37
    private void doEvaluateExpression() {
47
    private void doEvaluateExpression(Arguments arguments) {
38 48
        WindowManager windowManager = ToolsSwingLocator.getWindowManager();
39 49
        FeatureStore store = null;
40 50
        try {
......
43 53
        } catch (Exception ex) {
44 54
            //Do nothing
45 55
        }
46
        windowManager.showWindow(new EvaluateExpressionPanel(this, store), "Expression", WindowManager.MODE.WINDOW);
56
        EvaluateExpressionPanel panel = new EvaluateExpressionPanel(store);
57
        panel.setParameters(arguments);
58
        if( ! arguments.contains("execute") ) {
59
            windowManager.showWindow(panel, "Expression", WindowManager.MODE.WINDOW);
60
        }
47 61
    }
48 62
    
49 63
    @Override
50 64
    public boolean isEnabled() {
51
        try {
52
            this.listenerHelper.fireActionEvent(null);
53
        } catch(Throwable th) {
54
            
55
        }
65
        this.windowFocusChangedFactory.updateAll();
56 66
        return true;
57 67
    }
58 68

  
......
61 71
        return true;
62 72
    }
63 73

  
64
    @Override
65
    public void addActionListener(ActionListener listener) {
66
        this.listenerHelper.addActionListener(listener);
67
    }
74
    private class WindowFocusChangedUpdaterFactory extends AbstractUpdaterFactory {
68 75

  
69
    @Override
70
    public ActionListener[] getActionListeners() {
71
        return this.listenerHelper.getActionListeners();
72
    }
76
        private final Set<WindowFocusChangedUpdater> windowFocusChangedUpdaters = new HashSet<>();
73 77

  
74
    @Override
75
    public void removeActionListener(ActionListener listener) {
76
        this.listenerHelper.removeActionListener(listener);
77
    }
78
        private class WindowFocusChangedUpdater extends AbstractUpdaterFactory.AbstractUpdater {
78 79

  
79
    @Override
80
    public void removeAllActionListener() {
81
        this.listenerHelper.removeAllActionListener();
82
    }
80
            @SuppressWarnings("Convert2Lambda")
81
            public WindowFocusChangedUpdater(UpdaterFactory factory, Observer observer) {
82
                super(factory, observer);
83
            }
83 84

  
84
    @Override
85
    public void fireActionEvent(ActionEvent event) {
86
        this.listenerHelper.fireActionEvent(event);
85
            @Override
86
            public void add() {
87
                windowFocusChangedUpdaters.add(this);
88
            }
89

  
90
            @Override
91
            public void remove() {
92
                windowFocusChangedUpdaters.remove(this);
93
            }
94

  
95
        }
96

  
97
        public WindowFocusChangedUpdaterFactory() {
98
            super("WindowFocusChanged", "Actualizar cuando cambie la ventana activa");
99
        }
100

  
101
        @Override
102
        public UpdaterFactory.Updater create(Observer observer) {
103
            UpdaterFactory.Updater updater = new WindowFocusChangedUpdater(this, observer);
104
            return updater;
105
        }
106

  
107
        public void updateAll() {
108
            for (WindowFocusChangedUpdater windowFocusChangedUpdater : windowFocusChangedUpdaters) {
109
                windowFocusChangedUpdater.update();
110
            }        
111
        }
87 112
    }
88 113

  
89
    @Override
90
    public boolean hasActionListeners() {
91
        return this.listenerHelper.hasActionListeners();
92
    }
93
    
94 114
}
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/extension/evalexpression/EvaluateExpressionPanel.java
1 1
package org.gvsig.app.extension.evalexpression;
2 2

  
3 3
import java.awt.BorderLayout;
4
import java.awt.Dimension;
4 5
import java.awt.Image;
5 6
import java.awt.event.ActionEvent;
7
import java.awt.event.ActionListener;
6 8
import java.awt.event.ComponentEvent;
7 9
import java.awt.event.ComponentListener;
10
import java.util.ArrayList;
11
import java.util.HashMap;
12
import java.util.List;
13
import java.util.Map;
8 14
import java.util.Objects;
15
import javax.swing.DefaultListModel;
9 16
import javax.swing.ImageIcon;
10 17
import javax.swing.JComponent;
11 18
import javax.swing.JEditorPane;
12 19
import javax.swing.JLabel;
13 20
import javax.swing.JPanel;
21
import javax.swing.ListModel;
22
import javax.swing.ListSelectionModel;
14 23
import javax.swing.SwingUtilities;
15 24
import org.apache.commons.lang3.StringUtils;
16 25
import org.gvsig.andami.ui.mdiManager.IWindow;
17 26
import org.gvsig.app.ApplicationLocator;
18 27
import org.gvsig.app.ApplicationManager;
19
import org.gvsig.app.project.documents.Document;
20
import org.gvsig.app.project.documents.view.ViewDocument;
21
import org.gvsig.app.project.documents.view.ViewManager;
22
import org.gvsig.app.project.documents.view.gui.IView;
28
import org.gvsig.app.extension.evalexpression.notifierfactory.UpdaterFactory;
29
import org.gvsig.app.extension.evalexpression.notifierfactory.UpdaterFactory.Updater;
23 30
import org.gvsig.expressionevaluator.Expression;
24 31
import org.gvsig.expressionevaluator.ExpressionUtils;
25 32
import org.gvsig.expressionevaluator.MutableSymbolTable;
26 33
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator;
27 34
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager;
28 35
import org.gvsig.expressionevaluator.swing.ExpressionPickerController;
29
import org.gvsig.fmap.dal.DataStoreNotification;
30 36
import org.gvsig.fmap.dal.feature.FeatureStore;
31
import org.gvsig.fmap.dal.feature.FeatureStoreNotification;
32 37
import org.gvsig.fmap.dal.swing.DALSwingLocator;
33
import org.gvsig.fmap.mapcontext.ViewPort;
34
import org.gvsig.fmap.mapcontext.events.ColorEvent;
35
import org.gvsig.fmap.mapcontext.events.ExtentEvent;
36
import org.gvsig.fmap.mapcontext.events.ProjectionEvent;
37
import org.gvsig.fmap.mapcontext.events.listeners.ViewPortListener;
38
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
39
import org.gvsig.fmap.mapcontrol.MapControl;
38
import org.gvsig.tools.arguments.Arguments;
40 39
import org.gvsig.tools.observer.BaseNotification;
41 40
import org.gvsig.tools.observer.Observable;
42 41
import org.gvsig.tools.observer.Observer;
43
import org.gvsig.tools.swing.api.ActionListenerSupport;
42
import org.gvsig.tools.swing.api.JListWithCheckbox;
44 43
import org.gvsig.tools.swing.api.SimpleImage;
45 44
import org.gvsig.tools.swing.api.ToolsSwingLocator;
45
import org.gvsig.tools.swing.api.ToolsSwingManager;
46
import org.gvsig.tools.swing.api.ToolsSwingUtils;
46 47
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
47 48
import org.slf4j.Logger;
48 49
import org.slf4j.LoggerFactory;
......
56 57
    private static final Logger LOGGER = LoggerFactory.getLogger(EvaluateExpressionPanel.class);
57 58

  
58 59
    private ExpressionPickerController pickerExpression;
59
    private final ActionListenerSupport actionListener;
60

  
61
    public EvaluateExpressionPanel(ActionListenerSupport actionListener, FeatureStore store) {
62
        this.actionListener = actionListener;
60
    private static Map<String,UpdaterFactory> updaterFactories = new HashMap<>();
61
    private JListWithCheckbox chklstUpdaters;
62
    private Arguments arguments;
63
    
64
    public EvaluateExpressionPanel(FeatureStore store) {
65
        this.arguments = Arguments.create(null);
63 66
        initComponents(store);
64 67
    }
65 68

  
69
    public static void registerUpdater(UpdaterFactory factory) {
70
        updaterFactories.put(factory.getName(), factory);
71
    }
72
    
66 73
    private void initComponents(FeatureStore store) {
67 74
        ApplicationManager application = ApplicationLocator.getApplicationManager();
75
        ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
68 76
        ExpressionEvaluatorSwingManager expressionSwingManager = ExpressionEvaluatorSwingLocator.getManager();
69 77

  
70 78
        this.pickerExpression = expressionSwingManager.createExpressionPickerController(
......
80 88
        MutableSymbolTable symbolTable = ExpressionUtils.createSymbolTable();
81 89
        IWindow window = application.getActiveWindow();
82 90
        symbolTable.setVar("window", window);
91
        symbolTable.setVar("arguments", arguments);
92
        symbolTable.setVar("notification", new BaseNotification("Unknown", 1));
83 93
        this.pickerExpression.getConfig().setPreviewSymbolTable(symbolTable);
84 94

  
85 95
        this.btnExecute.addActionListener((ActionEvent e) -> {
86 96
            doExecuteExpression();
87 97
        });
88 98
        this.txtTitle.setText("Expresion");
99
        this.chklstUpdaters = toolsSwingManager.createJListWithCheckbox(this.lstUpdaters);
100
        DefaultListModel model = new DefaultListModel();
101
        for (UpdaterFactory factory : updaterFactories.values()) {
102
            model.addElement(factory);
103
        }
104
        this.chklstUpdaters.setModel(model);
105
        
106
        this.btnMakeScript.addActionListener((ActionEvent e) -> {doMakeScript();});
89 107
    }
90 108

  
109
    private void doMakeScript() {
110
        
111
    }
112
    
91 113
    private void doExecuteExpression() {
92 114
        ApplicationManager application = ApplicationLocator.getApplicationManager();
93 115
        WindowManager windowManager = ToolsSwingLocator.getWindowManager();
......
99 121
        MutableSymbolTable symbolTable = ExpressionUtils.createSymbolTable();
100 122
        IWindow window = application.getActiveWindow();
101 123
        symbolTable.setVar("window", window);
124
        symbolTable.setVar("arguments", arguments);
125
        symbolTable.setVar("notification", new BaseNotification("Unknown", 1));
102 126
        this.pickerExpression.getConfig().setPreviewSymbolTable(symbolTable);
103 127
        Object value;
104 128
        try {
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff