Revision 9526

View differences:

org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.api/src/main/java/org/gvsig/online/swing/api/OnlineJSimpleSearch.java
1
/*
2
 * gvSIG. Desktop Geographic Information System.
3
 * 
4
 * Copyright (C) 2007-2020 gvSIG Association.
5
 * 
6
 * This program is free software; you can redistribute it and/or
7
 * modify it under the terms of the GNU General Public License
8
 * as published by the Free Software Foundation; either version 3
9
 * of the License, or (at your option) any later version.
10
 * 
11
 * This program is distributed in the hope that it will be useful,
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
 * GNU General Public License for more details.
15
 * 
16
 * You should have received a copy of the GNU General Public License 
17
 * along with this program. If not, see <https://www.gnu.org/licenses/>. 
18
 * 
19
 * For any additional information, do not hesitate to contact us
20
 * at info AT gvsig.com, or visit our website www.gvsig.com.
21
 */
22
package org.gvsig.online.swing.api;
23

  
24
/**
25
 *
26
 * @author jjdelcerro
27
 */
28
public interface OnlineJSimpleSearch extends OnlinePanel {
29
    
30
}
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.api/src/main/java/org/gvsig/online/swing/api/OnlineSwingManager.java
30 30
import javax.swing.JList;
31 31
import javax.swing.JTree;
32 32
import javax.swing.text.JTextComponent;
33
import org.gvsig.fmap.dal.feature.FeatureStore;
33 34
import org.gvsig.online.lib.api.workingcopy.OnlineEntity;
34 35
import org.gvsig.online.lib.api.workingcopy.OnlineWorkingcopy;
36
import org.gvsig.tools.arguments.Arguments;
35 37
import org.gvsig.tools.swing.api.pickercontroller.PickerController;
36 38

  
37 39

  
......
48 50
    
49 51
    public OnlineJDownload createDownloadPanel(OnlineWorkingcopy workspace, List<String> tableNames, Boolean overwrite);
50 52

  
53
    public OnlineJSimpleSearch createSimpleSearchPanel(FeatureStore store, Arguments arguments);
54

  
51 55
    public OnlineJInitWorkingcopy createInitWorkspacePanel();
52 56
    
53 57
    public PickerController<OnlineWorkingcopy> createPickerWorkspaceController(JComboBox combo);
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/OnlineSwingManagerImpl.java
11 11
import javax.swing.JTree;
12 12
import javax.swing.text.JTextComponent;
13 13
import org.apache.commons.io.FilenameUtils;
14
import org.gvsig.fmap.dal.feature.FeatureStore;
14 15
import static org.gvsig.online.lib.api.OnlineManager.STATE_UNKNOWN;
15 16
import org.gvsig.online.lib.api.workingcopy.OnlineEntity;
16 17
import org.gvsig.online.lib.api.workingcopy.OnlineWorkingcopy;
......
19 20
import org.gvsig.online.swing.api.OnlineJDownload;
20 21
import org.gvsig.online.swing.api.OnlineJInitWorkingcopy;
21 22
import org.gvsig.online.swing.api.OnlineJRegisterWorkspace;
23
import org.gvsig.online.swing.api.OnlineJSimpleSearch;
22 24
import org.gvsig.online.swing.api.OnlineSwingManager;
23 25
import org.gvsig.online.swing.api.OnlineSwingServices;
24 26
import static org.gvsig.online.swing.impl.OnlineSwingCommons.getHTMLColorTag;
......
27 29
import org.gvsig.online.swing.impl.initworkspace.OnlineJInitWorkingcopyImpl;
28 30
import org.gvsig.tools.swing.api.pickercontroller.PickerController;
29 31
import org.gvsig.online.swing.impl.registerWorkspace.OnlineJRegisterWorkspaceImpl;
32
import org.gvsig.online.swing.impl.simplesearch.OnlineJSimpleSearchImpl;
33
import org.gvsig.tools.arguments.Arguments;
30 34
import org.gvsig.tools.swing.api.ToolsSwingLocator;
31 35
import org.gvsig.tools.swing.icontheme.IconTheme;
32 36

  
......
162 166
        return new OnlineJRegisterWorkspaceImpl();
163 167
    }
164 168

  
169
    @Override
170
    public OnlineJSimpleSearch createSimpleSearchPanel(FeatureStore store, Arguments arguments) {
171
        return new OnlineJSimpleSearchImpl(store, arguments);
172
    }
173

  
165 174
}
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/download/OnlineJDownloadImpl.java
23 23
 */
24 24
package org.gvsig.online.swing.impl.download;
25 25

  
26
import java.awt.event.ActionEvent;
26 27
import java.util.ArrayList;
27 28
import java.util.Collections;
28 29
import java.util.List;
29 30
import java.util.stream.Collectors;
31
import javax.swing.ComboBoxModel;
30 32
import javax.swing.ImageIcon;
31 33
import javax.swing.JComponent;
32 34
import javax.swing.SwingUtilities;
......
34 36
import javax.swing.event.TableModelEvent;
35 37
import org.apache.commons.collections4.CollectionUtils;
36 38
import org.apache.commons.lang3.StringUtils;
39
import org.gvsig.fmap.dal.feature.FeatureStore;
37 40
import org.gvsig.fmap.dal.swing.DALSwingLocator;
38 41
import org.gvsig.fmap.dal.swing.DataSwingManager;
39 42
import org.gvsig.fmap.mapcontrol.MapControl;
......
54 57
import org.gvsig.online.swing.impl.initworkspace.LayersTableModel;
55 58
import org.gvsig.online.swing.impl.workingarea.WorkingAreaPickerControllerImpl;
56 59
import org.gvsig.tools.ToolsLocator;
60
import org.gvsig.tools.dispose.DisposeUtils;
57 61
import org.gvsig.tools.i18n.I18nManager;
58 62
import org.gvsig.tools.swing.api.Component;
59 63
import org.gvsig.tools.swing.api.ToolsSwingLocator;
......
116 120
        TaskStatusSwingManager taskStatusManager = ToolsSwingLocator.getTaskStatusSwingManager();
117 121
        DataSwingManager dataSwingManager = DALSwingLocator.getSwingManager();
118 122
        OnlineSwingManager swingManager = OnlineSwingLocator.getOnlineSwingManager();
119
        OnlineSwingServices onlineservices = OnlineSwingLocator.getOnlineSwingManager().getDefaultServices();
123
        OnlineSwingServices onlineServices = OnlineSwingLocator.getOnlineSwingManager().getDefaultServices();
