- Timestamp:
- 2012-10-02T20:54:42+02:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/JosmAction.java
r5459 r5526 100 100 * won't be assigned a shortcut unless the user configures one. If you pass null here, 101 101 * the user CANNOT configure a shortcut for your action. 102 * @param register register this action for the toolbar preferences?102 * @param registerInToolbar register this action for the toolbar preferences? 103 103 * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null 104 104 * @param installAdapters false, if you don't want to install layer changed and selection changed adapters 105 105 */ 106 public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register , String toolbarId, boolean installAdapters) {107 this(name, iconName == null ? null : ImageProvider.get(iconName), tooltip, shortcut, register ,106 public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar, String toolbarId, boolean installAdapters) { 107 this(name, iconName == null ? null : ImageProvider.get(iconName), tooltip, shortcut, registerInToolbar, 108 108 toolbarId == null ? iconName : toolbarId, installAdapters); 109 109 } 110 110 111 public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register , boolean installAdapters) {112 this(name, iconName, tooltip, shortcut, register , null, installAdapters);113 } 114 115 public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register ) {116 this(name, iconName, tooltip, shortcut, register , null, true);111 public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar, boolean installAdapters) { 112 this(name, iconName, tooltip, shortcut, registerInToolbar, null, installAdapters); 113 } 114 115 public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar) { 116 this(name, iconName, tooltip, shortcut, registerInToolbar, null, true); 117 117 } 118 118 -
trunk/src/org/openstreetmap/josm/actions/ValidateAction.java
r5463 r5526 101 101 } 102 102 103 @Override 104 public void destroy() { 105 // Hack - this action should stay forever because it could be added to toolbar 106 // Do not call super.destroy() here 107 } 108 103 109 /** 104 110 * Asynchronous task for running a collection of tests against a collection -
trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
r5463 r5526 22 22 23 23 import org.openstreetmap.josm.Main; 24 import org.openstreetmap.josm.actions.ValidateAction; 24 25 import org.openstreetmap.josm.data.projection.Epsg4326; 25 26 import org.openstreetmap.josm.data.projection.Lambert; … … 67 68 public static ValidatorLayer errorLayer = null; 68 69 70 /** The validate action */ 71 public ValidateAction validateAction = new ValidateAction(); 72 69 73 /** Grid detail, multiplier of east,north values for valuable cell sizing */ 70 74 public static double griddetail; -
trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
r5463 r5526 33 33 import org.openstreetmap.josm.Main; 34 34 import org.openstreetmap.josm.actions.AutoScaleAction; 35 import org.openstreetmap.josm.actions.ValidateAction;36 35 import org.openstreetmap.josm.command.Command; 37 36 import org.openstreetmap.josm.data.SelectionChangedListener; … … 130 129 buttons.add(selectButton); 131 130 132 buttons.add(new SideButton( new ValidateAction()));131 buttons.add(new SideButton(Main.main.validator.validateAction)); 133 132 134 133 fixButton = new SideButton(new AbstractAction() {
Note:
See TracChangeset
for help on using the changeset viewer.