Revision 4506

View differences:

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
84 84
    public void  setUseUI(boolean useUI);
85 85
    
86 86
    public int getLastStatus();
87
    
88
    public boolean getAcceptExceptions();
87 89

  
90
    public void setAcceptExceptions(boolean acceptExceptions);
91
    
88 92
}
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
67 67
    private double tolerance;
68 68
    private SimpleTaskStatus taskStatus;
69 69
    private boolean useUI;
70
    private boolean acceptExceptions;
70 71
    
71 72
    public DefaultTopologyPlan(TopologyManager manager, TopologyServices services) {
72 73
        this.manager = manager;
......
286 287

  
287 288
        me.put("name", this.name);
288 289
        me.put("tolerance", this.tolerance);
290
        me.put("acceptExceptions", this.acceptExceptions);
289 291
        
290 292
        JSONArray jsonDataSets=  new JSONArray();
291 293
        for (TopologyDataSet dataSet : this.dataSets.values()) {
......
314 316
        
315 317
        this.name = jsonPlan.getString("name");
316 318
        this.tolerance = jsonPlan.getDouble("tolerance");
319
        this.acceptExceptions = jsonPlan.getBoolean("acceptExceptions");
317 320
        
318 321
        JSONArray jsonDataSets = jsonPlan.getJSONArray("dataSets");
319 322
        for (Object o : jsonDataSets) {
......
360 363
        }
361 364
        return TopologyManager.TOPOLOGY_PLAN_STATUS_NOT_EXECUTED;
362 365
    }
363
    
364
    
365
    
366
    
367 366

  
368
    
367
    @Override
368
    public boolean getAcceptExceptions() {
369
        return this.acceptExceptions;
370
    }
371

  
372
    @Override
373
    public void setAcceptExceptions(boolean acceptExceptions) {
374
        this.acceptExceptions = acceptExceptions;
375
    }
376

  
369 377
}
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
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.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: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>
27
   <at name="id">/home/fdiaz/projects/gvSIG/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:DEFAULT:NONE,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</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">
......
74 74
             </object>
75 75
            </at>
76 76
            <at name="name">lblName</at>
77
            <at name="width">76</at>
77
            <at name="width">62</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">15</at>
84
            <at name="height">14</at>
85 85
           </object>
86 86
          </at>
87 87
         </object>
......
134 134
             </object>
135 135
            </at>
136 136
            <at name="name">txtName</at>
137
            <at name="width">782</at>
138
            <at name="height">19</at>
137
            <at name="width">1210</at>
138
            <at name="height">20</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">7</at>
153
           <at name="row">9</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.957815630</at>
225
                     <at name="id">embedded.784192979</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">819</at>
277
                              <at name="width">1236</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">334</at>
310
                              <at name="height">507</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.539100958</at>
335
                          <at name="id">embedded.676671066</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.838977986</at>
682
                     <at name="id">embedded.2060161659</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">819</at>
734
                              <at name="width">1236</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">334</at>
767
                              <at name="height">507</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.1756089269</at>
792
                          <at name="id">embedded.1272015727</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">871</at>
1183
            <at name="width">1283</at>
1184 1184
            <at name="tabCount">2</at>
1185
            <at name="height">474</at>
1185
            <at name="height">645</at>
1186 1186
           </object>
1187 1187
          </at>
1188 1188
         </object>
......
1235 1235
             </object>
1236 1236
            </at>
1237 1237
            <at name="name">lblTolerance</at>
1238
            <at name="width">76</at>
1238
            <at name="width">62</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">15</at>
1245
            <at name="height">14</at>
1246 1246
           </object>
1247 1247
          </at>
1248 1248
         </object>
......
1296 1296
            </at>
1297 1297
            <at name="horizontalAlignment">4</at>
1298 1298
            <at name="name">txtTolerance</at>
1299
            <at name="width">782</at>
1300
            <at name="height">19</at>
1299
            <at name="width">1210</at>
1300
            <at name="height">20</at>
1301 1301
           </object>
1302 1302
          </at>
1303 1303
         </object>
......
1339 1339
       </object>
1340 1340
      </at>
1341 1341
     </item>
