Changeset 3944 in josm

Timestamp:

Mar 2, 2011 5:44:35 PM (2 years ago)

Author:

stoecker

Message:

remove broken dead code

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/GridLayer.java (deleted)
• data/validation/OsmValidator.java (modified) (5 diffs)
• gui/preferences/ValidatorPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -65 +65 @@
     public ValidateAction validateAction = new ValidateAction();
 
-    /** Grid detail, multiplier of east,north values for valuable cell sizing */
-    public static double griddetail;
-
     public static Collection<String> ignoredErrors = new TreeSet<String>();
 
@@ -99 +96 @@
     public OsmValidator() {
         checkValidatorDir();
-        initializeGridDetail();
         initializeTests(getTests());
         loadIgnoredErrors(); //FIXME: load only when needed
@@ -154 +150 @@
     public static void saveIgnoredErrors() {
         try {
-            final PrintWriter out = new PrintWriter(new FileWriter(getValidatorDir() + "ignorederrors"), false);
+            final PrintWriter out = new PrintWriter(new FileWriter(getValidatorDir()
+            + "ignorederrors"), false);
             for (String e : ignoredErrors) {
                 out.println(e);
@@ -163 +160 @@
         }
     }
-
-    private ValidateUploadHook uploadHook;
-
-//    public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-//        if (newFrame != null) {
-//            initializeErrorLayer();
-//            if (Main.pref.hasKey(ValidatorPreference.PREF_DEBUG + ".grid"))
-//                Main.main.addLayer(new GridLayer(tr("Grid")));
-//        }
-//    }
 
     public static void initializeErrorLayer() {
@@ -245 +232 @@
 
     /**
-     * Initialize grid details based on current projection system. Values based on
-     * the original value fixed for EPSG:4326 (10000) using heuristics (that is, test&error
-     * until most bugs were discovered while keeping the processing time reasonable)
-     */
-    public void initializeGridDetail() {
-        if (Main.proj.toString().equals(new Epsg4326().toString())) {
-            OsmValidator.griddetail = 10000;
-        } else if (Main.proj.toString().equals(new Mercator().toString())) {
-            OsmValidator.griddetail = 0.01;
-        } else if (Main.proj.toString().equals(new Lambert().toString())) {
-            OsmValidator.griddetail = 0.1;
-        }
-    }
-
-    /**
      * Initializes all tests
      * @param allTests The tests to initialize

trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java

@@ -37 +37 @@
     public static final String PREFIX = "validator";
 
-    /** The preferences key for debug preferences */
-    public static final String PREF_DEBUG = PREFIX + ".debug";
-
-    /** The preferences key for debug preferences */
+    /** The preferences key for error layer */
     public static final String PREF_LAYER = PREFIX + ".layer";