/ - Diff - gvSIG projects pool - gvSIG

Revision 3954

      */
     package org.gvsig.topology.app.mainplugin;
     import java.util.Map;
     import javax.swing.ImageIcon;
     import javax.swing.event.TreeModelListener;
     import javax.swing.tree.TreeModel;
     import javax.swing.tree.TreePath;
     import org.gvsig.andami.IconThemeHelper;
     import org.gvsig.app.project.documents.view.ViewDocument;
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataManager;
     import org.gvsig.fmap.dal.DataStore;
     import org.gvsig.fmap.mapcontext.MapContextLocator;
     import org.gvsig.fmap.mapcontext.layers.FLayer;

     package org.gvsig.topology.rule;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.expressionevaluator.ExpressionBuilder;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
     import org.gvsig.expressionevaluator.ExpressionUtils;
     import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
     import org.gvsig.expressionevaluator.GeometryExpressionUtils;
     import org.gvsig.fmap.dal.feature.EditableFeature;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.feature.FeatureReference;
     import org.gvsig.fmap.geom.Geometry;
-...
             @Override
             public void execute(TopologyRule rule, TopologyReportLine line, DynObject parameters) {
                 try {
                     // TODO
                     Geometry errorGeom = line.getError();
                     TopologyDataSet dataSet = rule.getDataSet1();
                     for (FeatureReference reference : dataSet.query(errorGeom)) {
                         Feature initialFeature = reference.getFeature();
                         Geometry initialFeatureGeom = initialFeature.getDefaultGeometry();
     //                    initialFeature1.getEditable();
                         if (initialFeatureGeom.intersects(errorGeom)) {
                             Geometry targetFeatureGeom = initialFeatureGeom.difference(errorGeom);
                             EditableFeature targetFeature = dataSet.createNewFeature();
                             targetFeature.copyFrom(initialFeature);
                             targetFeature.setDefaultGeometry(targetFeatureGeom);
                             dataSet.insert(targetFeature);
                             dataSet.delete(reference);
+                        }
+                    }
                     EditableFeature newFeature = dataSet.createNewFeature();
                     newFeature.setDefaultGeometry(errorGeom);
                     dataSet.insert(newFeature);
                 } catch (Exception ex) {
                     throw new ExecuteTopologyRuleActionException(ex);
+                }
-...
             @Override
             public void execute(TopologyRule rule, TopologyReportLine line, DynObject parameters) {
                 try {
                     // TODO
                     Geometry errorGeom = line.getError();
                     TopologyDataSet dataSet = rule.getDataSet1();
                     for (FeatureReference reference : dataSet.query(errorGeom)) {
                         Feature initialFeature = reference.getFeature();
                         Geometry initialFeatureGeom = initialFeature.getDefaultGeometry();
     //                    initialFeature1.getEditable();
                         if (initialFeatureGeom.intersects(errorGeom)) {
                             Geometry targetFeatureGeom = initialFeatureGeom.difference(errorGeom);
                             EditableFeature targetFeature = dataSet.createNewFeature();
                             targetFeature.copyFrom(initialFeature);
                             targetFeature.setDefaultGeometry(targetFeatureGeom);
                             dataSet.insert(targetFeature);
                             dataSet.delete(reference);
+                        }
+                    }
                 } catch (Exception ex) {
                     throw new ExecuteTopologyRuleActionException(ex);
+                }
+            }
+        }
         private class MergeAction extends AbstractTopologyRuleAction {
-...
                 );
+            }
     //        @Override
     //        public boolean hasParameters() {
     //            return true;
     //        }
     //
     //        @Override
     //        public DynObject createParameters() {
     //            DynObjectManager dynObjectManager = ToolsLocator.getDynObjectManager();
     //            DynClass parametersDefinition = dynObjectManager.createDynClass("MustNotOverlapPolygonRulActionParameters","MustNotOverlapPolygonRulActionParameters");
     //            parametersDefinition.addDynFieldString("polygonToApply").setDescription("Polygon to apply topology rule action");
     //            DynObject ruleActionParameters = dynObjectManager.createDynObject(parametersDefinition);
     //            //rellenar el desplegable con la lista de poligoos que se superponen
     //            return ruleActionParameters;
     //        }
             @Override
             public void execute(TopologyRule rule, TopologyReportLine line, DynObject parameters) {
                 try {
                     // TODO
                     Geometry errorGeom = line.getError();
                     TopologyDataSet dataSet = rule.getDataSet1();
                     Feature initialFeature1 = line.getFeature1().getFeature();
                     EditableFeature targetFeature1 = dataSet.createNewFeature();
                     targetFeature1.copyFrom(initialFeature1);
                     Feature initialFeature2 = line.getFeature2().getFeature();
                     EditableFeature targetFeature2 = dataSet.createNewFeature();
                     targetFeature2.copyFrom(initialFeature2);
                     Geometry initialFeature1Geom = initialFeature1.getDefaultGeometry();
     //                Geometry targetFeature1Geom = initialFeature1Geom.union(errorGeom);
                     Geometry initialFeature2Geom = initialFeature2.getDefaultGeometry();
                     Geometry targetFeature2Geom = initialFeature2Geom.difference(initialFeature1Geom);
     //                targetFeature1.setDefaultGeometry(targetFeature1Geom);
                     targetFeature2.setDefaultGeometry(targetFeature2Geom);
     //                dataSet.insert(targetFeature1);
                     dataSet.insert(targetFeature2);
                     dataSet.delete(line.getFeature1());
                     dataSet.delete(line.getFeature2());
                 } catch (Exception ex) {
                     throw new ExecuteTopologyRuleActionException(ex);
+                }
+            }
+        }
         private String geomName;
-...
                                     polygon,
                                     error,
                                     feature1.getReference(),
                                     null,
                                     reference,
                                     false,
                                     "The polygon overlay with others."
                             );
                             break;
     //                        break;
+                        }
+                    }
                 } else {
-...
                                 polygon,
                                 error,
                                 feature1.getReference(),
                                 null,
                                 feature.getReference(),
                                 false,
                                 "The polygon overlay with others."
                         );

         private final TopologyPlan plan;
         private final TopologyRuleFactory factory;
         private double tolerance;
         private String dataSet1;
         public String dataSet1;
         private String dataSet2;
         protected List<TopologyRuleAction> actions;

Also available in: Unified diff