Revision 3366

View differences:

org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/LocalChangesController.java
30 30
import java.sql.Timestamp;
31 31
import java.util.ArrayList;
32 32
import java.util.Date;
33
import java.util.HashMap;
34 33
import java.util.HashSet;
35 34
import java.util.Iterator;
36 35
import java.util.List;
37
import java.util.Map;
38 36
import java.util.Set;
39 37
import java.util.logging.Level;
40 38
import java.util.logging.Logger;
......
46 44
import javax.swing.JTable;
47 45
import javax.swing.JTextField;
48 46
import javax.swing.ListSelectionModel;
49
import javax.swing.SwingUtilities;
50 47
import javax.swing.event.ChangeEvent;
51 48
import javax.swing.event.ListSelectionEvent;
52 49
import javax.swing.event.TableModelEvent;
......
71 68
import org.gvsig.tools.swing.api.pickercontroller.PickerController;
72 69
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager;
73 70
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
74
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
75
import org.gvsig.topology.lib.api.TopologyLocator;
76
import org.gvsig.topology.lib.api.TopologyManager;
77
import org.gvsig.topology.lib.api.TopologyPlan;
78
import org.gvsig.topology.swing.api.JTopologyReport;
79
import org.gvsig.topology.swing.api.TopologySwingLocator;
80
import org.gvsig.topology.swing.api.TopologySwingManager;
81 71
import org.gvsig.vcsgis.lib.VCSGisChange;
82 72
import org.gvsig.vcsgis.lib.VCSGisEntity;
83 73
import org.gvsig.vcsgis.lib.VCSGisLocator;
......
686 676
    }
