Revision 44012

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text.properties
1292 1292
_Change_view_projection_to_projection_of_the_selected_item_in_the_list=Cambia la proyecci\u00f3n de la Vista a la proyecci\u00f3n del item seleccionado en la lista.
1293 1293
_precision_comparing_decimal_numbers=Precisi\u00f3n de comparaci\u00f3n de n\u00fameros decimales
1294 1294
_default_expression_evaluator=Evaluador de expresiones por defecto
1295
_Problems_saving_the_project_XnlX_It_is_possible_that_this_was_not_saved_properly_and_can_not_be_loaded_again=Problemas guardando el proyecto.\nEs posible que este no se haya guardado correctamente y no se pueda volver a cargar.
1295
_Problems_saving_the_project_XnlX_It_is_possible_that_this_was_not_saved_properly_and_can_not_be_loaded_again=Problemas guardando el proyecto.\nEs posible que este no se haya guardado correctamente y no se pueda volver a cargar.
1296
_Elements=Elementos
1297
_Functions=Funciones
1298
_Operators=Operadores
1299
_Expression=Expresi\u00f3n
1300
_Scripts=Guiones
1301
_Constant_Point=Constante Punto
1302
_Constant_Rectangle=Constante Rectangulo
1303
_Value=Valor
1304
_Start_capture=Iniciar captura
1305
_Description=Descripci\u00f3n
1306
_Capture_a_point_from_current_view=Captura un punto desde la Vista corriente
1307
_Use_WKT_or_WKB=Usar WKT o WKB
1308
_Insert_as_WKT=Insertar como WKT
1309
_Insert_as_WKB=Insertar como WKB
1310
_Use_Geometry_or_Text=Usar geometria o texto
1311
_Insert_as_Geometry=Insertar como geometria
1312
_Insert_as_Text=Insertar como texto
1313
_Name=Nombre
1314
_Generic_element=Elemento generico
1315
_Arguments=Argumentos
1316
_Template=Plantilla
1317
_Return=Retorno
1318
_Function=Functi\u00f3n
1319
_Type=Tipo
1320
_Source=Fuente
1321
_Constant=Constante
1322
_Capture_point=Capturar punto
1323
_Capture_rectangle=Capturar rectangulo
1324
_Take_projection_code=Tomar c\u00f3digo de proyecci\u00f3n
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
1211 1211
_Change_view_projection_to_projection_of_the_selected_item_in_the_list=Change View projection to the projection of the selected item in the list
1212 1212
_precision_comparing_decimal_numbers=Precision comparing decimal numbers
1213 1213
_default_expression_evaluator=Default expression evaluator
1214
_Problems_saving_the_project_XnlX_It_is_possible_that_this_was_not_saved_properly_and_can_not_be_loaded_again=Problems saving the project.\nIt is possible that this was not saved properly and can not be loaded again.
1214
_Problems_saving_the_project_XnlX_It_is_possible_that_this_was_not_saved_properly_and_can_not_be_loaded_again=Problems saving the project.\nIt is possible that this was not saved properly and can not be loaded again.
1215
_Elements=Elements
1216
_Functions=Functions
1217
_Operators=Operators
1218
_Expression=Expression
1219
_Scripts=Scripts
1220
_Constant_Point=Constant Point
1221
_Constant_Rectangle=Constante Rectangle
1222
_Value=Value
1223
_Start_capture=Start capture
1224
_Description=Description
1225
_Capture_a_point_from_current_view=Capture a point from current View
1226
_Use_WKT_or_WKB=Use WKT or WKB
1227
_Insert_as_WKT=Insert as WKT
1228
_Insert_as_WKB=Insert as WKB
1229
_Use_Geometry_or_Text=Use Geometry or Text
1230
_Insert_as_Geometry=Insert as Geometry
1231
_Insert_as_Text=Insert as Text
1232
_Name=Name
1233
_Generic_element=Generic element
1234
_Arguments=Arguments
1235
_Template=Template
1236
_Return=Return
1237
_Function=Function
1238
_Type=Type
1239
_Source=Source
1240
_Constant=Constant
1241
_Capture_point=Capture_point
1242
_Capture_rectangle=Capture rectangle
1243
_Take_projection_code=Take projection code
1244

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/config.xml
845 845
        />
846 846

  
847 847
      <tool-bar name="selection">
848
        <action-tool name="selection-by-attributes-layer2" />
848
        <action-tool name="selection-by-attributes-layer" />
849 849
      </tool-bar>
850 850

  
851 851
    </extension>
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewCapturePointPanel.java
47 47
        I18nManager i18n = ToolsLocator.getI18nManager();
48 48
        ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
49 49
        
50
        toolsSwingManager.setDefaultPopupMenu(this.txtPoint);
50
        toolsSwingManager.setDefaultPopupMenu(this.txtGeometry);
51 51
        
52 52
        this.btnToggleCapture.addActionListener(new ActionListener() {
53 53
            @Override
......
76 76
                return false;
77 77
            }
78 78
        });
79
        this.btnToggleCapture.setText(i18n.getTranslation("_Start_capture"));
80
        
81 79
        this.addAncestorListener(new AncestorListener() {
82 80
            @Override
83 81
            public void ancestorAdded(AncestorEvent event) {
......
99 97
            }
100 98
            
101 99
        });
100
        
101
        toolsSwingManager.translate(this.lblConstantPoint);
102
        toolsSwingManager.translate(this.lblValue);
103
        toolsSwingManager.translate(this.lblDescription);
104
        toolsSwingManager.translate(this.lblCaptureAPointFromCurrentView);
105
        toolsSwingManager.translate(this.lblUseWktOrWkb);
106
        toolsSwingManager.translate(this.lblUseGeometryOrText);
107
        toolsSwingManager.translate(this.rdoInsertAsGeometry);
108
        toolsSwingManager.translate(this.rdoInsertAsString);
109
        toolsSwingManager.translate(this.rdoInsertAsWKB);
110
        toolsSwingManager.translate(this.rdoInsertAsWKT);
111
        toolsSwingManager.translate(this.btnToggleCapture);
112
        
102 113
    }
103 114

  
104 115
    @Override
......
110 121
        this.geometry = geom;
111 122
        try {
112 123
            String wkt = geom.convertToWKT();
113
            this.txtPoint.setText(wkt);
124
            this.txtGeometry.setText(wkt);
114 125
        } catch (Exception ex) {
115
            this.txtPoint.setText("#########");
126
            this.txtGeometry.setText("#########");
116 127
        }
117
        this.txtPoint.setCaretPosition(0);
128
        this.txtGeometry.setCaretPosition(0);
118 129
    }
119 130
    
