Context Navigation

Changeset 9981 in josm for trunk

Timestamp:

2016-03-13T17:25:42+01:00 (8 years ago)

Author:

Don-vip

Message:

fix some unused code warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

-              r9952
+              r9981
                 // "operator" (null) should mean the same as "operator()"
                 // (Always). I.e. match everything
                 this.match = new Always();
+                this.match = Always.INSTANCE;
             } else {
                 this.match = match;
 …
      */
     public static class Never extends TaggedMatch {
+        /** The unique instance/ */
+        public static final Never INSTANCE = new Never();
         @Override
         public boolean match(Tagged osm) {
 …
             throw new ParseError(tr("Unexpected token: {0}", tokenizer.nextToken()));
         if (m == null)
             m = new Always();
+            m = Always.INSTANCE;
         Main.debug("Parsed search expression is {0}", m);
         return m;

-              r8378
+              r9981
 public class ProjectionConfigurationException extends Exception {
-    /**
-     * Constructs a new {@code ProjectionConfigurationException}.
-     */
-    public ProjectionConfigurationException() {
-        super();
+    }
     /**

-              r9230
+              r9981
         subGridName = string;
+    }
-    /**
-     * Make this object a copy of the supplied GridShift
-     * @param gs grid to copy data from
-     */
-    public void copy(NTV2GridShift gs) {
-        this.lon = gs.lon;
-        this.lat = gs.lat;
-        this.lonShift = gs.lonShift;
-        this.latShift = gs.latShift;
-        this.lonAccuracy = gs.lonAccuracy;
-        this.latAccuracy = gs.latAccuracy;
-        this.latAccuracyAvailable = gs.latAccuracyAvailable;
-        this.lonAccuracyAvailable = gs.lonAccuracyAvailable;
-        this.subGridName = gs.subGridName;
+    }
+}

-              r8870
+              r9981
+ *
  * @author Peter Yuill
  * Modifified for JOSM :
+ * Modified for JOSM :
  * - removed the RandomAccessFile mode (Pieren)
  */
 …
+        }
         return sub;
+    }
-    public boolean isLoaded() {
-        return topLevelSubGrid != null;
+    }
-    public void unload() {
-        topLevelSubGrid = null;
+    }
 …
+    }
-    /**
-     * Get a copy of the SubGrid tree for this file.
+     *
-     * @return a deep clone of the current SubGrid tree
-     */
-    public NTV2SubGrid[] getSubGridTree() {
-        NTV2SubGrid[] clone = new NTV2SubGrid[topLevelSubGrid.length];
-        for (int i = 0; i < topLevelSubGrid.length; i++) {
-            clone[i] = (NTV2SubGrid) topLevelSubGrid[i].clone();
+        }
-        return clone;
+    }
     public String getFromEllipsoid() {
         return fromEllipsoid;

-              r9067
+              r9981
  * - read grid file by single bytes. Workaround for a bug in some VM not supporting
  *   file reading by group of 4 bytes from a jar file.
+ * - removed the Cloneable interface
  */
 public class NTV2SubGrid implements Cloneable, Serializable {
+public class NTV2SubGrid implements Serializable {
     private static final long serialVersionUID = 1L;
 …
+    }
-    public NTV2SubGrid getSubGrid(int index) {
-        return (subGrid == null) ? null : subGrid[index];
+    }
     /**
      * Set an array of Sub Grids of this sub grid
 …
     /**
-     * Make a deep clone of this Sub Grid
-     */
-    @Override
-    public Object clone() {
-        NTV2SubGrid clone = null;
-        try {
-            clone = (NTV2SubGrid) super.clone();
-            // Do a deep clone of the sub grids
-            if (subGrid != null) {
-                clone.subGrid = new NTV2SubGrid[subGrid.length];
-                for (int i = 0; i < subGrid.length; i++) {
-                    clone.subGrid[i] = (NTV2SubGrid) subGrid[i].clone();
+                }
+            }
-        } catch (CloneNotSupportedException cnse) {
-            Main.warn(cnse);
+        }
-        return clone;
+    }
-    /**
      * Get maximum latitude value
      * @return maximum latitude

-              r8510
+              r9981
  */
 package org.openstreetmap.josm.data.projection.datum;
-import org.openstreetmap.josm.Main;
 /**
 …
         return Double.longBitsToDouble(l);
+    }
-    /**
-     * Does the current VM support the New IO api
-     * @return true or false
-     */
-    public static boolean isNioAvailable() {
-        boolean nioAvailable = false;
-        try {
-            Class.forName("java.nio.channels.FileChannel");
-            nioAvailable = true;
-        } catch (NoClassDefFoundError | ClassNotFoundException cnfe) {
-            Main.info(cnfe.getMessage());
+        }
-        return nioAvailable;
+    }
+}

r9940	r9981
26	26	}
27	27	};
28		tagsToIgnore = ~~new SearchCompiler.Never()~~;
	28	tagsToIgnore = SearchCompiler.Never.INSTANCE;
29	29	}
30	30
…	…
73	73
74	74	public void setTagsToIgnore(SearchAction.SearchSetting tagsToIgnore) throws SearchCompiler.ParseError {
75		setTagsToIgnore(tagsToIgnore.text.isEmpty() ? ~~new SearchCompiler.Never()~~ : SearchCompiler.compile(tagsToIgnore));
	75	setTagsToIgnore(tagsToIgnore.text.isEmpty() ? SearchCompiler.Never.INSTANCE : SearchCompiler.compile(tagsToIgnore));
76	76	}
77	77

r9940	r9981
310	310	warnAboutParseError(parseError);
311	311	tagsToIgnore = new SearchAction.SearchSetting();
312		recentTags.setTagsToIgnore(~~new SearchCompiler.Never()~~);
	312	recentTags.setTagsToIgnore(SearchCompiler.Never.INSTANCE);
313	313	}
314	314	}

r9978	r9981
45	45	textComponent.setBackground(new Color(255, 224, 224));
46	46	textComponent.setToolTipText(ex.getMessage());
47		filter = ~~new SearchCompiler.Always()~~;
	47	filter = SearchCompiler.Always.INSTANCE;
48	48	}
49	49	textComponent.firePropertyChange("filter", 0, 1);

Note: See TracChangeset for help on using the changeset viewer.