Changeset 13332 in osm for applications/editors/josm/plugins/surveyor/src

Timestamp:

2009-01-23T22:36:04+01:00 (16 years ago)

Author:

stoecker

Message:

fixes for new plugin handling

File:

• applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java

@@ -22 +22 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MainMenu;
-import org.openstreetmap.josm.plugins.PluginProxy;
+import org.openstreetmap.josm.plugins.PluginHandler;
 
 /**
@@ -44 +44 @@
         super();
 
-        // try to determine if the livegps plugin was already loaded:
-//        PluginInformation pluginInfo = PluginInformation.getLoaded("livegps");
-//        if (pluginInfo == null) {
-//          JOptionPane.showMessageDialog(null, "Please install wmsplugin");
-//          return;
-//        }
-//        if (!pluginInfo.version.equals("2")) {
-//          JOptionPane.showMessageDialog(null, "livegps Version 2 required.");
-//          return;
-//        }
-        try {
-            Class.forName("livegps.LiveGpsPlugin");
-        } catch(ClassNotFoundException cnfe) {
-            String message =
-                tr("SurveyorPlugin depends on LiveGpsPlugin!") + "\n" +
-                tr("LiveGpsPlugin not found, please install and activate.") + "\n" +
-                tr("SurveyorPlugin is disabled for the moment");
-            JOptionPane.showMessageDialog(Main.parent, message, tr("SurveyorPlugin"), JOptionPane.ERROR_MESSAGE);
-            return;
-        }
-
-
-        LiveGpsPlugin gpsPlugin = null;
-        Iterator<PluginProxy> proxyIter = Main.plugins.iterator();
-        while(proxyIter.hasNext()) {
-            Object plugin = proxyIter.next().plugin;
-            if(plugin instanceof LiveGpsPlugin) {
-                gpsPlugin = (LiveGpsPlugin) plugin;
-                break;
-            }
-        }
+        LiveGpsPlugin gpsPlugin = (LiveGpsPlugin) PluginHandler.getPlugin("livegps");
         if(gpsPlugin == null)
             throw new IllegalStateException(tr("SurveyorPlugin needs LiveGpsPlugin, but could not find it!"));