From dcf2c1656ae0b7faf57ed2748f461ce92970bd21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Michaud?= Date: Sat, 2 Jul 2022 15:51:31 +0200 Subject: [PATCH] remove unused imports --- .../ui/plugin/analysis/BufferPlugIn.java | 1 - .../CalculateAreasAndLengthsPlugIn.java | 23 +------ .../ui/plugin/analysis/ConvexHullPlugIn.java | 1 - .../ui/plugin/analysis/GeometryPredicate.java | 2 - .../ui/plugin/analysis/OffsetCurvePlugIn.java | 67 ++++++------------- .../plugin/analysis/RemoveSmallSegments.java | 2 - .../plugin/analysis/SpatialQueryPlugIn.java | 1 - 7 files changed, 23 insertions(+), 74 deletions(-) diff --git a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/BufferPlugIn.java b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/BufferPlugIn.java index 42b502843..df29c4a34 100644 --- a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/BufferPlugIn.java +++ b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/BufferPlugIn.java @@ -52,7 +52,6 @@ import com.vividsolutions.jump.workbench.WorkbenchContext; import com.vividsolutions.jump.workbench.model.*; import com.vividsolutions.jump.workbench.plugin.*; -import com.vividsolutions.jump.workbench.plugin.StartMacroPlugIn; import com.vividsolutions.jump.workbench.ui.*; import com.vividsolutions.jump.workbench.ui.images.IconLoader; import com.vividsolutions.jump.workbench.ui.plugin.clipboard.PasteItemsPlugIn; diff --git a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/CalculateAreasAndLengthsPlugIn.java b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/CalculateAreasAndLengthsPlugIn.java index ca5377fdd..5dbcb3c0b 100644 --- a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/CalculateAreasAndLengthsPlugIn.java +++ b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/CalculateAreasAndLengthsPlugIn.java @@ -30,35 +30,15 @@ * www.vividsolutions.com */ package com.vividsolutions.jump.workbench.ui.plugin.analysis; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.image.BufferedImage; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; -import java.util.Vector; -import javax.swing.DefaultComboBoxModel; -import javax.swing.Icon; -import javax.swing.ImageIcon; -import javax.swing.JCheckBox; -import javax.swing.JComboBox; import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JMenuItem; import org.locationtech.jts.geom.Geometry; import com.vividsolutions.jump.I18N; import com.vividsolutions.jump.feature.AttributeType; import com.vividsolutions.jump.feature.Feature; -import com.vividsolutions.jump.feature.FeatureSchema; -import com.vividsolutions.jump.util.Blackboard; -import com.vividsolutions.jump.util.CollectionUtil; -import com.vividsolutions.jump.util.StringUtil; import com.vividsolutions.jump.workbench.WorkbenchContext; import com.vividsolutions.jump.workbench.model.FeatureEventType; import com.vividsolutions.jump.workbench.model.Layer; @@ -68,8 +48,7 @@ import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck; import com.vividsolutions.jump.workbench.plugin.PlugInContext; import com.vividsolutions.jump.workbench.ui.*; -import com.vividsolutions.jump.workbench.ui.images.IconLoader; -import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller; + /** * Calculates areas and lengths from information obtained diff --git a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/ConvexHullPlugIn.java b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/ConvexHullPlugIn.java index 994a79929..36be68c89 100644 --- a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/ConvexHullPlugIn.java +++ b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/ConvexHullPlugIn.java @@ -37,7 +37,6 @@ import java.util.List; import javax.swing.JComboBox; -import javax.swing.JMenuItem; import org.locationtech.jts.geom.*; import com.vividsolutions.jump.I18N; diff --git a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/GeometryPredicate.java b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/GeometryPredicate.java index e5e39ced1..6a7459dee 100644 --- a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/GeometryPredicate.java +++ b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/GeometryPredicate.java @@ -34,9 +34,7 @@ package com.vividsolutions.jump.workbench.ui.plugin.analysis; import java.util.*; -import org.locationtech.jts.algorithm.*; import org.locationtech.jts.geom.*; -import org.locationtech.jts.simplify.*; import com.vividsolutions.jump.qa.diff.BufferGeometryMatcher; import com.vividsolutions.jump.workbench.ui.GenericNames; diff --git a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/OffsetCurvePlugIn.java b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/OffsetCurvePlugIn.java index fdc6867ea..9a4f53093 100644 --- a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/OffsetCurvePlugIn.java +++ b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/OffsetCurvePlugIn.java @@ -34,36 +34,25 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; import java.lang.Exception; import java.lang.Integer; import java.util.*; import java.util.Collection; -import javax.swing.DefaultComboBoxModel; -import javax.swing.ImageIcon; import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JTextField; import org.locationtech.jts.geom.*; import com.vividsolutions.jump.I18N; -import org.locationtech.jts.algorithm.CGAlgorithms; import org.locationtech.jts.algorithm.distance.DistanceToPoint; import org.locationtech.jts.algorithm.distance.PointPairDistance; import org.locationtech.jts.geom.Position; -import org.locationtech.jts.math.Vector2D; -import org.locationtech.jts.noding.SegmentString; import org.locationtech.jts.operation.buffer.OffsetCurveBuilder; -import org.locationtech.jts.operation.buffer.BufferCurveSetBuilder; import org.locationtech.jts.operation.buffer.BufferOp; import org.locationtech.jts.operation.buffer.BufferParameters; import org.locationtech.jts.operation.linemerge.LineMerger; -import org.locationtech.jts.operation.union.UnaryUnionOp; -import org.locationtech.jts.simplify.DouglasPeuckerSimplifier; import com.vividsolutions.jump.feature.*; import com.vividsolutions.jump.task.*; import com.vividsolutions.jump.workbench.WorkbenchContext; @@ -71,7 +60,6 @@ import com.vividsolutions.jump.workbench.plugin.*; import com.vividsolutions.jump.workbench.ui.*; import com.vividsolutions.jump.workbench.ui.images.IconLoader; -import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller; import com.vividsolutions.jump.workbench.ui.plugin.clipboard.PasteItemsPlugIn; import org.openjump.core.ui.plugin.AbstractThreadedUiPlugIn; @@ -116,7 +104,7 @@ public class OffsetCurvePlugIn extends AbstractThreadedUiPlugIn { private String JOIN_ROUND; private String MITRE_LIMIT; - private List joinStyles; + private List joinStyles; private Layer layer; private double offsetDistance = 1.0; @@ -143,9 +131,9 @@ public void setCategoryName(String value) { } public void initialize(PlugInContext context) throws Exception { - context.getFeatureInstaller().addMainMenuItem( + context.getFeatureInstaller().addMainMenuPlugin(this, new String[] {MenuNames.TOOLS, MenuNames.TOOLS_ANALYSIS}, - this, + getName(), false, null, createEnableCheck(context.getWorkbenchContext()) ); } @@ -187,7 +175,7 @@ public boolean execute(PlugInContext context) throws Exception { JOIN_ROUND = I18N.getInstance().get("ui.plugin.analysis.BufferPlugIn.join-round"); MITRE_LIMIT = I18N.getInstance().get("ui.plugin.analysis.BufferPlugIn.mitre-join-limit"); - joinStyles = new ArrayList(); + joinStyles = new ArrayList<>(); joinStyles.add(JOIN_BEVEL); joinStyles.add(JOIN_MITRE); joinStyles.add(JOIN_ROUND); @@ -212,7 +200,7 @@ public void run(TaskMonitor monitor, PlugInContext context) throws Exception{ featureSchema.addAttribute("GEOMETRY", AttributeType.GEOMETRY); FeatureCollection resultFC = new FeatureDataset(featureSchema); // Fill inputC with features to be processed - Collection inputC; + Collection inputC; if (useSelected) { inputC = context.getLayerViewPanel().getSelectionManager().getFeaturesWithSelectedItems(); Feature feature = (Feature) inputC.iterator().next(); @@ -231,11 +219,10 @@ public void run(TaskMonitor monitor, PlugInContext context) throws Exception{ return; } // Create offsets for each input feature - Collection resultGeomColl = runOffset(monitor, context, inputFD); + Collection resultGeomColl = runOffset(monitor, context, inputFD); FeatureCollection resultFeatureColl = new FeatureDataset(featureSchema); Iterator iResult = resultGeomColl.iterator(); - for (Iterator iSource = inputFD.iterator(); iSource.hasNext(); ) { - Feature sourceFeature = (Feature) iSource.next(); + for (Feature sourceFeature : inputFD.getFeatures()) { Geometry gResult = (Geometry) iResult.next(); if (!(gResult == null || gResult.isEmpty())) { Feature newFeature = sourceFeature.clone(true); @@ -260,14 +247,13 @@ public void run(TaskMonitor monitor, PlugInContext context) throws Exception{ context.addLayer(categoryName, name, resultFC); } - private Collection runOffset(TaskMonitor monitor, PlugInContext context, FeatureCollection fcA) throws Exception { + private Collection runOffset(TaskMonitor monitor, PlugInContext context, FeatureCollection fcA) throws Exception { int total = fcA.size(); int count = 0; - Collection resultColl = new ArrayList(); - for (Iterator ia = fcA.iterator(); ia.hasNext(); ) { + Collection resultColl = new ArrayList<>(); + for (Feature fa : fcA.getFeatures()) { monitor.report(count++, total, I18N.getInstance().get("com.vividsolutions.jump.qa.diff.DiffGeometry.features")); if (monitor.isCancelRequested()) break; - Feature fa = (Feature) ia.next(); Geometry ga = fa.getGeometry(); if (fromAttribute) { Object o = fa.getAttribute(attributeIndex); @@ -283,7 +269,7 @@ else if (o instanceof Integer) } catch (Exception e) { String errorMessage = I18N.getInstance().get( "ui.plugin.analysis.BufferPlugIn.error-found", - new Object[]{fa.getID(), ga.getCoordinate().x, ga.getCoordinate().x}); + fa.getID(), ga.getCoordinate().x, ga.getCoordinate().x); context.getWorkbenchFrame().warnUser(errorMessage); throw new Exception(errorMessage, e); } @@ -298,7 +284,7 @@ private Geometry runOffset(Geometry a) throws TopologyException, Exception { BufferParameters parameters = new BufferParameters(quadrantSegments, BufferParameters.CAP_FLAT, joinStyleCode, mitreLimit); - Collection offsetCurves = new ArrayList(); + Collection offsetCurves = new ArrayList<>(); if (roughOffsetCurve) { addRoughOffsetCurves(offsetCurves, a, parameters); @@ -309,20 +295,20 @@ private Geometry runOffset(Geometry a) throws TopologyException, Exception { } - private Collection merge(Collection linestrings) { + private Collection merge(Collection linestrings) { LineMerger merger = new LineMerger(); merger.add(linestrings); return merger.getMergedLineStrings(); } - private void addCleanOffsetCurves(Collection offsetCurves, + private void addCleanOffsetCurves(Collection offsetCurves, Geometry sourceCurve, BufferParameters parameters) { parameters.setSingleSided(true); parameters.setQuadrantSegments(quadrantSegments); Geometry sidedBuffer = new BufferOp(sourceCurve, parameters) .getResultGeometry(offsetDistance) .getBoundary(); - Collection offsetSegments = new ArrayList(); + Collection offsetSegments = new ArrayList<>(); // Segments located entirely under this distance are excluded double lowerBound = Math.abs(offsetDistance)*Math.sin(Math.PI/(4*quadrantSegments)); // Segments located entirely over this distance are included @@ -369,7 +355,7 @@ else if (Math.min(di, dj) > lowerBound && Math.max(di, dj) < upperBound) { // Recursive function to split segments located on the single-side buffer // boundary, but having a part of them inside the full buffer. - private void divide(Collection offsetSegments, Geometry sourceCurve, + private void divide(Collection offsetSegments, Geometry sourceCurve, Coordinate c1, Coordinate c2, double d1, double d2, double lb, double ub) { // I stop recursion for segment < 2*lb to exclude small segments // perpendicular but very close to the boundary @@ -401,7 +387,7 @@ else if (Math.min(d, d2) > ub) { } } - private void addRoughOffsetCurves(Collection offsetCurves, + private void addRoughOffsetCurves(Collection offsetCurves, Geometry sourceCurve, BufferParameters parameters) { OffsetCurveBuilder builder = new OffsetCurveBuilder( @@ -460,16 +446,8 @@ public void actionPerformed(ActionEvent e) { updateControls(dialog); } }); - fromAttributeCheckBox.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - updateControls(dialog); - } - }); - joinStyleComboBox.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - updateControls(dialog); - } - }); + fromAttributeCheckBox.addActionListener(e -> updateControls(dialog)); + joinStyleComboBox.addActionListener(e -> updateControls(dialog)); } private void getDialogValues(MultiInputDialog dialog) { @@ -497,8 +475,8 @@ private void getDialogValues(MultiInputDialog dialog) { } private int joinStyleCode(String joinStyle) { - if (joinStyle == JOIN_BEVEL) return BufferParameters.JOIN_BEVEL; - if (joinStyle == JOIN_MITRE) return BufferParameters.JOIN_MITRE; + if (joinStyle.equals(JOIN_BEVEL)) return BufferParameters.JOIN_BEVEL; + if (joinStyle.equals(JOIN_MITRE)) return BufferParameters.JOIN_MITRE; return BufferParameters.JOIN_ROUND; } @@ -519,8 +497,7 @@ protected void updateControls(final MultiInputDialog dialog) { dialog.setFieldEnabled(FROM_ATTRIBUTE, !useSelected && hasNumericAttributes); dialog.setFieldEnabled(ATTRIBUTE, !useSelected && fromAttribute && hasNumericAttributes); dialog.setFieldEnabled(QUADRANT_SEGMENTS, joinStyleCode == BufferParameters.JOIN_ROUND); - dialog.setFieldEnabled(MITRE_LIMIT, - joinStyleCode == BufferParameters.JOIN_MITRE); + dialog.setFieldEnabled(MITRE_LIMIT, joinStyleCode == BufferParameters.JOIN_MITRE); } } diff --git a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/RemoveSmallSegments.java b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/RemoveSmallSegments.java index 2f44c0834..a2b3ebf6a 100644 --- a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/RemoveSmallSegments.java +++ b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/RemoveSmallSegments.java @@ -1,11 +1,9 @@ package com.vividsolutions.jump.workbench.ui.plugin.analysis; import org.locationtech.jts.geom.*; -import org.locationtech.jts.operation.valid.IsValidOp; import com.vividsolutions.jump.geom.AbstractGeometryProcessor; import java.util.List; -import java.util.PriorityQueue; /** * Simplifier removing segments based on their size, and taking care to remove diff --git a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/SpatialQueryPlugIn.java b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/SpatialQueryPlugIn.java index c23080a48..92bac6b99 100644 --- a/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/SpatialQueryPlugIn.java +++ b/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/SpatialQueryPlugIn.java @@ -42,7 +42,6 @@ import com.vividsolutions.jump.workbench.plugin.*; import com.vividsolutions.jump.workbench.ui.*; import com.vividsolutions.jump.workbench.ui.images.IconLoader; -import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller; import javax.swing.*; import java.awt.event.ItemEvent;