Revision 2067

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/TopologyRuleFactory.java
23 23
 */
24 24
package org.gvsig.topology.lib.api;
25 25

  
26
import java.awt.Image;
27 26
import java.util.List;
27
import org.gvsig.tools.dynobject.DynObject;
28 28

  
29 29
/**
30 30
 *
......
42 42
    
43 43
    public List<Integer> getGeometryTypeDataSet2();
44 44
    
45
    public DynObject createRuleParameters();
46

  
45 47
    public TopologyRule createRule(TopologyPlan plan, String dataSet1, String dataSet2, double tolerance);
46 48

  
49
    public boolean hasRuleParameters();
50

  
47 51
    public boolean hasSecondaryDataSet();
48 52

  
49 53
    public boolean canApplyToDataSet(TopologyDataSet dataSet);
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.api/src/main/java/org/gvsig/topology/lib/api/TopologyRule.java
24 24
package org.gvsig.topology.lib.api;
25 25

  
26 26
import java.util.List;
27
import org.gvsig.tools.dynobject.DynObject;
27 28
import org.gvsig.tools.task.SimpleTaskStatus;
28 29

  
29 30
/**
......
52 53
    
53 54
    public long getSteps();
54 55

  
56
    public void setParameters(DynObject parameters);
57

  
58
    public DynObject getParameters();
55 59
}
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.api/src/main/java/org/gvsig/topology/lib/api/TopologyDataSet.java
81 81
    /**
82 82
     * @param geom
83 83
     * @return 
84
     * @deprecated  use getFeaturesThatEnvelopeIntersectsWith 
85
     *              or getFeatureReferencessThatEnvelopeIntersectsWith
84
     * @deprecated  use queryFeatures or queryReferences
86 85
     */
87 86
    public Iterable<FeatureReference> query(Geometry geom);
88 87
    
89
    /**
90
     * @param geom
91
     * @return 
92
     * @deprecated  use getFeaturesThatEnvelopeIntersectsWith 
93
     */
94 88
    public Iterable<Feature> queryFeatures(Geometry geom);
95 89
    
96
    /**
97
     * @param geom
98
     * @return 
99
     * @deprecated  use getFeatureReferencesThatEnvelopeIntersectsWith
100
     */
101 90
    public Iterable<FeatureReference> queryReferences(Geometry geom);
102 91

  
103
    public Iterable<Feature>  getFeaturesThatEnvelopeIntersectsWith(Geometry geom);
104

  
105
    public Iterable<FeatureReference>  getFeatureReferencesThatEnvelopeIntersectsWith(Geometry geom);
106

  
107 92
    public Feature findFirst(Expression expression);
108 93

  
109 94
    public void restart();
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.api/src/main/java/org/gvsig/topology/lib/spi/AbstractTopologyRuleFactory.java
27 27
import java.util.List;
28 28
import org.gvsig.fmap.geom.GeometryLocator;
29 29
import org.gvsig.fmap.geom.GeometryManager;
30
import org.gvsig.tools.ToolsLocator;
31
import org.gvsig.tools.dynform.DynFormLocator;
32
import org.gvsig.tools.dynform.DynFormManager;
33
import org.gvsig.tools.dynobject.DynClass;
34
import org.gvsig.tools.dynobject.DynObject;
35
import org.gvsig.tools.dynobject.DynObjectManager;
30 36
import org.gvsig.topology.lib.api.TopologyDataSet;
31 37
import org.gvsig.topology.lib.api.TopologyRuleFactory;
32 38
import org.json.JSONObject;
......
108 114

  
109 115
    @Override
110 116
    public boolean canApplyToDataSet(TopologyDataSet dataSet) {
117
        if (geometryTypeDataSet1== null) {
118
            return true;
119
        }  
111 120
        GeometryManager geomManager = GeometryLocator.getGeometryManager();
112 121
        for (Integer geometryType : geometryTypeDataSet1) {
113 122
            boolean canApply = geomManager.isSubtype(geometryType, dataSet.getGeometryType());
......
150 159
            this.description = RuleResourceLoaderUtils.getDescription(jsonUrl, json);
151 160
        }
152 161
    }
162

  
163
    @Override
164
    public DynObject createRuleParameters() {
165
        DynObjectManager dynObjectManager = ToolsLocator.getDynObjectManager();
166
        DynClass dynClass = dynObjectManager.createDynClass("UserDefinedRuleParameters", "UserDefinedRuleParameters");
167
        dynClass.addDynFieldString("CheckExpression");
168
        dynClass.addDynFieldString("CorrectiveExpression");
169
        
170
        dynObjectManager.createDynObject(dynClass);
171
        
172
        
173
        return null;
174
    }
175

  
176
    @Override
177
    public boolean hasRuleParameters() {
178
        return false;
179
    }
180

  
153 181
}
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.api/src/main/java/org/gvsig/topology/lib/spi/AbstractTopologyRule.java
28 28
import java.util.List;
29 29
import org.apache.commons.lang3.StringUtils;
30 30
import org.gvsig.fmap.dal.feature.Feature;
31
import org.gvsig.tools.dynobject.DynClass;
32
import org.gvsig.tools.dynobject.DynField;
33
import org.gvsig.tools.dynobject.DynObject;
31 34
import org.gvsig.tools.exception.BaseException;
32 35
import org.gvsig.tools.task.SimpleTaskStatus;
33 36
import org.gvsig.tools.visitor.VisitCanceledException;
......
57 60
    private String dataSet2;
58 61

  
59 62
    protected List<TopologyRuleAction> actions;
63
    private DynObject parameters;
60 64

  
61 65
    protected AbstractTopologyRule(
62 66
            TopologyPlan plan,
......
200 204
        me.put("dataSet1", this.dataSet1);
201 205
        me.put("dataSet2", this.dataSet2);
202 206
        
207
        DynObject params = this.getParameters();
208
        if(params!= null) {
209
            JSONObject jsonParams = new JSONObject();
210
            DynClass parametersDefinition = params.getDynClass();
211
            for (DynField dynField : parametersDefinition.getDynFields()) {
212
                jsonParams.put(dynField.getName(), params.getDynValue(dynField.getName()));
213
            }
214
            me.put("params", jsonParams);
215
        }
203 216
        return me;
204 217
    }
205 218

  
......
221 234
        if( json.has("dataSet2") ) {
222 235
            this.dataSet2 = json.getString("dataSet2");
223 236
        }