687 677

  
688 678
    private boolean executeTopologyPlans(VCSGisWorkspace ws, List<VCSGisEntity> entities) {
689
        final I18nManager i18n = ToolsLocator.getI18nManager();
690
        final TopologyManager topologyManager = TopologyLocator.getTopologyManager();
691
        final TopologySwingManager swingManager = TopologySwingLocator.getTopologySwingManager();
692
        final WindowManager_v2 winManager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();
693
        
694
        Map<String, TopologyPlan> topologyPlans = new HashMap<>();
679
        boolean topologyRequired = false;
695 680
        for (VCSGisEntity entity : entities) {
696 681
            String x = ws.getTopologyPlan(entity.getTopologyPlanCode());
697
            if( StringUtils.isBlank(x) ) {
698
                continue;
682
            if( StringUtils.isNotBlank(x) ) {
683
                topologyRequired= true;
684
                break;
699 685
            }
700
            TopologyPlan plan = topologyManager.createTopologyPlan();
701
            plan.fromJSON(x);
702
            if( plan.hasRules() ) {
703
                topologyPlans.put(plan.getName(), plan);
704
            }
705 686
        }
706
        if( topologyPlans.isEmpty() ) {
687
        if (!topologyRequired){
707 688
            return true;
708 689
        }
709
        for (TopologyPlan plan : topologyPlans.values()) {
710
            JTopologyReport panel = swingManager.createJTopologyReport(plan);
711
            panel.put(plan);
712
            SwingUtilities.invokeLater(() -> {
713
                winManager.showWindow(
714
                        panel.asJComponent(),
715
                        i18n.getTranslation("_Topology_plan_error_inspector") + " ("+plan.getName()+")",
716
                        WindowManager.MODE.TOOL
717
                );
718
            });
719
            try {
720
                plan.execute();
721
                if( plan.getReport().size()>0 ) {
722
                    return false;
723
                }
724
            } catch(Exception ex) {
725
                return false;
726
            }
690
        try {
691
            TopologyPlansExecutor executor = new TopologyPlansExecutor();
692
            return executor.execute(ws, entities);
693
        }catch(Exception ex){
694
            return false;
727 695
        }
728
        return true;
729 696
    }
730 697
    
731 698
    private void doPostCommit(int commitStatus) {
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/TopologyPlansExecutor.java
1
/*
2
 * To change this license header, choose License Headers in Project Properties.
3
 * To change this template file, choose Tools | Templates
4
 * and open the template in the editor.
5
 */
6
package org.gvsig.vcsgis.swing.impl.changes;
7

  
8
import java.util.HashMap;
9
import java.util.List;
10
import java.util.Map;
11
import javax.swing.SwingUtilities;
12
import org.apache.commons.lang3.StringUtils;
13
import org.gvsig.tools.ToolsLocator;
14
import org.gvsig.tools.i18n.I18nManager;
15
import org.gvsig.tools.swing.api.ToolsSwingLocator;
16
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
17
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
18
import org.gvsig.topology.lib.api.TopologyLocator;
19
import org.gvsig.topology.lib.api.TopologyManager;
20
import org.gvsig.topology.lib.api.TopologyPlan;
21
import org.gvsig.topology.swing.api.JTopologyReport;
22
import org.gvsig.topology.swing.api.TopologySwingLocator;
23
import org.gvsig.topology.swing.api.TopologySwingManager;
24
import org.gvsig.vcsgis.lib.VCSGisEntity;
25
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
26

  
27
/**
28
 *
29
 * @author jovivas
30
 */
31
public class TopologyPlansExecutor {
32
    public boolean execute(VCSGisWorkspace ws, List<VCSGisEntity> entities) {
33
        final I18nManager i18n = ToolsLocator.getI18nManager();
34
        final TopologyManager topologyManager = TopologyLocator.getTopologyManager();
35
        final TopologySwingManager swingManager = TopologySwingLocator.getTopologySwingManager();
36
        final WindowManager_v2 winManager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();
37
        
38
        Map<String, TopologyPlan> topologyPlans = new HashMap<>();
39
        for (VCSGisEntity entity : entities) {
40
            String x = ws.getTopologyPlan(entity.getTopologyPlanCode());
41
            if( StringUtils.isBlank(x) ) {
42
                continue;
43
            }
44
            TopologyPlan plan = topologyManager.createTopologyPlan();
45
            plan.fromJSON(x);
46
            if( plan.hasRules() ) {
47
                topologyPlans.put(plan.getName(), plan);
48
            }
49
        }
50
        if( topologyPlans.isEmpty() ) {
51
            return true;
52
        }
53
        for (TopologyPlan plan : topologyPlans.values()) {
54
            JTopologyReport panel = swingManager.createJTopologyReport(plan);
55
            panel.put(plan);
56
            SwingUtilities.invokeLater(() -> {
57
                winManager.showWindow(
58
                        panel.asJComponent(),
59
                        i18n.getTranslation("_Topology_plan_error_inspector") + " ("+plan.getName()+")",
60
                        WindowManager.MODE.TOOL
61
                );
62
            });
63
            try {
64
                plan.execute();
65
                if( plan.getReport().size()>0 ) {
66
                    return false;
67
                }
68
            } catch(Exception ex) {
69
                return false;
70
            }
71
        }
72
        return true;
73
    }
74
    
75
}
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/VCSGisJChangesView.xml
24 24
    </at>
25 25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26 26
   </super>
27
   <at name="id">/home/fdiaz/projects/gvSIG/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/VCSGisJChangesView.xml</at>
28
   <at name="path">src/main/java/org/gvsig/vcsgis/swing/impl/changes/VCSGisJChangesView.xml</at>
27
   <at name="id">/home/jovivas/datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/VCSGisJChangesView.xml</at>
28
   <at name="path">datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/VCSGisJChangesView.xml</at>
29 29
   <at name="rowspecs">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">
......
135 135
             </object>
136 136
            </at>
137 137
            <at name="name">cboWorkspace</at>
138
            <at name="width">1163</at>
138
            <at name="width">723</at>
139 139
            <at name="items">
140 140
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
141 141
              <at name="name">items</at>
......
210 210
                     <at name="embedded">false</at>
211 211
                     <at name="path">datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-show-local-changes.png</at>
212 212
                     <at name="description">vcsgis-show-local-changes.png</at>
213
                     <at name="width">16</at>
214
                     <at name="height">16</at>
213
                     <at name="width">18</at>
214
                     <at name="height">18</at>
215 215
                    </object>
216 216
                   </at>
217 217
                   <at name="form">
......
230 230
                      </at>
231 231
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
232 232
                     </super>
233
                     <at name="id">embedded.396447840</at>
233
                     <at name="id">embedded.1432837974</at>
234 234
                     <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
235 235
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.2),FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
236 236
                     <at name="components">
......
280 280
                               </object>
281 281
                              </at>
282 282
                              <at name="name">tblLocalChanges</at>
283
                              <at name="width">1000</at>
283
                              <at name="width">629</at>
284 284
                              <at name="scollBars">
285 285
                               <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
286 286
                                <at name="name">scollBars</at>
......
318 318
                       </item>
319 319
                       <item >
320 320
                        <at name="value">
321
                         <object classname="com.jeta.forms.store.memento.BeanMemento">
322
                          <super classname="com.jeta.forms.store.memento.ComponentMemento">
323
                           <at name="cellconstraints">
324
                            <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
325
                             <at name="column">2</at>
326
                             <at name="row">5</at>
327
                             <at name="colspan">1</at>
328
                             <at name="rowspan">1</at>
329
                             <at name="halign">default</at>
330
                             <at name="valign">default</at>
331
                             <at name="insets" object="insets">0,0,0,0</at>
332
                            </object>
333
                           </at>
334
                           <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
335
                          </super>
336
                          <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
337
                          <at name="beanclass">javax.swing.JList</at>
338
                          <at name="beanproperties">
339
                           <object classname="com.jeta.forms.store.memento.PropertiesMemento">
340
                            <at name="classname">javax.swing.JList</at>
341
                            <at name="properties">
342
                             <object classname="com.jeta.forms.store.support.PropertyMap">
343
                              <at name="border">
344
                               <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
345
                                <super classname="com.jeta.forms.store.properties.BorderProperty">
346
                                 <at name="name">border</at>
347
                                </super>
348
                                <at name="borders">
349
                                 <object classname="java.util.LinkedList">
350
                                  <item >
351
                                   <at name="value">
352
                                    <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
353
                                     <super classname="com.jeta.forms.store.properties.BorderProperty">
354
                                      <at name="name">border</at>
355
                                     </super>
356
                                    </object>
357
                                   </at>
358
                                  </item>
359
                                 </object>
360
                                </at>
361
                               </object>
362
                              </at>
363
                              <at name="scrollableTracksViewportHeight">true</at>
364
                              <at name="scrollableTracksViewportWidth">true</at>
365
                              <at name="name">lstLocalTables</at>
366
                              <at name="width">223</at>
367
                              <at name="items">
368
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
369
                                <at name="name">items</at>
370
                               </object>
371
                              </at>
372
                              <at name="scollBars">
373
                               <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
374
                                <at name="name">scollBars</at>
375
                                <at name="verticalpolicy">20</at>
376
                                <at name="horizontalpolicy">30</at>
377
                                <at name="border">
378
                                 <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
379
                                  <super classname="com.jeta.forms.store.properties.BorderProperty">
380
                                   <at name="name">border</at>
381
                                  </super>
382
                                  <at name="borders">
383
                                   <object classname="java.util.LinkedList">
384
                                    <item >
385
                                     <at name="value">
386
                                      <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
387
                                       <super classname="com.jeta.forms.store.properties.BorderProperty">
388
                                        <at name="name">border</at>
389
                                       </super>
390
                                      </object>
391
                                     </at>
392
                                    </item>
393
                                   </object>
394
                                  </at>
395
                                 </object>
396
                                </at>
397
                               </object>
398
                              </at>
399
                              <at name="height">377</at>
400
                             </object>
401
                            </at>
402
                           </object>
403
                          </at>
404
                         </object>
405
                        </at>
406
                       </item>
407
                       <item >
408
                        <at name="value">
409 321
                         <object classname="com.jeta.forms.store.memento.FormMemento">
410 322
                          <super classname="com.jeta.forms.store.memento.ComponentMemento">
411 323
                           <at name="cellconstraints">
......
421 333
                           </at>
422 334
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
423 335
                          </super>
424
                          <at name="id">embedded.2129838058</at>
336
                          <at name="id">embedded.115135752</at>
425 337
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
426 338
                          <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</at>
427 339
                          <at name="components">
......
682 594
                                     </at>
683 595
                                    </object>
684 596
                                   </at>
685
                                   <at name="name"></at>
686
                                   <at name="width">736</at>
597
                                   <at name="width">365</at>
598
                                   <at name="name"/>
687 599
                                   <at name="fill">
688 600
                                    <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
689 601
                                     <at name="name">fill</at>
......
1138 1050
                                </at>
1139 1051
                               </object>
1140 1052
                              </at>
1141
                              <at name="name"></at>
1053
                              <at name="name"/>
1142 1054
                              <at name="fill">
1143 1055
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1144 1056
                                <at name="name">fill</at>
......
1220 1132
                           </at>
1221 1133
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1222 1134
                          </super>
1223
                          <at name="id">embedded.1620538819</at>
1135
                          <at name="id">embedded.1916434937</at>
1224 1136
                          <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
1225 1137
                          <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:MIN(12DLU;DEFAULT):GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE</at>
1226 1138
                          <at name="components">
......
1331 1243
                                    </object>
1332 1244
                                   </at>
1333 1245
                                   <at name="name">txtLocalEffectiveDate</at>
1334
                                   <at name="width">1096</at>
1246
                                   <at name="width">656</at>
1335 1247
                                   <at name="height">20</at>
1336 1248
                                  </object>
1337 1249
                                 </at>
......
1385 1297
                                    </object>
1386 1298
                                   </at>
1387 1299
                                   <at name="name">txtLocalComment</at>
1388
                                   <at name="width">1123</at>
1300
                                   <at name="width">683</at>
1389 1301
                                   <at name="height">20</at>
1390 1302
                                  </object>
1391 1303
                                 </at>
......
1652 1564
                              </at>
1653 1565
                              <at name="horizontalAlignment">4</at>
1654 1566
                              <at name="name">lblLocalChangesCount</at>
1655
                              <at name="width">1238</at>
1567
                              <at name="width">798</at>
1656 1568
                              <at name="text">0</at>
1657 1569
                              <at name="fill">
1658 1570
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
1684 1596
                           </at>
1685 1597
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1686 1598
                          </super>
1687
                          <at name="id">embedded.G78d584a1S1778fe3abaeLQ7ffc</at>
1599
                          <at name="id">embedded.1940623612</at>
1688 1600
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1601
                          <at name="colspecs">FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)</at>
1602
                          <at name="components">
1603
                           <object classname="java.util.LinkedList">
1604
                            <item >
1605
                             <at name="value">
1606
                              <object classname="com.jeta.forms.store.memento.BeanMemento">
1607
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
1608
                                <at name="cellconstraints">
1609
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1610
                                  <at name="column">1</at>
1611
                                  <at name="row">1</at>
1612
                                  <at name="colspan">1</at>
1613
                                  <at name="rowspan">1</at>
1614
                                  <at name="halign">default</at>
1615
                                  <at name="valign">default</at>
1616
                                  <at name="insets" object="insets">0,0,0,0</at>
1617
                                 </object>
1618
                                </at>
1619
                                <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1620
                               </super>
1621
                               <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1622
                               <at name="beanclass">javax.swing.JButton</at>
1623
                               <at name="beanproperties">
1624
                                <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1625
                                 <at name="classname">javax.swing.JButton</at>
1626
                                 <at name="properties">
1627
                                  <object classname="com.jeta.forms.store.support.PropertyMap">
1628
                                   <at name="border">
1629
                                    <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1630
                                     <super classname="com.jeta.forms.store.properties.BorderProperty">
1631
                                      <at name="name">border</at>
1632
                                     </super>
1633
                                     <at name="borders">
1634
                                      <object classname="java.util.LinkedList">
1635
                                       <item >
1636
                                        <at name="value">
1637
                                         <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
1638
                                          <super classname="com.jeta.forms.store.properties.BorderProperty">
1639
                                           <at name="name">border</at>
1640
                                          </super>
1641
                                          <at name="top">1</at>
1642
                                          <at name="left">1</at>
1643
                                          <at name="bottom">1</at>
1644
                                          <at name="right">1</at>
1645
                                         </object>
1646
                                        </at>
1647
                                       </item>
1648
                                      </object>
1649
                                     </at>
1650
                                    </object>
1651
                                   </at>
1652
                                   <at name="actionCommand">...</at>
1653
                                   <at name="opaque">false</at>
1654
                                   <at name="icon">
1655
                                    <object classname="com.jeta.forms.store.properties.IconProperty">
1656
                                     <at name="embedded">false</at>
1657
                                     <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/common-check-on.png</at>
1658
                                     <at name="description">common-check-on.png</at>
1659
                                     <at name="width">16</at>
1660
                                     <at name="height">16</at>
1661
                                    </object>
1662
                                   </at>
1663
                                   <at name="name">btnLocalCheckAllEntities</at>
1664
                                   <at name="width">18</at>
1665
                                   <at name="enabled">false</at>
1666
                                   <at name="toolTipText">_Select_all</at>
1667
                                   <at name="height">18</at>
1668
                                  </object>
1669
                                 </at>
1670
                                </object>
1671
                               </at>
1672
                              </object>
1673
                             </at>
1674
                            </item>
1675
                            <item >
1676
                             <at name="value">
1677
                              <object classname="com.jeta.forms.store.memento.BeanMemento">
1678
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
1679
                                <at name="cellconstraints">
1680
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1681
                                  <at name="column">2</at>
1682
                                  <at name="row">1</at>
1683
                                  <at name="colspan">1</at>
1684
                                  <at name="rowspan">1</at>
1685
                                  <at name="halign">default</at>
1686
                                  <at name="valign">default</at>
1687
                                  <at name="insets" object="insets">0,0,0,0</at>
1688
                                 </object>
1689
                                </at>
1690
                                <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1691
                               </super>
1692
                               <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1693
                               <at name="beanclass">javax.swing.JButton</at>
1694
                               <at name="beanproperties">
1695
                                <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1696
                                 <at name="classname">javax.swing.JButton</at>
1697
                                 <at name="properties">
1698
                                  <object classname="com.jeta.forms.store.support.PropertyMap">
1699
                                   <at name="border">
1700
                                    <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1701
                                     <super classname="com.jeta.forms.store.properties.BorderProperty">
1702
                                      <at name="name">border</at>
1703
                                     </super>
1704
                                     <at name="borders">
1705
                                      <object classname="java.util.LinkedList">
1706
                                       <item >
1707
                                        <at name="value">
1708
                                         <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
1709
                                          <super classname="com.jeta.forms.store.properties.BorderProperty">
1710
                                           <at name="name">border</at>
1711
                                          </super>
1712
                                          <at name="top">1</at>
1713
                                          <at name="left">1</at>
1714
                                          <at name="bottom">1</at>
1715
                                          <at name="right">1</at>
1716
                                         </object>
1717
                                        </at>
1718
                                       </item>
1719
                                      </object>
1720
                                     </at>
1721
                                    </object>
1722
                                   </at>
1723
                                   <at name="actionCommand">...</at>
1724
                                   <at name="opaque">false</at>
1725
                                   <at name="icon">
1726
                                    <object classname="com.jeta.forms.store.properties.IconProperty">
1727
                                     <at name="embedded">false</at>
1728
                                     <at name="path">src/main/resources/org/gvsig/vcsgis/swing/impl/images/common-check-off.png</at>
1729
                                     <at name="description">common-check-off.png</at>
1730
                                     <at name="width">16</at>
1731
                                     <at name="height">16</at>
1732
                                    </object>
1733
                                   </at>
1734
                                   <at name="name">btnLocalUnCheckAll</at>
1735
                                   <at name="width">18</at>
1736
                                   <at name="enabled">false</at>
1737
                                   <at name="toolTipText">_Unselect_all</at>
1738
                                   <at name="height">18</at>
1739
                                  </object>
1740
                                 </at>
1741
                                </object>
1742
                               </at>
1743
                              </object>
1744
                             </at>
1745
                            </item>
1746
                           </object>
1747
                          </at>
1748
                          <at name="properties">
1749
                           <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1750
                            <at name="classname">com.jeta.forms.gui.form.GridView</at>
1751
                            <at name="properties">
1752
                             <object classname="com.jeta.forms.store.support.PropertyMap">
1753
                              <at name="border">
1754
                               <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1755
                                <super classname="com.jeta.forms.store.properties.BorderProperty">
1756
                                 <at name="name">border</at>
1757
                                </super>
1758
                                <at name="borders">
1759
                                 <object classname="java.util.LinkedList"/>
1760
                                </at>
1761
                               </object>
1762
                              </at>
1763
                              <at name="name"/>
1764
                              <at name="fill">
1765
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1766
                                <at name="name">fill</at>
1767
                               </object>
1768
                              </at>
1769
                              <at name="scollBars">
1770
                               <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
1771
                                <at name="name">scollBars</at>
1772
                                <at name="verticalpolicy">21</at>
1773
                                <at name="horizontalpolicy">31</at>
1774
                                <at name="border">
1775
                                 <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1776
                                  <super classname="com.jeta.forms.store.properties.BorderProperty">
1777
                                   <at name="name">border</at>
1778
                                  </super>
1779
                                  <at name="borders">
1780
                                   <object classname="java.util.LinkedList">
1781
                                    <item >
1782
                                     <at name="value">
1783
                                      <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1784
                                       <super classname="com.jeta.forms.store.properties.BorderProperty">
1785
                                        <at name="name">border</at>
1786
                                       </super>
1787
                                      </object>
1788
                                     </at>
1789
                                    </item>
1790
                                   </object>
1791
                                  </at>
1792
                                 </object>
1793
                                </at>
1794
                               </object>
1795
                              </at>
1796
                             </object>
1797
                            </at>
1798
                           </object>
1799
                          </at>
1800
                          <at name="cellpainters">
1801
                           <object classname="com.jeta.forms.store.support.Matrix">
1802
                            <at name="rows">
1803
                             <object classname="[Ljava.lang.Object;" size="1">
1804
                              <at name="item" index="0">
1805
                               <object classname="[Ljava.lang.Object;" size="3"/>
1806
                              </at>
1807
                             </object>
1808
                            </at>
1809
                           </object>
1810
                          </at>
1811
                          <at name="rowgroups">
1812
                           <object classname="com.jeta.forms.store.memento.FormGroupSet">
1813
                            <at name="groups">
1814
                             <object classname="java.util.HashMap"/>
1815
                            </at>
1816
                           </object>
1817
                          </at>
1818
                          <at name="colgroups">
1819
                           <object classname="com.jeta.forms.store.memento.FormGroupSet">
1820
                            <at name="groups">
1821
                             <object classname="java.util.HashMap"/>
1822
                            </at>
1823
                           </object>
1824
                          </at>
1825
                         </object>
1826
                        </at>
1827
                       </item>
1828
                       <item >
1829
                        <at name="value">
1830
                         <object classname="com.jeta.forms.store.memento.FormMemento">
1831
                          <super classname="com.jeta.forms.store.memento.ComponentMemento">
1832
                           <at name="cellconstraints">
1833
                            <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1834
                             <at name="column">2</at>
1835
                             <at name="row">5</at>
1836
                             <at name="colspan">1</at>
1837
                             <at name="rowspan">1</at>
1838
                             <at name="halign">default</at>
1839
                             <at name="valign">default</at>
1840
                             <at name="insets" object="insets">0,0,0,0</at>
1841
                            </object>
1842
                           </at>
1843
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1844
                          </super>
1845
                          <at name="id">embedded.Zd3cb15K177a682e96fBT7ffd</at>
1846
                          <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
1689 1847
                          <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
1690 1848
                          <at name="components">
1691 1849
                           <object classname="java.util.LinkedList">
......
1696 1854
                                <at name="cellconstraints">
1697 1855
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1698 1856
                                  <at name="column">1</at>
1857
                                  <at name="row">3</at>
1858
                                  <at name="colspan">3</at>
1859
                                  <at name="rowspan">1</at>
1860
                                  <at name="halign">default</at>
1861
                                  <at name="valign">default</at>
1862
                                  <at name="insets" object="insets">0,0,0,0</at>
1863
                                 </object>
1864
                                </at>
1865
                                <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1866
                               </super>
1867
                               <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1868
                               <at name="beanclass">javax.swing.JList</at>
1869
                               <at name="beanproperties">
1870
                                <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1871
                                 <at name="classname">javax.swing.JList</at>
1872
                                 <at name="properties">
1873
                                  <object classname="com.jeta.forms.store.support.PropertyMap">
1874
                                   <at name="border">
1875
                                    <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1876
                                     <super classname="com.jeta.forms.store.properties.BorderProperty">
1877
                                      <at name="name">border</at>
1878
                                     </super>
1879
                                     <at name="borders">
1880
                                      <object classname="java.util.LinkedList">
1881
                                       <item >
1882
                                        <at name="value">
1883
                                         <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1884
                                          <super classname="com.jeta.forms.store.properties.BorderProperty">
1885
                                           <at name="name">border</at>
1886
                                          </super>
1887
                                         </object>
1888
                                        </at>
1889
                                       </item>
1890
                                      </object>
1891
                                     </at>
1892
                                    </object>
1893
                                   </at>
1894
                                   <at name="scrollableTracksViewportHeight">true</at>
1895
                                   <at name="scrollableTracksViewportWidth">true</at>
1896
                                   <at name="name">lstLocalTables</at>
1897
                                   <at name="width">149</at>
1898
                                   <at name="items">
1899
                                    <object classname="com.jeta.forms.store.properties.ItemsProperty">
1900
                                     <at name="name">items</at>
1901
                                    </object>
1902
                                   </at>
1903
                                   <at name="scollBars">
1904
                                    <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
1905
                                     <at name="name">scollBars</at>
1906
                                     <at name="verticalpolicy">20</at>
1907
                                     <at name="horizontalpolicy">30</at>
1908
                                     <at name="border">
1909
                                      <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1910
                                       <super classname="com.jeta.forms.store.properties.BorderProperty">
1911
                                        <at name="name">border</at>
1912
                                       </super>
1913
                                       <at name="borders">
1914
                                        <object classname="java.util.LinkedList">
1915
                                         <item >
1916
                                          <at name="value">
1917
                                           <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1918
                                            <super classname="com.jeta.forms.store.properties.BorderProperty">
1919
                                             <at name="name">border</at>
1920
                                            </super>
1921
                                           </object>
1922
                                          </at>
1923
                                         </item>
1924
                                        </object>
1925
                                       </at>
1926
                                      </object>
1927
                                     </at>
1928
                                    </object>
1929
                                   </at>
1930
                                   <at name="height">79</at>
1931
                                  </object>
1932
                                 </at>
1933
                                </object>
1934
                               </at>
1935
                              </object>
1936
                             </at>
1937
                            </item>
1938
                            <item >
1939
                             <at name="value">
1940
                              <object classname="com.jeta.forms.store.memento.BeanMemento">
1941
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
1942
                                <at name="cellconstraints">
1943
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1944
                                  <at name="column">1</at>
1699 1945
                                  <at name="row">1</at>
1700 1946
                                  <at name="colspan">1</at>
1701 1947
                                  <at name="rowspan">1</at>
......
1734 1980
                                    </object>
1735 1981
                                   </at>
1736 1982
                                   <at name="name">txtLocalTablesFilter</at>
1737
                                   <at name="width">193</at>
1983
                                   <at name="width">124</at>
1738 1984
                                   <at name="height">20</at>
1739 1985
                                  </object>
1740 1986
                                 </at>
......
1841 2087
                          <at name="cellpainters">
1842 2088
                           <object classname="com.jeta.forms.store.support.Matrix">
1843 2089
                            <at name="rows">
1844
                             <object classname="[Ljava.lang.Object;" size="1">
2090
                             <object classname="[Ljava.lang.Object;" size="3">
1845 2091
                              <at name="item" index="0">
1846 2092
                               <object classname="[Ljava.lang.Object;" size="3"/>
1847 2093
                              </at>
2094
                              <at name="item" index="1">
2095
                               <object classname="[Ljava.lang.Object;" size="3"/>
2096
                              </at>
2097
                              <at name="item" index="2">
2098
                               <object classname="[Ljava.lang.Object;" size="3"/>
2099
                              </at>
1848 2100
                             </object>
1849 2101
                            </at>
1850 2102
                           </object>
......
1984 2236
                     <at name="embedded">false</at>
1985 2237
                     <at name="path">datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-show-remote-changes.png</at>
1986 2238
                     <at name="description">vcsgis-show-remote-changes.png</at>
1987
                     <at name="width">16</at>
1988
                     <at name="height">16</at>
2239
                     <at name="width">18</at>
2240
                     <at name="height">18</at>
1989 2241
                    </object>
1990 2242
                   </at>
1991 2243
                   <at name="form">
......
2004 2256
                      </at>
2005 2257
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2006 2258
                     </super>
2007
                     <at name="id">embedded.1392320159</at>
2259
                     <at name="id">embedded.1009625553</at>
2008 2260
                     <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
2009 2261
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.2),FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.8),FILL:4DLU:NONE</at>
2010 2262
                     <at name="components">
