From ac1970b90122e89589e952276a21bef60c33c1a2 Mon Sep 17 00:00:00 2001 From: Mike Barry Date: Wed, 8 Nov 2023 06:12:04 -0500 Subject: [PATCH] add missing @overrides without whitespace diffs Signed-off-by: Mike Barry --- .../function/OverlayNoSnapFunctions.java | 1 + .../StaticMethodGeometryFunction.java | 3 ++- .../jtstest/testbuilder/GeometryEditPanel.java | 7 +++++++ .../testbuilder/GeometryFunctionListPanel.java | 2 ++ .../testbuilder/GeometryFunctionTreePanel.java | 3 +++ .../jtstest/testbuilder/GeometryTreePanel.java | 7 ++++++- .../jtstest/testbuilder/LayerListPanel.java | 15 ++++++++++++++- .../testbuilder/geom/GeometryBoxDeleter.java | 2 ++ .../geom/GeometryVertexDeleter.java | 1 + .../geom/GeometryVertexInserter.java | 1 + .../testbuilder/geom/GeometryVertexMover.java | 1 + .../io/shapefile/MultiLineHandler.java | 3 +++ .../io/shapefile/MultiPointHandler.java | 3 +++ .../testbuilder/io/shapefile/PointHandler.java | 5 ++++- .../io/shapefile/PolygonHandler.java | 3 +++ .../topostretch/GeometryVerticesMover.java | 1 + .../jtstest/testbuilder/ui/ClipImage.java | 4 ++++ .../jtstest/testbuilder/ui/dnd/FileDrop.java | 16 ++++++++++------ .../ui/style/ArrowLineEndStyle.java | 1 + .../ui/style/CircleLineEndStyle.java | 1 + .../testbuilder/ui/style/ComponentStyle.java | 3 ++- .../testbuilder/ui/style/LineStringStyle.java | 3 ++- .../ui/style/PolygonStructureStyle.java | 1 + .../testbuilder/ui/tools/BasicTool.java | 18 ++++++++++++++++-- .../testbuilder/ui/tools/DeleteByBoxTool.java | 3 ++- .../testbuilder/ui/tools/EditVertexTool.java | 7 ++++++- .../ui/tools/ExtractComponentTool.java | 3 ++- .../testbuilder/ui/tools/IndicatorTool.java | 4 +++- .../jtstest/testbuilder/ui/tools/InfoTool.java | 3 ++- .../jtstest/testbuilder/ui/tools/MoveTool.java | 6 +++++- .../testbuilder/ui/tools/RectangleTool.java | 3 ++- .../jtstest/testbuilder/ui/tools/ZoomTool.java | 7 ++++++- .../distance/DiscreteHausdorffDistance.java | 6 +++++- .../locate/SimplePointInAreaLocator.java | 1 + .../algorithm/match/AreaSimilarityMeasure.java | 1 + .../jts/awt/IdentityPointTransformation.java | 1 + .../jts/geom/prep/PreparedPolygonContains.java | 1 + .../jts/geom/prep/PreparedPolygonCovers.java | 1 + .../jts/geom/util/AffineTransformation.java | 6 +++++- .../jts/geom/util/GeometryEditor.java | 3 +++ .../index/intervalrtree/IntervalRTreeNode.java | 1 + .../BoundablePairDistanceComparator.java | 1 + .../locationtech/jts/io/ByteArrayInStream.java | 1 + .../locationtech/jts/io/gml2/GMLHandler.java | 8 ++++++++ .../java/org/locationtech/jts/math/DD.java | 4 +++- .../BufferCurveMaximumDistanceFinder.java | 6 +++++- .../CoordinatePrecisionReducerFilter.java | 3 +++ .../jts/simplify/DouglasPeuckerSimplifier.java | 6 +++++- .../quadedge/QuadEdgeSubdivision.java | 6 +++++- .../jts/generator/PointGenerator.java | 1 + .../jts/geom/GeometryOpGCUnsupportedTest.java | 18 +++++++++--------- .../PreparedPolygonPredicateStressTest.java | 1 + .../strtree/GeometryDistanceComparator.java | 1 + .../DDOrientationIndexAccuracyTest.java | 2 ++ .../algorithm/MCIndexedPointInAreaLocator.java | 2 ++ .../jtsexample/io/gml2/KMLReaderExample.java | 7 ++++++- .../jtslab/geom/util/GeometryEditorEx.java | 3 +++ .../OverlayValidatedGeometryOperation.java | 2 ++ .../geomop/PreparedGeometryOperation.java | 2 ++ .../geomop/StaticMethodGeometryFunction.java | 3 ++- .../jtstest/geomop/TeeGeometryOperation.java | 2 ++ .../testrunner/BufferResultMatcher.java | 3 ++- .../testrunner/EqualityResultMatcher.java | 3 ++- .../jtstest/testrunner/NullResultMatcher.java | 3 ++- 64 files changed, 208 insertions(+), 42 deletions(-) diff --git a/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNoSnapFunctions.java b/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNoSnapFunctions.java index 93b8c24ebc..ccaf904844 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNoSnapFunctions.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/function/OverlayNoSnapFunctions.java @@ -26,6 +26,7 @@ public class OverlayNoSnapFunctions { public static Geometry unaryUnion(Geometry a) { UnionStrategy unionSRFun = new UnionStrategy() { + @Override public Geometry union(Geometry g0, Geometry g1) { return OverlayOp.overlayOp(g0, g1, OverlayOp.UNION ); } diff --git a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/StaticMethodGeometryFunction.java b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/StaticMethodGeometryFunction.java index dba8b46203..01c449f7f5 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/StaticMethodGeometryFunction.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/geomfunction/StaticMethodGeometryFunction.java @@ -158,7 +158,8 @@ public StaticMethodGeometryFunction( isRequiredB = extractRequiredB(method); } - public Object invoke(Geometry g, Object[] arg) + @Override + public Object invoke(Geometry g, Object[] arg) { return invoke(method, null, createFullArgs(g, arg)); } diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java index 3ca39506c5..d5704ba251 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryEditPanel.java @@ -115,6 +115,7 @@ public GeometryEditPanel() { void initUI() throws Exception { this.addComponentListener(new java.awt.event.ComponentAdapter() { + @Override public void componentResized(ComponentEvent e) { this_componentResized(e); } @@ -132,11 +133,13 @@ public void componentResized(ComponentEvent e) { class PopupClickListener extends MouseAdapter { + @Override public void mousePressed(MouseEvent e) { if (e.isPopupTrigger()) doPopUp(e); } + @Override public void mouseReleased(MouseEvent e) { if (e.isPopupTrigger()) @@ -242,6 +245,7 @@ public void updateGeom() getGeomModel().geomChanged(); } + @Override public String getToolTipText(MouseEvent event) { // if (event.getPoint().x < 100) return null; Coordinate pt = viewport.toModelCoordinate(event.getPoint()); @@ -266,6 +270,7 @@ public String getInfo(Coordinate pt) return writer.writeLocationString(getLayerList(), pt, toleranceInModel); } + @Override public void paintComponent(Graphics g) { super.paintComponent(g); renderMgr.render(); @@ -596,6 +601,7 @@ public GeometryEditPanelRenderer() } } + @Override public void render(Graphics2D g2) { g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, @@ -795,6 +801,7 @@ public void renderRevealTopoWarning(Graphics2D g) } + @Override public synchronized void cancel() { if (currentRenderer != null) diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionListPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionListPanel.java index c2ae2e79f0..0fd7266c33 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionListPanel.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionListPanel.java @@ -44,6 +44,7 @@ public class GeometryFunctionListPanel extends JPanel { JScrollPane jScrollPane1 = new JScrollPane(); JList list = new JList(listModel){ + @Override public String getToolTipText(MouseEvent e) { int index = locationToIndex(e.getPoint()); if (-1 < index) { @@ -69,6 +70,7 @@ private class GeometryFunctionCellRenderer extends JLabel implements private final ImageIcon unaryIcon = new ImageIcon(this.getClass() .getResource("UnaryGeomFunction.png")); + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { GeometryFunction func = (GeometryFunction) value; diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionTreePanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionTreePanel.java index 3f6f0cb7eb..58847a79c8 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionTreePanel.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionTreePanel.java @@ -75,6 +75,7 @@ private class GeometryFunctionRenderer extends DefaultTreeCellRenderer { public GeometryFunctionRenderer() { } + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { @@ -127,6 +128,7 @@ private void jbInit() throws Exception { TreeSelectionModel.SINGLE_TREE_SELECTION); tree.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if (e.getClickCount() == 2) { GeometryFunction fun = getFunction(); @@ -137,6 +139,7 @@ public void mouseClicked(MouseEvent e) { } }); tree.addTreeSelectionListener(new TreeSelectionListener() { + @Override public void valueChanged(TreeSelectionEvent e) { GeometryFunction fun = getFunction(); if (fun != null) diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryTreePanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryTreePanel.java index 6d8ab5ae75..3218f22a3a 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryTreePanel.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryTreePanel.java @@ -49,6 +49,7 @@ private class GeometryTreeCellRenderer extends DefaultTreeCellRenderer { public GeometryTreeCellRenderer() { } + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { @@ -94,6 +95,7 @@ private void initUI() throws Exception { tree.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { Geometry geom = getSelectedGeometry(); if (geom == null) return; @@ -108,6 +110,7 @@ public void mouseClicked(MouseEvent e) { } }); tree.addTreeSelectionListener(new TreeSelectionListener() { + @Override public void valueChanged(TreeSelectionEvent e) { //GeometryFunction fun = getFunction(); //if (fun != null) @@ -168,13 +171,15 @@ public void populate(Geometry geom, int source, Comparator comp) { } //Required by TreeWillExpandListener interface. - public void treeWillExpand(TreeExpansionEvent e) + @Override + public void treeWillExpand(TreeExpansionEvent e) throws ExpandVetoException { TreePath path = e.getPath(); Object lastComp = path.getLastPathComponent(); } //Required by TreeWillExpandListener interface. + @Override public void treeWillCollapse(TreeExpansionEvent e) { // take no action } diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerListPanel.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerListPanel.java index 1894ce3c76..9eba345ed3 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerListPanel.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerListPanel.java @@ -97,6 +97,7 @@ private void uiInit() throws Exception { btnCopy = SwingUtil.createButton(AppIcons.ADD, "Copy layer to a new layer", new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { layerCopy(); } @@ -106,6 +107,7 @@ public void actionPerformed(ActionEvent e) { btnInspect = SwingUtil.createButton(AppIcons.GEOM_INSPECT, "Inspect layer geometry", new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { layerInspect(); } @@ -115,6 +117,7 @@ public void actionPerformed(ActionEvent e) { btnPaste = SwingUtil.createButton(AppIcons.PASTE, "Paste geometry into layer", new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { layerPaste(focusLayer); } @@ -123,6 +126,7 @@ public void actionPerformed(ActionEvent e) { btnUp = SwingUtil.createButton(AppIcons.UP, "Move layer up", new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { layerUp(focusLayer); } @@ -131,6 +135,7 @@ public void actionPerformed(ActionEvent e) { btnDown = SwingUtil.createButton(AppIcons.DOWN, "Move layer down", new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { layerDown(focusLayer); } @@ -140,6 +145,7 @@ public void actionPerformed(ActionEvent e) { btnDelete = SwingUtil.createButton(AppIcons.DELETE, AppStrings.TIP_LAYER_CLEAR, new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { if (SwingUtil.isCtlKeyPressed(e)) { layerDelete(focusLayer); @@ -315,6 +321,7 @@ class LayerItemPanel extends JPanel { self = this; } + @Override public String getToolTipText(MouseEvent e) { return layer.getNameInfo(); } @@ -352,6 +359,7 @@ private void uiInit() throws Exception { add(checkbox); checkbox.setAlignmentX(Component.LEFT_ALIGNMENT); checkbox.addActionListener(new java.awt.event.ActionListener() { + @Override public void actionPerformed(ActionEvent e) { layerVisAction(); } @@ -369,7 +377,8 @@ public void actionPerformed(ActionEvent e) { lblName.addMouseListener(new HighlightMouseListener(this)); lblName.addMouseListener(new MouseAdapter() { - public void mouseClicked(MouseEvent e) + @Override + public void mouseClicked(MouseEvent e) { lyrListPanel.setLayerFocus(self); } @@ -408,6 +417,7 @@ class HighlightMouseListener extends MouseAdapter { this.comp = comp; } + @Override public void mouseEntered(MouseEvent e) { if (comp.isFocusLayer()) return; comp.setBackground(CLR_HIGHLIGHT); @@ -415,6 +425,7 @@ public void mouseEntered(MouseEvent e) { comp.revalidate(); } + @Override public void mouseExited(MouseEvent e) { if (comp.isFocusLayer()) return; comp.setBackground(AppColors.BACKGROUND); @@ -434,6 +445,7 @@ public LayerName(Layer layer) { setToolTipText(layer.getName()); } + @Override public String getToolTipText(MouseEvent e) { return layer.getNameSummary(); } @@ -459,6 +471,7 @@ public LayerStyleSwatchControl(Layer layer) { setToolTipText(layer.getName()); } + @Override public String getToolTipText(MouseEvent e) { return layer.getNameSummary(); } diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryBoxDeleter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryBoxDeleter.java index 0952546113..e4e2356cb0 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryBoxDeleter.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryBoxDeleter.java @@ -100,6 +100,7 @@ public BoxDeleteComponentOperation(Envelope env, boolean deleteIntersecting) public boolean isEdited() { return isEdited; } + @Override public Geometry edit(Geometry geometry, GeometryFactory factory) { // Allow any number of components to be deleted @@ -145,6 +146,7 @@ public BoxDeleteVertexOperation(Envelope env) public boolean isEdited() { return isEdited; } + @Override public Coordinate[] edit(Coordinate[] coords, Geometry geometry) { diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexDeleter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexDeleter.java index ed13a0c308..a2f51fb020 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexDeleter.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexDeleter.java @@ -42,6 +42,7 @@ public DeleteVertexOperation(LineString line, int vertexIndex) this.vertexIndex = vertexIndex; } + @Override public Coordinate[] edit(Coordinate[] coords, Geometry geometry) { diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexInserter.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexInserter.java index cc30e1e378..e67315acbf 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexInserter.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexInserter.java @@ -43,6 +43,7 @@ public InsertVertexOperation(LineString line, int segIndex, Coordinate newVertex this.newVertex = newVertex; } + @Override public Coordinate[] edit(Coordinate[] coords, Geometry geometry) { diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexMover.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexMover.java index 4ea5bb1ed5..fd2925b66f 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexMover.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexMover.java @@ -38,6 +38,7 @@ public MoveVertexOperation(Coordinate fromLoc, Coordinate toLoc) this.toLoc = toLoc; } + @Override public Coordinate[] edit(Coordinate[] coords, Geometry geometry) { diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java index 4667548826..2fe9d9de0a 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java @@ -52,6 +52,7 @@ public MultiLineHandler(int type) throws InvalidShapefileException } + @Override public Geometry read( EndianDataInputStream file , GeometryFactory geometryFactory, int contentLength) throws IOException,InvalidShapefileException { @@ -186,10 +187,12 @@ public Geometry read( EndianDataInputStream file , GeometryFactory geometryFacto /** * Get the type of shape stored (Shapefile.ARC) */ + @Override public int getShapeType(){ return myShapeType; } + @Override public int getLength(Geometry geometry){ MultiLineString multi = (MultiLineString) geometry; diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiPointHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiPointHandler.java index 83d63060d0..083abaccc6 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiPointHandler.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiPointHandler.java @@ -55,6 +55,7 @@ public MultiPointHandler(int type) throws InvalidShapefileException myShapeType = type; } + @Override public Geometry read(EndianDataInputStream file,GeometryFactory geometryFactory,int contentLength) throws IOException,InvalidShapefileException{ //file.setLittleEndianMode(true); @@ -186,6 +187,7 @@ public Geometry read(EndianDataInputStream file,GeometryFactory geometryFactory, * Returns the shapefile shape type value for a point * @return int Shapefile.POINT */ + @Override public int getShapeType(){ return myShapeType; } @@ -194,6 +196,7 @@ public int getShapeType(){ * Calcuates the record length of this object. * @return int The length of the record that this shapepoint will take up in a shapefile **/ + @Override public int getLength(Geometry geometry){ MultiPoint mp = (MultiPoint) geometry; diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java index 28c62f28c8..d891fdd6c0 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java @@ -46,6 +46,7 @@ public PointHandler() myShapeType = 1; //2d } + @Override public Geometry read(EndianDataInputStream file,GeometryFactory geometryFactory,int contentLength) throws IOException,InvalidShapefileException { // file.setLittleEndianMode(true); @@ -88,7 +89,8 @@ public Geometry read(EndianDataInputStream file,GeometryFactory geometryFactory, * Returns the shapefile shape type value for a point * @return int Shapefile.POINT */ - public int getShapeType(){ + @Override + public int getShapeType(){ return myShapeType; } @@ -96,6 +98,7 @@ public int getShapeType(){ * Calcuates the record length of this object. * @return int The length of the record that this shapepoint will take up in a shapefile **/ + @Override public int getLength(Geometry geometry){ if (myShapeType == Shapefile.POINT) return 10; diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java index 7138304817..dcb9d94959 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java @@ -75,6 +75,7 @@ boolean pointInList(Coordinate testPoint, Coordinate[] pointList) return false; } + @Override public Geometry read( EndianDataInputStream file , GeometryFactory geometryFactory, int contentLength) throws IOException, InvalidShapefileException { @@ -297,9 +298,11 @@ private static int findIndex(ArrayList list, Object o) } + @Override public int getShapeType(){ return myShapeType; } + @Override public int getLength(Geometry geometry){ int nrings=0; diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/GeometryVerticesMover.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/GeometryVerticesMover.java index 789478dcc1..84996db196 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/GeometryVerticesMover.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/topostretch/GeometryVerticesMover.java @@ -62,6 +62,7 @@ public MoveVerticesOperation(Map moves) } + @Override public Coordinate[] edit(Coordinate[] coords, Geometry geometry) { diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ClipImage.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ClipImage.java index 82c9f619d4..12714cd109 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ClipImage.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/ClipImage.java @@ -27,16 +27,19 @@ public ClipImage(byte[] im) image = im; } + @Override public DataFlavor[] getTransferDataFlavors() { return new DataFlavor[] { DataFlavor.imageFlavor }; } + @Override public boolean isDataFlavorSupported(DataFlavor flavor) { return DataFlavor.imageFlavor.equals(flavor); } + @Override public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException { @@ -45,6 +48,7 @@ public Object getTransferData(DataFlavor flavor) throws return Toolkit.getDefaultToolkit().createImage(image); } + @Override public void lostOwnership(java.awt.datatransfer.Clipboard clip, java.awt.datatransfer.Transferable tr) diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/dnd/FileDrop.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/dnd/FileDrop.java index 3c4fb9e08f..24caab6415 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/dnd/FileDrop.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/dnd/FileDrop.java @@ -267,7 +267,7 @@ public FileDrop( if( supportsDnD() ) { // Make a drop listener dropListener = new java.awt.dnd.DropTargetListener() - { public void dragEnter( java.awt.dnd.DropTargetDragEvent evt ) + { @Override public void dragEnter( java.awt.dnd.DropTargetDragEvent evt ) { log( out, "FileDrop: dragEnter event." ); // Is this an acceptable drag event? @@ -294,11 +294,13 @@ public FileDrop( } // end else: drag not ok } // end dragEnter - public void dragOver( java.awt.dnd.DropTargetDragEvent evt ) + @Override + public void dragOver( java.awt.dnd.DropTargetDragEvent evt ) { // This is called continually as long as the mouse is // over the drag target. } // end dragOver + @Override public void drop( java.awt.dnd.DropTargetDropEvent evt ) { log( out, "FileDrop: drop event." ); try @@ -357,7 +359,8 @@ public void drop( java.awt.dnd.DropTargetDropEvent evt ) } // end finally } // end drop - public void dragExit( java.awt.dnd.DropTargetEvent evt ) + @Override + public void dragExit( java.awt.dnd.DropTargetEvent evt ) { log( out, "FileDrop: dragExit event." ); // If it's a Swing component, reset its border if( c instanceof javax.swing.JComponent ) @@ -367,7 +370,8 @@ public void dragExit( java.awt.dnd.DropTargetEvent evt ) } // end if: JComponent } // end dragExit - public void dropActionChanged( java.awt.dnd.DropTargetDragEvent evt ) + @Override + public void dropActionChanged( java.awt.dnd.DropTargetDragEvent evt ) { log( out, "FileDrop: dropActionChanged event." ); // Is this an acceptable drag event? if( isDragOk( out, evt ) ) @@ -426,7 +430,7 @@ private void makeDropTarget( final java.io.PrintStream out, final java.awt.Compo // Listen for hierarchy changes and remove the drop target when the parent gets cleared out. c.addHierarchyListener( new java.awt.event.HierarchyListener() - { public void hierarchyChanged( java.awt.event.HierarchyEvent evt ) + { @Override public void hierarchyChanged( java.awt.event.HierarchyEvent evt ) { log( out, "FileDrop: Hierarchy changed." ); java.awt.Component parent = c.getParent(); if( parent == null ) @@ -554,7 +558,7 @@ public static void main( String[] args ) java.awt.BorderLayout.CENTER ); new FileDrop( System.out, text, /*dragBorder,*/ new FileDrop.Listener() - { public void filesDropped( java.io.File[] files ) + { @Override public void filesDropped( java.io.File[] files ) { for( int i = 0; i < files.length; i++ ) { try { text.append( files[i].getCanonicalPath() + "\n" ); diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ArrowLineEndStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ArrowLineEndStyle.java index 36c090efc2..1f816ec28f 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ArrowLineEndStyle.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ArrowLineEndStyle.java @@ -44,6 +44,7 @@ public void setColor(Color color) { this.color = ColorUtil.setAlpha(color, FILL_ALPHA); } + @Override protected void paint(Point2D terminal, Point2D next, Viewport viewport, Graphics2D g) throws NoninvertibleTransformException { diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/CircleLineEndStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/CircleLineEndStyle.java index b8a861598e..2f0c7e30e3 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/CircleLineEndStyle.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/CircleLineEndStyle.java @@ -60,6 +60,7 @@ public void setSize(double size) { this.diameter = size; } + @Override protected void paint(Point2D terminal, Point2D next, Viewport viewport, Graphics2D g) { diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ComponentStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ComponentStyle.java index b0376bc751..b0eb9a3332 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ComponentStyle.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/ComponentStyle.java @@ -22,7 +22,8 @@ public abstract class ComponentStyle implements Style { - public void paint(Geometry geom, Viewport viewport, Graphics2D g) + @Override + public void paint(Geometry geom, Viewport viewport, Graphics2D g) throws Exception { // cull non-visible geometries diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LineStringStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LineStringStyle.java index f1925f87c7..c8f8248cff 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LineStringStyle.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/LineStringStyle.java @@ -33,7 +33,8 @@ public abstract class LineStringStyle public LineStringStyle() { } - public void paint(Geometry geom, Viewport viewport, Graphics2D g) + @Override + public void paint(Geometry geom, Viewport viewport, Graphics2D g) throws Exception { // cull non-visible geometries diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/PolygonStructureStyle.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/PolygonStructureStyle.java index 9cac0fdae3..4ac4d14650 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/PolygonStructureStyle.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/PolygonStructureStyle.java @@ -39,6 +39,7 @@ public PolygonStructureStyle(Color color) { this.color = color; } + @Override protected void paintLineString(LineString lineString, int lineType, Viewport viewport, Graphics2D gr) diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/BasicTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/BasicTool.java index f74a6e4445..afc8ef485a 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/BasicTool.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/BasicTool.java @@ -56,18 +56,30 @@ protected Graphics2D getGraphics2D() { return g; } + @Override public void mouseClicked(MouseEvent e) {} + @Override public void mousePressed(MouseEvent e) {} + @Override public void mouseReleased(MouseEvent e) {} + @Override public void mouseEntered(MouseEvent e) {} + @Override public void mouseExited(MouseEvent e) {} + @Override public void mouseDragged(MouseEvent e) { } + @Override public void keyPressed(KeyEvent e) { } + @Override public void keyReleased(KeyEvent e) { } + @Override public void keyTyped(KeyEvent e) { } + @Override public void mouseMoved(MouseEvent e) { } + @Override public void mouseWheelMoved(MouseWheelEvent e) { } + @Override public Cursor getCursor() { return cursor; @@ -78,7 +90,8 @@ public Cursor getCursor() * * If subclasses override this method they must call super.activate(). */ - public void activate(GeometryEditPanel panel) + @Override + public void activate(GeometryEditPanel panel) { this.panel = panel; gridPM = getViewport().getGridPrecisionModel(); @@ -88,7 +101,8 @@ public void activate(GeometryEditPanel panel) this.panel.addMouseWheelListener(this); } - public void deactivate() + @Override + public void deactivate() { this.panel.removeMouseListener(this); this.panel.removeMouseMotionListener(this); diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/DeleteByBoxTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/DeleteByBoxTool.java index c87dc030af..3103212b5f 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/DeleteByBoxTool.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/DeleteByBoxTool.java @@ -33,7 +33,8 @@ private DeleteByBoxTool() { super(); } - protected void gestureFinished() + @Override + protected void gestureFinished() { Envelope env = getBox().getEnvelopeInternal(); Geometry g = geomModel().getGeometry(); diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/EditVertexTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/EditVertexTool.java index 1037bb2b56..9c3e6cc0ae 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/EditVertexTool.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/EditVertexTool.java @@ -48,6 +48,7 @@ private EditVertexTool() { super(AppCursors.EDIT_VERTEX); } + @Override public void mousePressed(MouseEvent e) { currentVertexLoc = null; if (SwingUtilities.isRightMouseButton(e)) @@ -65,6 +66,7 @@ public void mousePressed(MouseEvent e) { } } + @Override public void mouseReleased(MouseEvent e) { if (SwingUtilities.isRightMouseButton(e)) return; @@ -77,12 +79,14 @@ public void mouseReleased(MouseEvent e) { } } + @Override public void mouseDragged(MouseEvent e) { currentVertexLoc = toModelSnapped(e.getPoint()); if (selectedVertexLocation != null) redrawIndicator(); } + @Override public void mouseClicked(MouseEvent e) { if (! SwingUtilities.isRightMouseButton(e)) return; @@ -107,7 +111,8 @@ public void mouseClicked(MouseEvent e) { } } - protected Shape getShape() + @Override + protected Shape getShape() { GeometryCollectionShape ind = new GeometryCollectionShape(); Point2D currentIndicatorLoc = toView(currentVertexLoc); diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ExtractComponentTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ExtractComponentTool.java index 3323718f52..961fdc58b1 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ExtractComponentTool.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ExtractComponentTool.java @@ -32,7 +32,8 @@ private ExtractComponentTool() { super(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); } - protected void gestureFinished() + @Override + protected void gestureFinished() { boolean isSegments = isControlKeyDown(); JTSTestBuilder.controller().extractComponentsToTestCase(getBox(), isSegments); diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/IndicatorTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/IndicatorTool.java index 00e5a260a1..0c8bbe8f69 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/IndicatorTool.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/IndicatorTool.java @@ -160,11 +160,13 @@ private String getLabel() // protected void gestureFinished() throws Exception; - public void mouseDragged(MouseEvent e) + @Override + public void mouseDragged(MouseEvent e) { recordLabel(e.getPoint()); } + @Override public void mouseMoved(MouseEvent e) { recordLabel(e.getPoint()); } diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/InfoTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/InfoTool.java index 356cbb2737..b62b099e20 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/InfoTool.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/InfoTool.java @@ -31,7 +31,8 @@ public static InfoTool getInstance() { private InfoTool() { } - public void mousePressed(MouseEvent e) + @Override + public void mousePressed(MouseEvent e) { JTSTestBuilder.controller().displayInfo(toModelCoordinate(e.getPoint())); } diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/MoveTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/MoveTool.java index 838ba77c6a..6208c7ce69 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/MoveTool.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/MoveTool.java @@ -57,6 +57,7 @@ private Geometry getComponent(Coordinate pt, double tolerance) { return geoms.get(0).getComponent(); } + @Override public void mousePressed(MouseEvent e) { startIndicatorLoc = null; //TODO: only start move if cursor is over geometry @@ -78,6 +79,7 @@ public void mousePressed(MouseEvent e) { redrawIndicator(); } + @Override public void mouseReleased(MouseEvent e) { clearIndicator(); // execute the move @@ -103,13 +105,15 @@ private void execute(Coordinate fromLoc, Coordinate toLoc, boolean isComponentMo geomModel().setGeometry(geomTrans); } + @Override public void mouseDragged(MouseEvent e) { currentVertexLoc = toModelSnapped(e.getPoint()); if (startIndicatorLoc != null) redrawIndicator(); } - protected Shape getShape() + @Override + protected Shape getShape() { Point2D currentIndicatorLoc = toView(currentVertexLoc); GeneralPath line = new GeneralPath(); diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/RectangleTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/RectangleTool.java index 8f28898107..1dc7136942 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/RectangleTool.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/RectangleTool.java @@ -32,7 +32,8 @@ public RectangleTool() { super(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); } - protected void gestureFinished() + @Override + protected void gestureFinished() { geomModel().setGeometryType(GeometryType.POLYGON); geomModel().addComponent(getCoordinates()); diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ZoomTool.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ZoomTool.java index e1c8748ae1..e2e975b2d6 100644 --- a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ZoomTool.java +++ b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ZoomTool.java @@ -47,7 +47,8 @@ public ZoomTool(double zoomFactor, Cursor cursor) { this.zoomFactor = zoomFactor; } - public void mouseClicked(MouseEvent mouseEvent) + @Override + public void mouseClicked(MouseEvent mouseEvent) { // determine if zoom in (left) or zoom out (right) double realZoomFactor = SwingUtilities.isRightMouseButton(mouseEvent) @@ -55,6 +56,7 @@ public void mouseClicked(MouseEvent mouseEvent) panel().zoom(toModel(mouseEvent.getPoint()), realZoomFactor); } + @Override public void mousePressed(MouseEvent e) { mouseStart = e.getPoint(); @@ -62,6 +64,7 @@ public void mousePressed(MouseEvent e) panStart = isPanGesture(e) ? toModel(mouseStart) : null; } + @Override public void mouseReleased(MouseEvent e) { // don't process if mouse was dragged a very short distance if (! isSignificantMouseMove(e.getPoint())) @@ -83,6 +86,7 @@ private boolean isPanning() { return panStart != null; } + @Override public void mouseDragged(MouseEvent e) { Graphics g = getBandGraphics(); @@ -111,6 +115,7 @@ private void drawBand(Graphics g) { } } + @Override public void mouseWheelMoved(MouseWheelEvent e) { /** * Rolling wheel forward zooms in, backward zooms out diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DiscreteHausdorffDistance.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DiscreteHausdorffDistance.java index b1512d4449..ffb6011420 100644 --- a/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DiscreteHausdorffDistance.java +++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DiscreteHausdorffDistance.java @@ -148,6 +148,7 @@ public MaxPointDistanceFilter(Geometry geom) this.geom = geom; } + @Override public void filter(Coordinate pt) { minPtDist.initialize(); @@ -171,7 +172,8 @@ public MaxDensifiedByFractionDistanceFilter(Geometry geom, double fraction) { numSubSegs = (int) Math.rint(1.0/fraction); } - public void filter(CoordinateSequence seq, int index) + @Override + public void filter(CoordinateSequence seq, int index) { /** * This logic also handles skipping Point geometries @@ -197,8 +199,10 @@ public void filter(CoordinateSequence seq, int index) } + @Override public boolean isGeometryChanged() { return false; } + @Override public boolean isDone() { return false; } public PointPairDistance getMaxPointDistance() { diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/SimplePointInAreaLocator.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/SimplePointInAreaLocator.java index 07e07f66c0..94d73b4080 100644 --- a/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/SimplePointInAreaLocator.java +++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/locate/SimplePointInAreaLocator.java @@ -198,6 +198,7 @@ public SimplePointInAreaLocator(Geometry geom) { * @param p the point to test * @return the Location of the point in the geometry */ + @Override public int locate(Coordinate p) { return SimplePointInAreaLocator.locate(p, geom); } diff --git a/modules/core/src/main/java/org/locationtech/jts/algorithm/match/AreaSimilarityMeasure.java b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/AreaSimilarityMeasure.java index e6630e16b6..3b66173479 100644 --- a/modules/core/src/main/java/org/locationtech/jts/algorithm/match/AreaSimilarityMeasure.java +++ b/modules/core/src/main/java/org/locationtech/jts/algorithm/match/AreaSimilarityMeasure.java @@ -43,6 +43,7 @@ public AreaSimilarityMeasure() { } + @Override public double measure(Geometry g1, Geometry g2) { double areaInt = g1.intersection(g2).getArea(); diff --git a/modules/core/src/main/java/org/locationtech/jts/awt/IdentityPointTransformation.java b/modules/core/src/main/java/org/locationtech/jts/awt/IdentityPointTransformation.java index b562e9106a..f4c349c381 100644 --- a/modules/core/src/main/java/org/locationtech/jts/awt/IdentityPointTransformation.java +++ b/modules/core/src/main/java/org/locationtech/jts/awt/IdentityPointTransformation.java @@ -24,6 +24,7 @@ public class IdentityPointTransformation implements PointTransformation { + @Override public void transform(Coordinate model, Point2D view) { view.setLocation(model.x, model.y); diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonContains.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonContains.java index b0a584d96a..5374c995da 100644 --- a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonContains.java +++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonContains.java @@ -71,6 +71,7 @@ public boolean contains(Geometry geom) * @param geom the test geometry * @return true if this prepared polygon contains the test geometry */ + @Override protected boolean fullTopologicalPredicate(Geometry geom) { boolean isContained = prepPoly.getGeometry().contains(geom); diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonCovers.java b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonCovers.java index 4615b833b4..ed87840249 100644 --- a/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonCovers.java +++ b/modules/core/src/main/java/org/locationtech/jts/geom/prep/PreparedPolygonCovers.java @@ -71,6 +71,7 @@ public boolean covers(Geometry geom) * @param geom the test geometry * @return true if this prepared polygon covers the test geometry */ + @Override protected boolean fullTopologicalPredicate(Geometry geom) { boolean result = prepPoly.getGeometry().covers(geom); diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformation.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformation.java index a8ed63ac25..d1c3daf86c 100644 --- a/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformation.java +++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/AffineTransformation.java @@ -1009,11 +1009,13 @@ public void transform(CoordinateSequence seq, int i) *@param seq a CoordinateSequence *@param i the index of the coordinate to transform */ + @Override public void filter(CoordinateSequence seq, int i) { transform(seq, i); } + @Override public boolean isGeometryChanged() { return true; @@ -1025,7 +1027,8 @@ public boolean isGeometryChanged() * * @return false */ - public boolean isDone() + @Override + public boolean isDone() { return false; } @@ -1110,6 +1113,7 @@ public String toString() * * @return a copy of this transformation */ + @Override public Object clone() { try { diff --git a/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryEditor.java b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryEditor.java index abbec9a5df..645781d1e4 100644 --- a/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryEditor.java +++ b/modules/core/src/main/java/org/locationtech/jts/geom/util/GeometryEditor.java @@ -263,6 +263,7 @@ public interface GeometryEditorOperation public static class NoOpGeometryOperation implements GeometryEditorOperation { + @Override public Geometry edit(Geometry geometry, GeometryFactory factory) { return geometry; @@ -276,6 +277,7 @@ public Geometry edit(Geometry geometry, GeometryFactory factory) public abstract static class CoordinateOperation implements GeometryEditorOperation { + @Override public final Geometry edit(Geometry geometry, GeometryFactory factory) { if (geometry instanceof LinearRing) { return factory.createLinearRing(edit(geometry.getCoordinates(), @@ -321,6 +323,7 @@ public abstract Coordinate[] edit(Coordinate[] coordinates, public abstract static class CoordinateSequenceOperation implements GeometryEditorOperation { + @Override public final Geometry edit(Geometry geometry, GeometryFactory factory) { if (geometry instanceof LinearRing) { return factory.createLinearRing(edit( diff --git a/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeNode.java b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeNode.java index 9e5bb9f0e2..6471914ff4 100644 --- a/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeNode.java +++ b/modules/core/src/main/java/org/locationtech/jts/index/intervalrtree/IntervalRTreeNode.java @@ -43,6 +43,7 @@ public String toString() public static class NodeComparator implements Comparator { + @Override public int compare(Object o1, Object o2) { IntervalRTreeNode n1 = (IntervalRTreeNode) o1; diff --git a/modules/core/src/main/java/org/locationtech/jts/index/strtree/BoundablePairDistanceComparator.java b/modules/core/src/main/java/org/locationtech/jts/index/strtree/BoundablePairDistanceComparator.java index ae9c52d2a0..15096920d2 100644 --- a/modules/core/src/main/java/org/locationtech/jts/index/strtree/BoundablePairDistanceComparator.java +++ b/modules/core/src/main/java/org/locationtech/jts/index/strtree/BoundablePairDistanceComparator.java @@ -38,6 +38,7 @@ public BoundablePairDistanceComparator(boolean normalOrder) /* (non-Javadoc) * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ + @Override public int compare(BoundablePair p1, BoundablePair p2) { double distance1 = p1.getDistance(); double distance2 = p2.getDistance(); diff --git a/modules/core/src/main/java/org/locationtech/jts/io/ByteArrayInStream.java b/modules/core/src/main/java/org/locationtech/jts/io/ByteArrayInStream.java index 6b9da54811..a38639adca 100644 --- a/modules/core/src/main/java/org/locationtech/jts/io/ByteArrayInStream.java +++ b/modules/core/src/main/java/org/locationtech/jts/io/ByteArrayInStream.java @@ -52,6 +52,7 @@ public void setBytes(final byte[] buffer) { * @param buf the buffer to place the read bytes into * @return the number of bytes read */ + @Override public int read(final byte[] buf) { int numToRead = buf.length; // don't try and copy past the end of the input diff --git a/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLHandler.java b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLHandler.java index a10a31364e..ace4e8852d 100644 --- a/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLHandler.java +++ b/modules/core/src/main/java/org/locationtech/jts/io/gml2/GMLHandler.java @@ -180,6 +180,7 @@ public Geometry getGeometry() { /** * @see org.xml.sax.helpers.DefaultHandler#characters(char[], int, int) */ + @Override public void characters(char[] ch, int start, int length) throws SAXException { if (!stack.isEmpty()) ((Handler) stack.peek()).addText(new String(ch, start, length)); @@ -188,6 +189,7 @@ public void characters(char[] ch, int start, int length) throws SAXException { /** * @see org.xml.sax.helpers.DefaultHandler#ignorableWhitespace(char[], int, int) */ + @Override public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { if (!stack.isEmpty()) @@ -197,6 +199,7 @@ public void ignorableWhitespace(char[] ch, int start, int length) /** * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, java.lang.String) */ + @Override public void endElement(String uri, String localName, String qName) throws SAXException { Handler thisAction = (Handler) stack.pop(); @@ -206,6 +209,7 @@ public void endElement(String uri, String localName, String qName) /** * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) */ + @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { // create a handler @@ -225,6 +229,7 @@ public void startElement(String uri, String localName, String qName, /** * @see org.xml.sax.helpers.DefaultHandler#setDocumentLocator(org.xml.sax.Locator) */ + @Override public void setDocumentLocator(Locator locator) { this.locator = locator; if (delegate instanceof ContentHandler) @@ -244,6 +249,7 @@ protected Locator getDocumentLocator() { /** * @see org.xml.sax.helpers.DefaultHandler#fatalError(org.xml.sax.SAXParseException) */ + @Override public void fatalError(SAXParseException e) throws SAXException { if (delegate != null) delegate.fatalError(e); @@ -254,6 +260,7 @@ public void fatalError(SAXParseException e) throws SAXException { /** * @see org.xml.sax.helpers.DefaultHandler#error(org.xml.sax.SAXParseException) */ + @Override public void error(SAXParseException e) throws SAXException { if (delegate != null) delegate.error(e); @@ -264,6 +271,7 @@ public void error(SAXParseException e) throws SAXException { /** * @see org.xml.sax.helpers.DefaultHandler#warning(org.xml.sax.SAXParseException) */ + @Override public void warning(SAXParseException e) throws SAXException { if (delegate != null) delegate.warning(e); diff --git a/modules/core/src/main/java/org/locationtech/jts/math/DD.java b/modules/core/src/main/java/org/locationtech/jts/math/DD.java index d38349f3e2..9166f40a6e 100644 --- a/modules/core/src/main/java/org/locationtech/jts/math/DD.java +++ b/modules/core/src/main/java/org/locationtech/jts/math/DD.java @@ -239,6 +239,7 @@ public static DD copy(DD dd) * * @return a copy of this value */ + @Override public Object clone() { try { @@ -1033,7 +1034,8 @@ public boolean le(DD y) * @return -1,0 or 1 depending on whether this value is less than, equal to * or greater than the value of o */ - public int compareTo(Object o) + @Override + public int compareTo(Object o) { DD other = (DD) o; diff --git a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferCurveMaximumDistanceFinder.java b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferCurveMaximumDistanceFinder.java index 2050569593..3a42336bcf 100644 --- a/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferCurveMaximumDistanceFinder.java +++ b/modules/core/src/main/java/org/locationtech/jts/operation/buffer/validate/BufferCurveMaximumDistanceFinder.java @@ -76,6 +76,7 @@ public MaxPointDistanceFilter(Geometry geom) { this.geom = geom; } + @Override public void filter(Coordinate pt) { minPtDist.initialize(); DistanceToPointFinder.computeDistance(geom, pt, minPtDist); @@ -98,7 +99,8 @@ public MaxMidpointDistanceFilter(Geometry geom) { this.geom = geom; } - public void filter(CoordinateSequence seq, int index) + @Override + public void filter(CoordinateSequence seq, int index) { if (index == 0) return; @@ -114,8 +116,10 @@ public void filter(CoordinateSequence seq, int index) maxPtDist.setMaximum(minPtDist); } + @Override public boolean isGeometryChanged() { return false; } + @Override public boolean isDone() { return false; } public PointPairDistance getMaxPointDistance() { diff --git a/modules/core/src/main/java/org/locationtech/jts/precision/CoordinatePrecisionReducerFilter.java b/modules/core/src/main/java/org/locationtech/jts/precision/CoordinatePrecisionReducerFilter.java index 543363fa76..df3386b740 100644 --- a/modules/core/src/main/java/org/locationtech/jts/precision/CoordinatePrecisionReducerFilter.java +++ b/modules/core/src/main/java/org/locationtech/jts/precision/CoordinatePrecisionReducerFilter.java @@ -46,6 +46,7 @@ public CoordinatePrecisionReducerFilter(PrecisionModel precModel) /** * Rounds the Coordinates in the sequence to match the PrecisionModel */ + @Override public void filter(CoordinateSequence seq, int i) { seq.setOrdinate(i, 0, precModel.makePrecise(seq.getOrdinate(i, 0))); @@ -57,6 +58,7 @@ public void filter(CoordinateSequence seq, int i) * * @return false */ + @Override public boolean isDone() { return false; } /** @@ -64,5 +66,6 @@ public void filter(CoordinateSequence seq, int i) * * @return true */ + @Override public boolean isGeometryChanged() { return true; } } diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/DouglasPeuckerSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/simplify/DouglasPeuckerSimplifier.java index e14d0481c3..8dbf29af56 100644 --- a/modules/core/src/main/java/org/locationtech/jts/simplify/DouglasPeuckerSimplifier.java +++ b/modules/core/src/main/java/org/locationtech/jts/simplify/DouglasPeuckerSimplifier.java @@ -133,6 +133,7 @@ public DPTransformer(boolean isEnsureValidTopology, double distanceTolerance) this.distanceTolerance = distanceTolerance; } + @Override protected CoordinateSequence transformCoordinates(CoordinateSequence coords, Geometry parent) { boolean isPreserveEndpoint = ! (parent instanceof LinearRing); @@ -150,6 +151,7 @@ protected CoordinateSequence transformCoordinates(CoordinateSequence coords, Geo /** * Simplifies a polygon, fixing it if required. */ + @Override protected Geometry transformPolygon(Polygon geom, Geometry parent) { // empty geometries are simply removed if (geom.isEmpty()) @@ -169,7 +171,8 @@ protected Geometry transformPolygon(Polygon geom, Geometry parent) { * @return null if the simplification results in a degenerate ring */ //* - protected Geometry transformLinearRing(LinearRing geom, Geometry parent) + @Override + protected Geometry transformLinearRing(LinearRing geom, Geometry parent) { boolean removeDegenerateRings = parent instanceof Polygon; Geometry simpResult = super.transformLinearRing(geom, parent); @@ -182,6 +185,7 @@ protected Geometry transformLinearRing(LinearRing geom, Geometry parent) /** * Simplifies a MultiPolygon, fixing it if required. */ + @Override protected Geometry transformMultiPolygon(MultiPolygon geom, Geometry parent) { Geometry rawGeom = super.transformMultiPolygon(geom, parent); return createValidArea(rawGeom); diff --git a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeSubdivision.java b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeSubdivision.java index ba98c107b4..e61543ed3c 100644 --- a/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeSubdivision.java +++ b/modules/core/src/main/java/org/locationtech/jts/triangulate/quadedge/QuadEdgeSubdivision.java @@ -648,7 +648,8 @@ private static class TriangleCircumcentreVisitor implements TriangleVisitor public TriangleCircumcentreVisitor() { } - public void visit(QuadEdge[] triEdges) + @Override + public void visit(QuadEdge[] triEdges) { Coordinate a = triEdges[0].orig().getCoordinate(); Coordinate b = triEdges[1].orig().getCoordinate(); @@ -754,6 +755,7 @@ public List getTriangleEdges(boolean includeFrame) { private static class TriangleEdgesListVisitor implements TriangleVisitor { private List triList = new ArrayList(); + @Override public void visit(QuadEdge[] triEdges) { triList.add(new QuadEdge[]{triEdges[0], triEdges[1], triEdges[2]}); } @@ -780,6 +782,7 @@ public List getTriangleVertices(boolean includeFrame) { private static class TriangleVertexListVisitor implements TriangleVisitor { private List triList = new ArrayList(); + @Override public void visit(QuadEdge[] triEdges) { triList.add(new Vertex[] { triEdges[0].orig(), triEdges[1].orig(), triEdges[2].orig() }); @@ -811,6 +814,7 @@ private static class TriangleCoordinatesVisitor implements TriangleVisitor { public TriangleCoordinatesVisitor() { } + @Override public void visit(QuadEdge[] triEdges) { coordList.clear(); for (int i = 0; i < 3; i++) { diff --git a/modules/core/src/test/java/org/locationtech/jts/generator/PointGenerator.java b/modules/core/src/test/java/org/locationtech/jts/generator/PointGenerator.java index c4ab1d3006..bbc293936a 100644 --- a/modules/core/src/test/java/org/locationtech/jts/generator/PointGenerator.java +++ b/modules/core/src/test/java/org/locationtech/jts/generator/PointGenerator.java @@ -28,6 +28,7 @@ public class PointGenerator extends GeometryGenerator { * @see org.locationtech.jts.generator.GeometryGenerator#create() * @throws NullPointerException when either the Geometry Factory, or the Bounding Box are undefined. */ + @Override public Geometry create() { if(geometryFactory == null){ throw new NullPointerException("GeometryFactory is not declared"); diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/GeometryOpGCUnsupportedTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/GeometryOpGCUnsupportedTest.java index 6fd4e82f79..0bb15d7cbf 100644 --- a/modules/core/src/test/java/org/locationtech/jts/geom/GeometryOpGCUnsupportedTest.java +++ b/modules/core/src/test/java/org/locationtech/jts/geom/GeometryOpGCUnsupportedTest.java @@ -19,7 +19,7 @@ public void testBoundary() { final Geometry a = read(WKT_GC); final Geometry b = read(WKT_POLY); - (new FailureChecker() { void operation() { + (new FailureChecker() { @Override void operation() { a.getBoundary(); } }).check(IllegalArgumentException.class); @@ -29,11 +29,11 @@ public void testRelate() { final Geometry a = read(WKT_GC); final Geometry b = read(WKT_POLY); - (new FailureChecker() { void operation() { + (new FailureChecker() { @Override void operation() { a.relate(b); } }).check(IllegalArgumentException.class); - (new FailureChecker() { void operation() { + (new FailureChecker() { @Override void operation() { b.relate(a); } }).check(IllegalArgumentException.class); @@ -43,11 +43,11 @@ public void testUnion() { final Geometry a = read(WKT_GC); final Geometry b = read(WKT_POLY); - (new FailureChecker() { void operation() { + (new FailureChecker() { @Override void operation() { a.union(b); } }).check(IllegalArgumentException.class); - (new FailureChecker() { void operation() { + (new FailureChecker() { @Override void operation() { b.union(a); } }).check(IllegalArgumentException.class); } @@ -56,11 +56,11 @@ public void testDifference() { final Geometry a = read(WKT_GC); final Geometry b = read(WKT_POLY); - (new FailureChecker() { void operation() { + (new FailureChecker() { @Override void operation() { a.difference(b); } }).check(IllegalArgumentException.class); - (new FailureChecker() { void operation() { + (new FailureChecker() { @Override void operation() { b.difference(a); } }).check(IllegalArgumentException.class); } @@ -69,11 +69,11 @@ public void testSymDifference() { final Geometry a = read(WKT_GC); final Geometry b = read(WKT_POLY); - (new FailureChecker() { void operation() { + (new FailureChecker() { @Override void operation() { a.symDifference(b); } }).check(IllegalArgumentException.class); - (new FailureChecker() { void operation() { + (new FailureChecker() { @Override void operation() { b.symDifference(a); } }).check(IllegalArgumentException.class); } diff --git a/modules/core/src/test/java/org/locationtech/jts/geom/prep/PreparedPolygonPredicateStressTest.java b/modules/core/src/test/java/org/locationtech/jts/geom/prep/PreparedPolygonPredicateStressTest.java index 978868591e..9170f0b0e3 100644 --- a/modules/core/src/test/java/org/locationtech/jts/geom/prep/PreparedPolygonPredicateStressTest.java +++ b/modules/core/src/test/java/org/locationtech/jts/geom/prep/PreparedPolygonPredicateStressTest.java @@ -49,6 +49,7 @@ public void test() class PredicateStressTester extends StressTestHarness { + @Override public boolean checkResult(Geometry target, Geometry test) { if (! checkIntersects(target, test)) return false; if (! checkContains(target, test)) return false; diff --git a/modules/core/src/test/java/org/locationtech/jts/index/strtree/GeometryDistanceComparator.java b/modules/core/src/test/java/org/locationtech/jts/index/strtree/GeometryDistanceComparator.java index 6b52167348..f034b493ca 100644 --- a/modules/core/src/test/java/org/locationtech/jts/index/strtree/GeometryDistanceComparator.java +++ b/modules/core/src/test/java/org/locationtech/jts/index/strtree/GeometryDistanceComparator.java @@ -43,6 +43,7 @@ public GeometryDistanceComparator(Point queryCenter, boolean normalOrder) /* (non-Javadoc) * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) */ + @Override public int compare(Geometry g1, Geometry g2) { double distance1 = g1.getEnvelopeInternal().distance(this.queryCenter.getEnvelopeInternal()); double distance2 = g2.getEnvelopeInternal().distance(this.queryCenter.getEnvelopeInternal()); diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/DDOrientationIndexAccuracyTest.java b/modules/core/src/test/java/test/jts/perf/algorithm/DDOrientationIndexAccuracyTest.java index bd0d0230f9..4abde5602b 100644 --- a/modules/core/src/test/java/test/jts/perf/algorithm/DDOrientationIndexAccuracyTest.java +++ b/modules/core/src/test/java/test/jts/perf/algorithm/DDOrientationIndexAccuracyTest.java @@ -79,11 +79,13 @@ static interface DDConverter { DD convert(double x); } static final DDConverter DD_STD = new DDConverter() { + @Override public DD convert(double x) { return DD.valueOf(x); } }; static final DDConverter DD_DEC = new DDConverter() { + @Override public DD convert(double x) { return DD.valueOf(x + ""); } diff --git a/modules/core/src/test/java/test/jts/perf/algorithm/MCIndexedPointInAreaLocator.java b/modules/core/src/test/java/test/jts/perf/algorithm/MCIndexedPointInAreaLocator.java index a664de2d9f..8d47de4507 100644 --- a/modules/core/src/test/java/test/jts/perf/algorithm/MCIndexedPointInAreaLocator.java +++ b/modules/core/src/test/java/test/jts/perf/algorithm/MCIndexedPointInAreaLocator.java @@ -70,6 +70,7 @@ private void buildIndex(Geometry g) * @param p the point to test * @return the location of the point in the geometry */ + @Override public int locate(Coordinate p) { RayCrossingCounter rcc = new RayCrossingCounter(p); @@ -100,6 +101,7 @@ public MCSegmentCounter(RayCrossingCounter rcc) this.rcc = rcc; } + @Override public void select(LineSegment ls) { rcc.countSegment(ls.getCoordinate(0), ls.getCoordinate(1)); diff --git a/modules/example/src/main/java/org/locationtech/jtsexample/io/gml2/KMLReaderExample.java b/modules/example/src/main/java/org/locationtech/jtsexample/io/gml2/KMLReaderExample.java index f8041f4ca1..b6658e4dec 100644 --- a/modules/example/src/main/java/org/locationtech/jtsexample/io/gml2/KMLReaderExample.java +++ b/modules/example/src/main/java/org/locationtech/jtsexample/io/gml2/KMLReaderExample.java @@ -109,6 +109,7 @@ public List getGeometries() *@param atts Description of the Parameter *@exception SAXException Description of the Exception */ + @Override public void startElement(String uri, String name, String qName, Attributes atts) throws SAXException { if (name.equalsIgnoreCase(GMLConstants.GML_POLYGON)) { @@ -122,7 +123,8 @@ public void startElement(String uri, String name, String qName, } } - public void characters(char[] ch, int start, int length) throws SAXException + @Override + public void characters(char[] ch, int start, int length) throws SAXException { if (currGeomHandler != null) { currGeomHandler.characters(ch, start, length); @@ -135,6 +137,7 @@ public void characters(char[] ch, int start, int length) throws SAXException } } + @Override public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { if (currGeomHandler != null) @@ -150,6 +153,7 @@ public void ignorableWhitespace(char[] ch, int start, int length) *@param qName Description of the Parameter *@exception SAXException Description of the Exception */ + @Override public void endElement(String uri, String name, String qName) throws SAXException { // System.out.println("/" + name); @@ -179,6 +183,7 @@ public void endElement(String uri, String name, String qName) */ class FixingGeometryFactory extends GeometryFactory { + @Override public LinearRing createLinearRing(CoordinateSequence cs) { if (cs.getCoordinate(0).equals(cs.getCoordinate(cs.size() - 1))) diff --git a/modules/lab/src/main/java/org/locationtech/jtslab/geom/util/GeometryEditorEx.java b/modules/lab/src/main/java/org/locationtech/jtslab/geom/util/GeometryEditorEx.java index e5f6c55bcd..c958163649 100644 --- a/modules/lab/src/main/java/org/locationtech/jtslab/geom/util/GeometryEditorEx.java +++ b/modules/lab/src/main/java/org/locationtech/jtslab/geom/util/GeometryEditorEx.java @@ -335,6 +335,7 @@ public interface GeometryEditorOperation public static class NoOpGeometryOperation implements GeometryEditorOperation { + @Override public Geometry edit(Geometry geometry, GeometryFactory targetFactory) { return geometry; @@ -348,6 +349,7 @@ public Geometry edit(Geometry geometry, GeometryFactory targetFactory) public abstract static class CoordinateOperation implements GeometryEditorOperation { + @Override public final Geometry edit(Geometry geometry, GeometryFactory targetFactory) { if (geometry instanceof LinearRing) { return targetFactory.createLinearRing(edit(geometry.getCoordinates(), @@ -393,6 +395,7 @@ public abstract Coordinate[] edit(Coordinate[] coordinates, public abstract static class CoordinateSequenceOperation implements GeometryEditorOperation { + @Override public final Geometry edit(Geometry geometry, GeometryFactory targetFactory) { if (geometry instanceof LinearRing) { return targetFactory.createLinearRing(edit( diff --git a/modules/tests/src/main/java/org/locationtech/jtstest/geomop/OverlayValidatedGeometryOperation.java b/modules/tests/src/main/java/org/locationtech/jtstest/geomop/OverlayValidatedGeometryOperation.java index 2459090221..db2812ed10 100644 --- a/modules/tests/src/main/java/org/locationtech/jtstest/geomop/OverlayValidatedGeometryOperation.java +++ b/modules/tests/src/main/java/org/locationtech/jtstest/geomop/OverlayValidatedGeometryOperation.java @@ -56,6 +56,7 @@ public OverlayValidatedGeometryOperation() } + @Override public Class getReturnType(String opName) { return chainOp.getReturnType(opName); @@ -82,6 +83,7 @@ public OverlayValidatedGeometryOperation(GeometryMethodOperation chainOp) * @throws Exception * @see GeometryOperation#invoke */ + @Override public Result invoke(String opName, Geometry geometry, Object[] args) throws Exception { diff --git a/modules/tests/src/main/java/org/locationtech/jtstest/geomop/PreparedGeometryOperation.java b/modules/tests/src/main/java/org/locationtech/jtstest/geomop/PreparedGeometryOperation.java index a041fb22dc..7809ff78d4 100644 --- a/modules/tests/src/main/java/org/locationtech/jtstest/geomop/PreparedGeometryOperation.java +++ b/modules/tests/src/main/java/org/locationtech/jtstest/geomop/PreparedGeometryOperation.java @@ -39,6 +39,7 @@ public PreparedGeometryOperation() } + @Override public Class getReturnType(String opName) { if (isPreparedOp(opName)) @@ -76,6 +77,7 @@ private static boolean isPreparedOp(String opName) * @throws Exception * @see GeometryOperation#invoke */ + @Override public Result invoke(String opName, Geometry geometry, Object[] args) throws Exception { diff --git a/modules/tests/src/main/java/org/locationtech/jtstest/geomop/StaticMethodGeometryFunction.java b/modules/tests/src/main/java/org/locationtech/jtstest/geomop/StaticMethodGeometryFunction.java index b3397dfb72..ad2da1cc10 100644 --- a/modules/tests/src/main/java/org/locationtech/jtstest/geomop/StaticMethodGeometryFunction.java +++ b/modules/tests/src/main/java/org/locationtech/jtstest/geomop/StaticMethodGeometryFunction.java @@ -74,7 +74,8 @@ public StaticMethodGeometryFunction( this.method = method; } - public Object invoke(Geometry g, Object[] arg) + @Override + public Object invoke(Geometry g, Object[] arg) { return invoke(method, null, createFullArgs(g, arg)); } diff --git a/modules/tests/src/main/java/org/locationtech/jtstest/geomop/TeeGeometryOperation.java b/modules/tests/src/main/java/org/locationtech/jtstest/geomop/TeeGeometryOperation.java index 4ef8b332e0..41334db804 100644 --- a/modules/tests/src/main/java/org/locationtech/jtstest/geomop/TeeGeometryOperation.java +++ b/modules/tests/src/main/java/org/locationtech/jtstest/geomop/TeeGeometryOperation.java @@ -39,6 +39,7 @@ public TeeGeometryOperation() } + @Override public Class getReturnType(String opName) { return chainOp.getReturnType(opName); @@ -65,6 +66,7 @@ public TeeGeometryOperation(GeometryMethodOperation chainOp) * @throws Exception * @see GeometryOperation#invoke */ + @Override public Result invoke(String opName, Geometry geometry, Object[] args) throws Exception { diff --git a/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/BufferResultMatcher.java b/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/BufferResultMatcher.java index 004a7d34c6..a37cba8445 100644 --- a/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/BufferResultMatcher.java +++ b/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/BufferResultMatcher.java @@ -34,7 +34,8 @@ public class BufferResultMatcher * * @return true if the actual and expected results are considered equal */ - public boolean isMatch(Geometry geom, String opName, Object[] args, + @Override + public boolean isMatch(Geometry geom, String opName, Object[] args, Result actualResult, Result expectedResult, double tolerance) { diff --git a/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/EqualityResultMatcher.java b/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/EqualityResultMatcher.java index 7502b6451c..4c0e8732cb 100644 --- a/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/EqualityResultMatcher.java +++ b/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/EqualityResultMatcher.java @@ -29,7 +29,8 @@ public class EqualityResultMatcher * * @return true if the actual and expected results are considered equal */ - public boolean isMatch(Geometry geom, String opName, Object[] args, + @Override + public boolean isMatch(Geometry geom, String opName, Object[] args, Result actualResult, Result expectedResult, double tolerance) { diff --git a/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/NullResultMatcher.java b/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/NullResultMatcher.java index 3695f38919..4eba9a6399 100644 --- a/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/NullResultMatcher.java +++ b/modules/tests/src/main/java/org/locationtech/jtstest/testrunner/NullResultMatcher.java @@ -28,7 +28,8 @@ public class NullResultMatcher * * @return true always */ - public boolean isMatch(Geometry geom, String opName, Object[] args, + @Override + public boolean isMatch(Geometry geom, String opName, Object[] args, Result actualResult, Result expectedResult, double tolerance) {