237
        if( json.has("params") ) {
238
            JSONObject jsonParams = json.getJSONObject("params");
239
            DynObject params = this.getFactory().createRuleParameters();
240
            DynClass parametersDefinition = params.getDynClass();
241
            for (DynField dynField : parametersDefinition.getDynFields()) {
242
                String paramName = dynField.getName();
243
                if (jsonParams.has(paramName)){
244
                    params.setDynValue(paramName, jsonParams.getString(paramName));
245
                }
246
            }
247
            this.setParameters(params);
248
        }
224 249
    }
225 250

  
251
    @Override
252
    public void setParameters(DynObject parameters) {
253
        this.parameters=parameters;
254
        
255
    }
256

  
257
    @Override
258
    public DynObject getParameters() {
259
        return this.parameters;
260
    }
261

  
226 262
}
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.api/pom.xml
18 18
      <artifactId>org.gvsig.fmap.dal.api</artifactId>
19 19
      <scope>compile</scope>
20 20
    </dependency>
21
    <dependency>
22
      <groupId>org.gvsig</groupId>
23
      <artifactId>org.gvsig.tools.dynform.api</artifactId>
24
      <version>3.0.245-SNAPSHOT</version>
25
      <type>jar</type>
26
    </dependency>
21 27
  </dependencies>
22 28

  
23 29
</project>
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.impl/src/main/java/org/gvsig/topology/lib/impl/DefaultTopologyDataSet.java
29 29
import org.apache.commons.lang3.StringUtils;
30 30
import org.apache.commons.lang3.mutable.MutableObject;
31 31
import org.gvsig.expressionevaluator.Expression;
32
import org.gvsig.expressionevaluator.ExpressionBuilder;
33
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
34
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
32 35
import org.gvsig.expressionevaluator.ExpressionUtils;
33 36
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
34 37
import org.gvsig.expressionevaluator.GeometryExpressionUtils;
......
372 375
                    );
373 376
                    final SpatialIndex dataIndex = theStore.wrapSpatialIndex(geomIndex);