......
2054 2306
                               </object>
2055 2307
                              </at>
2056 2308
                              <at name="name">tblRemoteChanges</at>
2057
                              <at name="width">969</at>
2309
                              <at name="width">617</at>
2058 2310
                              <at name="scollBars">
2059 2311
                               <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
2060 2312
                                <at name="name">scollBars</at>
......
2137 2389
                              <at name="scrollableTracksViewportHeight">true</at>
2138 2390
                              <at name="scrollableTracksViewportWidth">true</at>
2139 2391
                              <at name="name">lstRemoteTables</at>
2140
                              <at name="width">254</at>
2392
                              <at name="width">166</at>
2141 2393
                              <at name="items">
2142 2394
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
2143 2395
                                <at name="name">items</at>
......
2170 2422
                                </at>
2171 2423
                               </object>
2172 2424
                              </at>
2173
                              <at name="height">495</at>
2425
                              <at name="height">251</at>
2174 2426
                             </object>
2175 2427
                            </at>
2176 2428
                           </object>
......
2224 2476
                              </at>
2225 2477
                              <at name="horizontalAlignment">4</at>
2226 2478
                              <at name="name">lblRemoteChangesCount</at>
2227
                              <at name="width">971</at>
2479
                              <at name="width">619</at>
2228 2480
                              <at name="text">0</at>
