Changeset 3038 in osm for applications/editors

Timestamp:

2007-05-27T20:32:30+02:00 (18 years ago)

Author:

frsantos

Message:

New tests: Crossing roads, reused segments, untagged way, fixmes
Add timeout to mirror connections

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator

Files:

• OSMValidatorPlugin.java (modified) (6 diffs)
• tests/CrossingSegments.java (added)
• tests/ReusedSegment.java (added)
• tests/SpellCheck.java (modified) (17 diffs)
• tests/UntaggedWay.java (added)
• util/Util.java (modified) (4 diffs)

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -11 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.UploadAction;
+import org.openstreetmap.josm.actions.UploadAction.UploadHook;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -43 +45 @@
         DuplicateSegment.class, 
         SingleNodeSegment.class, 
+        UntaggedNode.class, 
         TaggedSegment.class, 
+        UntaggedWay.class,
         UnorderedWay.class, 
         SpellCheck.class,
-        UntaggedNode.class, 
         OrphanSegment.class, 
+        ReusedSegment.class, 
+        CrossingSegments.class, 
     };
 
@@ -73 +78 @@
                 newFrame.addToggleDialog(validationDialog);
             Main.main.addLayer(new ErrorLayer(tr("Validation errors")));
-            try
+                }
+        
+        // Add/Remove the upload hook
+        try
+        {
+            LinkedList<UploadHook> hooks = ((UploadAction)Main.main.menu.upload).uploadHooks;
+            Iterator<UploadHook> hooksIt = hooks.iterator(); 
+            while( hooksIt.hasNext() )
             {
-                ((UploadAction)Main.main.menu.upload).uploadHooks.add( 0, new ValidateUploadHook() );
+                if( hooksIt.next() instanceof ValidateUploadHook )
+                {
+                    if( newFrame == null )
+                        hooksIt.remove();
+                    break;
+                }
             }
-            catch(Throwable t)
-            {
-                // JOSM has no upload hooks in older versions 
-            }
-                }
+            if( newFrame != null )
+                hooks.add( 0, new ValidateUploadHook() );
+        }
+        catch(Throwable t)
+        {
+            // JOSM has no upload hooks in older versions 
+        }        
         }
 
@@ -118 +137 @@
             
             String simpleName = testClass.getSimpleName();
-            test.testBeforeUpload = Main.pref.getBoolean( "tests." + simpleName + ".checkBeforeUpload");            
+            test.testBeforeUpload = Main.pref.getBoolean( "tests." + simpleName + ".checkBeforeUpload", true);            
                         enabledTests.put(simpleName, test);
                 }
@@ -165 +184 @@
                                 }
                         } 
-                        catch(Exception e) 
-                        {
-                                e.printStackTrace();
-                                JOptionPane.showMessageDialog(null, tr("Error initializing test {0}.", test.getClass().getSimpleName()));
-                        }
+            catch(InvocationTargetException ite) 
+            {
+                ite.getCause().printStackTrace();
+                JOptionPane.showMessageDialog(null, tr("Error initializing test {0}:\n {1}", test.getClass().getSimpleName(), ite.getCause().getMessage()));
+            }
+            catch(Exception e) 
+            {
+                e.printStackTrace();
+                JOptionPane.showMessageDialog(null, tr("Error initializing test {0}:\n {1}", test.getClass().getSimpleName(), e));
+            }
                 }
         }

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

@@ -46 +46 @@
     /** Preference name for checking values */
     public static final String PREF_CHECK_KEYS = "tests." + SpellCheck.class.getSimpleName() + ".checkKeys";
+    /** Preference name for checking FIXMES */
+    public static final String PREF_CHECK_FIXMES = "tests." + SpellCheck.class.getSimpleName() + ".checkFixmes";
     /** Preference name for sources */
     public static final String PREF_SOURCES = "tests." + SpellCheck.class.getSimpleName() + ".sources";
@@ -54 +56 @@
     /** Preference name for values upload check */
     public static final String PREF_CHECK_VALUES_BEFORE_UPLOAD = "tests." + SpellCheck.class.getSimpleName() + ".checkValuesBeforeUpload";
+    /** Preference name for fixmes upload check */
+    public static final String PREF_CHECK_FIXMES_BEFORE_UPLOAD = "tests." + SpellCheck.class.getSimpleName() + ".checkFixmesBeforeUpload";
         
     /** Whether to check keys */
@@ -59 +63 @@
     /** Whether to check values */
     protected boolean checkValues = false;
+    /** Whether to check for fixmes in values */
+    protected boolean checkFixmes = false;
 
     /** Preferences checkbox for keys */
@@ -64 +70 @@
     /** Preferences checkbox for values */
     protected JCheckBox prefCheckValues;