374 377
                    try {
375
                        store.accept((Object o) -> {
376
                            Feature f = (Feature) o;
377
                            Geometry geom = f.getDefaultGeometry();
378
                            if (geom != null) {
379
                                dataIndex.insert(geom, f);
378
                        store.accept(new Visitor() {
379
                            @Override
380
                            public void visit(Object o) throws VisitCanceledException, BaseException {
381
                                Feature f = (Feature) o;
382
                                Geometry geom = f.getDefaultGeometry();
383
                                if (geom != null) {
384
                                    dataIndex.insert(geom, f);
385
                                }
380 386
                            }
381 387
                        });
382 388
                    } catch (VisitCanceledException ex) {
......
390 396
        return this.spatialIndex.getValue();
391 397
    }
392 398

  
393
    
394 399
    @Override
395
    public Iterable<FeatureReference>  getFeatureReferencesThatEnvelopeIntersectsWith(Geometry geom) {
396
        SpatialIndex index = this.getSpatialIndex();
397
        if( index == null ) {
398
            try {
399
                FeatureStore theStore = (FeatureStore) this.getStore();
400
                Expression expression = ExpressionUtils.createExpression();
401
                GeometryExpressionBuilder expressionBuilder = GeometryExpressionUtils.createExpressionBuilder();
402
                String geomName = theStore.getDefaultFeatureType().getDefaultGeometryAttributeName();
403
                if( GeometryUtils.isSubtype(Geometry.TYPES.POINT, geom.getType()) )  {
404
                    expression.setPhrase(
405
                        expressionBuilder.ifnull(
406
                            expressionBuilder.column(geomName),
407
                            expressionBuilder.constant(false),
408
                            expressionBuilder.ST_Intersects(
409
                                    expressionBuilder.column(geomName),
410
                                    expressionBuilder.geometry(geom)
411
                            )
412
                        ).toString()
413
                    );
414
                } else {
415
                    expression.setPhrase(
416
                        expressionBuilder.ifnull(
417
                            expressionBuilder.column(geomName),
418
                            expressionBuilder.constant(false),
419
                            expressionBuilder.ST_Intersects(
420
                                    expressionBuilder.column(geomName),
421
                                    expressionBuilder.envelope(geom.getEnvelope())
422
                            )
423
                        ).toString()
424
                    );
425
                }
426
                FeatureSet set = theStore.getFeatureSet(expression);
427
                final DisposableIterator it = set.fastIterator();
428
                return () -> new Iterator<FeatureReference>() {
429
                    @Override
430
                    public boolean hasNext() {
431
                        return it.hasNext();
432
                    }
433
                    
434
                    @Override
435
                    public FeatureReference next() {
436
                        Feature f = (Feature) it.next();
437
                        return f.getReference();
438
                    }
439
                };
440
                
441
            } catch(Exception ex) {
442
                return (Iterable<FeatureReference>) IteratorUtils.EMPTY_ITERATOR;
443
            }
444
        }
445
        final Iterator it = index.query(geom);
446
        if( it == null ) {
447
            return (Iterable<FeatureReference>) IteratorUtils.EMPTY_ITERATOR;
448
        }
449
        return () -> it;
450
    }
451
    
452
    @Override
453
    public Iterable<Feature>  getFeaturesThatEnvelopeIntersectsWith(Geometry geom) {
454
        SpatialIndex index = this.getSpatialIndex();
455
        if( index == null ) {
456
            try {
457
                FeatureStore theStore = (FeatureStore) this.getStore();
458
                Expression expression = ExpressionUtils.createExpression();
459
                GeometryExpressionBuilder expressionBuilder = GeometryExpressionUtils.createExpressionBuilder();
460
                String geomName = theStore.getDefaultFeatureType().getDefaultGeometryAttributeName();
461
                if( GeometryUtils.isSubtype(Geometry.TYPES.POINT, geom.getType()) )  {
462
                    expression.setPhrase(
463
                        expressionBuilder.ifnull(
464
                            expressionBuilder.column(geomName),
465
                            expressionBuilder.constant(false),
466
                            expressionBuilder.ST_Intersects(
467
                                    expressionBuilder.column(geomName),
468
                                    expressionBuilder.geometry(geom)
469
                            )
470
                        ).toString()
471
                    );
472
                } else {
473
                    expression.setPhrase(
474
                        expressionBuilder.ifnull(
475
                            expressionBuilder.column(geomName),
476
                            expressionBuilder.constant(false),
477
                            expressionBuilder.ST_Intersects(
478
                                    expressionBuilder.column(geomName),
479
                                    expressionBuilder.envelope(geom.getEnvelope())
480
                            )
481
                        ).toString()
482
                    );
483
                }
484
                FeatureSet set = theStore.getFeatureSet(expression);
485
                final DisposableIterator it = set.fastIterator();
486
                return () -> it;
487
                
488
            } catch(Exception ex) {
489
                return (Iterable<Feature>) IteratorUtils.EMPTY_ITERATOR;
490
            }
491
        }
492
        final Iterator it = index.query(geom);
493
        if( it == null ) {
494
            return (Iterable<Feature>) IteratorUtils.EMPTY_ITERATOR;
495
        }
496
        return () -> new Iterator<Feature>() {
497
            @Override
498
            public boolean hasNext() {
499
                return it.hasNext();
500
            }
501
            
502
            @Override
503
            public Feature next() {
504
                FeatureReference ref = (FeatureReference) it.next();
505
                try {
506
                    return ref.getFeature();
507
                } catch (DataException ex) {
508
                    return null;
509
                }
510
            }
511
        };
512
    }
513

  
514
    @Override
515 400
    public Iterable<FeatureReference> query(Geometry geom) {
516 401
        return this.queryReferences(geom);
517 402
    }
......
550 435
                }
551 436
                FeatureSet set = theStore.getFeatureSet(expression);
552 437
                final DisposableIterator it = set.fastIterator();
553
                return () -> new Iterator<FeatureReference>() {
438
                return new Iterable<FeatureReference>() {
554 439
                    @Override
555
                    public boolean hasNext() {
556
                        return it.hasNext();
440
                    public Iterator<FeatureReference> iterator() {
441
                        return new Iterator<FeatureReference>() {
442
                            @Override
443
                            public boolean hasNext() {
444
                                return it.hasNext();
445
                            }
446

  
447
                            @Override
448
                            public FeatureReference next() {
449
                                Feature f = (Feature) it.next();
450
                                return f.getReference();
451
                            }
452
                        };
557 453
                    }
558
                    
559
                    @Override
560
                    public FeatureReference next() {
561
                        Feature f = (Feature) it.next();
562
                        return f.getReference();
563
                    }
564 454
                };
565 455
                
566 456
            } catch(Exception ex) {
......
571 461
        if( it == null ) {
572 462
            return (Iterable<FeatureReference>) IteratorUtils.EMPTY_ITERATOR;
573 463
        }
574
        return () -> it;
464
        return new Iterable<FeatureReference>() {
465
            @Override
466
            public Iterator<FeatureReference> iterator() {
467
                return it;
468
            }
469
        };
575 470
    }
576 471

  
577 472
    @Override
......
608 503
                }
609 504
                FeatureSet set = theStore.getFeatureSet(expression);
610 505
                final DisposableIterator it = set.fastIterator();
611
                return () -> it;
506
                return new Iterable<Feature>() {
507
                    @Override
508
                    public Iterator<Feature> iterator() {
509
                        return it;
510
                    }
511
                };
612 512
                
613 513
            } catch(Exception ex) {
614 514
                return (Iterable<Feature>) IteratorUtils.EMPTY_ITERATOR;
......
618 518
        if( it == null ) {
619 519
            return (Iterable<Feature>) IteratorUtils.EMPTY_ITERATOR;
620 520
        }
621
        return () -> new Iterator<Feature>() {
521
        return new Iterable<Feature>() {
622 522
            @Override
623
            public boolean hasNext() {
624
                return it.hasNext();
523
            public Iterator<Feature> iterator() {
524
                return new Iterator<Feature>() {
525
                    @Override
526
                    public boolean hasNext() {
527
                        return it.hasNext();
528
                    }
529

  
530
                    @Override
531
                    public Feature next() {
532
                        FeatureReference ref = (FeatureReference) it.next();
533
                        try {
534
                            return ref.getFeature();
535
                        } catch (DataException ex) {
536
                            return null;
537
                        }
538
                    }
539
                };
625 540
            }
626
            
627
            @Override
628
            public Feature next() {
629
                FeatureReference ref = (FeatureReference) it.next();
630
                try {
631
                    return ref.getFeature();
632
                } catch (DataException ex) {
633
                    return null;
634
                }
635
            }
636 541
        };
637 542
    }
638 543

  
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
74 74
        this.rules = new ArrayList<>();
75 75
        this.report = null;
76 76
        this.name = "TopologyPlan-" + String.format("%08X", new Date().getTime());
77
        this.tolerance = 0.001;
77
        this.tolerance = 0;
78 78
    }
79 79

  
80 80
    @Override
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyReportView.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/DefaultJTopologyReportView.xml</at>
27
   <at name="id">/home/jovivas/datos/devel/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyReportView.xml</at>
28
   <at name="path">datos/devel/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyReportView.xml</at>
28 29
   <at name="rowspecs">CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
29 30
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
30 31
   <at name="components">
......
108 109
                      </at>
109 110
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
110 111
                     </super>
111
                     <at name="id">embedded.1967681505</at>
112
                     <at name="id">embedded.1387805287</at>
112 113
                     <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE</at>
113 114
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
114 115
                     <at name="components">
......
158 159
                               </object>
159 160
                              </at>
160 161
                              <at name="name">tblErrors</at>
161
                              <at name="width">906</at>
162
                              <at name="width">796</at>
162 163
                              <at name="scollBars">
163 164
                               <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
164 165
                                <at name="name">scollBars</at>
......
211 212
                           </at>
212 213
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
213 214
                          </super>
214
                          <at name="id">embedded.1447955211</at>
215
                          <at name="id">embedded.1236314175</at>
215 216
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
216
                          <at name="colspecs">FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT: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,FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE</at>
217
                          <at name="colspecs">FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:7PX: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,FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE</at>
217 218
                          <at name="components">
218 219
                           <object classname="java.util.LinkedList">
219 220
                            <item >
......
321 322
                                    </object>
322 323
                                   </at>
323 324
                                   <at name="name">cboRules</at>
324
                                   <at name="width">464</at>
325
                                   <at name="width">323</at>
325 326
                                   <at name="items">
326 327
                                    <object classname="com.jeta.forms.store.properties.ItemsProperty">
327 328
                                     <at name="name">items</at>
......
409 410
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
410 411
                                <at name="cellconstraints">
411 412
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
412
                                  <at name="column">13</at>
413
                                  <at name="column">15</at>
413 414
                                  <at name="row">1</at>
414 415
                                  <at name="colspan">1</at>
415 416
                                  <at name="rowspan">1</at>
......
477 478
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
478 479
                                <at name="cellconstraints">
479 480
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
480
                                  <at name="column">23</at>
481
                                  <at name="column">25</at>
481 482
                                  <at name="row">1</at>
482 483
                                  <at name="colspan">1</at>
483 484
                                  <at name="rowspan">1</at>
......
545 546
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
546 547
                                <at name="cellconstraints">
547 548
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
548
                                  <at name="column">25</at>
549
                                  <at name="column">27</at>
549 550
                                  <at name="row">1</at>
550 551
                                  <at name="colspan">1</at>
551 552
                                  <at name="rowspan">1</at>
......
817 818
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
818 819
                                <at name="cellconstraints">
819 820
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
820
                                  <at name="column">19</at>
821
                                  <at name="column">21</at>
821 822
                                  <at name="row">1</at>
822 823
                                  <at name="colspan">1</at>
823 824
                                  <at name="rowspan">1</at>
......
885 886
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
886 887
                                <at name="cellconstraints">
887 888
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
888
                                  <at name="column">15</at>
889
                                  <at name="column">17</at>
889 890
                                  <at name="row">1</at>
890 891
                                  <at name="colspan">1</at>
891 892
                                  <at name="rowspan">1</at>
......
953 954
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
954 955
                                <at name="cellconstraints">
955 956
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
956
                                  <at name="column">17</at>
957
                                  <at name="column">19</at>
957 958
                                  <at name="row">1</at>
958 959
                                  <at name="colspan">1</at>
959 960
                                  <at name="rowspan">1</at>
......
1021 1022
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
1022 1023
                                <at name="cellconstraints">
1023 1024
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1024
                                  <at name="column">21</at>
1025
                                  <at name="column">23</at>
1025 1026
                                  <at name="row">1</at>
1026 1027
                                  <at name="colspan">1</at>
1027 1028
                                  <at name="rowspan">1</at>
......
1083 1084
                              </object>
1084 1085
                             </at>
1085 1086
                            </item>
1087
                            <item >
1088
                             <at name="value">
1089
                              <object classname="com.jeta.forms.store.memento.BeanMemento">
1090
                               <super classname="com.jeta.forms.store.memento.ComponentMemento">
1091
                                <at name="cellconstraints">
1092
                                 <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1093
                                  <at name="column">13</at>
1094
                                  <at name="row">1</at>
1095
                                  <at name="colspan">1</at>
1096
                                  <at name="rowspan">1</at>
1097
                                  <at name="halign">default</at>
1098
                                  <at name="valign">default</at>
1099
                                  <at name="insets" object="insets">0,0,0,0</at>
1100
                                 </object>
1101
                                </at>
1102
                                <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1103
                               </super>
1104
                               <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1105
                               <at name="beanclass">javax.swing.JToggleButton</at>
1106
                               <at name="beanproperties">
1107
                                <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1108
                                 <at name="classname">javax.swing.JToggleButton</at>
1109
                                 <at name="properties">
1110
                                  <object classname="com.jeta.forms.store.support.PropertyMap">
1111
                                   <at name="border">
1112
                                    <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1113
                                     <super classname="com.jeta.forms.store.properties.BorderProperty">
1114
                                      <at name="name">border</at>
1115
                                     </super>
1116
                                     <at name="borders">
1117
                                      <object classname="java.util.LinkedList">
1118
                                       <item >
1119
                                        <at name="value">
1120
                                         <object classname="com.jeta.forms.store.properties.EmptyBorderProperty">
1121
                                          <super classname="com.jeta.forms.store.properties.BorderProperty">
1122
                                           <at name="name">border</at>
1123
                                          </super>
1124
                                          <at name="top">2</at>
1125
                                          <at name="left">2</at>
1126
                                          <at name="bottom">2</at>
1127
                                          <at name="right">2</at>
1128
                                         </object>
1129
                                        </at>
1130
                                       </item>
1131
                                      </object>
1132
                                     </at>
1133
                                    </object>
1134
                                   </at>
1135
                                   <at name="icon">
1136
                                    <object classname="com.jeta.forms.store.properties.IconProperty">
1137
                                     <at name="embedded">false</at>
1138
                                     <at name="path">org/gvsig/topology/swing/impl/images/topology-report-show-form.png</at>
1139
                                     <at name="description">topology-report-show-form.png</at>
1140
                                     <at name="width">16</at>
1141
                                     <at name="height">16</at>
1142
                                    </object>
1143
                                   </at>
1144
                                   <at name="name">btnShowForm</at>
1145
                                   <at name="width">20</at>
1146
                                   <at name="toolTipText">_Show_form_when_modify_geometry</at>
1147
                                   <at name="height">20</at>
1148
                                  </object>
1149
                                 </at>
1150
                                </object>
1151
                               </at>
1152
                              </object>
1153
                             </at>
1154
                            </item>
1086 1155
                           </object>
1087 1156
                          </at>
1088 1157
                          <at name="properties">
......
1100 1169
                                </at>
1101 1170
                               </object>
1102 1171
                              </at>
1103
                              <at name="name"/>
1172
                              <at name="name"></at>
1104 1173
                              <at name="fill">
1105 1174
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1106 1175
                                <at name="name">fill</at>
......
1142 1211
                            <at name="rows">
1143 1212
                             <object classname="[Ljava.lang.Object;" size="1">
1144 1213
                              <at name="item" index="0">
1145
                               <object classname="[Ljava.lang.Object;" size="25"/>
1214
                               <object classname="[Ljava.lang.Object;" size="27"/>
1146 1215
                              </at>
1147 1216
                             </object>
1148 1217
                            </at>
......
1292 1361
                      </at>
1293 1362
                      <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1294 1363
                     </super>
1295
                     <at name="id">embedded.2138351478</at>
1364
                     <at name="id">embedded.1183016094</at>
1296 1365
                     <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,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
1297 1366
                     <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE</at>
1298 1367
                     <at name="components">
......
1322 1391
                            <at name="properties">
1323 1392
                             <object classname="com.jeta.forms.store.support.PropertyMap">
1324 1393
                              <at name="name">pnlParameters</at>
1325
                              <at name="width">908</at>
1326
                              <at name="height">317</at>
1394
                              <at name="width">798</at>
1395
                              <at name="height">275</at>
1327 1396
                             </object>
1328 1397
                            </at>
1329 1398
                           </object>
......
1376 1445
                               </object>
1377 1446
                              </at>
1378 1447
                              <at name="name">lblActionDescription</at>
1379
                              <at name="width">908</at>
1448
                              <at name="width">798</at>
1380 1449
                              <at name="fill">
1381 1450
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1382 1451
                                <at name="name">fill</at>
......
1435 1504
                               </object>
1436 1505
                              </at>
1437 1506
                              <at name="name">lblActionTitle</at>
1438
                              <at name="width">908</at>
1507
                              <at name="width">798</at>
1439 1508
                              <at name="fill">
1440 1509
                               <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1441 1510
                                <at name="name">fill</at>
......
1466 1535
                           </at>
1467 1536
                           <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1468 1537
                          </super>
1469
                          <at name="id">embedded.1789563886</at>
1538
                          <at name="id">embedded.1682634684</at>
1470 1539
                          <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1471 1540
                          <at name="colspecs">FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
1472 1541
                          <at name="components">
......
1777 1846
              </at>
1778 1847
             </object>
1779 1848
            </at>
1780
            <at name="width">953</at>
1849
            <at name="width">843</at>
1781 1850
            <at name="tabCount">2</at>
1782
            <at name="height">493</at>
1851
            <at name="height">451</at>
1783 1852
           </object>
1784 1853
          </at>
1785 1854
         </object>
......
1804 1873
         </at>
1805 1874
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1806 1875
        </super>
1807
        <at name="id">embedded.1162152160</at>
1876
        <at name="id">embedded.322577919</at>
1808 1877
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1809 1878
        <at name="colspecs">FILL:DEFAULT:GROW(0.3),FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.7),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
1810 1879
        <at name="components">
......
1854 1923
                  </object>
1855 1924
                 </at>
1856 1925
                 <at name="name">lblTaskStatusMessage</at>
1857
                 <at name="width">524</at>
1926
                 <at name="width">447</at>
1858 1927
                 <at name="text">...</at>
1859 1928
                 <at name="fill">
1860 1929
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
......
2029 2098
                  </object>
2030 2099
                 </at>
2031 2100
                 <at name="name">lblTaskStatusTitle</at>
2032
                 <at name="width">231</at>
2101
                 <at name="width">198</at>
2033 2102
                 <at name="text">...</at>
2034 2103
                 <at name="fill">
2035 2104
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/DefaultJTopologyReportView.java
39 39
   JButton btnCenterGeometry = new JButton();
40 40
   JButton btnZoomError = new JButton();
41 41
   JButton btnEraseErrorMarks = new JButton();
42
   JToggleButton btnShowFormGsOC2020 = new JToggleButton();
42 43
   JPanel pnlParameters = new JPanel();
43 44
   JLabel lblActionDescription = new JLabel();
44 45
   JLabel lblActionTitle = new JLabel();
......
175 176
   public JPanel createPanel2()
176 177
   {
177 178
      JPanel jpanel1 = new JPanel();
178
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT: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,FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
179
      FormLayout formlayout1 = new FormLayout("FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:7PX: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,FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:8DLU:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE,FILL:DEFAULT:NONE","CENTER:DEFAULT:NONE");
179 180
      CellConstraints cc = new CellConstraints();
180 181
      jpanel1.setLayout(formlayout1);
181 182

  
......
198 199
      btnZoomGeometry.setToolTipText("_Zoom");
199 200
      EmptyBorder emptyborder2 = new EmptyBorder(2,2,2,2);
200 201
      btnZoomGeometry.setBorder(emptyborder2);
201
      jpanel1.add(btnZoomGeometry,cc.xy(13,1));
202
      jpanel1.add(btnZoomGeometry,cc.xy(15,1));
202 203

  
203 204
      btnActions.setIcon(loadImage("org/gvsig/topology/swing/impl/images/topology-report-actions.png"));
204 205
      btnActions.setName("btnActions");
205 206
      btnActions.setToolTipText("_Actions");
206 207
      EmptyBorder emptyborder3 = new EmptyBorder(2,2,2,2);
207 208
      btnActions.setBorder(emptyborder3);
208
      jpanel1.add(btnActions,cc.xy(23,1));
209
      jpanel1.add(btnActions,cc.xy(25,1));
209 210

  
210 211
      btnRefresh.setIcon(loadImage("org/gvsig/topology/swing/impl/images/topology-report-refresh.png"));
211 212
      btnRefresh.setName("btnRefresh");
212 213
      btnRefresh.setToolTipText("_Update");
213 214
      EmptyBorder emptyborder4 = new EmptyBorder(2,2,2,2);
214 215
      btnRefresh.setBorder(emptyborder4);
215
      jpanel1.add(btnRefresh,cc.xy(25,1));
216
      jpanel1.add(btnRefresh,cc.xy(27,1));
216 217

  
217 218
      btnShowErrors.setIcon(loadImage("org/gvsig/topology/swing/impl/images/topology-report-filter-errors.png"));
218 219
      btnShowErrors.setName("btnShowErrors");
......
240 241
      btnCenterError.setToolTipText("_Center_error");
241 242
      EmptyBorder emptyborder8 = new EmptyBorder(2,2,2,2);
242 243
      btnCenterError.setBorder(emptyborder8);
243
      jpanel1.add(btnCenterError,cc.xy(19,1));
244
      jpanel1.add(btnCenterError,cc.xy(21,1));
244 245

  
245 246
      btnCenterGeometry.setIcon(loadImage("org/gvsig/topology/swing/impl/images/topology-report-center-geometry.png"));
246 247
      btnCenterGeometry.setName("btnCenterGeometry");
247 248
      btnCenterGeometry.setToolTipText("_Center_geometry");
248 249
      EmptyBorder emptyborder9 = new EmptyBorder(2,2,2,2);
249 250
      btnCenterGeometry.setBorder(emptyborder9);
250
      jpanel1.add(btnCenterGeometry,cc.xy(15,1));
251
      jpanel1.add(btnCenterGeometry,cc.xy(17,1));
251 252

  
252 253
      btnZoomError.setIcon(loadImage("org/gvsig/topology/swing/impl/images/topology-report-zoom-error.png"));
253 254
      btnZoomError.setName("btnZoomError");
254 255
      btnZoomError.setToolTipText("_Zoom");
255 256
      EmptyBorder emptyborder10 = new EmptyBorder(2,2,2,2);
256 257
      btnZoomError.setBorder(emptyborder10);
257
      jpanel1.add(btnZoomError,cc.xy(17,1));
258
      jpanel1.add(btnZoomError,cc.xy(19,1));
258 259

  
259 260
      btnEraseErrorMarks.setIcon(loadImage("org/gvsig/topology/swing/impl/images/topology-report-erase-errors.png"));
260 261
      btnEraseErrorMarks.setName("btnEraseErrorMarks");
261 262
      btnEraseErrorMarks.setToolTipText("_Erase_error_marks");
262 263
      EmptyBorder emptyborder11 = new EmptyBorder(2,2,2,2);
263 264
      btnEraseErrorMarks.setBorder(emptyborder11);
264
      jpanel1.add(btnEraseErrorMarks,cc.xy(21,1));
265
      jpanel1.add(btnEraseErrorMarks,cc.xy(23,1));
265 266

  
266
      addFillComponents(jpanel1,new int[]{ 2,4,6,8,10,12,14,16,18,20,22,24 },new int[0]);
267
      btnShowFormGsOC2020.setIcon(loadImage("org/gvsig/topology/swing/impl/images/topology-report-show-form.png"));
268
      btnShowFormGsOC2020.setName("btnShowFormGsOC2020");
269
      btnShowFormGsOC2020.setToolTipText("_Show_form_when_modify_geometry");
270
      EmptyBorder emptyborder12 = new EmptyBorder(2,2,2,2);
271
      btnShowFormGsOC2020.setBorder(emptyborder12);
272
      jpanel1.add(btnShowFormGsOC2020,cc.xy(13,1));
273

  
274
      addFillComponents(jpanel1,new int[]{ 2,4,6,8,10,12,14,16,18,20,22,24,26 },new int[0]);
267 275
      return jpanel1;
268 276
   }
269 277

  
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/CreateRuleDialogView.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/prototipo-topologia/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/CreateRuleDialogView.xml</at>
28
   <at name="rowspecs">CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:DEFAULT:NONE</at>
29
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.5),FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.5),FILL:4DLU:NONE</at>
27
   <at name="id">/home/jovivas/datos/devel/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/CreateRuleDialogView.xml</at>