2229 2481
                              <at name="fill">
2230 2482
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
2256 2508
                           </at>
2257 2509
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
2258 2510
                          </super>
2259
                          <at name="id">embedded.541476270</at>
2511
                          <at name="id">embedded.1037349340</at>
2260 2512
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
2261 2513
                          <at name="colspecs">FILL:DEFAULT:NONE,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:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
2262 2514
                          <at name="components">
......
3065 3317
                           </at>
3066 3318
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3067 3319
                          </super>
3068
                          <at name="id">embedded.1902518875</at>
3320
                          <at name="id">embedded.881707425</at>
3069 3321
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
3070 3322
                          <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
3071 3323
                          <at name="components">
......
3297 3549
                                </at>
3298 3550
                               </object>
3299 3551
                              </at>
3300
                              <at name="name"></at>
3552
                              <at name="name"/>
3301 3553
                              <at name="fill">
3302 3554
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
3303 3555
                                <at name="name">fill</at>
......
3465 3717
              </at>
3466 3718
             </object>
3467 3719
            </at>
3468
            <at name="width">1283</at>
3720
            <at name="width">843</at>
3469 3721
            <at name="tabCount">2</at>
3470
            <at name="height">633</at>
3722
            <at name="height">391</at>
3471 3723
           </object>
3472 3724
          </at>