120 124

  
121 125
        this.taskStatusController = taskStatusManager.createTaskStatusController(
122 126
                null,
......
151 155
            btnWorkingAreaHistory,
152 156
            btnWorkingAreaBookmarks,
153 157
            () -> {
154
                LabeledValue<MapControl> n = onlineservices.getActiveMapControl();
158
                LabeledValue<MapControl> n = onlineServices.getActiveMapControl();
155 159
                return (n == null) ? null : n.getValue();
156 160
            },
157 161
            () -> {
......
164 168
        );
165 169
        this.workingAreaPicker.addChangeListener((ChangeEvent e) -> {
166 170
            this.getWorkingcopy().setCurrentWorkingArea(this.workingAreaPicker.getWithoutAddHistory());
167
            doUpdateEnableComponents();
171
            doUpdateComponents();
168 172
        });
169
        
173

  
174
        ComboBoxModel<LabeledValue> viewDocumentsModel = onlineServices.getViewDocumentsComboBoxModel();
175

  
176
        cboView.setModel(viewDocumentsModel);
177
        cboView.addActionListener((ActionEvent e) -> {
178
            this.clearMessage();
179
            doUpdateComponents();
180
        });
181
        this.rdbDontAddToProject.addActionListener((ActionEvent e) -> {
182
            this.clearMessage();
183
            doUpdateComponents();
184
        });
185

  
186
        this.rdbAddLayerToView.addActionListener((ActionEvent e) -> {
187
            this.clearMessage();
188
            doUpdateComponents();
189
        });
190

  
191
        this.rdbAddTableToProject.addActionListener((ActionEvent e) -> {
192
            this.clearMessage();
193
            doUpdateComponents();
194
        });
195

  
196
        this.rdbDontAddToProject.setSelected(true);
197
                
170 198
        SwingUtilities.invokeLater(() -> { clearMessage(); });
171 199
        ToolsSwingUtils.ensureRowsCols(this, 15, 40, 25, 100);
172 200

  
......
175 203
    @Override
176 204
    public void setDialog(Dialog dialog) {
177 205
        this.dialog = dialog;
178
        this.doUpdateEnableComponents();
206
        this.doUpdateComponents();
179 207
    }
180 208

  
181
    private void doUpdateEnableComponents() {
209
    private void doUpdateComponents() {
182 210
        message("");
183 211
        
184 212
        boolean enableAll = true;
......
246 274
        swingManager.translate(this.lblWorkingArea);
247 275
        swingManager.translate(this.btnWorkingAreaFromView);
248 276
        swingManager.translate(this.btnWorkingAreaDialog);
277
        swingManager.translate(this.rdbDontAddToProject);
278
        swingManager.translate(this.rdbAddLayerToView);
279
        swingManager.translate(this.rdbAddTableToProject);
249 280
    }
250 281
    
251 282
    @Override
252 283
    public int actionPerformed() {
253 284
        I18nManager i18n = ToolsLocator.getI18nManager();
254 285
        OnlineManager manager = OnlineLocator.getOnlineManager();
286
        OnlineSwingServices services = OnlineSwingLocator.getOnlineSwingManager().getDefaultServices();
255 287
        
256 288
        OnlineWorkingcopy workingcopy = this.getWorkingcopy();
257 289
        if( workingcopy==null ) {
......
308 340
                        // TODO: Que hacer aqui si da error
309 341
                    }
310 342
                }
343
                
344
                for (OnlineLayer layer : selectedLayers) {
345
                    if (!rdbDontAddToProject.isSelected()) {
346
                        FeatureStore store = null;
347
                        LabeledValue selectedView = (LabeledValue) cboView.getSelectedItem();
348
                        try {
349
                            store = workingcopy.openFeatureStore(layer.getName(), false);
350
                            if (rdbAddLayerToView.isSelected()) {
351
                                    String layerName = layer.getLabel();
352

  
353
                                    services.addLayerToView(
354
                                        store,
355
                                        selectedView,
356
                                        null,
357
                                        layerName,
358
                                        false
359
                                    );
360
                            }
361
                            if (rdbAddTableToProject.isSelected()) {
362
                                services.addTableToProject(workingcopy, store);
363
                            }
364
                        } catch (Exception ex) {
365
                            LOGGER.warn("Can't layer +'"+layer.getName()+"' to view '"+selectedView.getLabel()+"'", ex);
366
                        } finally {
367
                            DisposeUtils.disposeQuietly(store);
368
                        }
369
                    }
370
                }
371
                
311 372
            }
312
            OnlineSwingServices services = OnlineSwingLocator.getOnlineSwingManager().getDefaultServices();
313 373
            services.refreshDocuments();
314 374
        } catch (UserCancelTaskException ex) {
315 375
            LOGGER.info("Cancelled by user.");
......
429 489
        layers.sort((OnlineLayer o1, OnlineLayer o2) -> o1.getLabel().compareTo(o2.getLabel()));
430 490
        LayersTableModel model = new LayersTableModel(layers);
431 491
        model.addTableModelListener((TableModelEvent e) -> {
432
            doUpdateEnableComponents();
492
            doUpdateComponents();
433 493
        });
434 494
        this.txtWorkspaceName.setText(w.getLabel());
435 495
        this.tblLayers.setModel(model);
436 496
        this.workingAreaPicker.set(w.getCurrentWorkingArea());
437
        doUpdateEnableComponents();    
497
        doUpdateComponents();    
438 498
    }
439 499

  
440 500
}
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/download/OnlineJDownloadView.xml
26 26
   </super>
27 27
   <at name="id">/home/fdiaz/projects/gvSIG/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/download/OnlineJDownloadView.xml</at>
28 28
   <at name="path">org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/download/OnlineJDownloadView.xml</at>
29
   <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
29
   <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
30 30
   <at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE</at>
31 31
   <at name="components">
32 32
    <object classname="java.util.LinkedList">
......
75 75
             </object>
76 76
            </at>
77 77
            <at name="name">lblProjects</at>
78
            <at name="width">88</at>
78
            <at name="width">82</at>
79 79
            <at name="text">_Workingcopy</at>
80 80
            <at name="fill">
81 81
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
135 135
             </object>
136 136
            </at>
137 137
            <at name="name">lblWorkspaceName</at>
138
            <at name="width">88</at>
138
            <at name="width">82</at>
139 139
            <at name="text">Nombre</at>
140 140
            <at name="fill">
141 141
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
195 195
             </object>
196 196
            </at>
197 197
            <at name="name">lblLayers</at>
198
            <at name="width">88</at>
198
            <at name="width">82</at>
199 199
            <at name="text">Capas</at>
200 200
            <at name="fill">
201 201
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
255 255
             </object>
256 256
            </at>
257 257
            <at name="name">tblLayers</at>
258
            <at name="width">928</at>
258
            <at name="width">1291</at>
259 259
            <at name="scollBars">
260 260
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
261 261
              <at name="name">scollBars</at>
......
336 336
             </object>
337 337
            </at>
338 338
            <at name="name">lblWorkingArea</at>
339
            <at name="width">88</at>
339
            <at name="width">82</at>
340 340
            <at name="text">_Working_area</at>
341 341
            <at name="fill">
342 342
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
396 396
             </object>
397 397
            </at>
398 398
            <at name="name">cboWorkingcopy</at>
399
            <at name="width">822</at>
399
            <at name="width">1191</at>
400 400
            <at name="items">
401 401
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
402 402
              <at name="name">items</at>
......
459 459
            </at>
460 460
            <at name="selectionStart">7</at>
461 461
            <at name="name">txtWorkspaceName</at>
462
            <at name="width">822</at>
462
            <at name="width">1191</at>
