Menu
▾
▴
[Magicmap-commits] SF.net SVN: magicmap: [504] trunk/magicmapclient
|
From: <jan...@us...> - 2007-01-14 19:57:34
|
Revision: 504
http://svn.sourceforge.net/magicmap/?rev=504&view=rev
Author: jan_fride
Date: 2007-01-14 11:57:31 -0800 (Sun, 14 Jan 2007)
Log Message:
-----------
removed old pluginsystem
Modified Paths:
--------------
trunk/magicmapclient/magicmapclient.iml
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
Removed Paths:
-------------
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IClientPlugin.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/InfoPlugin.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginHandler.java
trunk/magicmapclient/src/net/sf/magicmap/client/plugin/udpscanner/
Modified: trunk/magicmapclient/magicmapclient.iml
===================================================================
--- trunk/magicmapclient/magicmapclient.iml 2007-01-14 19:09:55 UTC (rev 503)
+++ trunk/magicmapclient/magicmapclient.iml 2007-01-14 19:57:31 UTC (rev 504)
@@ -4,37 +4,301 @@
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build" />
<exclude-output />
+ <output-test url="file://$MODULE_DIR$/build-test" />
<content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/perl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/res" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src-gen" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/.settings" />
- <excludeFolder url="file://$MODULE_DIR$/dist" />
<excludeFolder url="file://$MODULE_DIR$/inf" />
+ <excludeFolder url="file://$MODULE_DIR$/lib" />
+ <excludeFolder url="file://$MODULE_DIR$/lib-dev" />
</content>
- <orderEntry type="jdk" jdkName="1.5" jdkType="JavaSDK" />
+ <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library" exported="">
+ <orderEntry type="library" name="Groovy from GroovyJ 0.1.8 (Demetra)" level="application" />
+ <orderEntry type="library" name="magicmap-server" level="application" />
+ <orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/magicmap.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/nekohtml.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" exported="" name="client-libs" level="project" />
- <orderEntry type="library" exported="" name="lib-dev" level="project" />
- <orderEntry type="module-library" exported="">
+ <orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../magicmapserver/dist/magicmap-server.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/jaxrpc.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/concurrent.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/commons-collections-3.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jaxen-1.1-beta-9.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/forms-1.0.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/xml-apis.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/activation.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jung-1.5.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/xmlParserAPIs.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/mail.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/derby.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/foxtrot.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/commons-httpclient-3.0-rc3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/dom4j-1.6.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/commons-discovery.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/RelativeLayout.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/saaj.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/log4j-1.2.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/xercesImpl.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/looks-1.2.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/axis.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/ostermillerutils_1_05_00.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jpox-20041204.032009.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/commons-codec-1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/colt.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/wsdl4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib-dev/axis-ant.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib-dev/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="file://$MODULE_DIR$/build" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-01-14 19:09:55 UTC (rev 503)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-01-14 19:57:31 UTC (rev 504)
@@ -125,9 +125,6 @@
this.infoObjects = new ArrayList<InfoObject>();
// initializeScanner();
this.infoServiceRegistry = new InfoObjectProviderRegistry(this.nodeModel);
- PluginHandler.getInstance();
-
- //TODO
try {
this.pluginManager = new PluginManager(new Settings(), this);
} catch (MalformedURLException e) {
Deleted: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IClientPlugin.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IClientPlugin.java 2007-01-14 19:09:55 UTC (rev 503)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/IClientPlugin.java 2007-01-14 19:57:31 UTC (rev 504)
@@ -1,24 +0,0 @@
-
-package net.sf.magicmap.client.plugin;
-
-/**
- * Wird durch die neue Architektur ersetzt.
- *
- *
- *
- */
-@Deprecated
-public interface IClientPlugin {
-
- public boolean canStartup();
-
- public void connect();
-
- public void loadMap();
-
- public void dispose();
-
- public void setId(String id);
-
- public String getId();
-}
Deleted: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/InfoPlugin.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/InfoPlugin.java 2007-01-14 19:09:55 UTC (rev 503)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/InfoPlugin.java 2007-01-14 19:57:31 UTC (rev 504)
@@ -1,30 +0,0 @@
-
-package net.sf.magicmap.client.plugin;
-
-import net.sf.magicmap.client.model.node.InfoObjectNode;
-
-@Deprecated
-public interface InfoPlugin extends IClientPlugin {
-
- /**
- *
- * @param node
- * @throws Exception
- */
- public void expandNode(InfoObjectNode node) throws Exception;
-
- /**
- *
- * @return
- * @throws Exception
- */
- public InfoObjectNode createNode() throws Exception;
-
- /**
- *
- * @param source
- * @param target
- * @param data
- */
- public void addEdge(InfoObjectNode source, InfoObjectNode target, String[][] data);
-}
Deleted: trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginHandler.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginHandler.java 2007-01-14 19:09:55 UTC (rev 503)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/plugin/PluginHandler.java 2007-01-14 19:57:31 UTC (rev 504)
@@ -1,113 +0,0 @@
-
-package net.sf.magicmap.client.plugin;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import net.sf.magicmap.client.gui.utils.GUIUtils;
-
-@Deprecated
-public class PluginHandler {
-
- private static PluginHandler instance = null;
- private List<IClientPlugin> plugins;
- private ResourceBundle pluginBundle;
- private static final String PLUGIN_KEY = "plugins";
- private static final String BUNDLE_NAME = "plugins";
-
- private PluginHandler() {
- this.plugins = new ArrayList<IClientPlugin>();
-
- // Instantiate all availlable plugins
- initPlugins();
- }
-
- public static PluginHandler getInstance(){
- if (PluginHandler.instance == null) PluginHandler.instance = new PluginHandler();
- return PluginHandler.instance;
- }
-
- public void initPlugins(){
- if (this.pluginBundle == null) initBundle();
-
- String pluginNames;
- String[] pluginNamesArray;
- if (((pluginNames = this.pluginBundle.getString(PluginHandler.PLUGIN_KEY)) != null)
- && (pluginNames.trim().length() > 0)) {
- pluginNamesArray = pluginNames.split(",");
-
- Class clazz = null;
- IClientPlugin clientPlugin = null;
- for (String pluginName : pluginNamesArray)
- // init Plugin
- try {
- clazz = Class.forName(pluginName.trim());
- clientPlugin = (IClientPlugin) clazz.newInstance();
- clientPlugin.setId(clientPlugin.getClass().getName());
- this.plugins.add(clientPlugin);
- System.out.println("Neuer Plugin: " + clientPlugin);
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }
-
- public void initBundle() throws MissingResourceException{
- try {
- this.pluginBundle = ResourceBundle.getBundle(PluginHandler.BUNDLE_NAME, GUIUtils.getLocale());
- } catch (MissingResourceException e) {
- throw e;
- }
- }
-
- public void connect(){
- for (IClientPlugin plugin : this.plugins)
- plugin.connect();
- }
-
- public void loadMap(){
- for (IClientPlugin plugin : this.plugins)
- plugin.loadMap();
- }
-
- public void dispose(){
- for (IClientPlugin plugin : this.plugins)
- plugin.dispose();
- }
-
- public IClientPlugin getPlugin(Class clazz){
- for (IClientPlugin plugin : this.plugins)
- if (plugin.getClass().isAssignableFrom(clazz)) return plugin;
- return null;
- }
-
- public Collection<IClientPlugin> getPlugins(Class clazz){
- LinkedList<IClientPlugin> pluginList = new LinkedList<IClientPlugin>();
- for (IClientPlugin plugin : this.plugins)
- if (clazz.isAssignableFrom(plugin.getClass()))
- pluginList.add(plugin);
- else
- System.err.println(clazz + " not assignable to " + plugin.getClass());
- return pluginList;
- }
-
- public List<IClientPlugin> getPlugins(){
- return this.plugins;
- }
-
- public void setPlugins(List<IClientPlugin> plugins){
- this.plugins = plugins;
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