3473 3725
         </object>
......
3553 3805
         </at>
3554 3806
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
3555 3807
        </super>
3556
        <at name="id">embedded.1049192470</at>
3808
        <at name="id">embedded.757837019</at>
3557 3809
        <at name="rowspecs">CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE</at>
3558 3810
        <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE</at>
3559 3811
        <at name="components">
......
3603 3855
                  </object>
3604 3856
                 </at>
3605 3857
                 <at name="name">lblStatusCaption</at>
3606
                 <at name="width">1262</at>
3858
                 <at name="width">822</at>
3607 3859
                 <at name="fill">
3608 3860
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
3609 3861
                   <at name="name">fill</at>
......
3662 3914
                  </object>
3663 3915
                 </at>
3664 3916
                 <at name="name">lblStatusMessages</at>
3665
                 <at name="width">1262</at>
3917
                 <at name="width">822</at>
3666 3918
                 <at name="fill">
3667 3919
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
3668 3920
                   <at name="name">fill</at>
......
3721 3973
                  </object>
3722 3974
                 </at>
3723 3975
                 <at name="name">pbStatus</at>
3724
                 <at name="width">1262</at>
3976
                 <at name="width">822</at>
3725 3977
                 <at name="percentComplete">0.25</at>
3726 3978
                 <at name="value">25</at>