28
   <at name="path">datos/devel/org.gvsig.topology/org.gvsig.topology.swing/org.gvsig.topology.swing.impl/src/main/java/org/gvsig/topology/swing/impl/CreateRuleDialogView.xml</at>
29
   <at name="rowspecs">CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
30
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:GROW(0.5),FILL:4DLU:NONE,FILL:4DLU:NONE</at>
30 31
   <at name="components">
31 32
    <object classname="java.util.LinkedList">
32 33
     <item >
33 34
      <at name="value">
34
       <object classname="com.jeta.forms.store.memento.FormMemento">
35
       <object classname="com.jeta.forms.store.memento.BeanMemento">
35 36
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
36 37
         <at name="cellconstraints">
37 38
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
......
44 45
           <at name="insets" object="insets">0,0,0,0</at>
45 46
          </object>
46 47
         </at>
47
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
48
         <at name="componentclass">com.jeta.forms.gui.form.FormContainerComponent</at>
48 49
        </super>
49
        <at name="id">embedded.688400936</at>
50
        <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE</at>
51
        <at name="colspecs">FILL:DEFAULT:GROW(1.0)</at>
52
        <at name="components">
53
         <object classname="java.util.LinkedList">
54
          <item >
55
           <at name="value">
56
            <object classname="com.jeta.forms.store.memento.BeanMemento">