463 463
            <at name="selectionEnd">7</at>
464 464
            <at name="text">Pruebas</at>
465 465
            <at name="height">20</at>
......
472 472
     </item>
473 473
     <item >
474 474
      <at name="value">
475
       <object classname="com.jeta.forms.store.memento.BeanMemento">
476
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
477
         <at name="cellconstraints">
478
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
479
           <at name="column">2</at>
480
           <at name="row">18</at>
481
           <at name="colspan">3</at>
482
           <at name="rowspan">1</at>
483
           <at name="halign">default</at>
484
           <at name="valign">default</at>
485
           <at name="insets" object="insets">0,0,0,0</at>
486
          </object>
487
         </at>
488
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
489
        </super>
490
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
491
        <at name="beanclass">javax.swing.JRadioButton</at>
492
        <at name="beanproperties">
493
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
494
          <at name="classname">javax.swing.JRadioButton</at>
495
          <at name="properties">
496
           <object classname="com.jeta.forms.store.support.PropertyMap">
497
            <at name="border">
498
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
499
              <super classname="com.jeta.forms.store.properties.BorderProperty">
500
               <at name="name">border</at>
501
              </super>
502
              <at name="borders">
503
               <object classname="java.util.LinkedList">
504
                <item >
505
                 <at name="value">
506
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
507
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
508
                    <at name="name">border</at>
509
                   </super>
510
                  </object>
511
                 </at>
512
                </item>
513
               </object>
514
              </at>
515
             </object>
516
            </at>
517
            <at name="actionCommand">_Add_table_to_project</at>
518
            <at name="buttonGroup">
519
             <object classname="com.jeta.forms.store.properties.ButtonGroupProperty">
520
              <at name="name">buttonGroup</at>
521
              <at name="groupname">2</at>
522
             </object>
523
            </at>
524
            <at name="name">rdbAddTableToProject</at>
525
            <at name="width">1293</at>
526
            <at name="text">_Add_as_table_document_to_project</at>
527
            <at name="height">16</at>
528
           </object>
529
          </at>
530
         </object>
531
        </at>
532
       </object>
533
      </at>
534
     </item>
535
     <item >
536
      <at name="value">
537
       <object classname="com.jeta.forms.store.memento.BeanMemento">
538
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
539
         <at name="cellconstraints">
540
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
541
           <at name="column">2</at>
542
           <at name="row">14</at>
543
           <at name="colspan">3</at>
544
           <at name="rowspan">1</at>
545
           <at name="halign">default</at>
546
           <at name="valign">default</at>
547
           <at name="insets" object="insets">0,0,0,0</at>
548
          </object>
549
         </at>
550
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
551
        </super>
552
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
553
        <at name="beanclass">javax.swing.JRadioButton</at>
554
        <at name="beanproperties">
555
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
556
          <at name="classname">javax.swing.JRadioButton</at>
557
          <at name="properties">
558
           <object classname="com.jeta.forms.store.support.PropertyMap">
559
            <at name="border">
560
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
561
              <super classname="com.jeta.forms.store.properties.BorderProperty">
562
               <at name="name">border</at>
563
              </super>
564
              <at name="borders">
565
               <object classname="java.util.LinkedList">
566
                <item >
567
                 <at name="value">
568
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
569
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
570
                    <at name="name">border</at>
571
                   </super>
572
                  </object>
573
                 </at>
574
                </item>
575
               </object>
576
              </at>
577
             </object>
578
            </at>
579
            <at name="actionCommand">_Add_layer_to_view</at>
580
            <at name="buttonGroup">
581
             <object classname="com.jeta.forms.store.properties.ButtonGroupProperty">
582
              <at name="name">buttonGroup</at>
583
              <at name="groupname">2</at>
584
             </object>
585
            </at>
586
            <at name="name">rdbAddLayerToView</at>
587
            <at name="width">1293</at>
588
            <at name="text">_Add_layers_to_view</at>
589
            <at name="height">16</at>
590
           </object>
591
          </at>
592
         </object>
593
        </at>
594
       </object>
595
      </at>
596
     </item>
597
     <item >
598
      <at name="value">
475 599
       <object classname="com.jeta.forms.store.memento.FormMemento">
476 600
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
477 601
         <at name="cellconstraints">
......
487 611
         </at>
488 612
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
489 613
        </super>
490
        <at name="id">embedded.76726752</at>
614
        <at name="id">embedded.35345639</at>
491 615
        <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
492 616
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
493 617
        <at name="components">
......
537 661
                  </object>
538 662
                 </at>
539 663
                 <at name="name">txtWorkingAreaLabel</at>
540
                 <at name="width">755</at>
664
                 <at name="width">1124</at>
541 665
                 <at name="height">20</at>
542 666
                </object>
543 667
               </at>
......
591 715
                  </object>
592 716
                 </at>
593 717
                 <at name="name">txtWorkingArea</at>
594
                 <at name="width">755</at>
718
                 <at name="width">1124</at>
595 719
                 <at name="height">20</at>
596 720
                </object>
597 721
               </at>
......
873 997
              </at>
874 998
             </object>
875 999
            </at>
876
            <at name="name"></at>
1000
            <at name="name"/>
877 1001
            <at name="fill">
878 1002
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
879 1003
              <at name="name">fill</at>
......
951 1075
         <at name="cellconstraints">
952 1076
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
953 1077
           <at name="column">2</at>
954
           <at name="row">12</at>
1078
           <at name="row">20</at>
955 1079
           <at name="colspan">3</at>
956 1080
           <at name="rowspan">1</at>
957 1081
           <at name="halign">default</at>
......
961 1085
         </at>
962 1086
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
963 1087
        </super>
964
        <at name="id">embedded.1805460749</at>
1088
        <at name="id">embedded.985777835</at>
965 1089
        <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE</at>
966 1090
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:MAX(12DLU;DEFAULT):NONE</at>
967 1091
        <at name="components">
......
1011 1135
                  </object>
1012 1136
                 </at>
1013 1137
                 <at name="name">lblStatusTitle</at>
1014
                 <at name="width">904</at>
1138
                 <at name="width">1267</at>
1015 1139
                 <at name="fill">
1016 1140
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1017 1141
                   <at name="name">fill</at>
......
1070 1194
                  </object>
1071 1195
                 </at>
1072 1196
                 <at name="name">pbStatus</at>
1073
                 <at name="width">904</at>
1197
                 <at name="width">1267</at>
1074 1198
                 <at name="percentComplete">0.25</at>
1075 1199
                 <at name="value">25</at>
1076 1200
                 <at name="height">14</at>
......
1126 1250
                  </object>
1127 1251
                 </at>
1128 1252
                 <at name="name">lblStatusMessages</at>
1129
                 <at name="width">904</at>
1253
                 <at name="width">1267</at>
1130 1254
                 <at name="fill">
1131 1255
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1132 1256
                   <at name="name">fill</at>
......
1218 1342
              </at>
1219 1343
             </object>
1220 1344
            </at>
1221
            <at name="name"/>
1345
            <at name="name"></at>
1222 1346
            <at name="fill">
1223 1347
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1224 1348
              <at name="name">fill</at>
