Revision 3305

View differences:

org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.impl/src/main/java/org/gvsig/topology/lib/impl/DefaultTopologyPlan.java
259 259
    public Collection<TopologyRule> getRules() {
260 260
        return Collections.unmodifiableList(rules);
261 261
    }
262
    
263
    @Override
264
    public boolean hasRules() {
265
        return !this.rules.isEmpty();
266
    }
262 267

  
263 268
    @Override
264 269
    public DefaultTopologyReport getReport() {
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.api/src/main/java/org/gvsig/topology/lib/api/TopologyPlan.java
75 75
 
76 76
    public Collection<TopologyRule> getRules();
77 77
    
78
    public boolean hasRules();
79
    
78 80
    public TopologyReport getReport();
79 81

  
80 82
}
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyPlanPropertiesView.xml
25 25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26 26
   </super>
27 27
   <at name="id">/home/jjdelcerro/datos/devel/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyPlanPropertiesView.xml</at>
28
   <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE</at>
28
   <at name="rowspecs">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</at>
29 29
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
30 30
   <at name="components">
31 31
    <object classname="java.util.LinkedList">
......
36 36
         <at name="cellconstraints">
37 37
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
38 38
           <at name="column">2</at>
39
           <at name="row">2</at>
39
           <at name="row">3</at>
40 40
           <at name="colspan">1</at>
41 41
           <at name="rowspan">1</at>
42 42
           <at name="halign">default</at>
......
74 74
             </object>
75 75
            </at>
76 76
            <at name="name">lblName</at>
77
            <at name="width">62</at>
77
            <at name="width">76</at>
78 78
            <at name="text">_Name</at>
79 79
            <at name="fill">
80 80
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
81 81
              <at name="name">fill</at>
82 82
             </object>
83 83
            </at>
84
            <at name="height">14</at>
84
            <at name="height">15</at>
85 85
           </object>
86 86
          </at>
87 87
         </object>
......
96 96
         <at name="cellconstraints">
97 97
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
98 98
           <at name="column">4</at>
99
           <at name="row">2</at>
99
           <at name="row">3</at>
100 100
           <at name="colspan">1</at>
101 101
           <at name="rowspan">1</at>
102 102
           <at name="halign">default</at>
......
134 134
             </object>
135 135
            </at>
136 136
            <at name="name">txtName</at>
137
            <at name="width">880</at>
138
            <at name="height">20</at>
137
            <at name="width">782</at>
138
            <at name="height">19</at>
139 139
           </object>
140 140
          </at>
141 141
         </object>
......
150 150
         <at name="cellconstraints">
151 151
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
152 152
           <at name="column">2</at>
153
           <at name="row">6</at>
153
           <at name="row">7</at>
154 154
           <at name="colspan">3</at>
155 155
           <at name="rowspan">1</at>
156 156
           <at name="halign">default</at>
......
222 222
                      </at>
223 223
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
224 224
                     </super>
225
                     <at name="id">embedded.536063130</at>
225
                     <at name="id">embedded.957815630</at>
226 226
                     <at name="rowspecs">CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
227 227
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
228 228
                     <at name="components">
......
274 274
                              <at name="scrollableTracksViewportHeight">true</at>
275 275
                              <at name="scrollableTracksViewportWidth">true</at>
276 276
                              <at name="name">lstDataSets</at>
277
                              <at name="width">906</at>
277
                              <at name="width">819</at>
278 278
                              <at name="items">
279 279
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
280 280
                                <at name="name">items</at>
......
307 307
                                </at>
308 308
                               </object>
309 309
                              </at>
310
                              <at name="height">346</at>
310
                              <at name="height">334</at>
311 311
                             </object>
312 312
                            </at>
313 313
                           </object>
......
332 332
                           </at>
333 333
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
334 334
                          </super>
335
                          <at name="id">embedded.535055035</at>
335
                          <at name="id">embedded.539100958</at>
336 336
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
337 337
                          <at name="colspecs">FILL:8DLU:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
338 338
                          <at name="components">
......
679 679
                      </at>
680 680
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
681 681
                     </super>
682
                     <at name="id">embedded.586608407</at>
682
                     <at name="id">embedded.838977986</at>
683 683
                     <at name="rowspecs">CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