3727 3979
                 <at name="height">12</at>
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/changes/VCSGisJChangesView.java
29 29
   JComboBox cboWorkspace = new JComboBox();
30 30
   JTabbedPane tabLocalAndRemote = new JTabbedPane();
31 31
   JTable tblLocalChanges = new JTable();
32
   JList lstLocalTables = new JList();
33 32
   JButton btnLocalCheckAll = new JButton();
34 33
   JButton btnLocalUnCheckAll = new JButton();
35 34
   JButton btnLocalShowForm = new JButton();
......
45 44
   JButton btnLocalEffectiveDate = new JButton();
46 45
   JLabel lblLocalComment = new JLabel();
47 46
   JLabel lblLocalChangesCount = new JLabel();
47
   JButton btnLocalCheckAllEntities = new JButton();
48
   JButton btnLocalUnCheckAll1 = new JButton();
49
   JList lstLocalTables = new JList();
48 50
   JTextField txtLocalTablesFilter = new JTextField();
49 51
   JButton btnLocalTable = new JButton();
50 52
   JTable tblRemoteChanges = new JTable();
......
171 173

  
172 174
      tabLocalAndRemote.setName("tabLocalAndRemote");
173 175
      tabLocalAndRemote.addTab("_Working_copy",loadImage("datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-show-local-changes.png"),createPanel1());