57
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
58
              <at name="cellconstraints">
59
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
60
                <at name="column">1</at>
61
                <at name="row">15</at>
62
                <at name="colspan">1</at>
63
                <at name="rowspan">1</at>
64
                <at name="halign">default</at>
65
                <at name="valign">default</at>
66
                <at name="insets" object="insets">0,0,0,0</at>
67
               </object>
68
              </at>
69
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
70
             </super>
71
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
72
             <at name="beanclass">javax.swing.JTextField</at>
73
             <at name="beanproperties">
74
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
75
               <at name="classname">javax.swing.JTextField</at>
76
               <at name="properties">
77
                <object classname="com.jeta.forms.store.support.PropertyMap">
78
                 <at name="border">
79
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
80
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
81
                    <at name="name">border</at>
82
                   </super>
83
                   <at name="borders">
84
                    <object classname="java.util.LinkedList">
85
                     <item >
86
                      <at name="value">
87
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
88
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
89
                         <at name="name">border</at>
90
                        </super>
91
                       </object>
92
                      </at>
93
                     </item>
94
                    </object>
95
                   </at>
96
                  </object>
97
                 </at>
98
                 <at name="horizontalAlignment">4</at>
99
                 <at name="name">txtTolerance</at>
100
                 <at name="width">484</at>