+    /** Preferences checkbox for FIXMES */
+    protected JCheckBox prefCheckFixmes;
     /** The preferences checkbox for validation of keys on upload */
     protected JCheckBox prefCheckKeysBeforeUpload;
     /** The preferences checkbox for validation of values on upload */
     protected JCheckBox prefCheckValuesBeforeUpload;
+    /** The preferences checkbox for validation of fixmes on upload */
+    protected JCheckBox prefCheckFixmesBeforeUpload;
     /** The add button */
     protected JButton addSrcButton;
@@ -79 +89 @@
         /** Invalid key error */
         protected static int INVALID_KEY        = 1;
-        /** Invalid value error */
-        protected static int INVALID_VALUE      = 2;
+    /** Invalid value error */
+    protected static int INVALID_VALUE  = 2;
+    /** fixme error */
+    protected static int FIXME          = 3;
         
     /** List of sources for spellcheck data */
@@ -89 +101 @@
     /** Whether this test must check the values before upload. Used by peferences */
     protected boolean testValuesBeforeUpload;
+    /** Whether this test must check form fixmes in values before upload. Used by peferences */
+    protected boolean testFixmesBeforeUpload;
     
         /**
@@ -95 +109 @@
         public SpellCheck() 
         {
-                super(tr("Properties spell checker."),
-                          tr("This plugin checks misspelled property keys and values."));
+                super(tr("Properties checker."),
+                          tr("This plugin checks for errors in property keys and values."));
         }
 
@@ -124 +138 @@
         
         StringTokenizer st = new StringTokenizer(sources, ";");
+        StringBuilder errorSources = new StringBuilder();
         while (st.hasMoreTokens())
         {
             String source = st.nextToken();
             File sourceFile = Util.mirror(new URL(source), plugin.getPluginDir());
+            if( sourceFile == null || !sourceFile.exists() )
+            {
+                errorSources.append(source).append("\n");
+                continue;
+            }
+            
             BufferedReader reader = new BufferedReader(new FileReader(sourceFile));
 
@@ -154 +175 @@
                 while( true );
         }
+
+        if( errorSources.length() > 0 )
+            throw new IOException( tr("Could not download spellcheck data file:\n {0}", errorSources) );
+
         }
         
@@ -223 +248 @@
                                 withErrors.add(p, "IPK");
                         }
-                        if( checkValues && value != null && value.length() > 0 )
-                        {
-                                List<String> values = spellCheckValueData.get(key);
-                                if( values != null && !values.contains(prop.getValue()) && !withErrors.contains(p, "UPV"))
-                                {
-                                        errors.add( new TestError(this, Severity.OTHER, tr("Unknown property values"), p, INVALID_VALUE) );
-                                        withErrors.add(p, "UPV");
-                                }
-                        }
+            if( checkValues && value != null && value.length() > 0 && spellCheckValueData != null)
+            {
+                List<String> values = spellCheckValueData.get(key);
+                if( values != null && !values.contains(prop.getValue()) && !withErrors.contains(p, "UPV"))
+                {
+                    errors.add( new TestError(this, Severity.OTHER, tr("Unknown property values"), p, INVALID_VALUE) );
+                    withErrors.add(p, "UPV");
+                }
+            }
+            if( checkFixmes && value != null && value.length() > 0 )
+            {
+                if( value.contains("FIXME") && !withErrors.contains(p, "FIXME"))
+                {
+                    errors.add( new TestError(this, Severity.OTHER, tr("FIXMES"), p, FIXME) );
+                    withErrors.add(p, "FIXME");
+                }
+            }
                 }
         }
@@ -312 +345 @@
         checkKeys = Main.pref.getBoolean(PREF_CHECK_KEYS);
         if( isBeforeUpload )
-            checkKeys = checkKeys && Main.pref.getBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD);
+            checkKeys = checkKeys && Main.pref.getBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD, true);
 
         checkValues = Main.pref.getBoolean(PREF_CHECK_VALUES);
         if( isBeforeUpload )
-            checkValues = checkValues && Main.pref.getBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD);
+            checkValues = checkValues && Main.pref.getBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, true);
+
+        checkFixmes = Main.pref.getBoolean(PREF_CHECK_FIXMES);
+        if( isBeforeUpload )
+            checkFixmes = checkFixmes && Main.pref.getBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, true);
         }
 
@@ -331 +368 @@
         testPanel.add( new JLabel(), GBC.eol());
         
-        boolean checkKeys = Main.pref.getBoolean(PREF_CHECK_KEYS);
+        boolean checkKeys = Main.pref.getBoolean(PREF_CHECK_KEYS, true);
         prefCheckKeys = new JCheckBox(tr("Check property keys."), checkKeys);
         prefCheckKeys .setToolTipText(tr("Validate that property keys are valid checking against list of words."));
@@ -337 +374 @@
 
         prefCheckKeysBeforeUpload = new JCheckBox();
-        prefCheckKeysBeforeUpload.setSelected(Main.pref.getBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD));
+        prefCheckKeysBeforeUpload.setSelected(Main.pref.getBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD, true));
         testPanel.add(prefCheckKeysBeforeUpload, GBC.eop().insets(20,0,0,0));
         
@@ -411 +448 @@
         buttonPanel.setEnabled( checkKeys );
         
-        boolean checkValues = Main.pref.getBoolean(PREF_CHECK_VALUES);
+        boolean checkValues = Main.pref.getBoolean(PREF_CHECK_VALUES, true);
         prefCheckValues = new JCheckBox(tr("Check property values."), checkValues);
         prefCheckValues .setToolTipText(tr("Validate that property values are valid checking against presets."));
@@ -417 +454 @@
 
         prefCheckValuesBeforeUpload = new JCheckBox();
-        prefCheckValuesBeforeUpload.setSelected(Main.pref.getBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD));
+        prefCheckValuesBeforeUpload.setSelected(Main.pref.getBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, true));
         testPanel.add(prefCheckValuesBeforeUpload, GBC.eop().insets(20,0,0,0));
-        
+
+        boolean checkFixmes = Main.pref.getBoolean(PREF_CHECK_FIXMES, true);
+        prefCheckFixmes = new JCheckBox(tr("Check for FIXMES."), checkFixmes);
+        prefCheckFixmes.setToolTipText(tr("Looks for nodes, segments or ways with FIXME in any property value."));
+        testPanel.add(prefCheckFixmes, GBC.std().insets(40,0,0,0));
+
+        prefCheckFixmesBeforeUpload = new JCheckBox();
+        prefCheckFixmesBeforeUpload.setSelected(Main.pref.getBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, true));
+        testPanel.add(prefCheckFixmesBeforeUpload, GBC.eop().insets(20,0,0,0));
         }
 
@@ -432 +477 @@
         prefCheckValues.setEnabled(enabled);
         prefCheckValuesBeforeUpload.setEnabled(enabled);
+        prefCheckFixmes.setEnabled(enabled);
+        prefCheckFixmesBeforeUpload.setEnabled(enabled);
     } 
     
@@ -439 +486 @@
         Main.pref.put(PREF_CHECK_VALUES, prefCheckValues.isSelected());
         Main.pref.put(PREF_CHECK_KEYS, prefCheckKeys.isSelected());
+        Main.pref.put(PREF_CHECK_FIXMES, prefCheckFixmes.isSelected());
         Main.pref.put(PREF_CHECK_VALUES_BEFORE_UPLOAD, prefCheckValuesBeforeUpload.isSelected());
         Main.pref.put(PREF_CHECK_KEYS_BEFORE_UPLOAD, prefCheckKeysBeforeUpload.isSelected());
-        Main.pref.put(PREF_CHECK_BEFORE_UPLOAD, prefCheckKeysBeforeUpload.isSelected() || prefCheckValuesBeforeUpload.isSelected());            
+        Main.pref.put(PREF_CHECK_FIXMES_BEFORE_UPLOAD, prefCheckFixmesBeforeUpload.isSelected());            
+        Main.pref.put(PREF_CHECK_BEFORE_UPLOAD, prefCheckKeysBeforeUpload.isSelected() || prefCheckValuesBeforeUpload.isSelected() || prefCheckFixmesBeforeUpload.isSelected());
         String sources = "";
         if( spellcheckSources.getModel().getSize() > 0 )

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

@@ -6 +6 @@
 import java.io.*;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
@@ -172 +173 @@
      * @param destDir The destionation dir of the mirrored file
      * @return The local file
-     * @throws IOException If any error reading or writing the file
-     */
-    public static File mirror(URL url, String destDir) throws IOException
+     */
+    public static File mirror(URL url, String destDir)
     {
         if( url.getProtocol().equals("file") )
@@ -199 +199 @@
         try 
         {
-            bis = new BufferedInputStream(url.openStream());
+            URLConnection conn = url.openConnection();
+            conn.setConnectTimeout(5000);
+            bis = new BufferedInputStream(conn.getInputStream());
             bos = new BufferedOutputStream( new FileOutputStream(localPath) );
             byte[] buffer = new byte[4096];
@@ -207 +209 @@
                 bos.write( buffer, 0, length );
             }
+        }
+        catch(IOException ioe)
+        {
+            if( oldFile != null )
+                return oldFile;
+            else
+                return null;
         }
         finally