Changeset 192 in josm for src/org/openstreetmap

Timestamp:

2007-01-10T04:55:36+01:00 (18 years ago)

Author:

imi

Message:

• added command line parameter --default-classloader (for debug and packaging purpose)

Location:

src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• data/Preferences.java (modified) (1 diff)
• gui/MainApplication.java (modified) (2 diffs)
• plugins/PluginInformation.java (modified) (2 diffs)

src/org/openstreetmap/josm/Main.java

@@ -26 +26 @@
 import javax.swing.UIManager;
 
-import org.openstreetmap.josm.actions.AboutAction;
 import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.actions.DownloadAction.DownloadTask;
@@ -263 +262 @@
         public static void preConstructorInit(Map<String, Collection<String>> args) {
                 try {
-                        Main.pref.upgrade(Integer.parseInt(AboutAction.version));
-                } catch (NumberFormatException e1) {
-                }
-
-                try {
                         Main.proj = (Projection)Class.forName(Main.pref.get("projection")).newInstance();
                 } catch (final Exception e) {
@@ -310 +304 @@
                         bounds = !args.containsKey("no-fullscreen") ? new Rectangle(0,0,screenDimension.width,screenDimension.height) : new Rectangle(1000,740);
 
-                        pleaseWaitDlg = new PleaseWaitDialog();
+                pleaseWaitDlg = new PleaseWaitDialog();
         }
 

src/org/openstreetmap/josm/data/Preferences.java

@@ -161 +161 @@
         }
 
-        public final void upgrade(int oldVersion) {
-                if (oldVersion > 117) return;
-                if (!properties.containsKey("color.scale"))
-                        properties.put("color.scale", ColorHelper.color2html(Color.white));
-        }
-
         public Collection<Bookmark> loadBookmarks() throws IOException {
                 File bookmarkFile = new File(getPreferencesDir()+"bookmarks");

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

@@ -101 +101 @@
                 }
 
+                // determine what classloader to be used for plugins
+                if (args.containsKey("default-classloader"))
+                        PluginInformation.useJosmClassloader = true;
+                
                 // load the early plugins
             if (Main.pref.hasKey("plugins")) {
@@ -134 +138 @@
                                         "\t--downloadgps=minlat,minlon,maxlat,maxlon "+tr("Download the bounding box as raw gps")+"\n"+
                                         "\t--selection=<searchstring>                "+tr("Select with the given search")+"\n"+
+                                        "\t--default-classloader                     "+tr("Load all plugins with the default class loader")+"\n"+
                                         "\t--no-fullscreen                           "+tr("Don't launch in fullscreen mode")+"\n"+
                                         "\t--reset-preferences                       "+tr("Reset the preferences to default")+"\n\n"+

src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -21 +21 @@
  */
 public class PluginInformation {
+        
+        /**
+         * Whether to use the standard classloader to load the plugins or
+         * an seperate class loader. Note that in case of the standard classloader,
+         * all plugin files has to be included in the main josm.jar classpath
+         * 
+         * Set via command line parameter to true.
+         * 
+         * This switch is intended for debugging JOSM (or prepackaging plugins
+         * together with JOSM).
+         */
+        public static boolean useJosmClassloader = false;
+        
         public final File file;
         public final String name;
@@ -89 +102 @@
         public Class<?> loadClass() {
                 try {
+                        if (useJosmClassloader)
+                                return Class.forName(className);
+
                         URL[] urls = new URL[libraries.size()];
                         urls = libraries.toArray(urls);