1342
     <item >
1343
      <at name="value">
1344
       <object classname="com.jeta.forms.store.memento.BeanMemento">
1345
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
1346
         <at name="cellconstraints">
1347
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1348
           <at name="column">2</at>
1349
           <at name="row">7</at>
1350
           <at name="colspan">3</at>
1351
           <at name="rowspan">1</at>
1352
           <at name="halign">default</at>
1353
           <at name="valign">default</at>
1354
           <at name="insets" object="insets">0,0,0,0</at>
1355
          </object>
1356
         </at>
1357
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1358
        </super>
1359
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1360
        <at name="beanclass">javax.swing.JRadioButton</at>
1361
        <at name="beanproperties">
1362
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1363
          <at name="classname">javax.swing.JRadioButton</at>
1364
          <at name="properties">
1365
           <object classname="com.jeta.forms.store.support.PropertyMap">
1366
            <at name="border">
1367
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1368
              <super classname="com.jeta.forms.store.properties.BorderProperty">
1369
               <at name="name">border</at>
1370
              </super>
1371
              <at name="borders">
1372
               <object classname="java.util.LinkedList">
1373
                <item >
1374
                 <at name="value">
1375
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1376
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1377
                    <at name="name">border</at>
1378
                   </super>
1379
                  </object>
1380
                 </at>
1381
                </item>
1382
               </object>
1383
              </at>
1384
             </object>
1385
            </at>
1386
            <at name="actionCommand">_Accept_exceptions</at>
1387
            <at name="buttonGroup">
1388
             <object classname="com.jeta.forms.store.properties.ButtonGroupProperty">
1389
              <at name="name">buttonGroup</at>
1390
              <at name="groupname">1</at>
1391
             </object>
1392
            </at>
1393
            <at name="name">rdbAcceptExceptions</at>
1394
            <at name="width">1283</at>
1395
            <at name="text">_Accept_exceptions</at>
1396
            <at name="height">16</at>
1397
           </object>
1398
          </at>
1399
         </object>
1400
        </at>
1401
       </object>
1402
      </at>
1403
     </item>
1342 1404
    </object>
1343 1405
   </at>
1344 1406
   <at name="properties">
......
1396 1458
   <at name="cellpainters">
1397 1459
    <object classname="com.jeta.forms.store.support.Matrix">
1398 1460
     <at name="rows">
1399
      <object classname="[Ljava.lang.Object;" size="8">
1461
      <object classname="[Ljava.lang.Object;" size="10">
1400 1462
       <at name="item" index="0">
1401 1463
        <object classname="[Ljava.lang.Object;" size="5"/>
1402 1464
       </at>
......
1421 1483
       <at name="item" index="7">
1422 1484
        <object classname="[Ljava.lang.Object;" size="5"/>
1423 1485
       </at>
1486
       <at name="item" index="8">
1487
        <object classname="[Ljava.lang.Object;" size="5"/>
1488
       </at>
1489
       <at name="item" index="9">
1490
        <object classname="[Ljava.lang.Object;" size="5"/>
1491
       </at>
1424 1492
      </object>
1425 1493
     </at>
1426 1494
    </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
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.JFrame;
14 15
import javax.swing.JLabel;
15 16
import javax.swing.JList;
16 17
import javax.swing.JPanel;
18
import javax.swing.JRadioButton;
17 19
import javax.swing.JScrollPane;
18 20
import javax.swing.JTabbedPane;
19 21
import javax.swing.JTextField;
......
35 37
   JLabel lblTolerance = new JLabel();
36 38
   JTextField txtTolerance = new JTextField();
37 39
   JPanel pnlCfgActions = new JPanel();
40
   JRadioButton rdbAcceptExceptions = new JRadioButton();
41
   ButtonGroup buttongroup1 = new ButtonGroup();
38 42

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

  
......
140 144
      tabPanel.setName("tabPanel");
141 145
      tabPanel.addTab("_DataSets",null,createPanel1());
142 146
      tabPanel.addTab("_Rules",null,createPanel3());
143
      jpanel1.add(tabPanel,cc.xywh(2,7,3,1));