......
1289 1413
       </object>
1290 1414
      </at>
1291 1415
     </item>
1416
     <item >
1417
      <at name="value">
1418
       <object classname="com.jeta.forms.store.memento.FormMemento">
1419
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
1420
         <at name="cellconstraints">
1421
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1422
           <at name="column">2</at>
1423
           <at name="row">16</at>
1424
           <at name="colspan">3</at>
1425
           <at name="rowspan">1</at>
1426
           <at name="halign">default</at>
1427
           <at name="valign">default</at>
1428
           <at name="insets" object="insets">0,0,0,0</at>
1429
          </object>
1430
         </at>
1431
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1432
        </super>
1433
        <at name="id">embedded.721197197</at>
1434
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1435
        <at name="colspecs">FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)</at>
1436
        <at name="components">
1437
         <object classname="java.util.LinkedList">
1438
          <item >
1439
           <at name="value">
1440
            <object classname="com.jeta.forms.store.memento.BeanMemento">
1441
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
1442
              <at name="cellconstraints">
1443
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1444
                <at name="column">2</at>
1445
                <at name="row">1</at>
1446
                <at name="colspan">4</at>
1447
                <at name="rowspan">1</at>
1448
                <at name="halign">default</at>
1449
                <at name="valign">default</at>
1450
                <at name="insets" object="insets">0,0,0,0</at>
1451
               </object>
1452
              </at>
1453
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1454
             </super>
1455
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1456
             <at name="beanclass">javax.swing.JComboBox</at>
1457
             <at name="beanproperties">
1458
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1459
               <at name="classname">javax.swing.JComboBox</at>
1460
               <at name="properties">
1461
                <object classname="com.jeta.forms.store.support.PropertyMap">
1462
                 <at name="border">
1463
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1464
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1465
                    <at name="name">border</at>
1466
                   </super>
1467
                   <at name="borders">
1468
                    <object classname="java.util.LinkedList">
1469
                     <item >
1470
                      <at name="value">
1471
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1472
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
1473
                         <at name="name">border</at>
1474
                        </super>
1475
                       </object>
1476
                      </at>
1477
                     </item>
1478
                    </object>
1479
                   </at>
1480
                  </object>
1481
                 </at>
1482
                 <at name="name">cboView</at>
1483
                 <at name="width">1274</at>
1484
                 <at name="items">
1485
                  <object classname="com.jeta.forms.store.properties.ItemsProperty">
1486
                   <at name="name">items</at>
1487
                  </object>
1488
                 </at>
1489
                 <at name="height">20</at>
1490
                </object>
1491
               </at>
1492
              </object>
1493
             </at>
1494
            </object>
1495
           </at>
1496
          </item>
1497
         </object>
1498
        </at>
1499
        <at name="properties">
1500
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1501
          <at name="classname">com.jeta.forms.gui.form.GridView</at>
1502
          <at name="properties">
1503
           <object classname="com.jeta.forms.store.support.PropertyMap">
1504
            <at name="border">
1505
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1506
              <super classname="com.jeta.forms.store.properties.BorderProperty">
1507
               <at name="name">border</at>
1508
              </super>
1509
              <at name="borders">
1510
               <object classname="java.util.LinkedList"/>
1511
              </at>
1512
             </object>
1513
            </at>
1514
            <at name="name"></at>
1515
            <at name="fill">
1516
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1517
              <at name="name">fill</at>
1518
             </object>
1519
            </at>
1520
            <at name="scollBars">
1521
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
1522
              <at name="name">scollBars</at>
1523
              <at name="verticalpolicy">21</at>
1524
              <at name="horizontalpolicy">31</at>
1525
              <at name="border">
1526
               <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1527
                <super classname="com.jeta.forms.store.properties.BorderProperty">
1528
                 <at name="name">border</at>
1529
                </super>
1530
                <at name="borders">
1531
                 <object classname="java.util.LinkedList">
1532
                  <item >
1533
                   <at name="value">
1534
                    <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1535
                     <super classname="com.jeta.forms.store.properties.BorderProperty">
1536
                      <at name="name">border</at>
1537
                     </super>
1538
                    </object>
1539
                   </at>
1540
                  </item>
1541
                 </object>
1542
                </at>
1543
               </object>
1544
              </at>
1545
             </object>
1546
            </at>
1547
           </object>
1548
          </at>
1549
         </object>
1550
        </at>
1551
        <at name="cellpainters">
1552
         <object classname="com.jeta.forms.store.support.Matrix">
1553
          <at name="rows">
1554
           <object classname="[Ljava.lang.Object;" size="1">
1555
            <at name="item" index="0">
1556
             <object classname="[Ljava.lang.Object;" size="5"/>
1557
            </at>
1558
           </object>
1559
          </at>
1560
         </object>
1561
        </at>
1562
        <at name="rowgroups">
1563
         <object classname="com.jeta.forms.store.memento.FormGroupSet">
1564
          <at name="groups">
1565
           <object classname="java.util.HashMap"/>
1566
          </at>
1567
         </object>
1568
        </at>
1569
        <at name="colgroups">
1570
         <object classname="com.jeta.forms.store.memento.FormGroupSet">
1571
          <at name="groups">
1572
           <object classname="java.util.HashMap"/>
1573
          </at>
1574
         </object>
1575
        </at>
1576
       </object>
1577
      </at>
1578
     </item>
1579
     <item >
1580
      <at name="value">
1581
       <object classname="com.jeta.forms.store.memento.BeanMemento">
1582
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
1583
         <at name="cellconstraints">
1584
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1585
           <at name="column">2</at>
1586
           <at name="row">12</at>
1587
           <at name="colspan">3</at>
1588
           <at name="rowspan">1</at>
1589
           <at name="halign">default</at>
1590
           <at name="valign">default</at>
1591
           <at name="insets" object="insets">0,0,0,0</at>
1592
          </object>
1593
         </at>
1594
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1595
        </super>
1596
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1597
        <at name="beanclass">javax.swing.JRadioButton</at>
1598
        <at name="beanproperties">
1599
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1600
          <at name="classname">javax.swing.JRadioButton</at>
1601
          <at name="properties">
1602
           <object classname="com.jeta.forms.store.support.PropertyMap">
1603
            <at name="border">
1604
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1605
              <super classname="com.jeta.forms.store.properties.BorderProperty">
1606
               <at name="name">border</at>
1607
              </super>
1608
              <at name="borders">
1609
               <object classname="java.util.LinkedList">
1610
                <item >
1611
                 <at name="value">
1612
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1613
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1614
                    <at name="name">border</at>
1615
                   </super>
1616
                  </object>
1617
                 </at>
1618
                </item>
1619
               </object>
1620
              </at>
1621
             </object>
1622
            </at>
1623
            <at name="actionCommand">_Dont_add_the_table_or_layer_to_the_project</at>
1624
            <at name="buttonGroup">
1625
             <object classname="com.jeta.forms.store.properties.ButtonGroupProperty">
1626
              <at name="name">buttonGroup</at>
1627
              <at name="groupname">2</at>
1628
             </object>