174
      tabLocalAndRemote.addTab("_Repository",loadImage("datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-show-remote-changes.png"),createPanel5());
176
      tabLocalAndRemote.addTab("_Repository",loadImage("datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/resources/org/gvsig/vcsgis/swing/impl/images/vcsgis-show-remote-changes.png"),createPanel6());
175 177
      jpanel1.add(tabLocalAndRemote,cc.xywh(2,4,5,1));
176 178

  
177 179
      btnWorkspace.setActionCommand("...");
......
182 184
      btnWorkspace.setBorder(emptyborder1);
183 185
      jpanel1.add(btnWorkspace,cc.xy(6,2));
184 186

  
185
      jpanel1.add(createPanel8(),cc.xywh(2,6,5,1));
187
      jpanel1.add(createPanel9(),cc.xywh(2,6,5,1));
186 188
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7 },new int[]{ 1,2,3,4,5,6,7 });
187 189
      return jpanel1;
188 190
   }
......
201 203
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
202 204
      jpanel1.add(jscrollpane1,cc.xy(4,5));
203 205

  
204
      lstLocalTables.setName("lstLocalTables");
205
      JScrollPane jscrollpane2 = new JScrollPane();
206
      jscrollpane2.setViewportView(lstLocalTables);
207
      jscrollpane2.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
208
      jscrollpane2.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
209
      jpanel1.add(jscrollpane2,cc.xy(2,5));
210

  
211 206
      jpanel1.add(createPanel2(),cc.xy(4,3));
212 207
      jpanel1.add(createPanel3(),cc.xywh(2,8,3,1));
213 208
      lblLocalChangesCount.setName("lblLocalChangesCount");
......
216 211
      jpanel1.add(lblLocalChangesCount,cc.xywh(2,6,3,1));
217 212

  
218 213
      jpanel1.add(createPanel4(),cc.xy(2,3));
214
      jpanel1.add(createPanel5(),cc.xy(2,5));
219 215
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7,8,9 });
220 216
      return jpanel1;
221 217
   }