101
                 <at name="height">20</at>
102
                </object>
103
               </at>
104
              </object>
105
             </at>
106
            </object>
107
           </at>
108
          </item>
109
          <item >
110
           <at name="value">
111
            <object classname="com.jeta.forms.store.memento.BeanMemento">
112
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
113
              <at name="cellconstraints">
114
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
115
                <at name="column">1</at>
116
                <at name="row">3</at>
117
                <at name="colspan">1</at>
118
                <at name="rowspan">1</at>
119
                <at name="halign">default</at>
120
                <at name="valign">default</at>
121
                <at name="insets" object="insets">0,0,0,0</at>
122
               </object>
123
              </at>
124
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
125
             </super>
126
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
127
             <at name="beanclass">javax.swing.JComboBox</at>
128
             <at name="beanproperties">
129
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
130
               <at name="classname">javax.swing.JComboBox</at>
131
               <at name="properties">
132
                <object classname="com.jeta.forms.store.support.PropertyMap">
133
                 <at name="border">
134
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
135
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
136
                    <at name="name">border</at>
137
                   </super>
138
                   <at name="borders">
139
                    <object classname="java.util.LinkedList">
140
                     <item >
141
                      <at name="value">
142
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
143
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
144
                         <at name="name">border</at>
145
                        </super>
146
                       </object>
147
                      </at>
148
                     </item>
149
                    </object>
150
                   </at>
151
                  </object>
152
                 </at>
153
                 <at name="name">cboDataSet1</at>
154
                 <at name="width">484</at>
155
                 <at name="items">
156
                  <object classname="com.jeta.forms.store.properties.ItemsProperty">
157
                   <at name="name">items</at>
158
                  </object>
159
                 </at>
160
                 <at name="height">20</at>
161
                </object>
162
               </at>
163
              </object>
164
             </at>
165
            </object>
166
           </at>
167
          </item>
168
          <item >
169
           <at name="value">
170
            <object classname="com.jeta.forms.store.memento.BeanMemento">
171
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
172
              <at name="cellconstraints">
173
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
174
                <at name="column">1</at>
175
                <at name="row">1</at>
176
                <at name="colspan">1</at>
177
                <at name="rowspan">1</at>
178
                <at name="halign">default</at>
179
                <at name="valign">default</at>
180
                <at name="insets" object="insets">0,0,0,0</at>
181
               </object>
182
              </at>
183
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
184
             </super>
185
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
186
             <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
187
             <at name="beanproperties">
188
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
189
               <at name="classname">com.jeta.forms.components.label.JETALabel</at>
190
               <at name="properties">
191
                <object classname="com.jeta.forms.store.support.PropertyMap">
192
                 <at name="border">
193
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
194
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
195
                    <at name="name">border</at>
196
                   </super>
197
                   <at name="borders">
198
                    <object classname="java.util.LinkedList">
199
                     <item >
200
                      <at name="value">
