Revision 727 org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.impl/src/main/java/org/gvsig/topology/lib/impl/DefaultTopologyReport.java
DefaultTopologyReport.java | ||
---|---|---|
30 | 30 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator; |
31 | 31 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager; |
32 | 32 |
import org.gvsig.expressionevaluator.MutableSymbolTable; |
33 |
import org.gvsig.expressionevaluator.spi.AbstractSymbolTable; |
|
34 | 33 |
import org.gvsig.fmap.dal.feature.FeatureReference; |
35 | 34 |
import org.gvsig.fmap.geom.Geometry; |
36 | 35 |
import org.gvsig.tools.task.SimpleTaskStatus; |
37 | 36 |
import org.gvsig.topology.lib.api.TopologyDataSet; |
38 | 37 |
import org.gvsig.topology.lib.api.TopologyPlan; |
39 | 38 |
import org.gvsig.topology.lib.api.TopologyReport; |
40 |
import static org.gvsig.topology.lib.api.TopologyReport.IS_ERROR; |
|
41 |
import static org.gvsig.topology.lib.api.TopologyReport.RULE_ID; |
|
42 | 39 |
import org.gvsig.topology.lib.api.TopologyReportLine; |
43 | 40 |
import org.gvsig.topology.lib.api.TopologyReportLineSet; |
44 | 41 |
import org.gvsig.topology.lib.api.TopologyRule; |
... | ... | |
72 | 69 |
} |
73 | 70 |
SimpleTaskStatus theTaskStatus = plan.getTaskStatus(); |
74 | 71 |
try { |
72 |
theTaskStatus.push(); |
|
75 | 73 |
theTaskStatus.restart(); |
76 | 74 |
theTaskStatus.message("Preparing filter"); |
77 | 75 |
theTaskStatus.setAutoremove(true); |
... | ... | |
105 | 103 |
if (theTaskStatus.isRunning()) { |
106 | 104 |
theTaskStatus.terminate(); |
107 | 105 |
} |
106 |
theTaskStatus.pop(); |
|
108 | 107 |
this.completed = true; |
109 | 108 |
} |
110 | 109 |
} |
... | ... | |
121 | 120 |
|
122 | 121 |
@Override |
123 | 122 |
public TopologyReportLine addLine(TopologyRule rule, TopologyDataSet dataSet1, |
124 |
TopologyDataSet dataSet2, Geometry geometry, |
|
123 |
TopologyDataSet dataSet2, Geometry geometry, Geometry error,
|
|
125 | 124 |
FeatureReference feature1, FeatureReference feature2, |
126 | 125 |
boolean exception, String description |
127 | 126 |
) { |
128 | 127 |
TopologyReportLine line = new DefaultTopologyReportLine( |
129 |
this, rule, dataSet1, dataSet2, geometry, feature1, feature2,
|
|
130 |
exception, description |
|
128 |
this, rule, dataSet1, dataSet2, geometry, error, feature1,
|
|
129 |
feature2, exception, description
|
|
131 | 130 |
); |
132 | 131 |
this.lines.add(line); |
133 | 132 |
this.changeListenerHelper.fireEvent(); |
Also available in: Unified diff