147
      jpanel1.add(tabPanel,cc.xywh(2,9,3,1));
144 148

  
145 149
      lblTolerance.setName("lblTolerance");
146 150
      lblTolerance.setText("_Tolerance");
......
153 157
      pnlCfgActions.setName("pnlCfgActions");
154 158
      jpanel1.add(pnlCfgActions,new CellConstraints(4,1,1,1,CellConstraints.RIGHT,CellConstraints.FILL));
155 159

  
156
      addFillComponents(jpanel1,new int[]{ 1,2,3,5 },new int[]{ 1,2,3,4,5,6,7,8 });
160
      rdbAcceptExceptions.setActionCommand("_Accept_exceptions");
161
      rdbAcceptExceptions.setName("rdbAcceptExceptions");
162
      rdbAcceptExceptions.setText("_Accept_exceptions");
163
      buttongroup1.add(rdbAcceptExceptions);
164
      jpanel1.add(rdbAcceptExceptions,cc.xywh(2,7,3,1));
165

  
166
      addFillComponents(jpanel1,new int[]{ 1,2,3,5 },new int[]{ 1,2,3,4,5,6,7,8,9,10 });
157 167
      return jpanel1;
158 168
   }
159 169

  
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
86 86
    
87 87
        this.btnEditRule.setVisible(false);
88 88
        
89
        this.rdbAcceptExceptions.setVisible(true);
90
        this.rdbAcceptExceptions.setSelected(false);
91
        this.rdbAcceptExceptions.setEnabled(false);
92
        
89 93
        this.translate();
90 94
        
91 95
        this.btnAddDataSet.addActionListener((ActionEvent e) -> {
......
136 140
        tsm.translate(this.lblName);
137 141
        tsm.translate(this.tabPanel);
138 142
        tsm.translate(this.lblTolerance);
143
        tsm.translate(this.rdbAcceptExceptions);
139 144
    }
140 145
    
141 146
    public void performDataSetSelected() {
......
183 188
            );
184 189
        }
185 190
        this.lstRules.setModel(modelRules);
191
        this.rdbAcceptExceptions.setSelected(thePlan.getAcceptExceptions());
186 192
    }
187 193

  
188 194
    @Override
......
202 208
        for (TopologyRule rule : this.plan.getRules()) {
203 209
            thePlan.addRule(rule);
204 210
        }
211
        thePlan.setAcceptExceptions(this.rdbAcceptExceptions.isSelected());
205 212
        return thePlan;
206 213
    }
207 214

  
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.app/org.gvsig.topology.app.mainplugin/src/main/resources-plugin/i18n/text.properties
54 54
_The_polygon_contains_more_than_a_point=El pol\u00edgono contiene m\u00e1s de un punto
55 55
_Add_dataset=A\u00f1adir conjunto de datos
56 56
_The_dataset_XnameX_is_neither_2D_nor_2DM_The_result_of_the_topological_checks_may_not_be_what_you_expect_Do_you_want_to_continue=El conjunto de datos "{0}" no es 2D ni 2DM. El resultado de las comprobaciones topol\u00f3gicas puede no ser el esperado.\n\u00bfDesea continuar?
57
_Add_non_2D_topology_dataset=A\u00f1adir conjunto de datos no 2D a topolog\u00eda
57
_Add_non_2D_topology_dataset=A\u00f1adir conjunto de datos no 2D a topolog\u00eda
58
_Accept_exceptions=Aceptar excepciones
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.app/org.gvsig.topology.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
53 53
_The_polygon_contains_more_than_a_point=The polygon contains more than a point
54 54
_Add_dataset=Add dataset
55 55
_The_dataset_XnameX_is_neither_2D_nor_2DM_The_result_of_the_topological_checks_may_not_be_what_you_expect_Do_you_want_to_continue=The dataset "{0}" is neither 2D nor 2DM. The result of the topological checks may not be what you expect.\nDo you want to continue?
56
_Add_non_2D_topology_dataset=Add non 2D topology dataset
56
_Add_non_2D_topology_dataset=Add non 2D topology dataset
57
_Accept_exceptions=Accept exceptions

Also available in: Unified diff