201
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
202
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
203
                         <at name="name">border</at>
204
                        </super>
205
                       </object>
206
                      </at>
207
                     </item>
208
                    </object>
209
                   </at>
210
                  </object>
211
                 </at>
212
                 <at name="name">lblDataSet1</at>
213
                 <at name="width">484</at>
214
                 <at name="text">_Primary_dataset</at>
215
                 <at name="fill">
216
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
217
                   <at name="name">fill</at>
218
                  </object>
219
                 </at>
220
                 <at name="height">14</at>
221
                </object>
222
               </at>
223
              </object>
224
             </at>
225
            </object>
226
           </at>
227
          </item>
228
          <item >
229
           <at name="value">
230
            <object classname="com.jeta.forms.store.memento.BeanMemento">
231
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
232
              <at name="cellconstraints">
233
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
234
                <at name="column">1</at>
235
                <at name="row">5</at>
236
                <at name="colspan">1</at>
237
                <at name="rowspan">1</at>
238
                <at name="halign">default</at>
239
                <at name="valign">default</at>
240
                <at name="insets" object="insets">0,0,0,0</at>
241
               </object>
242
              </at>
243
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
244
             </super>
245
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
246
             <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
247
             <at name="beanproperties">
248
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
249
               <at name="classname">com.jeta.forms.components.label.JETALabel</at>
250
               <at name="properties">
251
                <object classname="com.jeta.forms.store.support.PropertyMap">
252
                 <at name="border">
253
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
254
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
255
                    <at name="name">border</at>
256
                   </super>
257
                   <at name="borders">
258
                    <object classname="java.util.LinkedList">
259
                     <item >
260
                      <at name="value">
261
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
262
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
263
                         <at name="name">border</at>
264
                        </super>
265
                       </object>
266
                      </at>
267
                     </item>
268
                    </object>
269
                   </at>
270
                  </object>
271
                 </at>
272
                 <at name="name">lblRule</at>
273
                 <at name="width">484</at>
274
                 <at name="text">_Rule</at>
275
                 <at name="fill">
276
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
277
                   <at name="name">fill</at>
278
                  </object>
279
                 </at>
280
                 <at name="height">14</at>
281
                </object>
282
               </at>
283
              </object>
284
             </at>
285
            </object>
286
           </at>
287
          </item>
288
          <item >
289
           <at name="value">
290
            <object classname="com.jeta.forms.store.memento.BeanMemento">
291
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
292
              <at name="cellconstraints">
293
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
294
                <at name="column">1</at>
295
                <at name="row">7</at>
296
                <at name="colspan">1</at>
297
                <at name="rowspan">1</at>
298
                <at name="halign">default</at>
299
                <at name="valign">default</at>
300
                <at name="insets" object="insets">0,0,0,0</at>
301
               </object>
302
              </at>
303
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
304
             </super>
305
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
306
             <at name="beanclass">javax.swing.JComboBox</at>
307
             <at name="beanproperties">
308
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
309
               <at name="classname">javax.swing.JComboBox</at>
310
               <at name="properties">
311
                <object classname="com.jeta.forms.store.support.PropertyMap">
312
                 <at name="border">
313
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
314
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
315
                    <at name="name">border</at>
316
                   </super>
317
                   <at name="borders">
318
                    <object classname="java.util.LinkedList">
319
                     <item >
320
                      <at name="value">
321
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
322
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
323
                         <at name="name">border</at>
324
                        </super>
325
                       </object>
326
                      </at>
327
                     </item>
328
                    </object>
329
                   </at>
330
                  </object>
331
                 </at>
332
                 <at name="name">cboRule</at>
333
                 <at name="width">484</at>
334
                 <at name="items">
335
                  <object classname="com.jeta.forms.store.properties.ItemsProperty">
336
                   <at name="name">items</at>
337
                  </object>
338
                 </at>
339
                 <at name="enabled">false</at>
340
                 <at name="height">20</at>
341
                </object>
342
               </at>
343
              </object>
344
             </at>
345
            </object>
346
           </at>
347
          </item>
348
          <item >
349
           <at name="value">
350
            <object classname="com.jeta.forms.store.memento.BeanMemento">
351
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
352
              <at name="cellconstraints">
353
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
354
                <at name="column">1</at>
355
                <at name="row">9</at>
356
                <at name="colspan">1</at>
357
                <at name="rowspan">1</at>
358
                <at name="halign">default</at>
359
                <at name="valign">default</at>
360
                <at name="insets" object="insets">0,0,0,0</at>
361
               </object>
362
              </at>
363
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
364
             </super>
365
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
366
             <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
367
             <at name="beanproperties">
368
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
369
               <at name="classname">com.jeta.forms.components.label.JETALabel</at>
370
               <at name="properties">
371
                <object classname="com.jeta.forms.store.support.PropertyMap">
372
                 <at name="border">
373
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
374
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
375
                    <at name="name">border</at>
376
                   </super>
377
                   <at name="borders">
378
                    <object classname="java.util.LinkedList">
379
                     <item >
380
                      <at name="value">
381
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
382
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
383
                         <at name="name">border</at>
384
                        </super>
385
                       </object>
386
                      </at>
387
                     </item>
388
                    </object>
389
                   </at>
390
                  </object>
391
                 </at>
392
                 <at name="name">lblDataSet2</at>
393
                 <at name="width">484</at>
394
                 <at name="text">_Secondary_dataset</at>
395
                 <at name="fill">
396
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
397
                   <at name="name">fill</at>
398
                  </object>
399
                 </at>
400
                 <at name="height">14</at>
401
                </object>
402
               </at>
403
              </object>
404
             </at>
405
            </object>
406
           </at>
407
          </item>
408
          <item >
409
           <at name="value">
410
            <object classname="com.jeta.forms.store.memento.BeanMemento">
411
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
412
              <at name="cellconstraints">
413
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
414
                <at name="column">1</at>
415
                <at name="row">11</at>
416
                <at name="colspan">1</at>
417
                <at name="rowspan">1</at>
418
                <at name="halign">default</at>
419
                <at name="valign">default</at>
420
                <at name="insets" object="insets">0,0,0,0</at>
421
               </object>
422
              </at>
423
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
424
             </super>
425
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
426
             <at name="beanclass">javax.swing.JComboBox</at>
427
             <at name="beanproperties">
428
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
429
               <at name="classname">javax.swing.JComboBox</at>
430
               <at name="properties">
431
                <object classname="com.jeta.forms.store.support.PropertyMap">
432
                 <at name="border">
433
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
434
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
435
                    <at name="name">border</at>
436
                   </super>
437
                   <at name="borders">
438
                    <object classname="java.util.LinkedList">