1629
            </at>
1630
            <at name="name">rdbDontAddToProject</at>
1631
            <at name="width">1293</at>
1632
            <at name="text">_Dont_add_the_tables_or_layers_to_the_project</at>
1633
            <at name="height">16</at>
1634
           </object>
1635
          </at>
1636
         </object>
1637
        </at>
1638
       </object>
1639
      </at>
1640
     </item>
1292 1641
    </object>
1293 1642
   </at>
1294 1643
   <at name="properties">
......
1346 1695
   <at name="cellpainters">
1347 1696
    <object classname="com.jeta.forms.store.support.Matrix">
1348 1697
     <at name="rows">
1349
      <object classname="[Ljava.lang.Object;" size="13">
1698
      <object classname="[Ljava.lang.Object;" size="21">
1350 1699
       <at name="item" index="0">
1351 1700
        <object classname="[Ljava.lang.Object;" size="5"/>
1352 1701
       </at>
......
1386 1735
       <at name="item" index="12">
1387 1736
        <object classname="[Ljava.lang.Object;" size="5"/>
1388 1737
       </at>
1738
       <at name="item" index="13">
1739
        <object classname="[Ljava.lang.Object;" size="5"/>
1740
       </at>
1741
       <at name="item" index="14">
1742
        <object classname="[Ljava.lang.Object;" size="5"/>
1743
       </at>
1744
       <at name="item" index="15">
1745
        <object classname="[Ljava.lang.Object;" size="5"/>
1746
       </at>
1747
       <at name="item" index="16">
1748
        <object classname="[Ljava.lang.Object;" size="5"/>
1749
       </at>
1750
       <at name="item" index="17">
1751
        <object classname="[Ljava.lang.Object;" size="5"/>
1752
       </at>
1753
       <at name="item" index="18">
1754
        <object classname="[Ljava.lang.Object;" size="5"/>
1755
       </at>
1756
       <at name="item" index="19">
1757
        <object classname="[Ljava.lang.Object;" size="5"/>
1758
       </at>
1759
       <at name="item" index="20">
1760
        <object classname="[Ljava.lang.Object;" size="5"/>
1761
       </at>
1389 1762
      </object>
1390 1763
     </at>
1391 1764
    </object>
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/download/OnlineJDownloadView.java
8 8
import java.awt.Container;
9 9
import java.awt.Dimension;
10 10
import javax.swing.Box;
11
import javax.swing.ButtonGroup;
11 12
import javax.swing.ImageIcon;
12 13
import javax.swing.JButton;
13 14
import javax.swing.JComboBox;
......
15 16
import javax.swing.JLabel;
16 17
import javax.swing.JPanel;
17 18
import javax.swing.JProgressBar;
19
import javax.swing.JRadioButton;
18 20
import javax.swing.JScrollPane;
19 21
import javax.swing.JTable;
20 22
import javax.swing.JTextField;
......
30 32
   JLabel lblWorkingArea = new JLabel();
31 33
   JComboBox cboWorkingcopy = new JComboBox();
32 34
   JTextField txtWorkspaceName = new JTextField();
35
   JRadioButton rdbAddTableToProject = new JRadioButton();
36
   ButtonGroup buttongroup2 = new ButtonGroup();
37
   JRadioButton rdbAddLayerToView = new JRadioButton();
33 38
   JTextField txtWorkingAreaLabel = new JTextField();
34 39
   JTextField txtWorkingArea = new JTextField();
35 40
   JButton btnWorkingAreaFromView = new JButton();
......
40 45
   JProgressBar pbStatus = new JProgressBar();
41 46
   JLabel lblStatusMessages = new JLabel();
42 47
   JButton btnStatusCancel = new JButton();
48
   JComboBox cboView = new JComboBox();
49
   JRadioButton rdbDontAddToProject = new JRadioButton();
43 50

  
44 51
   /**
45 52
    * Default constructor
......
131 138
   public JPanel createPanel()
132 139
   {
133 140
      JPanel jpanel1 = new JPanel();
134
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE");
141
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE");
135 142
      CellConstraints cc = new CellConstraints();
136 143
      jpanel1.setLayout(formlayout1);
137 144

  
......
167 174
      txtWorkspaceName.setText("Pruebas");
168 175
      jpanel1.add(txtWorkspaceName,cc.xy(4,4));
169 176

  
177
      rdbAddTableToProject.setActionCommand("_Add_table_to_project");
178
      rdbAddTableToProject.setName("rdbAddTableToProject");
179
      rdbAddTableToProject.setText("_Add_as_table_document_to_project");
180
      buttongroup2.add(rdbAddTableToProject);
181
      jpanel1.add(rdbAddTableToProject,cc.xywh(2,18,3,1));
182

  
183
      rdbAddLayerToView.setActionCommand("_Add_layer_to_view");
184
      rdbAddLayerToView.setName("rdbAddLayerToView");
185
      rdbAddLayerToView.setText("_Add_layers_to_view");
186
      buttongroup2.add(rdbAddLayerToView);
187
      jpanel1.add(rdbAddLayerToView,cc.xywh(2,14,3,1));
188

  
170 189
      jpanel1.add(createPanel1(),cc.xy(4,10));
171
      jpanel1.add(createPanel2(),cc.xywh(2,12,3,1));
172
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13 });
190
      jpanel1.add(createPanel2(),cc.xywh(2,20,3,1));
191
      jpanel1.add(createPanel3(),cc.xywh(2,16,3,1));
192
      rdbDontAddToProject.setActionCommand("_Dont_add_the_table_or_layer_to_the_project");
193
      rdbDontAddToProject.setName("rdbDontAddToProject");
194
      rdbDontAddToProject.setText("_Dont_add_the_tables_or_layers_to_the_project");
195
      buttongroup2.add(rdbDontAddToProject);
196
      jpanel1.add(rdbDontAddToProject,cc.xywh(2,12,3,1));
197

  
198
      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,15,16,17,18,19,20,21 });
173 199
      return jpanel1;
174 200
   }
175 201

  
......
247 273
      return jpanel1;
248 274
   }
249 275

  
276
   public JPanel createPanel3()
277
   {
278
      JPanel jpanel1 = new JPanel();
279
      FormLayout formlayout1 = new FormLayout("FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)","CENTER:DEFAULT:NONE");
280
      CellConstraints cc = new CellConstraints();
281
      jpanel1.setLayout(formlayout1);
282

  
283
      cboView.setName("cboView");
284
      jpanel1.add(cboView,cc.xywh(2,1,4,1));
285

  
286
      addFillComponents(jpanel1,new int[]{ 1,3,4,5 },new int[]{ 1 });
287
      return jpanel1;
288
   }
289

  
250 290
   /**
251 291
    * Initializer
252 292
    */
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/MessageStatus.java
1
/*
2
 * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
3
 * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
4
 */
