Revision: 5099
http://sourceforge.net/p/jump-pilot/code/5099
Author: michaudm
Date: 2016-10-25 11:31:05 +0000 (Tue, 25 Oct 2016)
Log Message:
-----------
small cleaning
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/util/Timer.java
core/trunk/src/com/vividsolutions/jump/warp/CoordinateTransform.java
core/trunk/src/com/vividsolutions/jump/warp/Triangle.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadDatasetPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadSaveDatasetPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractSaveDatasetAsPlugIn.java
Modified: core/trunk/src/com/vividsolutions/jump/util/Timer.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/util/Timer.java 2016-10-25
07:11:00 UTC (rev 5098)
+++ core/trunk/src/com/vividsolutions/jump/util/Timer.java 2016-10-25
11:31:05 UTC (rev 5099)
@@ -3,7 +3,7 @@
public class Timer {
/**
* a helper method to measure time frames in milliseconds
- * @param time in milliseconds
+ * @param i time in milliseconds
* @return milliseconds since time
*/
public static long milliSecondsSince( long i ){
@@ -12,7 +12,7 @@
/**
* a helper method to nicely format the above output e.g. 12046ms -> 12.05s
- * @param milliseconds
+ * @param i milliseconds
* @return eg. "1.05" for a difference of 1047ms
*/
public static String secondsSinceString( long i ){
Modified: core/trunk/src/com/vividsolutions/jump/warp/CoordinateTransform.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/warp/CoordinateTransform.java
2016-10-25 07:11:00 UTC (rev 5098)
+++ core/trunk/src/com/vividsolutions/jump/warp/CoordinateTransform.java
2016-10-25 11:31:05 UTC (rev 5099)
@@ -68,7 +68,7 @@
for (Iterator i = featureCollection.iterator(); i.hasNext();) {
Feature feature = (Feature) i.next();
Geometry newGeometry = transform(feature.getGeometry());
- Feature newFeature = (Feature) feature.clone(false);
+ Feature newFeature = feature.clone(false);
newFeature.setGeometry(newGeometry);
newCollection.add(newFeature);
}
Modified: core/trunk/src/com/vividsolutions/jump/warp/Triangle.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/warp/Triangle.java 2016-10-25
07:11:00 UTC (rev 5098)
+++ core/trunk/src/com/vividsolutions/jump/warp/Triangle.java 2016-10-25
11:31:05 UTC (rev 5099)
@@ -37,7 +37,7 @@
import java.util.ArrayList;
import java.util.List;
-import com.vividsolutions.jts.algorithm.RobustCGAlgorithms;
+import com.vividsolutions.jts.algorithm.CGAlgorithms;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jts.geom.GeometryFactory;
@@ -143,8 +143,6 @@
return toLinearRing().toString();
}
- private static RobustCGAlgorithms cga = new RobustCGAlgorithms();
-
/**
* Returns whether this Triangle contains the given coordinate
* @param p the point to test for containment
@@ -159,11 +157,11 @@
//is not robust (see TriangulatorTestCase#testContains2) [Jon Aquino]
//Can't simply use != because if one is 1 and the other is 0 that's
OK. [Jon Aquino]
- if (cga.computeOrientation(p1, p2, p) == - cga.computeOrientation(p2,
p3, p)) {
+ if (CGAlgorithms.computeOrientation(p1, p2, p) == -
CGAlgorithms.computeOrientation(p2, p3, p)) {
return false;
}
- if (cga.computeOrientation(p1, p2, p) == - cga.computeOrientation(p3,
p1, p)) {
+ if (CGAlgorithms.computeOrientation(p1, p2, p) == -
CGAlgorithms.computeOrientation(p3, p1, p)) {
return false;
}
@@ -208,7 +206,7 @@
* given Coordinate
*/
public List subTriangles(Coordinate newVertex) {
- ArrayList triangles = new ArrayList();
+ ArrayList<Triangle> triangles = new ArrayList<>();
triangles.add(new Triangle(p1, p2, newVertex));
triangles.add(new Triangle(p2, p3, newVertex));
triangles.add(new Triangle(p3, p1, newVertex));
@@ -301,11 +299,11 @@
}
private class SaalfeldCoefficients {
- public double A1;
- public double B1;
- public double C1;
- public double A2;
- public double B2;
- public double C2;
+ double A1;
+ double B1;
+ double C1;
+ double A2;
+ double B2;
+ double C2;
}
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadDatasetPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadDatasetPlugIn.java
2016-10-25 07:11:00 UTC (rev 5098)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadDatasetPlugIn.java
2016-10-25 11:31:05 UTC (rev 5099)
@@ -1,10 +1,6 @@
package com.vividsolutions.jump.workbench.datasource;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.Iterator;
@@ -16,20 +12,18 @@
import com.vividsolutions.jump.io.datasource.Connection;
import com.vividsolutions.jump.io.datasource.DataSourceQuery;
import com.vividsolutions.jump.task.TaskMonitor;
-import com.vividsolutions.jump.util.CollectionUtil;
import com.vividsolutions.jump.util.StringUtil;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.StandardCategoryNames;
import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory;
import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
-import com.vividsolutions.jump.workbench.ui.GUIUtil;
-import com.vividsolutions.jump.workbench.ui.WorkbenchFrame;
import org.openjump.core.ui.util.ExceptionUtil;
-public abstract class AbstractLoadDatasetPlugIn extends
AbstractLoadSaveDatasetPlugIn {
- public void run(TaskMonitor monitor, PlugInContext context)
- throws Exception {
+public abstract class AbstractLoadDatasetPlugIn extends
AbstractLoadSaveDatasetPlugIn {
+
+ public void run(TaskMonitor monitor, PlugInContext context) throws
Exception {
+
//Seamus Thomas Carroll [mailto:carro...@cpsc.ucalgary.ca]
//was concerned when he noticed that #getDataSourceQueries
//was being called twice. So call it once only. [Jon Aquino 2004-02-05]
@@ -38,7 +32,7 @@
boolean exceptionsEncountered = false;
for (Iterator i = getDataSourceQueries().iterator(); i.hasNext();) {
DataSourceQuery dataSourceQuery = (DataSourceQuery) i.next();
- ArrayList exceptions = new ArrayList();
+ ArrayList<Throwable> exceptions = new ArrayList<>();
Assert.isTrue(dataSourceQuery.getDataSource().isReadable());
monitor.report(I18N.get("datasource.LoadDatasetPlugIn.loading")+"
" + dataSourceQuery.toString() + "...");
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadSaveDatasetPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadSaveDatasetPlugIn.java
2016-10-25 07:11:00 UTC (rev 5098)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractLoadSaveDatasetPlugIn.java
2016-10-25 11:31:05 UTC (rev 5099)
@@ -10,9 +10,11 @@
import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
public abstract class AbstractLoadSaveDatasetPlugIn extends ThreadedBasePlugIn
{
+
private WorkbenchContext context;
protected String getLastFormatKey() { return getClass().getName() + " -
LAST FORMAT"; }
protected String getLastDirectoryKey() { return getClass().getName() + " -
LAST DIRECTORY"; }
+
public void initialize(final PlugInContext context) throws Exception {
this.context = context.getWorkbenchContext();
//Give other plug-ins a chance to add DataSourceQueryChoosers
@@ -27,12 +29,14 @@
}
});
}
+
protected abstract void setSelectedFormat(String format);
protected abstract String getSelectedFormat();
protected WorkbenchContext getContext() {
return context;
}
private Collection dataSourceQueries;
+
public boolean execute(PlugInContext context) throws Exception {
dataSourceQueries = showDialog(context.getWorkbenchContext());
if (dataSourceQueries != null) {
@@ -41,7 +45,9 @@
}
return dataSourceQueries != null;
}
+
protected abstract Collection showDialog(WorkbenchContext context);
+
protected Collection getDataSourceQueries() {
return dataSourceQueries;
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractSaveDatasetAsPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractSaveDatasetAsPlugIn.java
2016-10-25 07:11:00 UTC (rev 5098)
+++
core/trunk/src/com/vividsolutions/jump/workbench/datasource/AbstractSaveDatasetAsPlugIn.java
2016-10-25 11:31:05 UTC (rev 5099)
@@ -11,8 +11,7 @@
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
public abstract class AbstractSaveDatasetAsPlugIn
- extends
- AbstractLoadSaveDatasetPlugIn {
+ extends AbstractLoadSaveDatasetPlugIn {
public void run(TaskMonitor monitor, PlugInContext context)
throws Exception {
------------------------------------------------------------------------------
The Command Line: Reinvented for Modern Developers
Did the resurgence of CLI tooling catch you by surprise?
Reconnect with the command line and become more productive.
Learn the new .NET and ASP.NET CLI. Get your free copy!
http://sdm.link/telerik
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
