add missing @OVERRIDES without whitespace diffs

Signed-off-by: Mike Barry <[email protected]>
locationtech · Nov 8, 2023 · ac1970b · ac1970b
1 parent cb9455e
commit ac1970b
Show file tree

Hide file tree

Showing 64 changed files with 208 additions and 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
@@ -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/...app/src/main/java/org/locationtech/jtstest/geomfunction/StaticMethodGeometryFunction.java b/...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
@@ -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/...les/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionListPanel.java b/...les/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/...les/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryFunctionTreePanel.java b/...les/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
@@ -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
@@ -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,13 +417,15 @@ class HighlightMouseListener extends MouseAdapter {
       this.comp = comp;
     }
 
+    @Override
     public void mouseEntered(MouseEvent e) {
       if (comp.isFocusLayer()) return;
       comp.setBackground(CLR_HIGHLIGHT);
       //comp.setBorder(BORDER_HIGHLIGHT);
       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
@@ -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/...es/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexDeleter.java b/...es/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/...s/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/GeometryVertexInserter.java b/...s/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
@@ -38,6 +38,7 @@ public MoveVertexOperation(Coordinate fromLoc, Coordinate toLoc)
       this.toLoc = toLoc;
     }
 
+    @Override
     public Coordinate[] edit(Coordinate[] coords,
         Geometry geometry)
     {

diff --git a/...app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiLineHandler.java b/...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/...pp/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/MultiPointHandler.java b/...pp/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/...les/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PointHandler.java b/...les/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,14 +89,16 @@ 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;
     }
 
     /**
      * 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/...s/app/src/main/java/org/locationtech/jtstest/testbuilder/io/shapefile/PolygonHandler.java b/...s/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/...src/main/java/org/locationtech/jtstest/testbuilder/topostretch/GeometryVerticesMover.java b/...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)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,7 @@ public MoveVerticesOperation(Map moves) @@
         }
+        @Override
         public Coordinate[] edit(Coordinate[] coords,
             Geometry geometry)
         {
@@ Expand Down @@