5
package org.gvsig.online.swing.impl;
6

  
7
import java.awt.Color;
8
import java.awt.event.ActionEvent;
9
import javax.swing.JLabel;
10
import javax.swing.JProgressBar;
11
import javax.swing.SwingUtilities;
12
import javax.swing.Timer;
13
import org.apache.commons.lang3.StringUtils;
14
import static org.gvsig.online.swing.impl.OnlineSwingCommons.notInSwingThreadInvokeLater;
15
import org.gvsig.tools.ToolsLocator;
16
import org.gvsig.tools.i18n.I18nManager;
17
import org.gvsig.tools.swing.api.ToolsSwingLocator;
18
import org.gvsig.tools.swing.api.task.TaskStatusController;
19
import org.gvsig.tools.swing.api.task.TaskStatusSwingManager;
20
import org.gvsig.tools.task.SimpleTaskStatus;
21

  
22
/**
23
 *
24
 * @author fdiaz
25
 */
26
public class MessageStatus {
27

  
28
    private final Timer timerClearMsg;
29
    private final JLabel lblMessages;
30
    private final JLabel lblCaption;
31
    private final JProgressBar pbStatus;
32
    private final TaskStatusController taskStatusController;
33

  
34
    public MessageStatus(JLabel lblCaption, JProgressBar pbStatus, JLabel lblMessages ) {
35
        this.lblMessages = lblMessages;
36
        this.lblCaption = lblCaption;
37
        this.pbStatus = pbStatus;
38
        
39
        this.timerClearMsg = new Timer(20000, (ActionEvent e) -> {
40
            this.clear();
41
        });
42
        this.timerClearMsg.setRepeats(false);
43

  
44
        TaskStatusSwingManager taskStatusManager = ToolsSwingLocator.getTaskStatusSwingManager();
45
        this.taskStatusController = taskStatusManager.createTaskStatusController(
46
                this.lblCaption, 
47
                this.lblMessages, 
48
                this.pbStatus
49
        );
50
        this.taskStatusController.setShowCancelButton(false);
51
        this.taskStatusController.setShowRemoveTaskButton(false);
52
        
53
        SwingUtilities.invokeLater(() -> {this.setVisible(false); });
54

  
55
    }
56
    
57
    public void clear() {
58
        this.lblMessages.setText("");
59
    }
60

  
61
    public void alert(String msg) {
62
        if( StringUtils.startsWith(msg, "_") ) {
63
            I18nManager i18n = ToolsLocator.getI18nManager();
64
            msg = i18n.getTranslation(msg);
65
        }
66
        message(OnlineSwingCommons.getHTMLColorTag(Color.red.darker(), msg));
67
    }
68
    
69
    public void message(final String msg) {
70
        if( notInSwingThreadInvokeLater(() -> {message(msg);})) {
71
            return;
72
        }
73
        String message = msg;
74
        this.timerClearMsg.stop();
75
        if( StringUtils.startsWith(message, "_") ) {
76
            I18nManager i18n = ToolsLocator.getI18nManager();
77
            message = i18n.getTranslation(message);
78
        }
79

  
80
        this.lblMessages.setVisible(true);
81
        this.lblMessages.setText(message);
82
        this.timerClearMsg.start();
83
    }
84

  
85
    public void setVisible(boolean visible) {
86
        if( notInSwingThreadInvokeLater(() -> {setVisible(visible);}) ) {
87
            return;
88
        }
89
        this.lblCaption.setVisible(visible);
90
        this.pbStatus.setVisible(visible);
91
        this.lblMessages.setVisible(true);
92
    }
93
    
94
    
95
    public SimpleTaskStatus createTaskStatus(String title) {
96
        if(StringUtils.startsWith(title, "_")) {
97
            I18nManager i18n = ToolsLocator.getI18nManager();
98
            title = i18n.getTranslation(title);
99
        }
100

  
101
        SimpleTaskStatus status = ToolsLocator.getTaskStatusManager().createDefaultSimpleTaskStatus(title);
102
        this.taskStatusController.bind(status);
103
        return status;
104
    }
105
    
106
    
107
}
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/OnlineSwingCommons.java
151 151
            color.getRed(),
152 152
            color.getGreen(),
153 153
            color.getBlue(),
154
            text
154
            StringUtils.replace(text, "\n", "<br>")
155 155
        );
156 156
        return tag;
157 157
    }
......
171 171
            color.getRed(),
172 172
            color.getGreen(),
173 173
            color.getBlue(),
174
            text
174
            StringUtils.replace(text, "\n", "<br>")
175 175
        );
176 176
        return tag;
177 177
    }
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/SelectAreaPanel.java
35 35
import org.gvsig.fmap.mapcontrol.tools.ZoomOutListenerImpl;
36 36
import org.gvsig.online.lib.api.OnlineLayer;
37 37
import org.gvsig.online.lib.api.OnlineSite;
38
import org.gvsig.tools.ToolsLocator;
39
import org.gvsig.tools.i18n.I18nManager;
38 40
import org.gvsig.tools.swing.api.ToolsSwingLocator;
39 41
import org.gvsig.tools.swing.api.ToolsSwingManager;
40 42
import org.gvsig.tools.swing.api.ToolsSwingUtils;
......
207 209
        MutableObject<Envelope> area = new MutableObject<>();
208 210
        SelectAreaPanel selectAreaPanel = new SelectAreaPanel(previewLayer, envelope);
209 211
        WindowManager_v2 winmager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();
210
        Dialog selectAreaDialog = winmager.createDialog(selectAreaPanel, "Select working area", "", WindowManager_v2.BUTTONS_OK_CANCEL);
212
        I18nManager i18n = ToolsLocator.getI18nManager();
213
        Dialog selectAreaDialog = winmager.createDialog(selectAreaPanel, i18n.getTranslation("_Select_working_area"), "", WindowManager_v2.BUTTONS_OK_CANCEL);
