Revision: 5251
http://sourceforge.net/p/jump-pilot/code/5251
Author: michaudm
Date: 2016-12-06 22:38:06 +0000 (Tue, 06 Dec 2016)
Log Message:
-----------
Upgrade RoadMatcher to be compatible with OpenJUMP 1.10
Modified Paths:
--------------
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/BoundaryFeature.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedSegment.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedShellReference.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedShellSubject.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/HideConflationAttributesFeature.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/ResultFeature.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/SourceFeature.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_Java2XML.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_StandardReaderWriterFileDataSource.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_XML2Java.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ExportResultPackagePlugIn.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/LegendToolboxPanel.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ResultPackageExporter.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ResultPackageSourceFeatureCollection.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/SelectInputLayersWizardPanel.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/SourcePackageManifest.java
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/Transaction.java
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/BoundaryFeature.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/BoundaryFeature.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/BoundaryFeature.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -35,7 +35,6 @@
package com.vividsolutions.jcs.conflate.boundarymatch;
import com.vividsolutions.jump.feature.Feature;
-import com.vividsolutions.jump.util.CoordinateArrays;
import com.vividsolutions.jts.algorithm.RobustCGAlgorithms;
import com.vividsolutions.jts.geom.*;
import java.util.*;
@@ -139,12 +138,12 @@
public List getAdjustedVertexIndicators()
{
MatchedShell ms = getMatchedShell();
- List coordArrays = null;
+ List<Coordinate[]> coordArrays = null;
coordArrays = ms.computeAdjustedVertexIndicators();
Geometry g = (Geometry) feature.getGeometry();
GeometryFactory fact = new GeometryFactory(g.getPrecisionModel(),
g.getSRID());
- return CoordinateArrays.fromCoordinateArrays(coordArrays, fact);
+ return
com.vividsolutions.jump.util.CoordinateArrays.fromCoordinateArrays(coordArrays,
fact);
}
public List getAdjustedEdgeIndicators()
@@ -155,7 +154,7 @@
Geometry g = (Geometry) feature.getGeometry();
GeometryFactory fact = new GeometryFactory(g.getPrecisionModel(),
g.getSRID());
- return CoordinateArrays.fromCoordinateArrays(coordArrays, fact);
+ return
com.vividsolutions.jump.util.CoordinateArrays.fromCoordinateArrays(coordArrays,
fact);
}
public boolean isAdjusted()
@@ -223,7 +222,7 @@
shellPts = (Coordinate[]) coord.clone();
RobustCGAlgorithms cga = new RobustCGAlgorithms();
if (cga.isCCW(shellPts)) {
- CoordinateArrays.reverse(shellPts);
+ com.vividsolutions.jts.geom.CoordinateArrays.reverse(shellPts);
}
}
@@ -232,7 +231,6 @@
* it with all neighbour features. (If a neighbour feature
* is flagged as overlapping, however, it is skipped)
*
- * @param sm the SegmentMatcher used to check for matches
*/
public void computeVertexMatches(double distanceTolerance) {
MatchedShell shell = getMatchedShell();
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedSegment.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedSegment.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedSegment.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -36,6 +36,7 @@
import java.util.*;
import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.CoordinateList;
import com.vividsolutions.jump.geom.*;
import com.vividsolutions.jts.geom.LineSegment;
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedShellReference.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedShellReference.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedShellReference.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -34,9 +34,6 @@
package com.vividsolutions.jcs.conflate.boundarymatch;
-import com.vividsolutions.jump.geom.CoordinateList;
-import com.vividsolutions.jts.util.Assert;
-import com.vividsolutions.jump.util.CoordinateArrays;
import com.vividsolutions.jts.geom.*;
import java.util.*;
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedShellSubject.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedShellSubject.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/boundarymatch/MatchedShellSubject.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -34,8 +34,6 @@
package com.vividsolutions.jcs.conflate.boundarymatch;
-import com.vividsolutions.jump.geom.CoordinateList;
-import com.vividsolutions.jts.util.Assert;
import com.vividsolutions.jump.util.CoordinateArrays;
import com.vividsolutions.jts.geom.*;
import java.util.*;
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/HideConflationAttributesFeature.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/HideConflationAttributesFeature.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/HideConflationAttributesFeature.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -83,7 +83,7 @@
return schema;
}
- public Object clone() {
+ public Feature clone() {
throw new UnsupportedOperationException();
}
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/ResultFeature.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/ResultFeature.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/ResultFeature.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -67,7 +67,7 @@
return (FUTURE_AttributeMapping.CombinedSchema) roadSegment
.getNetwork().getFeatureCollection().getFeatureSchema();
}
- public Object clone() {
+ public Feature clone() {
return clone(true);
}
public Object[] getAttributes() {
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/SourceFeature.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/SourceFeature.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/conflate/roads/model/SourceFeature.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -58,7 +58,7 @@
this.roadSegment = roadSegment;
}
- public Object clone() {
+ public Feature clone() {
return clone(true);
}
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_Java2XML.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_Java2XML.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_Java2XML.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -7,19 +7,20 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
import com.vividsolutions.jts.util.Assert;
import com.vividsolutions.jump.util.LangUtil;
import com.vividsolutions.jump.util.java2xml.Java2XML;
import com.vividsolutions.jump.util.java2xml.XMLBinder;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+
/**
* Fixes #specResourceStream.
*/
public class FUTURE_Java2XML extends Java2XML {
protected List specElements(Class c) throws XMLBinderException,
- JDOMException, IOException {
+ IOException {
InputStream stream = specResourceStream(c);
if (stream == null) {
throw new XMLBinderException("Could not find java2xml file for "
@@ -27,6 +28,7 @@
}
try {
Element root = new SAXBuilder().build(stream).getRootElement();
+
if (!root.getAttributes().isEmpty()) {
throw new XMLBinderException("Root element of "
+ _specFilename(c) + " should not have attributes");
@@ -36,6 +38,8 @@
+ _specFilename(c) + " should be named 'root'");
}
return root.getChildren();
+ } catch(JDOMException e) {
+ throw new XMLBinderException(e.getMessage());
} finally {
stream.close();
}
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_StandardReaderWriterFileDataSource.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_StandardReaderWriterFileDataSource.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_StandardReaderWriterFileDataSource.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -22,19 +22,19 @@
this.extensions = extensions;
}
}
- public static class Shapefile extends ClassicReaderWriterFileDataSource {
- public Shapefile() {
- super(new ShapefileReader(), new ShapefileWriter() {
- public GeometryCollection makeSHAPEGeometryCollection(
- FeatureCollection fc) throws Exception {
- //Avoid "Could not determine shapefile type - data is
- //either all GeometryCollections or empty" exception
- //[Jon Aquino 2004-05-04]
- return fc.isEmpty() ? new GeometryFactory()
- .createGeometryCollection(new Geometry[]{}) : super
- .makeSHAPEGeometryCollection(fc);
- }
- }, new String[]{"shp"});
- }
- }
+ //public static class Shapefile extends ClassicReaderWriterFileDataSource {
+ // public Shapefile() {
+ // super(new ShapefileReader(), new ShapefileWriter() {
+ // public GeometryCollection makeSHAPEGeometryCollection(
+ // FeatureCollection fc) throws Exception {
+ // //Avoid "Could not determine shapefile type - data is
+ // //either all GeometryCollections or empty" exception
+ // //[Jon Aquino 2004-05-04]
+ // return fc.isEmpty() ? new GeometryFactory()
+ // .createGeometryCollection(new Geometry[]{}) :
super
+ // .makeSHAPEGeometryCollection(fc);
+ // }
+ // }, new String[]{"shp"});
+ // }
+ //}
}
\ No newline at end of file
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_XML2Java.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_XML2Java.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/jump/FUTURE_XML2Java.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -13,13 +13,12 @@
import java.util.List;
import java.util.Map;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-
import com.vividsolutions.jts.util.Assert;
import com.vividsolutions.jump.util.StringUtil;
import com.vividsolutions.jump.util.java2xml.XML2Java;
import com.vividsolutions.jump.util.java2xml.XMLBinder;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
public class FUTURE_XML2Java extends XML2Java {
private interface Block {
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ExportResultPackagePlugIn.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ExportResultPackagePlugIn.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ExportResultPackagePlugIn.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -12,7 +12,7 @@
import
com.vividsolutions.jcs.conflate.roads.vertextransfer.VertexTransferStatistics;
import com.vividsolutions.jcs.jump.FUTURE_CollectionUtil;
import com.vividsolutions.jcs.jump.FUTURE_FileUtil;
-import com.vividsolutions.jcs.jump.FUTURE_StandardReaderWriterFileDataSource;
+//import com.vividsolutions.jcs.jump.FUTURE_StandardReaderWriterFileDataSource;
import com.vividsolutions.jcs.plugin.issuelog.IssueLog;
import com.vividsolutions.jump.feature.FeatureCollection;
import com.vividsolutions.jump.feature.FeatureDataset;
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/LegendToolboxPanel.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/LegendToolboxPanel.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/LegendToolboxPanel.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -20,12 +20,12 @@
import com.vividsolutions.jump.task.DummyTaskMonitor;
import com.vividsolutions.jump.util.Blackboard;
import com.vividsolutions.jump.util.StringUtil;
+import com.vividsolutions.jump.workbench.JUMPWorkbench;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.LayerManager;
import com.vividsolutions.jump.workbench.model.LayerManagerProxy;
-import com.vividsolutions.jump.workbench.ui.ErrorHandler;
-import com.vividsolutions.jump.workbench.ui.LayerViewPanel;
-import com.vividsolutions.jump.workbench.ui.LayerViewPanelContext;
+import com.vividsolutions.jump.workbench.ui.*;
+
import javax.swing.*;
public class LegendToolboxPanel extends JPanel {
@@ -661,13 +661,31 @@
return blackboard;
}
- public ErrorHandler getErrorHandler() {
- return new ErrorHandler() {
+ public ErrorHandlerV2 getErrorHandler()
{
+ return new ErrorHandlerV2() {
public void
handleThrowable(Throwable t) {
t.printStackTrace(System.err);
}
+ public void
handleThrowable(Throwable t, Component c) {
+
t.printStackTrace(System.err);
+ }
};
}
+
+ public LayerNamePanel
getLayerNamePanel() {
+ // Not implemented
+ return null;
+ }
+
+ public LayerableNamePanel
getLayerableNamePanel() {
+ // Not implemented
+ return null;
+ }
+
+ public JUMPWorkbench getWorkbench() {
+ // Not implemented
+ return
JUMPWorkbench.getInstance();
+ }
}));
frame.pack();
frame.setVisible(true);
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ResultPackageExporter.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ResultPackageExporter.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ResultPackageExporter.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -13,7 +13,7 @@
import com.vividsolutions.jcs.jump.FUTURE_CollectionUtil;
import com.vividsolutions.jcs.jump.FUTURE_FeatureCollectionUtil;
import com.vividsolutions.jcs.jump.FUTURE_FileUtil;
-import com.vividsolutions.jcs.jump.FUTURE_StandardReaderWriterFileDataSource;
+//import com.vividsolutions.jcs.jump.FUTURE_StandardReaderWriterFileDataSource;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.CoordinateFilter;
import com.vividsolutions.jump.feature.Feature;
@@ -23,6 +23,7 @@
import com.vividsolutions.jump.feature.FeatureSchema;
import com.vividsolutions.jump.io.datasource.Connection;
import com.vividsolutions.jump.io.datasource.DataSource;
+import
com.vividsolutions.jump.io.datasource.StandardReaderWriterFileDataSource;
import com.vividsolutions.jump.task.TaskMonitor;
import com.vividsolutions.jump.util.Block;
import com.vividsolutions.jump.util.CollectionUtil;
@@ -50,9 +51,10 @@
private void saveShapefile(FeatureCollection featureCollection, File
file,
TaskMonitor monitor) throws Exception {
- DataSource dataSource = new
FUTURE_StandardReaderWriterFileDataSource.Shapefile();
+ //DataSource dataSource = new
FUTURE_StandardReaderWriterFileDataSource.Shapefile();
+ DataSource dataSource = new
StandardReaderWriterFileDataSource.Shapefile();
dataSource.setProperties(Collections.singletonMap(DataSource.FILE_KEY,
- file.getPath()));
+ (Object)file.getPath()));
final FeatureSchema schema = uppercaseSchema(featureCollection
.getFeatureSchema());
Connection connection = dataSource.getConnection();
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ResultPackageSourceFeatureCollection.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ResultPackageSourceFeatureCollection.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/ResultPackageSourceFeatureCollection.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -183,7 +183,7 @@
return featureSchema;
}
- public Object clone() {
+ public Feature clone() {
throw new UnsupportedOperationException();
}
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/SelectInputLayersWizardPanel.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/SelectInputLayersWizardPanel.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/SelectInputLayersWizardPanel.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -370,7 +370,7 @@
}
public String getInstructions() {
- return "Choose the two input layers to conflate.\n\nThe
Reference Dataset choice is only used when a Match Precedence Rule of
\x93Reference Dataset\x94 is selected.";
+ return "Choose the two input layers to conflate.\n\nThe
Reference Dataset choice is only used when a Match Precedence Rule of Reference
Dataset is selected.";
}
public boolean isInputValid() {
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/SourcePackageManifest.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/SourcePackageManifest.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/SourcePackageManifest.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -7,7 +7,7 @@
import java.util.Map;
import com.vividsolutions.jcs.jump.FUTURE_Assert;
-import com.vividsolutions.jcs.jump.FUTURE_StandardReaderWriterFileDataSource;
+//import com.vividsolutions.jcs.jump.FUTURE_StandardReaderWriterFileDataSource;
import com.vividsolutions.jcs.jump.FUTURE_StringUtil;
import com.vividsolutions.jump.io.datasource.DataSource;
import
com.vividsolutions.jump.io.datasource.StandardReaderWriterFileDataSource;
@@ -107,7 +107,8 @@
private static Map FORMAT_TO_DATA_SOURCE_CLASS_MAP =
CollectionUtil
.createMap(new Object[] {
"shape",
-
FUTURE_StandardReaderWriterFileDataSource.Shapefile.class,
+
//FUTURE_StandardReaderWriterFileDataSource.Shapefile.class,
+
StandardReaderWriterFileDataSource.Shapefile.class,
"wkt",
StandardReaderWriterFileDataSource.WKT.class,
"jml",
StandardReaderWriterFileDataSource.JML.class,
"fmegml",
@@ -129,7 +130,7 @@
DataSource dataSource = (DataSource) ((Class)
FORMAT_TO_DATA_SOURCE_CLASS_MAP
.get(getFormat().toLowerCase())).newInstance();
dataSource.setProperties(Collections.singletonMap(
- DataSource.FILE_KEY, new
File(directory, getFileName())
+ DataSource.FILE_KEY,
(Object)new File(directory, getFileName())
.getPath()));
return dataSource;
} catch (InstantiationException e) {
Modified:
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/Transaction.java
===================================================================
---
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/Transaction.java
2016-12-06 22:36:10 UTC (rev 5250)
+++
plug-ins/RoadMatcher/trunk/src/com/vividsolutions/jcs/plugin/conflate/roads/Transaction.java
2016-12-06 22:38:06 UTC (rev 5251)
@@ -21,13 +21,13 @@
private LayerManager layerManager;
- private CollectionMap networkToAddedRoadSegmentsMap = new CollectionMap(
+ private CollectionMap<RoadNetwork,RoadSegment>
networkToAddedRoadSegmentsMap = new CollectionMap<>(
HashMap.class, HashSet.class);
- private CollectionMap networkToModifiedRoadSegmentsMap = new
CollectionMap(
+ private CollectionMap<RoadNetwork,RoadSegment>
networkToModifiedRoadSegmentsMap = new CollectionMap<>(
HashMap.class, HashSet.class);
- private CollectionMap networkToRemovedRoadSegmentsMap = new
CollectionMap(
+ private CollectionMap<RoadNetwork,RoadSegment>
networkToRemovedRoadSegmentsMap = new CollectionMap<>(
HashMap.class, HashSet.class);
private List operations = new ArrayList();
@@ -274,7 +274,7 @@
private Collection updateResultStates() {
return updateAffectedSegments(CollectionUtil.concatenate(Arrays
- .asList(new Collection[] {
+ .asList(
CollectionUtil
.concatenate(networkToAddedRoadSegmentsMap
.values()),
@@ -283,7 +283,7 @@
.values()),
CollectionUtil
.concatenate(networkToModifiedRoadSegmentsMap
-
.values()) })), toolboxModel
+
.values()) )), toolboxModel
.getSession(), monitor);
}
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