684 684
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
685 685
                     <at name="components">
......
731 731
                              <at name="scrollableTracksViewportHeight">true</at>
732 732
                              <at name="scrollableTracksViewportWidth">true</at>
733 733
                              <at name="name">lstRules</at>
734
                              <at name="width">906</at>
734
                              <at name="width">819</at>
735 735
                              <at name="items">
736 736
                               <object classname="com.jeta.forms.store.properties.ItemsProperty">
737 737
                                <at name="name">items</at>
......
764 764
                                </at>
765 765
                               </object>
766 766
                              </at>
767
                              <at name="height">346</at>
767
                              <at name="height">334</at>
768 768
                             </object>
769 769
                            </at>
770 770
                           </object>
......
789 789
                           </at>
790 790
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
791 791
                          </super>
792
                          <at name="id">embedded.82125976</at>
792
                          <at name="id">embedded.1756089269</at>
793 793
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
794 794
                          <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
795 795
                          <at name="components">
......
1180 1180
              </at>
1181 1181
             </object>
1182 1182
            </at>
1183
            <at name="width">953</at>
1183
            <at name="width">871</at>
1184 1184
            <at name="tabCount">2</at>
1185
            <at name="height">484</at>
1185
            <at name="height">474</at>
1186 1186
           </object>
1187 1187
          </at>
1188 1188
         </object>
......
1197 1197
         <at name="cellconstraints">
1198 1198
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1199 1199
           <at name="column">2</at>
1200
           <at name="row">4</at>
1200
           <at name="row">5</at>
1201 1201
           <at name="colspan">1</at>
1202 1202
           <at name="rowspan">1</at>
1203 1203
           <at name="halign">default</at>
......
1235 1235
             </object>
1236 1236
            </at>
1237 1237
            <at name="name">lblTolerance</at>
1238
            <at name="width">62</at>
1238
            <at name="width">76</at>
1239 1239
            <at name="text">_Tolerance</at>
1240 1240
            <at name="fill">
1241 1241
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1242 1242
              <at name="name">fill</at>
1243 1243
             </object>
1244 1244
            </at>
1245
            <at name="height">14</at>
1245
            <at name="height">15</at>
1246 1246
           </object>
1247 1247
          </at>
1248 1248
         </object>
......
1257 1257
         <at name="cellconstraints">
1258 1258
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1259 1259
           <at name="column">4</at>
1260
           <at name="row">4</at>
1260
           <at name="row">5</at>
1261 1261
           <at name="colspan">1</at>
1262 1262
           <at name="rowspan">1</at>
1263 1263
           <at name="halign">default</at>
......
1296 1296
            </at>
1297 1297
            <at name="horizontalAlignment">4</at>
1298 1298
            <at name="name">txtTolerance</at>
1299
            <at name="width">880</at>
1300
            <at name="height">20</at>
1299
            <at name="width">782</at>
1300
            <at name="height">19</at>
1301 1301
           </object>
1302 1302
          </at>
1303 1303
         </object>
......
1305 1305
       </object>
1306 1306
      </at>
1307 1307
     </item>
1308
     <item >
1309
      <at name="value">
1310
       <object classname="com.jeta.forms.store.memento.BeanMemento">
1311
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
1312
         <at name="cellconstraints">
1313
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1314
           <at name="column">4</at>
1315
           <at name="row">1</at>
1316
           <at name="colspan">1</at>
1317
           <at name="rowspan">1</at>
1318
           <at name="halign">right</at>
1319
           <at name="valign">fill</at>
1320
           <at name="insets" object="insets">0,0,0,0</at>
1321
          </object>
1322
         </at>
1323
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1324
        </super>
1325
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1326
        <at name="beanclass">javax.swing.JPanel</at>
1327
        <at name="beanproperties">
1328
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1329
          <at name="classname">javax.swing.JPanel</at>
1330
          <at name="properties">
1331
           <object classname="com.jeta.forms.store.support.PropertyMap">
1332
            <at name="name">pnlCfgActions</at>
1333
            <at name="width">12</at>
1334
            <at name="height">12</at>
1335
           </object>
1336
          </at>
1337
         </object>
1338
        </at>
1339
       </object>
1340
      </at>