211 214
        selectAreaDialog.addActionListener((ActionEvent e) -> {
212 215
            if( selectAreaDialog.getAction()==WindowManager_v2.BUTTON_OK ) {
213 216
                try {
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/changes/RemoteChangesController.java
517 517
        }
518 518

  
519 519
        this.tblRemoteChanges.setModel(createEmptyTableModel());
520

  
521
        SimpleTaskStatus taskStatus = ToolsLocator.getTaskStatusManager().createDefaultSimpleTaskStatus("_Download_changes");
520
        I18nManager i18n = ToolsLocator.getI18nManager();
521
        SimpleTaskStatus taskStatus = ToolsLocator.getTaskStatusManager().createDefaultSimpleTaskStatus(i18n.getTranslation("_Download_changes"));
522 522
        Thread task = new Thread(() -> {
523 523
            try {
524 524
                taskStatus.setAutoremove(true);
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/changes/OnlineJChangesImpl.java
318 318
            this.btnLocalUnCheckAll,
319 319
            this.btnLocalShowForm,
320 320
            this.btnLocalRefresh,
321
            this.btnLocalCommit,
321
            this.btnLocalUpload,
322 322
            this.btnLocalRevert,
323 323
            this.btnLocalZoom,
324 324
            this.btnLocalCenter,
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/changes/LocalChangesTableModel.java
69 69
        I18nManager i18n = ToolsLocator.getI18nManager();
70 70
        
71 71
        columnNames = new String[]{
72
            i18n.getTranslation("select"),
73
            i18n.getTranslation("table"),
74
            i18n.getTranslation("operation"),
75
            i18n.getTranslation("label"),
76
            i18n.getTranslation("code")
72
            i18n.getTranslation("_Select"),
73
            i18n.getTranslation("_Table"),
74
            i18n.getTranslation("_Operation"),
75
            i18n.getTranslation("_Label"),
76
            i18n.getTranslation("_Code")
77 77
        };
78 78
        this.changes = changes;
79 79
        if( this.changes!=null ) {
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/changes/RemoteChangesTableModel.java
53 53
    private static final int COLUMN_CODE = 6;
54 54
    
55 55
    private static final ColumnDescriptor[] COLUMNS = new ColumnDescriptor[] {
56
        new ColumnDescriptor(Boolean.class, "select", true),
57
        new ColumnDescriptor(String.class, "table", false),
58
        new ColumnDescriptor(String.class, "operation", false),
59
        new ColumnDescriptor(String.class, "label", false),
60
        new ColumnDescriptor(Long.class, "Rev.num.", false),
61
        new ColumnDescriptor(String.class, "Fecha", false),
62
        new ColumnDescriptor(String.class, "code", false)
56
        new ColumnDescriptor(Boolean.class, "_Select", true),
57
        new ColumnDescriptor(String.class, "_Table", false),
58
        new ColumnDescriptor(String.class, "_Operation", false),
59
        new ColumnDescriptor(String.class, "_Label", false),
60
        new ColumnDescriptor(Long.class, "_Rev_num", false),
61
        new ColumnDescriptor(String.class, "_Date", false),
62
        new ColumnDescriptor(String.class, "_Code", false)
63 63
    };
64 64
    
65 65
    private OnlineChanges<OnlineRemoteChange> changes;
org.gvsig.online/trunk/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/changes/OnlineJChangesView.xml
24 24
    </at>
25 25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26 26
   </super>
27
   <at name="id">/home/jjdelcerro/datos/devel/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/changes/OnlineJChangesView.xml</at>
28
   <at name="path">datos/devel/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/changes/OnlineJChangesView.xml</at>
27
   <at name="id">/home/fdiaz/projects/gvSIG/org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/changes/OnlineJChangesView.xml</at>
28
   <at name="path">org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/java/org/gvsig/online/swing/impl/changes/OnlineJChangesView.xml</at>
29 29
   <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
30 30
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE</at>
31 31
   <at name="components">
......
75 75
             </object>
76 76
            </at>
77 77
            <at name="name">lblWorkspace</at>
78
            <at name="width">120</at>
78
            <at name="width">127</at>
79 79
            <at name="text">_Working_copy</at>
80 80
            <at name="fill">
81 81
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
82 82
              <at name="name">fill</at>
83 83
             </object>
84 84
            </at>
85
            <at name="height">16</at>
85
            <at name="height">14</at>
86 86
           </object>
87 87
          </at>
88 88
         </object>
......
135 135
             </object>
136 136
            </at>
137 137
            <at name="name">cboWorkspace</at>
138
            <at name="width">881</at>
138
            <at name="width">1146</at>
139 139
            <at name="items">
140 140
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
141 141
              <at name="name">items</at>
142 142
             </object>
143 143
            </at>
144
            <at name="height">22</at>
144
            <at name="height">20</at>
145 145
           </object>
146 146
          </at>
147 147
         </object>
......
200 200
            <at name="actionCommand">...</at>
201 201
            <at name="opaque">false</at>
202 202
            <at name="name">btnWorkspace</at>
203
            <at name="width">13</at>
203
            <at name="width">16</at>
204 204
            <at name="rolloverEnabled">true</at>
205 205
            <at name="text">...</at>
206
            <at name="height">20</at>
206
            <at name="height">18</at>
207 207
           </object>
208 208
          </at>
209 209
         </object>
......
256 256
             </object>
257 257
            </at>
258 258
            <at name="name">lblSynchorizationZone</at>
259
            <at name="width">120</at>
259
            <at name="width">127</at>
260 260
            <at name="text">_Synchronization_zone</at>
261 261
            <at name="fill">
262 262
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
263 263
              <at name="name">fill</at>
264 264
             </object>
265 265
            </at>
266
            <at name="height">16</at>
266
            <at name="height">14</at>
267 267
           </object>
268 268
          </at>
269 269
         </object>
......
316 316
             </object>
317 317
            </at>
318 318
            <at name="name">cboSynchorizationZone</at>
319
            <at name="width">904</at>
319
            <at name="width">1173</at>
320 320
            <at name="items">
321 321
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
322 322
              <at name="name">items</at>
323 323
             </object>
324 324
            </at>
325 325
            <at name="toolTipText">_Synchronization_zone</at>
326
            <at name="height">22</at>
326
            <at name="height">20</at>
327 327
           </object>
328 328
          </at>
329 329
         </object>
......
348 348
         </at>
349 349
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
350 350
        </super>
351
        <at name="id">embedded.1615221882</at>
351
        <at name="id">embedded.1075806710</at>
352 352
        <at name="rowspecs">CENTER:MIN(16PX;DEFAULT):NONE,CENTER:DEFAULT:NONE,CENTER:MIN(16PX;DEFAULT):NONE</at>
353 353
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE</at>
354 354
        <at name="components">
......
398 398
                  </object>
399 399
                 </at>
400 400
                 <at name="name">lblStatusCaption</at>
401
                 <at name="width">944</at>
401
                 <at name="width">1216</at>
402 402
                 <at name="fill">
403 403
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
404 404
                   <at name="name">fill</at>
......
457 457
                  </object>
458 458
                 </at>
459 459
                 <at name="name">lblStatusMessages</at>
460
                 <at name="width">944</at>
460
                 <at name="width">1216</at>
461 461
                 <at name="fill">
462 462
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
463 463
                   <at name="name">fill</at>
......
516 516
                  </object>
517 517
                 </at>
518 518
                 <at name="name">pbStatus</at>
519
                 <at name="width">944</at>
519
                 <at name="width">1216</at>
520 520
                 <at name="percentComplete">0.25</at>
521 521
                 <at name="value">25</at>
522 522
                 <at name="height">14</at>
......
693 693
                 </at>
694 694
                 <at name="actionCommand">_Close</at>
695 695
                 <at name="name">btnClose</at>
696
                 <at name="width">65</at>
696
                 <at name="width">70</at>
697 697
                 <at name="text">_Close</at>
698
                 <at name="height">24</at>
698
                 <at name="height">22</at>
699 699
                </object>
700 700
               </at>
701 701
              </object>
......
808 808
         </at>
809 809
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
810 810
        </super>
811
        <at name="id">embedded.186490339</at>
811
        <at name="id">embedded.1090069549</at>
812 812
        <at name="rowspecs">CENTER:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)</at>
813 813
        <at name="colspecs">FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
814 814
        <at name="components">
......
830 830
              </at>
831 831
              <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
832 832
             </super>
833
             <at name="id">embedded.82429234</at>
833
             <at name="id">embedded.1323320122</at>
834 834
             <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
835 835
             <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
836 836
             <at name="components">
......
852 852
                   </at>
853 853
                   <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
854 854
                  </super>
855
                  <at name="id">embedded.1248133533</at>
855
                  <at name="id">embedded.2141303042</at>
856 856
                  <at name="rowspecs">CENTER:DEFAULT:NONE</at>
857 857
                  <at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
858 858
                  <at name="components">
......
1453 1453
                   </at>
1454 1454
                   <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1455 1455
                  </super>
1456
                  <at name="id">embedded.994316493</at>
1456
                  <at name="id">embedded.405178934</at>
1457 1457
                  <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
1458 1458
                  <at name="colspecs">FILL:MAX(200PX;DEFAULT):GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
1459 1459
                  <at name="components">
......
1504 1504
                           </at>
1505 1505
                           <at name="name">txtLocalTablesFilter</at>
1506 1506
                           <at name="width">196</at>
1507
                           <at name="height">22</at>
1507
                           <at name="height">20</at>
1508 1508
                          </object>
1509 1509
                         </at>
1510 1510
                        </object>
......
1563 1563
                           <at name="actionCommand">...</at>
1564 1564
                           <at name="opaque">false</at>
1565 1565
                           <at name="name">btnLocalTable</at>
1566
                           <at name="width">13</at>
1566
                           <at name="width">16</at>
1567 1567
                           <at name="rolloverEnabled">true</at>
1568 1568
                           <at name="text">...</at>
1569
                           <at name="height">20</at>
1569
                           <at name="height">18</at>
1570 1570
                          </object>
1571 1571
                         </at>
1572 1572
                        </object>
......
1622 1622
                           <at name="scrollableTracksViewportWidth">true</at>
1623 1623
                           <at name="name">treeLocalTables</at>
1624 1624
                           <at name="showsRootHandles">true</at>
1625
                           <at name="width">217</at>
1625
                           <at name="width">221</at>
1626 1626
                           <at name="foreground" object="color">239,240,241</at>
1627 1627
                           <at name="rowCount">3</at>
1628 1628
                           <at name="scollBars">
......
1653 1653
                            </object>
1654 1654
                           </at>
1655 1655
                           <at name="rootVisible">false</at>
1656
                           <at name="height">180</at>
1656
                           <at name="height">445</at>
1657 1657
                          </object>
1658 1658
                         </at>
1659 1659
                        </object>
......
1854 1854
              </at>
1855 1855
              <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1856 1856
             </super>
1857
             <at name="id">embedded.521467197</at>
1857
             <at name="id">embedded.848525398</at>
1858 1858
             <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
1859 1859
             <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
1860 1860
             <at name="components">
......
1920 1920
                               <at name="embedded">false</at>
1921 1921
                               <at name="path">org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/resources/org/gvsig/online/swing/impl/images/online-show-local-changes.png</at>
1922 1922
                               <at name="description">online-show-local-changes.png</at>
1923
                               <at name="width">16</at>
1924
                               <at name="height">16</at>
1923
                               <at name="width">18</at>
1924
                               <at name="height">18</at>
1925 1925
                              </object>
1926 1926
                             </at>
1927 1927
                             <at name="form">
......
1940 1940
                                </at>
1941 1941
                                <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1942 1942
                               </super>
1943
                               <at name="id">embedded.1931647634</at>
1943
                               <at name="id">embedded.1650428036</at>
1944 1944
                               <at name="rowspecs">CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
1945 1945
                               <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.2),FILL:4DLU:NONE</at>
1946 1946
                               <at name="components">
......
1991 1991
                                        </at>
1992 1992
                                        <at name="horizontalAlignment">4</at>
1993 1993
                                        <at name="name">lblLocalChangesCount</at>
1994
                                        <at name="width">742</at>
1994
                                        <at name="width">1012</at>
1995 1995
                                        <at name="text">0</at>
1996 1996
                                        <at name="fill">
1997 1997
                                         <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1998 1998
                                          <at name="name">fill</at>
1999 1999
                                         </object>
2000 2000
                                        </at>
2001
                                        <at name="height">16</at>
2001
                                        <at name="height">14</at>
2002 2002
                                       </object>
2003 2003
                                      </at>
2004 2004
                                     </object>
......
2023 2023
                                     </at>
2024 2024
                                     <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2025 2025
                                    </super>
2026
                                    <at name="id">embedded.882015591</at>
2026
                                    <at name="id">embedded.1387821386</at>
2027 2027
                                    <at name="rowspecs">FILL:DEFAULT:GROW(1.0)</at>
2028 2028
                                    <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
2029 2029
                                    <at name="components">
......
2045 2045
                                          </at>
2046 2046
                                          <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2047 2047
                                         </super>
2048
                                         <at name="id">embedded.2024888682</at>
2048
                                         <at name="id">embedded.951432514</at>
2049 2049
                                         <at name="rowspecs">CENTER:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)</at>
2050 2050
                                         <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
2051 2051
                                         <at name="components">
......
2095 2095
                                                   </object>
2096 2096
                                                  </at>
2097 2097
                                                  <at name="name">tblLocalChanges</at>
2098
                                                  <at name="width">730</at>
2098
                                                  <at name="width">1000</at>
2099 2099
                                                  <at name="scollBars">
2100 2100
                                                   <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
2101 2101
                                                    <at name="name">scollBars</at>
......
2148 2148
                                               </at>
2149 2149
                                               <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2150 2150
                                              </super>
2151
                                              <at name="id">embedded.2040838153</at>
2151
                                              <at name="id">embedded.2047674583</at>
2152 2152
                                              <at name="rowspecs">CENTER:DEFAULT:NONE</at>
2153 2153
                                              <at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
2154 2154
                                              <at name="components">
......
2412 2412
                                                         </at>
2413 2413
                                                        </object>
2414 2414
                                                       </at>
2415
                                                       <at name="width">443</at>
2415
                                                       <at name="width">705</at>
2416 2416
                                                       <at name="name"/>
2417 2417
                                                       <at name="fill">
2418 2418
                                                        <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
2557 2557
                                                         <at name="height">16</at>
2558 2558
                                                        </object>
2559 2559
                                                       </at>
2560
                                                       <at name="name">btnLocalCommit</at>
2560
                                                       <at name="name">btnLocalUpload</at>
2561 2561
                                                       <at name="width">20</at>
2562 2562
                                                       <at name="rolloverEnabled">true</at>
2563 2563
                                                       <at name="toolTipText">_Upload</at>
......
3281 3281
                               <at name="embedded">false</at>
3282 3282
                               <at name="path">org.gvsig.online/org.gvsig.online.swing/org.gvsig.online.swing.impl/src/main/resources/org/gvsig/online/swing/impl/images/online-show-remote-changes.png</at>
3283 3283
                               <at name="description">online-show-remote-changes.png</at>
3284
                               <at name="width">16</at>
3285
                               <at name="height">16</at>
3284
                               <at name="width">18</at>
3285
                               <at name="height">18</at>
3286 3286
                              </object>
3287 3287
                             </at>
3288 3288
                             <at name="form">
......
3301 3301
                                </at>
3302 3302
                                <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff