Changeset 3669 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2010-11-25T00:07:52+01:00 (13 years ago)

Author:

bastiK

Message:

add validator plugin to josm core. Original author: Francisco R. Santos (frsantos); major contributions by bilbo, daeron, delta_foxtrot, imi, jttt, jrreid, gabriel, guggis, pieren, rrankin, skela, stoecker, stotz and others

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (1 diff)
• MapFrame.java (modified) (3 diffs)
• MapView.java (modified) (1 diff)
• dialogs/ValidatorDialog.java (added)
• dialogs/validator (added)
• dialogs/validator/ValidatorTreePanel.java (added)
• dialogs/validator/ValidatorTreeRenderer.java (added)
• layer/OsmDataLayer.java (modified) (4 diffs)
• layer/ValidatorLayer.java (added)
• preferences/PreferenceTabbedPane.java (modified) (4 diffs)
• preferences/ValidatorPreference.java (added)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -77 +77 @@
 import org.openstreetmap.josm.actions.ZoomOutAction;
 import org.openstreetmap.josm.actions.OrthogonalizeAction.Undo;
+import org.openstreetmap.josm.actions.ValidateAction;
 import org.openstreetmap.josm.actions.audio.AudioBackAction;
 import org.openstreetmap.josm.actions.audio.AudioFasterAction;

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -55 +55 @@
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.dialogs.UserListDialog;
+import org.openstreetmap.josm.gui.dialogs.ValidatorDialog;
 import org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -92 +93 @@
     public FilterDialog filterDialog;
     public RelationListDialog relationListDialog;
+    public ValidatorDialog validatorDialog;
     public SelectionListDialog selectionListDialog;
     /**
@@ -180 +182 @@
         addToggleDialog(new HistoryDialog());
         addToggleDialog(conflictDialog = new ConflictDialog());
+        addToggleDialog(validatorDialog = new ValidatorDialog());
         addToggleDialog(filterDialog = new FilterDialog());
         addToggleDialog(new ChangesetDialog(this));

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -113 +113 @@
 
     /**
-     * Adds a edit layer change listener
+     * Adds an edit layer change listener
      *
      * @param listener the listener. Ignored if null or already registered.
-     * @param initialFire Fire an edit-layer-changed-event right after adding the listener.
+     * @param initialFire Fire an edit-layer-changed-event right after adding 
+     * the listener in case there is an edit layer present
      */
     public static void addEditLayerChangeListener(EditLayerChangeListener listener, boolean initialFire) {

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -24 +24 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 
@@ -63 +64 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintVisitor;
 import org.openstreetmap.josm.data.osm.visitor.paint.SimplePaintVisitor;
+import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.MapView;
@@ -86 +88 @@
     private boolean isChanged = true;
     private int highlightUpdateCount;
+
+    public List<TestError> validationErrors = new ArrayList<TestError>();
 
     protected void setRequiresSaveToFile(boolean newValue) {
@@ -483 +487 @@
             }
 
-            ArrayList<WayPoint> trkseg = null;
+            List<WayPoint> trkseg = null;
             for (Node n : w.getNodes()) {
                 if (!n.isUsable()) {

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

@@ -44 +44 @@
 
     /**
-     * Allows PreferenceSettings to do validation of entered values when ok was pressed. If data are invalid then event can
-     * return false to cancel closing of preferences dialog
+     * Allows PreferenceSettings to do validation of entered values when ok was pressed. 
+     * If data is invalid then event can return false to cancel closing of preferences dialog.
      *
      */
@@ -168 +168 @@
                 // to restart JOSM
                 //
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 sb.append("<html>");
                 if (task != null && !task.isCanceled()) {
@@ -222 +222 @@
 
     public void buildGui() {
-        for (PreferenceSettingFactory factory:settingsFactory) {
+        for (PreferenceSettingFactory factory : settingsFactory) {
             // logger.info("creating settings: " + factory);
             PreferenceSetting setting = factory.createPreferenceSetting();
@@ -276 +276 @@
         settingsFactory.add(new AudioPreference.Factory());
         settingsFactory.add(new ShortcutPreference.Factory());
+        settingsFactory.add(new ValidatorPreference.Factory());
 
         PluginHandler.getPreferenceSetting(settingsFactory);