120 131
    private void doToggleCapture() {
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewCaptureRectangleElement.java
6 6
import org.gvsig.expressionevaluator.swing.Element.SimpleElement;
7 7
import org.gvsig.expressionevaluator.swing.spi.AbstractElement;
8 8
import org.gvsig.fmap.geom.Geometry;
9
import org.gvsig.tools.ToolsLocator;
9 10
import org.gvsig.tools.swing.api.Component;
10 11

  
11 12
/**
......
20 21
    private ViewCaptureRectanglePanel aditionalPanel;
21 22

  
22 23
    public ViewCaptureRectangleElement() {
23
        super("Capture rectangle", "Capture a rectangle in the current view","expressionbuilder-element-view-capture-bbox");
24
        super(
25
                ToolsLocator.getI18nManager().getTranslation("_Capture_rectangle"), 
26
                "Capture a rectangle in the current view",
27
                "expressionbuilder-element-view-capture-bbox"
28
        );
24 29
    }
25 30

  
26 31
    @Override
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewCaptureRectanglePanelView.xml
74 74
              </at>
75 75
             </object>
76 76
            </at>
77
            <at name="name"></at>
78
            <at name="width">589</at>
79
            <at name="text">Constant Rectangle</at>
77
            <at name="name">lblConstantRectangle</at>
78
            <at name="width">953</at>
79
            <at name="text">_Constant_Rectangle</at>
80 80
            <at name="fill">
81 81
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
82 82
              <at name="name">fill</at>
......
104 104
         <at name="cellconstraints">
105 105
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
106 106
           <at name="column">2</at>
107
           <at name="row">4</at>
108
           <at name="colspan">1</at>
107
           <at name="row">6</at>
108
           <at name="colspan">3</at>
109 109
           <at name="rowspan">1</at>
110 110
           <at name="halign">default</at>
111 111
           <at name="valign">default</at>
......
115 115
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
116 116
        </super>
117 117
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
118
        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
118
        <at name="beanclass">javax.swing.JTextField</at>
119 119
        <at name="beanproperties">
120 120
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
121
          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
121
          <at name="classname">javax.swing.JTextField</at>
122 122
          <at name="properties">
123 123
           <object classname="com.jeta.forms.store.support.PropertyMap">
124 124
            <at name="border">
......
141 141
              </at>
142 142
             </object>
143 143
            </at>
144
            <at name="width">73</at>
145
            <at name="name"/>
146
            <at name="text">Value</at>
147
            <at name="fill">
148
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
149
              <at name="name">fill</at>
150
             </object>
151
            </at>
152
            <at name="font">
153
             <object classname="com.jeta.forms.store.properties.FontProperty">
154
              <at name="family">Dialog</at>
155
              <at name="style">1</at>
156
              <at name="size">11</at>
157
             </object>
158
            </at>
159
            <at name="height">14</at>
144
            <at name="background" object="color">236,233,216</at>
145
            <at name="editable">false</at>
146
            <at name="name">txtBox</at>
147
            <at name="width">953</at>
148
            <at name="height">20</at>
160 149
           </object>
161 150
          </at>
162 151
         </object>
......
171 160
         <at name="cellconstraints">
172 161
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
173 162
           <at name="column">2</at>
174
           <at name="row">10</at>
163
           <at name="row">4</at>
175 164
           <at name="colspan">1</at>
176 165
           <at name="rowspan">1</at>
177 166
           <at name="halign">default</at>
......
208 197
              </at>
209 198
             </object>
210 199
            </at>
211
            <at name="width">73</at>
212
            <at name="name"/>
213
            <at name="text">Description</at>
200
            <at name="name">lblValue</at>
201
            <at name="width">79</at>
202
            <at name="text">_Value</at>
214 203
            <at name="fill">
215 204
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
216 205
              <at name="name">fill</at>
......
237 226
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
238 227
         <at name="cellconstraints">
239 228
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
229
           <at name="column">4</at>
230
           <at name="row">8</at>
231
           <at name="colspan">1</at>
232
           <at name="rowspan">1</at>
233
           <at name="halign">right</at>
234
           <at name="valign">default</at>
235
           <at name="insets" object="insets">0,0,0,0</at>
236
          </object>
237
         </at>
238
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
239
        </super>
240
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
241
        <at name="beanclass">javax.swing.JButton</at>
242
        <at name="beanproperties">
243
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
244
          <at name="classname">javax.swing.JButton</at>
245
          <at name="properties">
246
           <object classname="com.jeta.forms.store.support.PropertyMap">
247
            <at name="border">
248
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
249
              <super classname="com.jeta.forms.store.properties.BorderProperty">
250
               <at name="name">border</at>
251
              </super>
252
              <at name="borders">
253
               <object classname="java.util.LinkedList">
254
                <item >
255
                 <at name="value">
256
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
257
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
258
                    <at name="name">border</at>
259
                   </super>
260
                  </object>
261
                 </at>
262
                </item>
263
               </object>
264
              </at>
265
             </object>
266
            </at>
267
            <at name="actionCommand">Toggle point capture</at>
268
            <at name="name">btnToggleCapture</at>
269
            <at name="width">115</at>
270
            <at name="text">_Start_capture</at>
271
            <at name="height">22</at>
272
           </object>
273
          </at>
274
         </object>
275
        </at>
276
       </object>
277
      </at>
278
     </item>
279
     <item >
280
      <at name="value">
281
       <object classname="com.jeta.forms.store.memento.BeanMemento">
282
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
283
         <at name="cellconstraints">
284
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
240 285
           <at name="column">2</at>
241
           <at name="row">11</at>
242
           <at name="colspan">3</at>
286
           <at name="row">10</at>
287
           <at name="colspan">1</at>
243 288
           <at name="rowspan">1</at>
244 289
           <at name="halign">default</at>
245 290
           <at name="valign">default</at>
......
275 320
              </at>
276 321
             </object>
277 322
            </at>
278
            <at name="name"></at>
279
            <at name="width">589</at>
280
            <at name="text">Capture a rectangle from current view</at>
323
            <at name="name">lblDescription</at>
324
            <at name="width">79</at>
325
            <at name="text">_Description</at>
281 326
            <at name="fill">
282 327
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
283 328
              <at name="name">fill</at>
284 329
             </object>
285 330
            </at>
331
            <at name="font">
332
             <object classname="com.jeta.forms.store.properties.FontProperty">
333
              <at name="family">Dialog</at>
334
              <at name="style">1</at>
335
              <at name="size">11</at>
336
             </object>
337
            </at>
286 338
            <at name="height">14</at>
287 339
           </object>
288 340
          </at>
......
297 349
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
298 350
         <at name="cellconstraints">
299 351
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
300
           <at name="column">4</at>
301
           <at name="row">8</at>
302
           <at name="colspan">1</at>
352
           <at name="column">2</at>
353
           <at name="row">11</at>
354
           <at name="colspan">3</at>
303 355
           <at name="rowspan">1</at>
304
           <at name="halign">right</at>
356
           <at name="halign">default</at>
305 357
           <at name="valign">default</at>
306 358
           <at name="insets" object="insets">0,0,0,0</at>
307 359
          </object>
......
309 361
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
310 362
        </super>
311 363
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
312
        <at name="beanclass">javax.swing.JButton</at>
364
        <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
313 365
        <at name="beanproperties">
314 366
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
315
          <at name="classname">javax.swing.JButton</at>
367
          <at name="classname">com.jeta.forms.components.label.JETALabel</at>
316 368
          <at name="properties">
317 369
           <object classname="com.jeta.forms.store.support.PropertyMap">
318 370
            <at name="border">
......
335 387
              </at>
336 388
             </object>
337 389
            </at>
338
            <at name="actionCommand">Toggle point capture</at>
339
            <at name="name">btnToggleCapture</at>
340
            <at name="width">117</at>
341
            <at name="text">Toggle capture</at>
342
            <at name="height">22</at>
390
            <at name="name">lblCaptureAPointFromCurrentView</at>
391
            <at name="width">953</at>
392
            <at name="text">_Capture_a_point_from_current_view</at>
393
            <at name="fill">
394
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
395
              <at name="name">fill</at>
396
             </object>
397
            </at>
398
            <at name="height">14</at>
343 399
           </object>
344 400
          </at>
345 401
         </object>
......
364 420
         </at>
365 421
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
366 422
        </super>
367
        <at name="id">embedded.953076057</at>
423
        <at name="id">embedded.150240449</at>
368 424
        <at name="rowspecs">CENTER:DEFAULT: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,CENTER:DEFAULT:NONE</at>
369 425
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE</at>
370 426
        <at name="components">
......
413 469
                   </at>
414 470
                  </object>
415 471
                 </at>
416
                 <at name="name"></at>
417
                 <at name="width">144</at>
418
                 <at name="text">Use WKT or WKB</at>
472
                 <at name="name">lblUseWktOrWkb</at>
473
                 <at name="width">154</at>
474
                 <at name="text">_Use_WKT_or_WKB</at>
419 475
                 <at name="fill">
420 476
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
421 477
                   <at name="name">fill</at>
......
435 491
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
436 492
              <at name="cellconstraints">
437 493
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
438
                <at name="column">2</at>
439
                <at name="row">6</at>
440
                <at name="colspan">2</at>
494
                <at name="column">3</at>
495
                <at name="row">2</at>
496
                <at name="colspan">1</at>
441 497
                <at name="rowspan">1</at>
442 498
                <at name="halign">default</at>
443 499
                <at name="valign">default</at>
......
447 503
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
448 504
             </super>
449 505
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
450
             <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
506
             <at name="beanclass">javax.swing.JRadioButton</at>
451 507
             <at name="beanproperties">
452 508
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
453
               <at name="classname">com.jeta.forms.components.label.JETALabel</at>
509
               <at name="classname">javax.swing.JRadioButton</at>
454 510
               <at name="properties">
455 511
                <object classname="com.jeta.forms.store.support.PropertyMap">
456 512
                 <at name="border">
......
473 529
                   </at>
474 530
                  </object>
475 531
                 </at>
476
                 <at name="name"></at>
477
                 <at name="width">144</at>
478
                 <at name="text">Use Geometry or Text</at>
479
                 <at name="fill">
480
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
481
                   <at name="name">fill</at>
532
                 <at name="actionCommand">Insert as WKT</at>
533
                 <at name="buttonGroup">
534
                  <object classname="com.jeta.forms.store.properties.ButtonGroupProperty">
535
                   <at name="name">buttonGroup</at>
536
                   <at name="groupname">1</at>
482 537
                  </object>
483 538
                 </at>
484
                 <at name="height">14</at>
539
                 <at name="opaque">false</at>
540
                 <at name="name">rdoInsertAsWKT</at>
541
                 <at name="width">140</at>
542
                 <at name="text">_Insert_as_WKT</at>
543
                 <at name="height">16</at>
485 544
                </object>
486 545
               </at>
487 546
              </object>
......
496 555
              <at name="cellconstraints">
497 556
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
498 557
                <at name="column">3</at>
499
                <at name="row">2</at>
558
                <at name="row">4</at>
500 559
                <at name="colspan">1</at>
501 560
                <at name="rowspan">1</at>
502 561
                <at name="halign">default</at>
......
533 592
                   </at>
534 593
                  </object>
535 594
                 </at>
536
                 <at name="actionCommand">Insert as WKT</at>
595
                 <at name="actionCommand">Insert as WKB</at>
537 596
                 <at name="buttonGroup">
538 597
                  <object classname="com.jeta.forms.store.properties.ButtonGroupProperty">
539 598
                   <at name="name">buttonGroup</at>
......
541 600
                  </object>
542 601
                 </at>
543 602
                 <at name="opaque">false</at>
544
                 <at name="name">rdoInsertAsWKT</at>
545
                 <at name="width">130</at>
546
                 <at name="text">Insert as WKT</at>
603
                 <at name="name">rdoInsertAsWKB</at>
604
                 <at name="width">140</at>
605
                 <at name="text">_Insert_as_WKB</at>
547 606
                 <at name="selected">true</at>
548 607
                 <at name="height">16</at>
549 608
                </object>
......
559 618
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
560 619
              <at name="cellconstraints">
561 620
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
562
                <at name="column">3</at>
563
                <at name="row">4</at>
564
                <at name="colspan">1</at>
621
                <at name="column">2</at>
622
                <at name="row">6</at>
623
                <at name="colspan">2</at>
565 624
                <at name="rowspan">1</at>
566 625
                <at name="halign">default</at>
567 626
                <at name="valign">default</at>
......
571 630
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
572 631
             </super>
573 632
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
574
             <at name="beanclass">javax.swing.JRadioButton</at>
633
             <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
575 634
             <at name="beanproperties">
576 635
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
577
               <at name="classname">javax.swing.JRadioButton</at>
636
               <at name="classname">com.jeta.forms.components.label.JETALabel</at>
578 637
               <at name="properties">
579 638
                <object classname="com.jeta.forms.store.support.PropertyMap">
580 639
                 <at name="border">
......
597 656
                   </at>
598 657
                  </object>
599 658
                 </at>
600
                 <at name="actionCommand">Insert as WKB</at>
601
                 <at name="buttonGroup">
602
                  <object classname="com.jeta.forms.store.properties.ButtonGroupProperty">
603
                   <at name="name">buttonGroup</at>
604
                   <at name="groupname">1</at>
659
                 <at name="name">lblUseGeometryOrText</at>
660
                 <at name="width">154</at>
661
                 <at name="text">_Use_Geometry_or_Text</at>
662
                 <at name="fill">
663
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
664
                   <at name="name">fill</at>
605 665
                  </object>
606 666
                 </at>
607
                 <at name="opaque">false</at>
608
                 <at name="name">rdoInsertAsWKB</at>
609
                 <at name="width">130</at>
610
                 <at name="text">Insert as WKB</at>
611
                 <at name="height">16</at>
667
                 <at name="height">14</at>
612 668
                </object>
613 669
               </at>
614 670
              </object>
......
669 725
                 </at>
670 726
                 <at name="opaque">false</at>
671 727
                 <at name="name">rdoInsertAsGeometry</at>
672
                 <at name="width">130</at>
673
                 <at name="text">Insert as Geometry</at>
728
                 <at name="width">140</at>
729
                 <at name="text">_Insert_as_Geometry</at>
674 730
                 <at name="selected">true</at>
675 731
                 <at name="height">16</at>
676 732
                </object>
......
733 789
                 </at>
734 790
                 <at name="opaque">false</at>
735 791
                 <at name="name">rdoInsertAsString</at>
736
                 <at name="width">130</at>
737
                 <at name="text">Insert as Text</at>
792
                 <at name="width">140</at>
793
                 <at name="text">_Insert_as_Text</at>
738 794
                 <at name="height">16</at>
739 795
                </object>
740 796
               </at>
......
760 816
              </at>
761 817
             </object>
762 818
            </at>
763
            <at name="name"></at>
819
            <at name="name"/>
764 820
            <at name="fill">
765 821
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
766 822
              <at name="name">fill</at>
......
863 919
       </object>
864 920
      </at>
865 921
     </item>
866
     <item >
867
      <at name="value">
868
       <object classname="com.jeta.forms.store.memento.BeanMemento">
869
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
870
         <at name="cellconstraints">
871
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
872
           <at name="column">2</at>
873
           <at name="row">6</at>
874
           <at name="colspan">3</at>
875
           <at name="rowspan">1</at>
876
           <at name="halign">default</at>
877
           <at name="valign">default</at>
878
           <at name="insets" object="insets">0,0,0,0</at>
879
          </object>
880
         </at>
881
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
882
        </super>
883
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
884
        <at name="beanclass">javax.swing.JTextField</at>
885
        <at name="beanproperties">
886
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
887
          <at name="classname">javax.swing.JTextField</at>
888
          <at name="properties">
889
           <object classname="com.jeta.forms.store.support.PropertyMap">
890
            <at name="border">
891
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
892
              <super classname="com.jeta.forms.store.properties.BorderProperty">
893
               <at name="name">border</at>
894
              </super>
895
              <at name="borders">
896
               <object classname="java.util.LinkedList">
897
                <item >
898
                 <at name="value">
899
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
900
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
901
                    <at name="name">border</at>
902
                   </super>
903
                  </object>
904
                 </at>
905
                </item>
906
               </object>
907
              </at>
908
             </object>
909
            </at>
910
            <at name="background" object="color">236,233,216</at>
911
            <at name="editable">false</at>
912
            <at name="name">txtBox</at>
913
            <at name="width">589</at>
914
            <at name="height">20</at>
915
           </object>
916
          </at>
917
         </object>
918
        </at>
919
       </object>
920
      </at>
921
     </item>
922 922
    </object>
923 923
   </at>
924 924
   <at name="properties">
......
936 936
         </at>
937 937
        </object>
938 938
       </at>
939
       <at name="name"></at>
939
       <at name="name"/>
940 940
       <at name="fill">
941 941
        <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
942 942
         <at name="name">fill</at>
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewCaptureRectanglePanelView.java
22 22

  
23 23
public class ViewCaptureRectanglePanelView extends JPanel
24 24
{
25
   JLabel lblConstantRectangle = new JLabel();
26
   JTextField txtBox = new JTextField();
27
   JLabel lblValue = new JLabel();
25 28
   JButton btnToggleCapture = new JButton();
29
   JLabel lblDescription = new JLabel();
30
   JLabel lblCaptureAPointFromCurrentView = new JLabel();
31
   JLabel lblUseWktOrWkb = new JLabel();
26 32
   JRadioButton rdoInsertAsWKT = new JRadioButton();
27 33
   ButtonGroup buttongroup1 = new ButtonGroup();
28 34
   JRadioButton rdoInsertAsWKB = new JRadioButton();
35
   JLabel lblUseGeometryOrText = new JLabel();
29 36
   JRadioButton rdoInsertAsGeometry = new JRadioButton();
30 37
   ButtonGroup buttongroup2 = new ButtonGroup();
31 38
   JRadioButton rdoInsertAsString = new JRadioButton();
32
   JTextField txtBox = new JTextField();
33 39

  
34 40
   /**
35 41
    * Default constructor
......
125 131
      CellConstraints cc = new CellConstraints();
126 132
      jpanel1.setLayout(formlayout1);
127 133

  
128
      JLabel jlabel1 = new JLabel();
129
      jlabel1.setFont(new Font("Dialog",Font.BOLD,11));
130
      jlabel1.setText("Constant Rectangle");
131
      jpanel1.add(jlabel1,cc.xywh(2,2,3,1));
134
      lblConstantRectangle.setFont(new Font("Dialog",Font.BOLD,11));
135
      lblConstantRectangle.setName("lblConstantRectangle");
136
      lblConstantRectangle.setText("_Constant_Rectangle");
137
      jpanel1.add(lblConstantRectangle,cc.xywh(2,2,3,1));
132 138

  
133
      JLabel jlabel2 = new JLabel();
134
      jlabel2.setFont(new Font("Dialog",Font.BOLD,11));
135
      jlabel2.setText("Value");
136
      jpanel1.add(jlabel2,cc.xy(2,4));
139
      txtBox.setBackground(new Color(236,233,216));
140
      txtBox.setEditable(false);
141
      txtBox.setName("txtBox");
142
      jpanel1.add(txtBox,cc.xywh(2,6,3,1));
137 143

  
138
      JLabel jlabel3 = new JLabel();
139
      jlabel3.setFont(new Font("Dialog",Font.BOLD,11));
140
      jlabel3.setText("Description");
141
      jpanel1.add(jlabel3,cc.xy(2,10));
144
      lblValue.setFont(new Font("Dialog",Font.BOLD,11));
145
      lblValue.setName("lblValue");
146
      lblValue.setText("_Value");
147
      jpanel1.add(lblValue,cc.xy(2,4));
142 148

  
143
      JLabel jlabel4 = new JLabel();
144
      jlabel4.setText("Capture a rectangle from current view");
145
      jpanel1.add(jlabel4,cc.xywh(2,11,3,1));
146

  
147 149
      btnToggleCapture.setActionCommand("Toggle point capture");
148 150
      btnToggleCapture.setName("btnToggleCapture");
149
      btnToggleCapture.setText("Toggle capture");
151
      btnToggleCapture.setText("_Start_capture");
150 152
      jpanel1.add(btnToggleCapture,new CellConstraints(4,8,1,1,CellConstraints.RIGHT,CellConstraints.DEFAULT));
151 153

  
154
      lblDescription.setFont(new Font("Dialog",Font.BOLD,11));
155
      lblDescription.setName("lblDescription");
156
      lblDescription.setText("_Description");
157
      jpanel1.add(lblDescription,cc.xy(2,10));
158

  
159
      lblCaptureAPointFromCurrentView.setName("lblCaptureAPointFromCurrentView");
160
      lblCaptureAPointFromCurrentView.setText("_Capture_a_point_from_current_view");
161
      jpanel1.add(lblCaptureAPointFromCurrentView,cc.xywh(2,11,3,1));
162

  
152 163
      jpanel1.add(createPanel1(),cc.xywh(2,13,3,1));
153
      txtBox.setBackground(new Color(236,233,216));
154
      txtBox.setEditable(false);
155
      txtBox.setName("txtBox");
156
      jpanel1.add(txtBox,cc.xywh(2,6,3,1));
157

  
158 164
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14 });
159 165
      return jpanel1;
160 166
   }
......
166 172
      CellConstraints cc = new CellConstraints();
167 173
      jpanel1.setLayout(formlayout1);
168 174

  
169
      JLabel jlabel1 = new JLabel();
170
      jlabel1.setText("Use WKT or WKB");
171
      jpanel1.add(jlabel1,cc.xywh(2,1,2,1));
175
      lblUseWktOrWkb.setName("lblUseWktOrWkb");
176
      lblUseWktOrWkb.setText("_Use_WKT_or_WKB");
177
      jpanel1.add(lblUseWktOrWkb,cc.xywh(2,1,2,1));
172 178

  
173
      JLabel jlabel2 = new JLabel();
174
      jlabel2.setText("Use Geometry or Text");
175
      jpanel1.add(jlabel2,cc.xywh(2,6,2,1));
176

  
177 179
      rdoInsertAsWKT.setActionCommand("Insert as WKT");
178 180
      rdoInsertAsWKT.setName("rdoInsertAsWKT");
179 181
      rdoInsertAsWKT.setOpaque(false);
180
      rdoInsertAsWKT.setSelected(true);
181
      rdoInsertAsWKT.setText("Insert as WKT");
182
      rdoInsertAsWKT.setText("_Insert_as_WKT");
182 183
      buttongroup1.add(rdoInsertAsWKT);
183 184
      jpanel1.add(rdoInsertAsWKT,cc.xy(3,2));
184 185

  
185 186
      rdoInsertAsWKB.setActionCommand("Insert as WKB");
186 187
      rdoInsertAsWKB.setName("rdoInsertAsWKB");
187 188
      rdoInsertAsWKB.setOpaque(false);
188
      rdoInsertAsWKB.setText("Insert as WKB");
189
      rdoInsertAsWKB.setSelected(true);
190
      rdoInsertAsWKB.setText("_Insert_as_WKB");
189 191
      buttongroup1.add(rdoInsertAsWKB);
190 192
      jpanel1.add(rdoInsertAsWKB,cc.xy(3,4));
191 193

  
194
      lblUseGeometryOrText.setName("lblUseGeometryOrText");
195
      lblUseGeometryOrText.setText("_Use_Geometry_or_Text");
196
      jpanel1.add(lblUseGeometryOrText,cc.xywh(2,6,2,1));
197

  
192 198
      rdoInsertAsGeometry.setActionCommand("Insert as geometry");
193 199
      rdoInsertAsGeometry.setName("rdoInsertAsGeometry");
194 200
      rdoInsertAsGeometry.setOpaque(false);
195 201
      rdoInsertAsGeometry.setSelected(true);
196
      rdoInsertAsGeometry.setText("Insert as Geometry");
202
      rdoInsertAsGeometry.setText("_Insert_as_Geometry");
197 203
      buttongroup2.add(rdoInsertAsGeometry);
198 204
      jpanel1.add(rdoInsertAsGeometry,cc.xy(3,8));
199 205

  
200 206
      rdoInsertAsString.setActionCommand("Insert as String");
201 207
      rdoInsertAsString.setName("rdoInsertAsString");
202 208
      rdoInsertAsString.setOpaque(false);
203
      rdoInsertAsString.setText("Insert as Text");
209
      rdoInsertAsString.setText("_Insert_as_Text");
204 210
      buttongroup2.add(rdoInsertAsString);
205 211
      jpanel1.add(rdoInsertAsString,cc.xy(3,10));
206 212

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewTakeProjectionCodeElement.java
3 3
import org.cresques.cts.IProjection;
4 4
import org.gvsig.app.ApplicationLocator;
5 5
import org.gvsig.app.ApplicationManager;
6
import org.gvsig.app.project.documents.Document;
7 6
import org.gvsig.app.project.documents.view.ViewDocument;
8 7
import org.gvsig.app.project.documents.view.ViewManager;
9 8
import org.gvsig.expressionevaluator.swing.Element.SimpleElement;
10 9
import org.gvsig.expressionevaluator.swing.Element.ConstantElement;
11 10
import org.gvsig.expressionevaluator.swing.spi.AbstractElement;
11
import org.gvsig.tools.ToolsLocator;
12 12

  
13 13
/**
14 14
 *
......
20 20
        implements SimpleElement, ConstantElement
21 21
{
22 22
    public ViewTakeProjectionCodeElement() {
23
        super("Take projection code", "Take the projection code of the current view", "expressionbuilder-element-view-projection-code");
23
        super(
24
                ToolsLocator.getI18nManager().getTranslation("_Take_projection_code"), 
25
                "Take the projection code of the current view", 
26
                "expressionbuilder-element-view-projection-code"
27
        );
24 28
    }
25 29

  
26 30
    @Override
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewCapturePointElement.java
8 8
import org.gvsig.expressionevaluator.swing.Element.SimpleElement;
9 9
import org.gvsig.expressionevaluator.swing.spi.AbstractElement;
10 10
import org.gvsig.fmap.geom.Geometry;
11
import org.gvsig.tools.ToolsLocator;
11 12
import org.gvsig.tools.swing.api.Component;
12 13

  
13 14
/**
......
22 23
    private ViewCapturePointPanel aditionalPanel;
23 24

  
24 25
    public ViewCapturePointElement() {
25
        super("Capture point", "Capture a point in the current view", "expressionbuilder-element-view-capture-point");
26
        super(
27
                ToolsLocator.getI18nManager().getTranslation("_Capture_point"), 
28
                "Capture a point in the current view", 
29
                "expressionbuilder-element-view-capture-point"
30
        );
26 31
    }
27 32

  
28 33
    @Override
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewCapturePointPanelView.xml
74 74
              </at>
75 75
             </object>
76 76
            </at>
77
            <at name="name"></at>
78
            <at name="width">589</at>
79
            <at name="text">Constant Point</at>
77
            <at name="name">lblConstantPoint</at>
78
            <at name="width">953</at>
79
            <at name="text">_Constant_Point</at>
80 80
            <at name="fill">
81 81
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
82 82
              <at name="name">fill</at>
......
141 141
              </at>
142 142
             </object>
143 143
            </at>
144
            <at name="width">73</at>
145
            <at name="name"/>
146
            <at name="text">Value</at>
144
            <at name="name">lblValue</at>
145
            <at name="width">79</at>
146
            <at name="text">_Value</at>
147 147
            <at name="fill">
148 148
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
149 149
              <at name="name">fill</at>
......
208 208
              </at>
209 209
             </object>
210 210
            </at>
211
            <at name="width">73</at>
212
            <at name="name"/>
213
            <at name="text">Description</at>
211
            <at name="name">lblDescription</at>
212
            <at name="width">79</at>
213
            <at name="text">_Description</at>
214 214
            <at name="fill">
215 215
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
216 216
              <at name="name">fill</at>
......
275 275
              </at>
276 276
             </object>
277 277
            </at>
278
            <at name="width">589</at>
279
            <at name="name"/>
280
            <at name="text">Capture a point from current view</at>
278
            <at name="name">lblCaptureAPointFromCurrentView</at>
279
            <at name="width">953</at>
280
            <at name="text">_Capture_a_point_from_current_view</at>
281 281
            <at name="fill">
282 282
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
283 283
              <at name="name">fill</at>
......
337 337
            </at>
338 338
            <at name="actionCommand">Toggle point capture</at>
339 339
            <at name="name">btnToggleCapture</at>
340
            <at name="width">149</at>
341
            <at name="text">Toggle point capture</at>
340
            <at name="width">115</at>
341
            <at name="text">_Start_capture</at>
342 342
            <at name="height">22</at>
343 343
           </object>
344 344
          </at>
......
349 349
     </item>
350 350
     <item >
351 351
      <at name="value">
352
       <object classname="com.jeta.forms.store.memento.BeanMemento">
353
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
354
         <at name="cellconstraints">
355
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
356
           <at name="column">2</at>
357
           <at name="row">6</at>
358
           <at name="colspan">3</at>
359
           <at name="rowspan">1</at>
360
           <at name="halign">default</at>
361
           <at name="valign">default</at>
362
           <at name="insets" object="insets">0,0,0,0</at>
363
          </object>
364
         </at>
365
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
366
        </super>
367
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
368
        <at name="beanclass">javax.swing.JTextField</at>
369
        <at name="beanproperties">
370
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
371
          <at name="classname">javax.swing.JTextField</at>
372
          <at name="properties">
373
           <object classname="com.jeta.forms.store.support.PropertyMap">
374
            <at name="border">
375
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
376
              <super classname="com.jeta.forms.store.properties.BorderProperty">
377
               <at name="name">border</at>
378
              </super>
379
              <at name="borders">
380
               <object classname="java.util.LinkedList">
381
                <item >
382
                 <at name="value">
383
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
384
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
385
                    <at name="name">border</at>
386
                   </super>
387
                  </object>
388
                 </at>
389
                </item>
390
               </object>
391
              </at>
392
             </object>
393
            </at>
394
            <at name="background" object="color">236,233,216</at>
395
            <at name="editable">false</at>
396
            <at name="name">txtGeometry</at>
397
            <at name="width">953</at>
398
            <at name="height">20</at>
399
           </object>
400
          </at>
401
         </object>
402
        </at>
403
       </object>
404
      </at>
405
     </item>
406
     <item >
407
      <at name="value">
352 408
       <object classname="com.jeta.forms.store.memento.FormMemento">
353 409
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
354 410
         <at name="cellconstraints">
......
364 420
         </at>
365 421
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
366 422
        </super>
367
        <at name="id">embedded.226816669</at>
423
        <at name="id">embedded.1539465916</at>
368 424
        <at name="rowspecs">CENTER:DEFAULT: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,CENTER:DEFAULT:NONE</at>
369 425
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE</at>
370 426
        <at name="components">
......
413 469
                   </at>
414 470
                  </object>
415 471
                 </at>
416
                 <at name="name"></at>
417
                 <at name="width">144</at>
418
                 <at name="text">Use WKT or WKB</at>
472
                 <at name="name">lblUseWktOrWkb</at>
473
                 <at name="width">154</at>
474
                 <at name="text">_Use_WKT_or_WKB</at>
419 475
                 <at name="fill">
420 476
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
421 477
                   <at name="name">fill</at>
......
473 529
                   </at>
474 530
                  </object>
475 531
                 </at>
476
                 <at name="name"></at>
477
                 <at name="width">144</at>
478
                 <at name="text">Use Geometry or Text</at>
532
                 <at name="name">lblUseGeometryOrText</at>
533
                 <at name="width">154</at>
534
                 <at name="text">_Use_Geometry_or_Text</at>
479 535
                 <at name="fill">
480 536
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
481 537
                   <at name="name">fill</at>
......
542 598
                 </at>
543 599
                 <at name="opaque">false</at>
544 600
                 <at name="name">rdoInsertAsWKT</at>
545
                 <at name="width">130</at>
546
                 <at name="text">Insert as WKT</at>
547
                 <at name="selected">true</at>
601
                 <at name="width">140</at>
602
                 <at name="text">_Insert_as_WKT</at>
548 603
                 <at name="height">16</at>
549 604
                </object>
550 605
               </at>
......
601 656
                 <at name="buttonGroup">
602 657
                  <object classname="com.jeta.forms.store.properties.ButtonGroupProperty">
603 658
                   <at name="name">buttonGroup</at>
604
                   <at name="groupname">1</at>
659
                   <at name="groupname">1ç</at>
605 660
                  </object>
606 661
                 </at>
607 662
                 <at name="opaque">false</at>
608 663
                 <at name="name">rdoInsertAsWKB</at>
609
                 <at name="width">130</at>
610
                 <at name="text">Insert as WKB</at>
664
                 <at name="width">140</at>
665
                 <at name="text">_Insert_as_WKB</at>
666
                 <at name="selected">true</at>
611 667
                 <at name="height">16</at>
612 668
                </object>
613 669
               </at>
......
669 725
                 </at>
670 726
                 <at name="opaque">false</at>
671 727
                 <at name="name">rdoInsertAsGeometry</at>
672
                 <at name="width">130</at>
673
                 <at name="text">Insert as Geometry</at>
728
                 <at name="width">140</at>
729
                 <at name="text">_Insert_as_Geometry</at>
674 730
                 <at name="selected">true</at>
675 731
                 <at name="height">16</at>
676 732
                </object>
......
733 789
                 </at>
734 790
                 <at name="opaque">false</at>
735 791
                 <at name="name">rdoInsertAsString</at>
736
                 <at name="width">130</at>
737
                 <at name="text">Insert as Text</at>
792
                 <at name="width">140</at>
793
                 <at name="text">_Insert_as_Text</at>
738 794
                 <at name="height">16</at>
739 795
                </object>
740 796
               </at>
......
760 816
              </at>
761 817
             </object>
762 818
            </at>
763
            <at name="name"></at>
819
            <at name="name"/>
764 820
            <at name="fill">
765 821
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
766 822
              <at name="name">fill</at>
......
863 919
       </object>
864 920
      </at>
865 921
     </item>
866
     <item >
867
      <at name="value">
868
       <object classname="com.jeta.forms.store.memento.BeanMemento">
869
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
870
         <at name="cellconstraints">
871
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
872
           <at name="column">2</at>
873
           <at name="row">6</at>
874
           <at name="colspan">3</at>
875
           <at name="rowspan">1</at>
876
           <at name="halign">default</at>
877
           <at name="valign">default</at>
878
           <at name="insets" object="insets">0,0,0,0</at>
879
          </object>
880
         </at>
881
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
882
        </super>
883
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
884
        <at name="beanclass">javax.swing.JTextField</at>
885
        <at name="beanproperties">
886
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
887
          <at name="classname">javax.swing.JTextField</at>
888
          <at name="properties">
889
           <object classname="com.jeta.forms.store.support.PropertyMap">
890
            <at name="border">
891
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
892
              <super classname="com.jeta.forms.store.properties.BorderProperty">
893
               <at name="name">border</at>
894
              </super>
895
              <at name="borders">
896
               <object classname="java.util.LinkedList">
897
                <item >
898
                 <at name="value">
899
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
900
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
901
                    <at name="name">border</at>
902
                   </super>
903
                  </object>
904
                 </at>
905
                </item>
906
               </object>
907
              </at>
908
             </object>
909
            </at>
910
            <at name="background" object="color">236,233,216</at>
911
            <at name="editable">false</at>
912
            <at name="name">txtPoint</at>
913
            <at name="width">589</at>
914
            <at name="height">20</at>
915
           </object>
916
          </at>
917
         </object>
918
        </at>
919
       </object>
920
      </at>
921
     </item>
922 922
    </object>
923 923
   </at>
924 924
   <at name="properties">
......
936 936
         </at>
937 937
        </object>
938 938
       </at>
939
       <at name="name"></at>
939
       <at name="name"/>
940 940
       <at name="fill">
941 941
        <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
942 942
         <at name="name">fill</at>
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewCapturePointPanelView.java
22 22

  
23 23
public class ViewCapturePointPanelView extends JPanel
24 24
{
25
   JLabel lblConstantPoint = new JLabel();
26
   JLabel lblValue = new JLabel();
27
   JLabel lblDescription = new JLabel();
28
   JLabel lblCaptureAPointFromCurrentView = new JLabel();
25 29
   JButton btnToggleCapture = new JButton();
30
   JTextField txtGeometry = new JTextField();
31
   JLabel lblUseWktOrWkb = new JLabel();
32
   JLabel lblUseGeometryOrText = new JLabel();
26 33
   JRadioButton rdoInsertAsWKT = new JRadioButton();
27 34
   ButtonGroup buttongroup1 = new ButtonGroup();
28 35
   JRadioButton rdoInsertAsWKB = new JRadioButton();
29 36
   JRadioButton rdoInsertAsGeometry = new JRadioButton();
30 37
   ButtonGroup buttongroup2 = new ButtonGroup();
31 38
   JRadioButton rdoInsertAsString = new JRadioButton();
32
   JTextField txtPoint = new JTextField();
33 39

  
34 40
   /**
35 41
    * Default constructor
......
125 131
      CellConstraints cc = new CellConstraints();
126 132
      jpanel1.setLayout(formlayout1);
127 133

  
128
      JLabel jlabel1 = new JLabel();
129
      jlabel1.setFont(new Font("Dialog",Font.BOLD,11));
130
      jlabel1.setText("Constant Point");
131
      jpanel1.add(jlabel1,cc.xywh(2,2,3,1));
134
      lblConstantPoint.setFont(new Font("Dialog",Font.BOLD,11));
135
      lblConstantPoint.setName("lblConstantPoint");
136
      lblConstantPoint.setText("_Constant_Point");
137
      jpanel1.add(lblConstantPoint,cc.xywh(2,2,3,1));
132 138

  
133
      JLabel jlabel2 = new JLabel();
134
      jlabel2.setFont(new Font("Dialog",Font.BOLD,11));
135
      jlabel2.setText("Value");
136
      jpanel1.add(jlabel2,cc.xy(2,4));
139
      lblValue.setFont(new Font("Dialog",Font.BOLD,11));
140
      lblValue.setName("lblValue");
141
      lblValue.setText("_Value");
142
      jpanel1.add(lblValue,cc.xy(2,4));
137 143

  
138
      JLabel jlabel3 = new JLabel();
139
      jlabel3.setFont(new Font("Dialog",Font.BOLD,11));
140
      jlabel3.setText("Description");
141
      jpanel1.add(jlabel3,cc.xy(2,10));
144
      lblDescription.setFont(new Font("Dialog",Font.BOLD,11));
145
      lblDescription.setName("lblDescription");
146
      lblDescription.setText("_Description");
147
      jpanel1.add(lblDescription,cc.xy(2,10));
142 148

  
143
      JLabel jlabel4 = new JLabel();
144
      jlabel4.setText("Capture a point from current view");
145
      jpanel1.add(jlabel4,cc.xywh(2,11,3,1));
149
      lblCaptureAPointFromCurrentView.setName("lblCaptureAPointFromCurrentView");
150
      lblCaptureAPointFromCurrentView.setText("_Capture_a_point_from_current_view");
151
      jpanel1.add(lblCaptureAPointFromCurrentView,cc.xywh(2,11,3,1));
146 152

  
147 153
      btnToggleCapture.setActionCommand("Toggle point capture");
148 154
      btnToggleCapture.setName("btnToggleCapture");
149
      btnToggleCapture.setText("Toggle point capture");
155
      btnToggleCapture.setText("_Start_capture");
150 156
      jpanel1.add(btnToggleCapture,new CellConstraints(4,8,1,1,CellConstraints.RIGHT,CellConstraints.DEFAULT));
151 157

  
158
      txtGeometry.setBackground(new Color(236,233,216));
159
      txtGeometry.setEditable(false);
160
      txtGeometry.setName("txtGeometry");
161
      jpanel1.add(txtGeometry,cc.xywh(2,6,3,1));
162

  
152 163
      jpanel1.add(createPanel1(),cc.xywh(2,13,3,1));
153
      txtPoint.setBackground(new Color(236,233,216));
154
      txtPoint.setEditable(false);
155
      txtPoint.setName("txtPoint");
156
      jpanel1.add(txtPoint,cc.xywh(2,6,3,1));
157

  
158 164
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14 });
159 165
      return jpanel1;
160 166
   }
......
166 172
      CellConstraints cc = new CellConstraints();
167 173
      jpanel1.setLayout(formlayout1);
168 174

  
169
      JLabel jlabel1 = new JLabel();
170
      jlabel1.setText("Use WKT or WKB");
171
      jpanel1.add(jlabel1,cc.xywh(2,1,2,1));
175
      lblUseWktOrWkb.setName("lblUseWktOrWkb");
176
      lblUseWktOrWkb.setText("_Use_WKT_or_WKB");
177
      jpanel1.add(lblUseWktOrWkb,cc.xywh(2,1,2,1));
172 178

  
173
      JLabel jlabel2 = new JLabel();
174
      jlabel2.setText("Use Geometry or Text");
175
      jpanel1.add(jlabel2,cc.xywh(2,6,2,1));
179
      lblUseGeometryOrText.setName("lblUseGeometryOrText");
180
      lblUseGeometryOrText.setText("_Use_Geometry_or_Text");
181
      jpanel1.add(lblUseGeometryOrText,cc.xywh(2,6,2,1));
176 182

  
177 183
      rdoInsertAsWKT.setActionCommand("Insert as WKT");
178 184
      rdoInsertAsWKT.setName("rdoInsertAsWKT");
179 185
      rdoInsertAsWKT.setOpaque(false);
180
      rdoInsertAsWKT.setSelected(true);
181
      rdoInsertAsWKT.setText("Insert as WKT");
186
      rdoInsertAsWKT.setText("_Insert_as_WKT");
182 187
      buttongroup1.add(rdoInsertAsWKT);
183 188
      jpanel1.add(rdoInsertAsWKT,cc.xy(3,2));
184 189

  
185 190
      rdoInsertAsWKB.setActionCommand("Insert as WKB");
186 191
      rdoInsertAsWKB.setName("rdoInsertAsWKB");
187 192
      rdoInsertAsWKB.setOpaque(false);
188
      rdoInsertAsWKB.setText("Insert as WKB");
193
      rdoInsertAsWKB.setSelected(true);
194
      rdoInsertAsWKB.setText("_Insert_as_WKB");
189 195
      buttongroup1.add(rdoInsertAsWKB);
190 196
      jpanel1.add(rdoInsertAsWKB,cc.xy(3,4));
191 197

  
......
193 199
      rdoInsertAsGeometry.setName("rdoInsertAsGeometry");
194 200
      rdoInsertAsGeometry.setOpaque(false);
195 201
      rdoInsertAsGeometry.setSelected(true);
196
      rdoInsertAsGeometry.setText("Insert as Geometry");
202
      rdoInsertAsGeometry.setText("_Insert_as_Geometry");
197 203
      buttongroup2.add(rdoInsertAsGeometry);
198 204
      jpanel1.add(rdoInsertAsGeometry,cc.xy(3,8));
199 205

  
200 206
      rdoInsertAsString.setActionCommand("Insert as String");
201 207
      rdoInsertAsString.setName("rdoInsertAsString");
202 208
      rdoInsertAsString.setOpaque(false);
203
      rdoInsertAsString.setText("Insert as Text");
209
      rdoInsertAsString.setText("_Insert_as_Text");
204 210
      buttongroup2.add(rdoInsertAsString);
205 211
      jpanel1.add(rdoInsertAsString,cc.xy(3,10));
206 212

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/ViewCaptureRectanglePanel.java
71 71
                return false;
72 72
            }
73 73
        });
74
        this.btnToggleCapture.setText(i18n.getTranslation("_Start_capture"));
75

  
76 74
        this.addAncestorListener(new AncestorListener() {
77 75
            @Override
78 76
            public void ancestorAdded(AncestorEvent event) {
......
95 93
            }
96 94
            
97 95
        });
96
        toolsSwingManager.translate(this.lblConstantRectangle);
97
        toolsSwingManager.translate(this.lblValue);
98
        toolsSwingManager.translate(this.lblDescription);
99
        toolsSwingManager.translate(this.lblCaptureAPointFromCurrentView);
100
        toolsSwingManager.translate(this.lblUseWktOrWkb);
101
        toolsSwingManager.translate(this.lblUseGeometryOrText);
102
        toolsSwingManager.translate(this.rdoInsertAsGeometry);
103
        toolsSwingManager.translate(this.rdoInsertAsString);
104
        toolsSwingManager.translate(this.rdoInsertAsWKB);
105
        toolsSwingManager.translate(this.rdoInsertAsWKT);
106
        toolsSwingManager.translate(this.btnToggleCapture);
98 107
    }
99 108

  
100 109
    @Override
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/DefaultExpressionEvaluatorSwingManager.java
1 1
package org.gvsig.expressionevaluator.swing.impl;
2 2

  
3
import java.awt.TextComponent;
4 3
import java.util.ArrayList;
5 4
import java.util.Collection;
6 5
import java.util.HashMap;
......
24 23
import org.gvsig.expressionevaluator.swing.impl.elements.DefaultFunctionElement;
25 24
import org.gvsig.expressionevaluator.swing.impl.elements.DefaultGroupElement;
26 25
import org.gvsig.expressionevaluator.swing.impl.elements.DefaultVariableElement;
26
import org.gvsig.tools.ToolsLocator;
27
import org.gvsig.tools.i18n.I18nManager;
27 28

  
28 29
public class DefaultExpressionEvaluatorSwingManager
29 30
        implements ExpressionEvaluatorSwingManager {
......
36 37

  
37 38
    @Override
38 39
    public List<Element> createElements(Collection<SymbolTable> symbolTables) {
40
        I18nManager i18n = ToolsLocator.getI18nManager();
39 41
        Map<String, Function> functions = new HashMap<>();
40 42
        
41 43
        for (SymbolTable symbolTable : symbolTables) {
......
65 67
                group.addElement(new DefaultFunctionElement(function));
66 68
            }
67 69
        }
68
        GroupElement builtinFunctions = this.createGroupElement("_Functions");
70
        GroupElement builtinFunctions = this.createGroupElement(i18n.getTranslation("_Functions"));
69 71
        for (GroupElement group : functionGroups.values()) {
70 72
            builtinFunctions.addElement(group);
71 73
        }
72
        GroupElement operatorFunctions = this.createGroupElement("_Operators");
74
        GroupElement operatorFunctions = this.createGroupElement(i18n.getTranslation("_Operators"));
73 75
        for (GroupElement group : operatorGroups.values()) {
74 76
            operatorFunctions.addElement(group);
75 77
        }
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/DefaultJExpressionBuilder.java
52 52
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager;
53 53
import org.gvsig.expressionevaluator.swing.JExpressionBuilder;
54 54
import org.gvsig.tools.ToolsLocator;
55
import org.gvsig.tools.i18n.I18nManager;
55 56
import org.gvsig.tools.script.Script;
56 57
import org.gvsig.tools.swing.api.Component;
57 58
import org.gvsig.tools.swing.api.ListElement;
......
66 67
 *
67 68
 * @author jjdelcerro
68 69
 */
70
@SuppressWarnings("UseSpecificCatch")
69 71
public class DefaultJExpressionBuilder
70 72
        extends DefaultJExpressionBuilderView
71 73
        implements JExpressionBuilder {
......
206 208
        this.txtDescription = new JEditorPane();
207 209
        this.scrDescription = new JScrollPane(this.txtDescription);
208 210
        
211
        toolsSwingManager.translate(this.tabExpressionBuilder);
209 212
        toolsSwingManager.setDefaultPopupMenu(this.txtExpression);
210 213
        toolsSwingManager.setDefaultPopupMenu(this.txtGroupElement);
211 214
        toolsSwingManager.setDefaultPopupMenu(this.txtSimpleElementFilter);
......
478 481
    }
479 482

  
480 483
    private void doSelectElement(SimpleElement element) {
484
        I18nManager i18n = ToolsLocator.getI18nManager();
485
        
481 486
        Component aditionalPanel = element.getAditionalPanel();
482
        java.awt.Component newInfoPanel = null;
487
        java.awt.Component newInfoPanel;
483 488
        if( aditionalPanel == null ) {
484 489
            StringBuilder html = new StringBuilder();
485 490
            html.append("<html>\n");
486 491
            if( element instanceof ConstantElement ) {
487 492
                Object value = ((ConstantElement)element).getValue();
488 493
                if( value == null ) {
489
                    html.append("<b>Constant</b><br>\n<br>\n");
490
                    html.append("<b>Value</b> NULL<br>\n");
494
                    html.append("<b>").append(i18n.getTranslation("_Constant")).append("</b><br>\n<br>\n");
495
                    html.append("<b>").append(i18n.getTranslation("_Value")).append("</b> NULL<br>\n");
491 496
                } else {
492
                    html.append("<b>Constant</b><br>\n<br>\n");
493
                    html.append("<b>Value</b> ").append(repr(value)).append("<br>\n");
494
                    html.append("<b>Type</b> ").append(value.getClass().getSimpleName()).append("<br>\n");
497
                    html.append("<b>").append(i18n.getTranslation("_Constant")).append("</b><br>\n<br>\n");
498
                    html.append("<b>").append(i18n.getTranslation("_Value")).append("</b> ").append(repr(value)).append("<br>\n");
499
                    html.append("<b>").append(i18n.getTranslation("_Type")).append("</b> ").append(value.getClass().getSimpleName()).append("<br>\n");
495 500
                }
496 501

  
497 502
            } else if( element instanceof VariableElement ) {
498 503
                    VariableElement var = (VariableElement)element;
499 504
                    html.append("<b>").append(var.getLabel()).append("</b><br>\n<br>\n");
500
                    html.append("<b>Source</b> ").append(var.getSource()).append("<br>\n");
501
                    html.append("<b>Name</b> ").append(var.getName()).append("<br>\n");
502
                    html.append("<b>Type</b> ").append(var.getTypeName()).append("<br>\n");
505
                    html.append("<b>").append(i18n.getTranslation("_Source")).append("</b> ").append(var.getSource()).append("<br>\n");
506
                    html.append("<b>").append(i18n.getTranslation("_Name")).append("</b> ").append(var.getName()).append("<br>\n");
507
                    html.append("<b>").append(i18n.getTranslation("_Type")).append("</b> ").append(var.getTypeName()).append("<br>\n");
503 508

  
504 509
            } else if( element instanceof FunctionElement ) {
505 510
                Function function = ((FunctionElement)element).getFunction();
506 511
                if (function == null) {
507
                    html.append("<b>Function</b> ").append(element.getName()).append("<br>\n<br>\n");
508
                    html.append("<b>Return</b> Object<br>\n<br>\n");
509
                    html.append("<b>Template:</b> ").append(element.getName()).append("()<br>\n");
512
                    html.append("<b>").append(i18n.getTranslation("_Function")).append("</b> ").append(element.getName()).append("<br>\n<br>\n");
513
                    html.append("<b>").append(i18n.getTranslation("_Return")).append("</b> Object<br>\n<br>\n");
514
                    html.append("<b>").append(i18n.getTranslation("_Template")).append(":</b> ").append(element.getName()).append("()<br>\n");
510 515
                } else {
511
                    html.append("<b>Function</b> ").append(element.getName()).append("<br>\n<br>\n");
512
                    html.append("<b>Return</b> ");
516
                    html.append("<b>").append(i18n.getTranslation("_Function")).append("</b> ").append(element.getName()).append("<br>\n<br>\n");
517
                    html.append("<b>").append(i18n.getTranslation("_Return")).append("</b> ");
513 518
                    html.append(StringUtils.isEmpty(function.returnType())?"Objec": function.returnType());
514 519
                    html.append("<br>\n");
515
                    html.append("<b>Template</b> ");
520
                    html.append("<b>").append(i18n.getTranslation("_Template")).append("</b> ");
516 521
                    html.append(StringUtils.isEmpty(function.template())?element.getName()+"()": removeCursorMark(function.template()));
517 522
                    html.append("<br>\n");
518 523

  
519 524
                    String[] args = function.descriptionArgs();
520 525
                    if (args != null) {
521
                        html.append("<b>Arguments:</b> ").append("<ul>\n");
526
                        html.append("<b>").append(i18n.getTranslation("_Arguments")).append(":</b> ").append("<ul>\n");
522 527
                        for (String arg : args) {
523 528
                            html.append("<li>").append(arg).append("</li>\n");
524 529
                        }
......
527 532
                    }
528 533
                }
529 534
            } else {
530
                html.append("<b>Generic element<br>\n<br>\n");
531
                html.append("<b>Name</b> ").append(element.getName()).append("</br>\n");
535
                html.append("<b>").append(i18n.getTranslation("_Generic_element")).append("<br>\n<br>\n");
536
                html.append("<b>").append(i18n.getTranslation("_Name")).append("</b> ").append(element.getName()).append("</br>\n");
532 537

  
533 538
            }
534 539

  
535 540
            if( element.getDescription()!=null ) {
536
                html.append("<b>Description</b><br>\n");
541
                html.append("<b>").append(i18n.getTranslation("_Description")).append("</b><br>\n");
537 542
                html.append(element.getDescription().replace("\n", "<br>")).append("<br>\n");
538 543
            }
539 544
            html.append("</html>\n");
......
703 708
    @Override
704 709
    public JComponent asJComponent() {
705 710
        if( this.treeModel == null ) {
711
            I18nManager i18n = ToolsLocator.getI18nManager();
706 712
            this.treeModel = new ElementsTreeModel(
707
                    this.manager.createGroupElement("_Elements", this.getElements())
713
                    this.manager.createGroupElement(
714
                            i18n.getTranslation("_Elements"),
715
                            this.getElements()
716
                    )
708 717
            );
709 718
            this.treeElements.setModel(this.treeModel);
710 719
        }

Also available in: Unified diff