Changeset 19335 in osm for applications/editors

Timestamp:

2010-01-09T15:03:13+01:00 (15 years ago)

Author:

jttt

Message:

Added multipolygon tests, fixed some warnings

Location:

applications/editors/josm/plugins/validator

Files:

• .settings/org.eclipse.jdt.ui.prefs (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/GridLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java (modified) (8 diffs)
• src/org/openstreetmap/josm/plugins/validator/Test.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java (added)
• src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/validator/util/Entities.java (modified) (1 diff)

applications/editors/josm/plugins/validator/.settings/org.eclipse.jdt.ui.prefs

@@ -1 @@
-#Sun Sep 07 16:57:55 CEST 2008
+#Fri Jan 08 08:06:27 CET 2010
 eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_JOSM
 formatter_settings_version=11
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=false
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

applications/editors/josm/plugins/validator/build.xml

@@ -27 +27 @@
         -->
         <property name="commit.message" value="Update to JOSM 2748" />
-        <property name="plugin.main.version" value="2748" />
+        <property name="plugin.main.version" value="2788" />
 
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java

@@ -138 +138 @@
      * Visitor that highlights all cells the selected primitives go through
      */
-    class HighlightCellVisitor extends AbstractVisitor
+    static class HighlightCellVisitor extends AbstractVisitor
     {
         /** The MapView */

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java

@@ -39 +39 @@
 import org.openstreetmap.josm.plugins.validator.tests.DuplicateWay;
 import org.openstreetmap.josm.plugins.validator.tests.DuplicatedWayNodes;
+import org.openstreetmap.josm.plugins.validator.tests.MultipolygonTest;
 import org.openstreetmap.josm.plugins.validator.tests.NameMismatch;
 import org.openstreetmap.josm.plugins.validator.tests.NodesWithSameName;
@@ -80 +81 @@
     /**
      * All available tests
-     * TODO: is there any way to find out automagically all available tests?
+     * TODO: is there any way to find out automatically all available tests?
      */
     @SuppressWarnings("unchecked")
@@ -99 +100 @@
             DuplicateWay.class, // ID 1401 .. 1499
             NameMismatch.class, // ID  1501 ..  1599
+            MultipolygonTest.class, // ID  1601 ..  1699
     };
 
@@ -134 +136 @@
                 }
             } catch (final FileNotFoundException e) {
+                // Ignore
             } catch (final IOException e) {
                 e.printStackTrace();
@@ -157 +160 @@
 
     private ValidateUploadHook uploadHook;
-    
+
     @Override
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
@@ -166 +169 @@
             if (Main.pref.hasKey(PreferenceEditor.PREF_DEBUG + ".grid"))
                 Main.main.addLayer(new GridLayer(tr("Grid")));
-            MapView.addLayerChangeListener(this);            
+            MapView.addLayerChangeListener(this);
         } else
                 MapView.removeLayerChangeListener(this);
@@ -273 +276 @@
             } catch (InvocationTargetException ite) {
                 ite.getCause().printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent, 
+                JOptionPane.showMessageDialog(Main.parent,
                                 tr("Error initializing test {0}:\n {1}", test.getClass()
                         .getSimpleName(), ite.getCause().getMessage()),
@@ -280 +283 @@
             } catch (Exception e) {
                 e.printStackTrace();
-                JOptionPane.showMessageDialog(Main.parent, 
+                JOptionPane.showMessageDialog(Main.parent,
                                 tr("Error initializing test {0}:\n {1}", test.getClass()
                         .getSimpleName(), e),

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.GridBagConstraints;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32 +33 @@
 {
     /** Name of the test */
-    protected String name;
+    protected final String name;
 
     /** Description of the test */
-    protected String description;
+    protected final String description;
 
     /** Whether this test is enabled. Enabled by default */
@@ -77 +78 @@
     public Test(String name)
     {
-        this.name = name;
+        this(name, null);
     }
 
@@ -162 +163 @@
 
         GBC a = GBC.eol();
-        a.anchor = GBC.EAST;
+        a.anchor = GridBagConstraints.EAST;
         checkBeforeUpload = new JCheckBox();
         checkBeforeUpload.setSelected(testBeforeUpload);

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java

@@ -438 +438 @@
         if (!Main.pref.getBoolean(PreferenceEditor.PREF_FILTER_BY_SELECTION, false))
             return;
-        if (newSelection == null || newSelection.size() == 0)
+        if (newSelection.isEmpty())
             tree.setFilter(null);
         HashSet<OsmPrimitive> filter = new HashSet<OsmPrimitive>(newSelection);

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java

@@ -166 +166 @@
      * @author frsantos
      */
-    private class ExtendedSegment
+    private static class ExtendedSegment
     {
         public Node n1, n2;

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java

@@ -28 +28 @@
 {
 
-    private class WayPair {
+    private static class WayPair {
         public List<LatLon> coor;
         public Map<String, String> keys;

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java

@@ -886 +886 @@
         protected static int TAG_CHECK_INFO   = 1270;
 
-        private class CheckerElement {
+        private static class CheckerElement {
             public Object tag;
             public Object value;

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java

@@ -226 +226 @@
 //            return !w.containsNode(n)
 //            && line.ptSegDist(n.getEastNorth().east(), n.getEastNorth().north()) < dist;
-            if (w == null)
+            if (w == null) {
                 Main.debug("way null");
+                return false;
+            }
             if (w.containsNode(n))
                 return false;

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Entities.java

@@ -341 +341 @@
         if (firstAmp < 0)
             return str;
-        String res = new String(str.substring(0, firstAmp));
+        String res = str.substring(0, firstAmp);
         int len = str.length();
         for (int i = firstAmp; i < len; i++) {