Changeset 11 in josm

Timestamp:

2005-10-04T20:36:42+02:00 (19 years ago)

Author:

imi

Message:

changed direct resource access to Class.getResource()

Location:

src/org/openstreetmap/josm

Files:

• actions/ExitAction.java (modified) (2 diffs)
• actions/OpenGpxAction.java (modified) (1 diff)
• actions/PreferencesAction.java (modified) (2 diffs)
• actions/SaveGpxAction.java (modified) (1 diff)
• actions/mapmode/MapMode.java (modified) (2 diffs)
• data/osm/visitor/SelectionComponentVisitor.java (modified) (2 diffs)
• gui/MapView.java (modified) (1 diff)
• gui/PreferenceDialog.java (modified) (1 diff)
• gui/dialogs/SelectionListDialog.java (modified) (1 diff)
• gui/dialogs/ToggleDialog.java (modified) (1 diff)

src/org/openstreetmap/josm/actions/ExitAction.java

@@ -6 +6 @@
 import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
+
+import org.openstreetmap.josm.gui.Main;
 
 /**
@@ -18 +20 @@
          */
         public ExitAction() {
-                super("Exit", new ImageIcon("images/exit.png"));
+                super("Exit", new ImageIcon(Main.class.getResource("/images/exit.png")));
                 putValue(MNEMONIC_KEY, KeyEvent.VK_X);
         }

src/org/openstreetmap/josm/actions/OpenGpxAction.java

@@ -32 +32 @@
          */
         public OpenGpxAction() {
-                super("Open GPX", new ImageIcon("images/opengpx.png"));
+                super("Open GPX", new ImageIcon(Main.class.getResource("/images/opengpx.png")));
                 putValue(MNEMONIC_KEY, KeyEvent.VK_O);
         }

src/org/openstreetmap/josm/actions/PreferencesAction.java

@@ -7 +7 @@
 import javax.swing.ImageIcon;
 
+import org.openstreetmap.josm.gui.Main;
 import org.openstreetmap.josm.gui.PreferenceDialog;
 
@@ -20 +21 @@
          */
         public PreferencesAction() {
-                super("Preferences", new ImageIcon("images/preference.png"));
+                super("Preferences", new ImageIcon(Main.class.getResource("/images/preference.png")));
                 putValue(MNEMONIC_KEY, KeyEvent.VK_P);
         }

src/org/openstreetmap/josm/actions/SaveGpxAction.java

@@ -28 +28 @@
          */
         public SaveGpxAction() {
-                super("Save GPX", new ImageIcon("images/savegpx.png"));
+                super("Save GPX", new ImageIcon(Main.class.getResource("/images/savegpx.png")));
                 putValue(MNEMONIC_KEY, KeyEvent.VK_S);
         }

src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.Main;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -45 +46 @@
          */
         public MapMode(String name, String iconName, String tooltip, int mnemonic, MapFrame mapFrame) {
-                super(name, new ImageIcon("images/mapmode/"+iconName+".png"));
+                super(name, new ImageIcon(Main.class.getResource("/images/mapmode/"+iconName+".png")));
                 putValue(MNEMONIC_KEY, mnemonic);
                 putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(mnemonic,0));

src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Track;
+import org.openstreetmap.josm.gui.Main;
 
 /**
@@ -37 +38 @@
         public void visit(Key k) {
                 name = k.name;
-                icon = new ImageIcon("images/data/key.png");
+                icon = new ImageIcon(Main.class.getResource("/images/data/key.png"));
         }
 

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

@@ -45 +45 @@
         public class AutoScaleAction extends AbstractAction {
                 public AutoScaleAction() {
-                        super("Auto Scale", new ImageIcon("images/autoscale.png"));
+                        super("Auto Scale", new ImageIcon(Main.class.getResource("/images/autoscale.png")));
                         putValue(MNEMONIC_KEY, KeyEvent.VK_A);
                 }

src/org/openstreetmap/josm/gui/PreferenceDialog.java

@@ -43 +43 @@
         class OkAction extends AbstractAction {
                 public OkAction() {
-                        super("Ok", new ImageIcon("images/ok.png"));
+                        super("Ok", new ImageIcon(Main.class.getResource("/images/ok.png")));
                         putValue(MNEMONIC_KEY, KeyEvent.VK_ENTER);
                 }

src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -71 +71 @@
                 getContentPane().add(new JScrollPane(displaylist), BorderLayout.CENTER);
 
-                JButton button = new JButton("Select", new ImageIcon("images/mapmode/selection.png"));
+                JButton button = new JButton("Select", new ImageIcon(Main.class.getResource("/images/mapmode/selection.png")));
                 button.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {

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

@@ -28 +28 @@
         public ToggleDialog(String title, String name, String iconName, int mnemonic, String tooltip) {
                 super(Main.main, title, false);
-                putValue(SMALL_ICON, new ImageIcon("images/dialogs/"+iconName+".png"));
+                putValue(SMALL_ICON, new ImageIcon(Main.class.getResource("/images/dialogs/"+iconName+".png")));
                 putValue(NAME, name);
                 putValue(MNEMONIC_KEY, mnemonic);