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

Timestamp:

2009-10-06T00:07:00+02:00 (17 years ago)

Author:

Gubaer

Message:

Refactored JOSM help system, slightly extended
Fixed problem with new internal representation of nodes as array (in Way)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapScaler.java (modified) (1 diff)
• MapSlider.java (modified) (1 diff)
• MapStatus.java (modified) (2 diffs)
• NavigatableComponent.java (modified) (2 diffs)
• dialogs/ConflictDialog.java (modified) (1 diff)
• dialogs/ConflictResolutionDialog.java (modified) (2 diffs)
• dialogs/ToggleDialog.java (modified) (2 diffs)
• help (added)
• help/HelpBrowser.java (added)
• help/HelpBuilder.java (added)
• help/Helpful.java (added)

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

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.HelpAction.Helpful;
+import org.openstreetmap.josm.gui.help.Helpful;
 
 public class MapScaler extends JComponent implements Helpful {

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

@@ -9 +9 @@
 import javax.swing.event.ChangeListener;
 
-import org.openstreetmap.josm.actions.HelpAction.Helpful;
 import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.gui.help.Helpful;
 
 class MapSlider extends JSlider implements PropertyChangeListener, ChangeListener, Helpful {

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

@@ -40 +40 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.HelpAction.Helpful;
 import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -46 +45 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.help.Helpful;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;

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

@@ -15 +15 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.HelpAction.Helpful;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
@@ -27 +26 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.help.Helpful;
 
 /**

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -46 +46 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.help.HelpBuilder;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.properties.OperationCancelledException;
+import org.openstreetmap.josm.gui.help.HelpBuilder;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -143 +144 @@
 
         resolver.addPropertyChangeListener(this);
+        HelpBuilder.setHelpContext(this.getRootPane(), "Dialog/ConflictDialog");
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -33 +33 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.actions.HelpAction.Helpful;
 import org.openstreetmap.josm.gui.dialogs.DialogsPanel.Action;
+import org.openstreetmap.josm.gui.help.Helpful;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -291 +291 @@
                         @Override
                         public void mouseClicked(MouseEvent e) {
-//                            toggleExpandedState();
+                            //                            toggleExpandedState();
                             if (isCollapsed) {
                                 expand();