Revision 893

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/TopologyReportLine.java
46 46

  
47 47
    public FeatureReference getFeature2();
48 48
    
49
    public int getPrimitiveNumber1();
50
    
51
    public int getPrimitiveNumber2();
52
    
49 53
    public boolean isException();
50 54
    
51 55
    public String getDescription();
52 56

  
57
    public String getData();
53 58
}
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.api/src/main/java/org/gvsig/topology/lib/api/TopologyReport.java
51 51
            String description
52 52
        );
53 53
    
54
    public TopologyReportLine addLine(
55
            TopologyRule rule,
56
            TopologyDataSet dataSet1,
57
            TopologyDataSet dataSet2,
58
            Geometry geometry,
59
            Geometry error,
60
            FeatureReference feature1,
61
            FeatureReference feature2,
62
            int primitive1,
63
            int primitive2,
64
            boolean exception,
65
            String description,
66
            String data
67
        );
68
    
54 69
    public void removeAllLines();
55 70
    
71
    @Override
56 72
    public List<TopologyReportLine> getLines();
57 73

  
58 74
    public List<TopologyReportLine> getLines(String filter);
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
126 126
    ) {
127 127
        TopologyReportLine line = new DefaultTopologyReportLine(
128 128
                this, rule, dataSet1, dataSet2, geometry, error, feature1, 
129
                feature2, exception, description
129
                feature2, -1, -1, exception, description, null
130 130
        );
131 131
        this.lines.add(line);
132 132
        this.fireChangeEvent();
......
134 134
    }
135 135

  
136 136
    @Override
137
    public TopologyReportLine addLine(TopologyRule rule, 
138
            TopologyDataSet dataSet1,TopologyDataSet dataSet2, 
139
            Geometry geometry, Geometry error,
140
            FeatureReference feature1, FeatureReference feature2,
141
            int primitive1, int primitive2,
142
            boolean exception, 
143
            String description,
144
            String data
145
    ) {
146
        TopologyReportLine line = new DefaultTopologyReportLine(
147
                this, rule, dataSet1, dataSet2, geometry, error, feature1, 
148
                feature2, primitive1, primitive2, exception, description, data
149
        );
150
        this.lines.add(line);
151
        this.fireChangeEvent();
152
        return line;
153
    }
154

  
155
    @Override
137 156
    public void removeAllLines() {
138 157
        this.lines.clear();
139 158
        this.fireChangeEvent();
org.gvsig.topology/trunk/org.gvsig.topology/org.gvsig.topology.lib/org.gvsig.topology.lib.impl/src/main/java/org/gvsig/topology/lib/impl/DefaultTopologyReportLine.java
43 43
    private final Geometry geometry;
44 44
    private final FeatureReference feature1;
45 45
    private final FeatureReference feature2;
46
    private final int primitive1;
47
    private final int primitive2;
46 48
    private boolean exception;
47 49
    private final String description;
48
    private Geometry errorGeometry;
50
    private final String data;
51
    private final Geometry errorGeometry;
49 52
    
50 53
    DefaultTopologyReportLine(DefaultTopologyReport report, 
51 54
            TopologyRule rule, 
......
55 58
            Geometry error,
56 59
            FeatureReference feature1, 
57 60
            FeatureReference feature2, 
61
            int primitive1,
62
            int primitive2,
58 63
            boolean exception,
59
            String description
64
            String description,
65
            String data
60 66
        ) {
61 67
        this.report = report;
62 68
        this.rule = rule;
......
65 71
        this.geometry = geometry;
66 72
        this.feature1 = feature1;
67 73
        this.feature2 = feature2;
74
        this.primitive1 = primitive1;
75
        this.primitive2 = primitive2;
68 76
        this.exception = exception;
69 77
        this.description = description;
70 78
        this.errorGeometry = error;
79
        this.data = data;
71 80
    }
72 81

  
73 82
    @Override
......
118 127
    public Geometry getError() {
119 128
        return this.errorGeometry;
120 129
    }
130

  
131
    @Override
132
    public int getPrimitiveNumber1() {
133
        return this.primitive1;
134
    }
135

  
136
    @Override
137
    public int getPrimitiveNumber2() {
138
        return this.primitive2;
139
    }
140

  
141
    @Override
142
    public String getData() {
143
        return this.data;
144
    }
121 145
}

Also available in: Unified diff