Changeset 20735 in osm for applications/editors/josm/plugins/turnrestrictions/src/org

Timestamp:

2010-03-29T19:14:54+02:00 (15 years ago)

Author:

guggis

Message:

Additional screenshots, also in German
Added help topics for context sensitive help
Removed sorting on selection list, order should be the order of selection

Location:

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

Files:

• editor/AdvancedEditorPanel.java (modified) (2 diffs)
• editor/BasicEditorPanel.java (modified) (2 diffs)
• editor/JosmSelectionListModel.java (modified) (2 diffs)
• editor/TurnRestrictionEditor.java (modified) (1 diff)
• editor/TurnRestrictionEditorModel.java (modified) (1 diff)
• list/TurnRestrictionsListDialog.java (modified) (2 diffs)
• qa/IssuesView.java (modified) (2 diffs)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java

@@ -12 +12 @@
 import javax.swing.JTable;
 
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
@@ -104 +105 @@
                 this.model = model;
                 build();
+                HelpUtil.setHelpContext(this, HelpUtil.ht("/Plugins/turnrestrictions#AdvancedEditor"));
         }
         

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java

@@ -13 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.NavigationControler.BasicEditorFokusTargets;
@@ -123 +124 @@
                 this.model = model;
                 build();
+                HelpUtil.setHelpContext(this, HelpUtil.ht("/Plugins/turnrestrictions#BasicEditor"));
         }
         

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModel.java

@@ -122 +122 @@
         }
         this.selection.addAll(selection);
-        sort();
         fireContentsChanged(this, 0, getSize());       
         setSelected(sel);
-    }
-
-    /**
-     * Sorts the primitives in the list
-     */
-    public void sort() {
-        Collections.sort(this.selection,new OsmPrimitiveComparator());
     }
 
@@ -234 +226 @@
                 return ret;
         }
-        
-        /**
-         * The comparator used when sorting the elements in this model
-         *
-         */
-        static private class OsmPrimitiveComparator implements Comparator<OsmPrimitive> {
-        final private HashMap<Object, String> cache= new HashMap<Object, String>();
-        final private DefaultNameFormatter df  = DefaultNameFormatter.getInstance();
-
-        private String cachedName(OsmPrimitive p) {
-            String name = cache.get(p);
-            if (name == null) {
-                name = p.getDisplayName(df);
-                cache.put(p, name);
-            }
-            return name;
-        }
-
-        private int compareName(OsmPrimitive a, OsmPrimitive b) {
-            String an = cachedName(a);
-            String bn = cachedName(b);
-            // make sure display names starting with digits are the end of the
-            // list
-            if (Character.isDigit(an.charAt(0)) && Character.isDigit(bn.charAt(0)))
-                return an.compareTo(bn);
-            else if (Character.isDigit(an.charAt(0)) && !Character.isDigit(bn.charAt(0)))
-                return 1;
-            else if (!Character.isDigit(an.charAt(0)) && Character.isDigit(bn.charAt(0)))
-                return -1;
-            return an.compareTo(bn);
-        }
-
-        private int compareType(OsmPrimitive a, OsmPrimitive b) {
-            // show ways before relations, then nodes
-            //
-            if (a.getType().equals(b.getType())) return 0;
-            if (a.getType().equals(OsmPrimitiveType.WAY)) return -1;
-            if (a.getType().equals(OsmPrimitiveType.NODE)) return 1;
-            // a is a relation
-            if (b.getType().equals(OsmPrimitiveType.WAY)) return 1;
-            // b is a node
-            return -1;
-        }
-        public int compare(OsmPrimitive a, OsmPrimitive b) {
-            if (a.getType().equals(b.getType()))
-                return compareName(a, b);
-            return compareType(a, b);
-        }
-    }
 }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java

@@ -105 +105 @@
         pnl.add(new SideButton(new CancelAction()));
         
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Plugins/turnrestrictions"))));
+        pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Plugins/turnrestrictions#TurnRestrictionEditor"))));
         return pnl;
     }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModel.java

@@ -209 +209 @@
          */
         public void apply(Relation turnRestriction) {
-                CheckParameterUtil.ensureParameterNotNull(turnRestriction, "turnRestriction");
-                
+                CheckParameterUtil.ensureParameterNotNull(turnRestriction, "turnRestriction");          
                 TagCollection tags = tagEditorModel.getTagCollection();
+                turnRestriction.removeAll();
                 tags.applyTo(turnRestriction);
                 memberModel.applyTo(turnRestriction);           

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java

@@ -33 +33 @@
 import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
@@ -166 +167 @@
                 );
                 build();
+                HelpUtil.setHelpContext(this, HelpUtil.ht("/Plugins/turnrestrictions#TurnRestrictionToggleDialog"));
         }       
         

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesView.java

@@ -9 +9 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -36 +37 @@
                 model.addObserver(this);
                 build();
+                HelpUtil.setHelpContext(this, HelpUtil.ht("/Plugins/turnrestrictions#ErrorsAndWarnings"));
         }