......
358 354
   public JPanel createPanel4()
359 355
   {
360 356
      JPanel jpanel1 = new JPanel();
361
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
357
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:GROW(1.0)","CENTER:DEFAULT:NONE");
362 358
      CellConstraints cc = new CellConstraints();
363 359
      jpanel1.setLayout(formlayout1);
364 360

  
361
      btnLocalCheckAllEntities.setActionCommand("...");
362
      btnLocalCheckAllEntities.setEnabled(false);
363
      btnLocalCheckAllEntities.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/common-check-on.png"));
364
      btnLocalCheckAllEntities.setName("btnLocalCheckAllEntities");
365
      btnLocalCheckAllEntities.setOpaque(false);
366
      btnLocalCheckAllEntities.setToolTipText("_Select_all");
367
      EmptyBorder emptyborder1 = new EmptyBorder(1,1,1,1);
368
      btnLocalCheckAllEntities.setBorder(emptyborder1);
369
      jpanel1.add(btnLocalCheckAllEntities,cc.xy(1,1));
370

  
371
      btnLocalUnCheckAll1.setActionCommand("...");
372
      btnLocalUnCheckAll1.setEnabled(false);
373
      btnLocalUnCheckAll1.setIcon(loadImage("src/main/resources/org/gvsig/vcsgis/swing/impl/images/common-check-off.png"));
374
      btnLocalUnCheckAll1.setName("btnLocalUnCheckAll");
375
      btnLocalUnCheckAll1.setOpaque(false);
376
      btnLocalUnCheckAll1.setToolTipText("_Unselect_all");
377
      EmptyBorder emptyborder2 = new EmptyBorder(1,1,1,1);
378
      btnLocalUnCheckAll1.setBorder(emptyborder2);
379
      jpanel1.add(btnLocalUnCheckAll1,cc.xy(2,1));
380

  
381
      addFillComponents(jpanel1,new int[]{ 3 },new int[0]);
382
      return jpanel1;
383
   }
384

  
385
   public JPanel createPanel5()
386
   {
387
      JPanel jpanel1 = new JPanel();
388
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0)");
389
      CellConstraints cc = new CellConstraints();
390
      jpanel1.setLayout(formlayout1);
391

  
392
      lstLocalTables.setName("lstLocalTables");
393
      JScrollPane jscrollpane1 = new JScrollPane();
394
      jscrollpane1.setViewportView(lstLocalTables);
395
      jscrollpane1.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
396
      jscrollpane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
397
      jpanel1.add(jscrollpane1,cc.xywh(1,3,3,1));
398

  
365 399
      txtLocalTablesFilter.setName("txtLocalTablesFilter");
366 400
      jpanel1.add(txtLocalTablesFilter,cc.xy(1,1));
367 401

  
......
373 407
      btnLocalTable.setBorder(emptyborder1);
374 408
      jpanel1.add(btnLocalTable,cc.xy(3,1));
375 409

  
376
      addFillComponents(jpanel1,new int[]{ 2 },new int[0]);
410
      addFillComponents(jpanel1,new int[]{ 2 },new int[]{ 2 });
377 411
      return jpanel1;
378 412
   }
379 413

  
380
   public JPanel createPanel5()
414
   public JPanel createPanel6()
381 415
   {
382 416
      JPanel jpanel1 = new JPanel();
383 417
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.2),FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.8),FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE,CENTER:2DLU:NONE");
......
403 437
      lblRemoteChangesCount.setHorizontalAlignment(JLabel.RIGHT);
404 438
      jpanel1.add(lblRemoteChangesCount,cc.xy(4,5));
405 439

  
406
      jpanel1.add(createPanel6(),cc.xy(4,2));
407
      jpanel1.add(createPanel7(),cc.xy(2,2));
440
      jpanel1.add(createPanel7(),cc.xy(4,2));
441
      jpanel1.add(createPanel8(),cc.xy(2,2));
408 442
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6 });
409 443
      return jpanel1;
410 444
   }
411 445

  
412
   public JPanel createPanel6()
446
   public JPanel createPanel7()
413 447
   {
414 448
      JPanel jpanel1 = new JPanel();
415 449
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,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:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
......
515 549
      return jpanel1;
516 550
   }
517 551

  
518
   public JPanel createPanel7()
552
   public JPanel createPanel8()
519 553
   {
520 554
      JPanel jpanel1 = new JPanel();
521 555
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
......
553 587
      return jpanel1;
554 588
   }
555 589

  
556
   public JPanel createPanel8()
590
   public JPanel createPanel9()
557 591
   {
558 592
      JPanel jpanel1 = new JPanel();
559 593
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE","CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE");
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.mainplugin/src/main/resources-plugin/config.xml
13 13
<plugin-config>
14 14
  <depends plugin-name="org.gvsig.app.mainplugin" />
15 15
  <depends plugin-name="org.gvsig.app.document.table.app.mainplugin" />
16
  <depends plugin-name="org.gvsig.topology.app.mainplugin" />
16
  <depends plugin-name="org.gvsig.topology.app.mainplugin" optional="true"/>
17 17
<!--  <depends plugin-name="org.gvsig.shp.app.mainplugin" />-->
18 18
  <depends plugin-name="org.gvsig.geodb.app.mainplugin" />
19 19
  <resourceBundle name="text" />

Also available in: Unified diff