1341
     </item>
1308 1342
    </object>
1309 1343
   </at>
1310 1344
   <at name="properties">
......
1362 1396
   <at name="cellpainters">
1363 1397
    <object classname="com.jeta.forms.store.support.Matrix">
1364 1398
     <at name="rows">
1365
      <object classname="[Ljava.lang.Object;" size="7">
1399
      <object classname="[Ljava.lang.Object;" size="8">
1366 1400
       <at name="item" index="0">
1367 1401
        <object classname="[Ljava.lang.Object;" size="5"/>
1368 1402
       </at>
......
1384 1418
       <at name="item" index="6">
1385 1419
        <object classname="[Ljava.lang.Object;" size="5"/>
1386 1420
       </at>
1421
       <at name="item" index="7">
1422
        <object classname="[Ljava.lang.Object;" size="5"/>
1423
       </at>
1387 1424
      </object>
1388 1425
     </at>
1389 1426
    </object>
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyPlanPropertiesView.java
34 34
   JButton btnEditRule = new JButton();
35 35
   JLabel lblTolerance = new JLabel();
36 36
   JTextField txtTolerance = new JTextField();
37
   JPanel pnlCfgActions = new JPanel();
37 38

  
38 39
   /**
39 40
    * Default constructor
......
125 126
   public JPanel createPanel()
126 127
   {
127 128
      JPanel jpanel1 = new JPanel();
128
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE");
129
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU: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");
129 130
      CellConstraints cc = new CellConstraints();
130 131
      jpanel1.setLayout(formlayout1);
131 132

  
132 133
      lblName.setName("lblName");
133 134
      lblName.setText("_Name");
134
      jpanel1.add(lblName,cc.xy(2,2));
135
      jpanel1.add(lblName,cc.xy(2,3));
135 136

  
136 137
      txtName.setName("txtName");
137
      jpanel1.add(txtName,cc.xy(4,2));
138
      jpanel1.add(txtName,cc.xy(4,3));
138 139

  
139 140
      tabPanel.setName("tabPanel");
140 141
      tabPanel.addTab("_DataSets",null,createPanel1());
141 142
      tabPanel.addTab("_Rules",null,createPanel3());
142
      jpanel1.add(tabPanel,cc.xywh(2,6,3,1));
143
      jpanel1.add(tabPanel,cc.xywh(2,7,3,1));
143 144

  
144 145
      lblTolerance.setName("lblTolerance");
145 146
      lblTolerance.setText("_Tolerance");
146
      jpanel1.add(lblTolerance,cc.xy(2,4));
147
      jpanel1.add(lblTolerance,cc.xy(2,5));
147 148

  
148 149
      txtTolerance.setName("txtTolerance");
149 150
      txtTolerance.setHorizontalAlignment(JTextField.RIGHT);
150
      jpanel1.add(txtTolerance,cc.xy(4,4));
151
      jpanel1.add(txtTolerance,cc.xy(4,5));
151 152

  
152
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5 },new int[]{ 1,2,3,4,5,6,7 });
153
      pnlCfgActions.setName("pnlCfgActions");
154
      jpanel1.add(pnlCfgActions,new CellConstraints(4,1,1,1,CellConstraints.RIGHT,CellConstraints.FILL));
155

  
156
      addFillComponents(jpanel1,new int[]{ 1,2,3,5 },new int[]{ 1,2,3,4,5,6,7,8 });
153 157
      return jpanel1;
154 158
   }
155 159

  
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyPlanProperties.java
1 1
package org.gvsig.topology.swing.impl;
2 2

  
3
import java.awt.BorderLayout;
3 4
import java.awt.Dimension;
4 5
import java.awt.event.ActionEvent;
5 6
import java.awt.event.ActionListener;
6 7
import java.net.URL;
7 8
import java.util.List;
9
import javax.swing.AbstractAction;
8 10
import javax.swing.DefaultListModel;
9 11
import javax.swing.ImageIcon;
10 12
import javax.swing.JComponent;
11 13
import javax.swing.event.ListSelectionEvent;
12 14
import javax.swing.event.ListSelectionListener;
13 15
import org.apache.commons.io.FilenameUtils;
16
import org.gvsig.configurableactions.ConfigurableActionsMamager;
14 17
import org.gvsig.tools.ToolsLocator;
15 18
import org.gvsig.tools.i18n.I18nManager;
16 19
import org.gvsig.tools.swing.api.ListElement;
17 20
import org.gvsig.tools.swing.api.ToolsSwingLocator;
18 21
import org.gvsig.tools.swing.api.ToolsSwingManager;
19 22
import org.gvsig.tools.swing.api.windowmanager.Dialog;
23
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
20 24
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
21 25
import org.gvsig.tools.swing.icontheme.IconTheme;
26
import org.gvsig.tools.util.ToolsUtilLocator;
22 27
import org.gvsig.topology.lib.api.TopologyDataSet;
23 28
import org.gvsig.topology.lib.api.TopologyLocator;
24 29
import org.gvsig.topology.lib.api.TopologyPlan;
......
33 38
        extends DefaultJTopologyPlanPropertiesView
34 39
        implements JTopologyPlanProperties {
35 40

  
41
    public static class CopyTopologyPLanToClipboardAction extends AbstractAction {
42

  
43
        @SuppressWarnings("OverridableMethodCallInConstructor")
44
        public CopyTopologyPLanToClipboardAction() {
45
            I18nManager i18n = ToolsLocator.getI18nManager();
46

  
47
            this.putValue(NAME, i18n.getTranslation("_Copy_topology_Plan_to_clipboard"));
48
            this.putValue(ACTION_COMMAND_KEY, "CopyTopologyPLanToClipboard");
49
        }
50

  
51
        @Override
52
        public Object getValue(String key) {
53
            if (NAME.equals(key)) {
54
                // Cuando se registra la accion aun no se han cargado las traducciones
55
                I18nManager i18n = ToolsLocator.getI18nManager();
56
                return i18n.getTranslation("_Copy_topology_Plan_to_clipboard");
57
            }
58
            return super.getValue(key);
59
        }
60

  
61
        @Override
62
        public void actionPerformed(ActionEvent ae) {
63
            DefaultJTopologyPlanProperties panel = (DefaultJTopologyPlanProperties) ae.getSource();
64
            panel.doCopyTopologyPlanToClipboard();
65
        }
66
    }
67

  
68
    
69
    
36 70
    private TopologyPlan plan;
37 71

  
38 72
    public DefaultJTopologyPlanProperties() {
......
42 76
    }
43 77

  
44 78
    private void initComponents() {
79
        ConfigurableActionsMamager cfgActionsManager = ToolsUtilLocator.getConfigurableActionsMamager();
80
        JComponent c = cfgActionsManager.getConfigurableActionsComponent(CONFIGURABLE_PANEL_ID, this);
81
        this.pnlCfgActions.setLayout(new BorderLayout(0, 0));
82
        this.pnlCfgActions.add(c, BorderLayout.CENTER);
83
    
45 84
        this.translate();
46 85
        
47 86
        this.btnAddDataSet.addActionListener(new ActionListener() {
......
255 294
        ((DefaultListModel)(lstRules.getModel())).remove(index);
256 295
    }
257 296

  
297
    private void doCopyTopologyPlanToClipboard() {
298
        ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
299
        String s = this.plan.toJSON().toString();
300
        toolsSwingManager.putInClipboard(s);
301
    }
302

  
258 303
}
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.api/src/main/java/org/gvsig/topology/swing/api/JTopologyPlanProperties.java
31 31
 * @author jjdelcerro
32 32
 */
33 33
public interface JTopologyPlanProperties extends Component {
34
    public static final String CONFIGURABLE_PANEL_ID = "TopologyPlanPropertiesPanel";
34 35
    
35 36
    public void put(TopologyPlan plan);
36 37
    
org.gvsig.topology/trunk/org.gvsig.topology/pom.xml
3 3
    <parent>
4 4
        <groupId>org.gvsig</groupId>
5 5
        <artifactId>org.gvsig.desktop</artifactId>
6
        <version>2.0.313</version>
6
        <version>2.0.313-SNAPSHOT</version>
7 7
    </parent>
8 8
    <artifactId>org.gvsig.topology</artifactId>
9 9
    <version>1.0.55-SNAPSHOT</version>

Also available in: Unified diff