439
                     <item >
440
                      <at name="value">
441
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
442
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
443
                         <at name="name">border</at>
444
                        </super>
445
                       </object>
446
                      </at>
447
                     </item>
448
                    </object>
449
                   </at>
450
                  </object>
451
                 </at>
452
                 <at name="name">cboDataSet2</at>
453
                 <at name="width">484</at>
454
                 <at name="items">
455
                  <object classname="com.jeta.forms.store.properties.ItemsProperty">
456
                   <at name="name">items</at>
457
                  </object>
458
                 </at>
459
                 <at name="enabled">false</at>
460
                 <at name="height">20</at>
461
                </object>
462
               </at>
463
              </object>
464
             </at>
465
            </object>
466
           </at>
467
          </item>
468
          <item >
469
           <at name="value">
470
            <object classname="com.jeta.forms.store.memento.BeanMemento">
471
             <super classname="com.jeta.forms.store.memento.ComponentMemento">
472
              <at name="cellconstraints">
473
               <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
474
                <at name="column">1</at>
475
                <at name="row">13</at>
476
                <at name="colspan">1</at>
477
                <at name="rowspan">1</at>
478
                <at name="halign">default</at>
479
                <at name="valign">default</at>
480
                <at name="insets" object="insets">0,0,0,0</at>
481
               </object>
482
              </at>
483
              <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
484
             </super>
485
             <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
486
             <at name="beanclass">com.jeta.forms.components.label.JETALabel</at>
487
             <at name="beanproperties">
488
              <object classname="com.jeta.forms.store.memento.PropertiesMemento">
489
               <at name="classname">com.jeta.forms.components.label.JETALabel</at>
490
               <at name="properties">
491
                <object classname="com.jeta.forms.store.support.PropertyMap">
492
                 <at name="border">
493
                  <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
494
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
495
                    <at name="name">border</at>
496
                   </super>
497
                   <at name="borders">
498
                    <object classname="java.util.LinkedList">
499
                     <item >
500
                      <at name="value">
501
                       <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
502
                        <super classname="com.jeta.forms.store.properties.BorderProperty">
503
                         <at name="name">border</at>
504
                        </super>
505
                       </object>
506
                      </at>
507
                     </item>
508
                    </object>
509
                   </at>
510
                  </object>
511
                 </at>
512
                 <at name="name">lblTolerance</at>
513
                 <at name="width">484</at>
514
                 <at name="text">_Tolerance</at>
515
                 <at name="fill">
516
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
517
                   <at name="name">fill</at>
518
                  </object>
519
                 </at>
520
                 <at name="height">14</at>
521
                </object>
522
               </at>
523
              </object>
524
             </at>
525
            </object>
526
           </at>
527
          </item>
528
         </object>
529
        </at>
530
        <at name="properties">
50
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
51
        <at name="beanclass">javax.swing.JTabbedPane</at>
52
        <at name="beanproperties">
531 53
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
532
          <at name="classname">com.jeta.forms.gui.form.GridView</at>
54
          <at name="classname">javax.swing.JTabbedPane</at>
533 55
          <at name="properties">
534 56
           <object classname="com.jeta.forms.store.support.PropertyMap">
535 57
            <at name="border">
......
538 60
               <at name="name">border</at>
539 61
              </super>
540 62
              <at name="borders">
541
               <object classname="java.util.LinkedList"/>
63
               <object classname="java.util.LinkedList">
64
                <item >
65
                 <at name="value">
66
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
67
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
68
                    <at name="name">border</at>
69
                   </super>
70
                  </object>
71
                 </at>
72
                </item>
73
               </object>
542 74
              </at>
543 75
             </object>
544 76
            </at>
545
            <at name="name"></at>
546
            <at name="fill">
547
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
548
              <at name="name">fill</at>
549
             </object>
550
            </at>
551
            <at name="scollBars">
552
             <object classname="com.jeta.forms.store.properties.ScrollBarsProperty">
553
              <at name="name">scollBars</at>
554
              <at name="verticalpolicy">21</at>
555
              <at name="horizontalpolicy">31</at>
556
              <at name="border">
557
               <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
558
                <super classname="com.jeta.forms.store.properties.BorderProperty">
559
                 <at name="name">border</at>
560
                </super>
561
                <at name="borders">
562
                 <object classname="java.util.LinkedList">
563
                  <item >
564
                   <at name="value">
565
                    <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
566
                     <super classname="com.jeta.forms.store.properties.BorderProperty">
567
                      <at name="name">border</at>
568
                     </super>
77
            <at name="componentCount">2</at>
78
            <at name="name">tabCreateRulePanel</at>
79
            <at name="tabs">
80
             <object classname="com.jeta.forms.store.properties.TabbedPaneProperties">
81
              <at name="name">tabs</at>
82
              <at name="items">
83
               <object classname="java.util.LinkedList">
84
                <item >
85
                 <at name="value">
86
                  <object classname="com.jeta.forms.store.properties.TabProperty">
87
                   <at name="name">tab</at>
88
                   <at name="title">General</at>
89
                   <at name="icon">
90
                    <object classname="com.jeta.forms.store.properties.IconProperty">
91
                     <at name="embedded">false</at>
92
                     <at name="width">0</at>
93
                     <at name="height">0</at>
569 94
                    </object>
570 95
                   </at>
571
                  </item>
572
                 </object>
573
                </at>
574
               </object>
575
              </at>
576
             </object>
577
            </at>
578
           </object>
579
          </at>
580
         </object>
581
        </at>
582
        <at name="cellpainters">
583
         <object classname="com.jeta.forms.store.support.Matrix">
584
          <at name="rows">
585
           <object classname="[Ljava.lang.Object;" size="15">
586
            <at name="item" index="0">
587
             <object classname="[Ljava.lang.Object;" size="1"/>
588
            </at>
589
            <at name="item" index="1">
590
             <object classname="[Ljava.lang.Object;" size="1"/>
591
            </at>
592
            <at name="item" index="2">
593
             <object classname="[Ljava.lang.Object;" size="1"/>
594
            </at>
595
            <at name="item" index="3">
596
             <object classname="[Ljava.lang.Object;" size="1"/>
597
            </at>
598
            <at name="item" index="4">
599
             <object classname="[Ljava.lang.Object;" size="1"/>
600
            </at>
601
            <at name="item" index="5">
602
             <object classname="[Ljava.lang.Object;" size="1"/>
603
            </at>
604
            <at name="item" index="6">
605
             <object classname="[Ljava.lang.Object;" size="1"/>
606
            </at>
607
            <at name="item" index="7">
608
             <object classname="[Ljava.lang.Object;" size="1"/>
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff