Menu
▾
▴
[Davinspector-svn] SF.net SVN: davinspector: [108] trunk/DAVInspector/src/de/dlr/davinspector
|
From: <wu...@us...> - 2008-04-06 15:17:15
|
Revision: 108
http://davinspector.svn.sourceforge.net/davinspector/?rev=108&view=rev
Author: wuest
Date: 2008-04-06 08:17:09 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
Removed reference to PluginManager from MainView. PluginManager should only be available via the controller.
Modified Paths:
--------------
trunk/DAVInspector/src/de/dlr/davinspector/plugin/PluginManager.java
trunk/DAVInspector/src/de/dlr/davinspector/plugins/xmlplugin/JTextPaneContentHandler.java
trunk/DAVInspector/src/de/dlr/davinspector/ui/IMainController.java
trunk/DAVInspector/src/de/dlr/davinspector/ui/MainController.java
trunk/DAVInspector/src/de/dlr/davinspector/ui/MainView.java
trunk/DAVInspector/src/de/dlr/davinspector/ui/PluginConfigurationDialog.java
Modified: trunk/DAVInspector/src/de/dlr/davinspector/plugin/PluginManager.java
===================================================================
--- trunk/DAVInspector/src/de/dlr/davinspector/plugin/PluginManager.java 2008-04-06 13:57:37 UTC (rev 107)
+++ trunk/DAVInspector/src/de/dlr/davinspector/plugin/PluginManager.java 2008-04-06 15:17:09 UTC (rev 108)
@@ -297,7 +297,7 @@
/**
* An edit-plugin signals the completion of an editing activity by calling this method.
* All active plugins with the same direction are updated.
- * TODO: Raw views are not updated yet
+ * NOTE: Raw views are not updated!
*
* @param direction {@link PluginDirection}
* @param message {@link AMessage}
Modified: trunk/DAVInspector/src/de/dlr/davinspector/plugins/xmlplugin/JTextPaneContentHandler.java
===================================================================
--- trunk/DAVInspector/src/de/dlr/davinspector/plugins/xmlplugin/JTextPaneContentHandler.java 2008-04-06 13:57:37 UTC (rev 107)
+++ trunk/DAVInspector/src/de/dlr/davinspector/plugins/xmlplugin/JTextPaneContentHandler.java 2008-04-06 15:17:09 UTC (rev 108)
@@ -126,7 +126,6 @@
try {
myStyledDocument.insertString(myStyledDocument.getLength(), text, myAttributeSet);
} catch (BadLocationException ble) {
- // INFO: Maybe logger instead?
myJTextAreaError.append(ble.getLocalizedMessage() + ": " + ble.offsetRequested());
}
Modified: trunk/DAVInspector/src/de/dlr/davinspector/ui/IMainController.java
===================================================================
--- trunk/DAVInspector/src/de/dlr/davinspector/ui/IMainController.java 2008-04-06 13:57:37 UTC (rev 107)
+++ trunk/DAVInspector/src/de/dlr/davinspector/ui/IMainController.java 2008-04-06 15:17:09 UTC (rev 108)
@@ -25,7 +25,11 @@
package de.dlr.davinspector.ui;
+import java.util.List;
+
import de.dlr.davinspector.common.Constant.Direction;
+import de.dlr.davinspector.history.AMessage;
+import de.dlr.davinspector.plugin.IPlugin;
/**
@@ -87,4 +91,78 @@
* @param filename String
*/
void exportHistory(Direction direction, String filename);
+
+ /**
+ * This method notifys all active plugins to prepare for shutdown.
+ * @see PluginManager#shutdownActivePlugins()
+ */
+ void shutdownActivePlugins();
+
+ /**
+ * Returns a List containing the available plugins.
+ * @see PluginManager#getAvailablePlugins()
+ *
+ * @return List of IPlugins
+ */
+ List<IPlugin> getAvailablePlugins();
+
+ /**
+ * This method sets the active plugins for the client side.
+ * @see PluginManager#setActivePluginsClient(List)
+ *
+ * @param pluginNames List of Strings
+ */
+ void setActivePluginsClient(List<String> pluginNames);
+
+ /**
+ * This method sets the active plugins for the server side.
+ * @see PluginManager#setActivePluginsServer(List)
+ *
+ * @param pluginNames List of Strings
+ */
+ void setActivePluginsServer(List<String> pluginNames);
+
+ /**
+ * This method clears all client plugins.
+ * @see PluginManager#clearActivePluginsClient()
+ */
+ void clearActivePluginsClient();
+
+ /**
+ * This method clears all server plugins.
+ * @see PluginManager#clearActivePluginsServer()
+ */
+ void clearActivePluginsServer();
+
+ /**
+ * If a new message on the client side has arrived this method is called.
+ * @see PluginManager#updateActivePluginsClient(AMessage)
+ *
+ * @param message AMessage
+ */
+ void updateActivePluginsClient(AMessage message);
+
+ /**
+ * If a new message on the server side has arrived this method is called.
+ * @see PluginManager#updateActivePluginsServer(AMessage)
+ *
+ * @param message AMessage
+ */
+ void updateActivePluginsServer(AMessage message);
+
+ /**
+ * Returns a List containing the active plugins on the client side.
+ * @see PluginManager#getActivePluginsClient()
+ *
+ * @return List of IPlugins
+ */
+ List<IPlugin> getActivePluginsClient();
+
+ /**
+ * Returns a List containing the active plugins on the server side.
+ * @see PluginManager#getActivePluginsServer()
+ *
+ * @return List of IPlugins
+ */
+ List<IPlugin> getActivePluginsServer();
}
Modified: trunk/DAVInspector/src/de/dlr/davinspector/ui/MainController.java
===================================================================
--- trunk/DAVInspector/src/de/dlr/davinspector/ui/MainController.java 2008-04-06 13:57:37 UTC (rev 107)
+++ trunk/DAVInspector/src/de/dlr/davinspector/ui/MainController.java 2008-04-06 15:17:09 UTC (rev 108)
@@ -25,8 +25,12 @@
package de.dlr.davinspector.ui;
+import java.util.List;
+
import de.dlr.davinspector.common.Constant.Direction;
import de.dlr.davinspector.configuration.Configuration;
+import de.dlr.davinspector.history.AMessage;
+import de.dlr.davinspector.plugin.IPlugin;
import de.dlr.davinspector.relay.IRelayModel;
@@ -157,4 +161,94 @@
public void exportHistory(Direction direction, String filename) {
myRelay.exportHistory(direction, filename);
}
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see de.dlr.davinspector.ui.IMainController#shutdownActivePlugins()
+ */
+ public void shutdownActivePlugins() {
+ myRelay.getPluginManager().shutdownActivePlugins();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see de.dlr.davinspector.ui.IMainController#getAvailablePlugins()
+ */
+ public List<IPlugin> getAvailablePlugins() {
+ return myRelay.getPluginManager().getAvailablePlugins();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see de.dlr.davinspector.ui.IMainController#setActivePluginsClient(java.util.List)
+ */
+ public void setActivePluginsClient(List<String> pluginNames) {
+ myRelay.getPluginManager().setActivePluginsClient(pluginNames);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see de.dlr.davinspector.ui.IMainController#setActivePluginsServer(java.util.List)
+ */
+ public void setActivePluginsServer(List<String> pluginNames) {
+ myRelay.getPluginManager().setActivePluginsServer(pluginNames);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see de.dlr.davinspector.ui.IMainController#clearActivePluginsClient()
+ */
+ public void clearActivePluginsClient() {
+ myRelay.getPluginManager().clearActivePluginsClient();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see de.dlr.davinspector.ui.IMainController#clearActivePluginsServer()
+ */
+ public void clearActivePluginsServer() {
+ myRelay.getPluginManager().clearActivePluginsServer();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see de.dlr.davinspector.ui.IMainController#updateActivePluginsClient(de.dlr.davinspector.history.AMessage)
+ */
+ public void updateActivePluginsClient(AMessage message) {
+ myRelay.getPluginManager().updateActivePluginsClient(message);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see de.dlr.davinspector.ui.IMainController#updateActivePluginsServer(de.dlr.davinspector.history.AMessage)
+ */
+ public void updateActivePluginsServer(AMessage message) {
+ myRelay.getPluginManager().updateActivePluginsServer(message);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see de.dlr.davinspector.ui.IMainController#getActivePluginsClient()
+ */
+ public List<IPlugin> getActivePluginsClient() {
+ return myRelay.getPluginManager().getActivePluginsClient();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see de.dlr.davinspector.ui.IMainController#getActivePluginsServer()
+ */
+ public List<IPlugin> getActivePluginsServer() {
+ return myRelay.getPluginManager().getActivePluginsServer();
+ }
}
Modified: trunk/DAVInspector/src/de/dlr/davinspector/ui/MainView.java
===================================================================
--- trunk/DAVInspector/src/de/dlr/davinspector/ui/MainView.java 2008-04-06 13:57:37 UTC (rev 107)
+++ trunk/DAVInspector/src/de/dlr/davinspector/ui/MainView.java 2008-04-06 15:17:09 UTC (rev 108)
@@ -67,7 +67,6 @@
import de.dlr.davinspector.history.MessageEvent;
import de.dlr.davinspector.plugin.IPlugin;
import de.dlr.davinspector.plugin.IViewPlugin;
-import de.dlr.davinspector.plugin.PluginManager;
import de.dlr.davinspector.relay.IRelayModel;
/**
@@ -202,9 +201,6 @@
/** Toggle button for controlling the auto mode. */
private JToggleButton jToggleButtonAutomode = null;
- /** The plugin manager. */
- private PluginManager myPluginManager = null;
-
/**
* Action: Exit program.
*/
@@ -219,8 +215,7 @@
public void actionPerformed(ActionEvent e) {
// INFO: Currently shutdownActivePlugins maybe called twice.
- // TODO: controller
- myPluginManager.shutdownActivePlugins();
+ myController.shutdownActivePlugins();
System.exit(0);
}
};
@@ -291,10 +286,9 @@
public void actionPerformed(ActionEvent e) {
if (myPluginConfigurationDialog == null) {
- myPluginConfigurationDialog = new PluginConfigurationDialog(jFrame, myPluginManager, myController.getView());
+ myPluginConfigurationDialog = new PluginConfigurationDialog(jFrame, myController);
}
- // TODO: controller
- myPluginConfigurationDialog.addPlugins(myPluginManager.getAvailablePlugins());
+ myPluginConfigurationDialog.addPlugins(myController.getAvailablePlugins());
myPluginConfigurationDialog.setVisible(true);
}
};
@@ -338,8 +332,7 @@
putValue(Action.SHORT_DESCRIPTION, Internationalization.getTranslation("ac_start_relay_description"));
putValue(Action.SMALL_ICON, UIResource.getIcon(UIResource.ICON_START));
myRelayIsActive = false;
- // TODO: controller
- myPluginManager.shutdownActivePlugins();
+ myController.shutdownActivePlugins();
myController.disableRelay();
} else {
putValue(Action.NAME, Internationalization.getTranslation("ac_stop_relay"));
@@ -364,8 +357,7 @@
public void actionPerformed(ActionEvent e) {
jTextPaneClientRaw.setText("");
- // TODO: controller
- myPluginManager.clearActivePluginsClient();
+ myController.clearActivePluginsClient();
}
};
@@ -382,8 +374,7 @@
public void actionPerformed(ActionEvent e) {
jTextPaneServerRaw.setText("");
- // TODO: controller
- myPluginManager.clearActivePluginsServer();
+ myController.clearActivePluginsServer();
}
};
@@ -401,9 +392,8 @@
public void actionPerformed(ActionEvent e) {
jTextPaneServerRaw.setText("");
jTextPaneClientRaw.setText("");
- // TODO: controller
- myPluginManager.clearActivePluginsClient();
- myPluginManager.clearActivePluginsServer();
+ myController.clearActivePluginsClient();
+ myController.clearActivePluginsServer();
}
};
@@ -473,8 +463,6 @@
myRelay.getMessageHistory().addNewMessageListener(this);
myRelay.getMessageHistory().addLoadMessageListener(this);
- myPluginManager = myRelay.getPluginManager();
-
jFrame = getJFrame();
jFrame.pack();
jFrame.setVisible(true);
@@ -561,12 +549,10 @@
private void updateMessage(AMessage message) {
if (message.getDirection().equals(Direction.ClientToServer)) {
jTextPaneClientRaw.setText(message.getRawData());
- // TODO: controller
- myPluginManager.updateActivePluginsClient(message);
+ myController.updateActivePluginsClient(message);
} else {
jTextPaneServerRaw.setText(message.getRawData());
- // TODO: controller
- myPluginManager.updateActivePluginsServer(message);
+ myController.updateActivePluginsServer(message);
}
}
@@ -623,15 +609,12 @@
jTabbedPaneClient.addTab(Internationalization.getTranslation("tab_raw"), null, getJScrollPaneClientRaw(), null);
//update plugins
- // TODO: controller
- if (myPluginManager != null) {
- List<IPlugin> plugged = myPluginManager.getActivePluginsClient();
- for (Iterator<IPlugin> iterator = plugged.iterator(); iterator.hasNext();) {
- IPlugin plugin = (IPlugin) iterator.next();
- if (plugin.isActive()) {
- IViewPlugin viewPlugin = (IViewPlugin) plugin;
- jTabbedPaneClient.addTab(viewPlugin.getName(), null, viewPlugin.getUI(), null);
- }
+ List<IPlugin> plugged = myController.getActivePluginsClient();
+ for (Iterator<IPlugin> iterator = plugged.iterator(); iterator.hasNext();) {
+ IPlugin plugin = (IPlugin) iterator.next();
+ if (plugin.isActive()) {
+ IViewPlugin viewPlugin = (IViewPlugin) plugin;
+ jTabbedPaneClient.addTab(viewPlugin.getName(), null, viewPlugin.getUI(), null);
}
}
}
@@ -663,15 +646,12 @@
jTabbedPaneServer.addTab(Internationalization.getTranslation("tab_raw"), null, getJScrollPaneServerRaw(), null);
//update plugins
- // TODO: controller
- if (myPluginManager != null) {
- List<IPlugin> plugged = myPluginManager.getActivePluginsServer();
- for (Iterator<IPlugin> iterator = plugged.iterator(); iterator.hasNext();) {
- IPlugin plugin = (IPlugin) iterator.next();
- if (plugin.isActive()) {
- IViewPlugin viewPlugin = (IViewPlugin) plugin;
- jTabbedPaneServer.addTab(viewPlugin.getName(), null, viewPlugin.getUI(), null);
- }
+ List<IPlugin> plugged = myController.getActivePluginsServer();
+ for (Iterator<IPlugin> iterator = plugged.iterator(); iterator.hasNext();) {
+ IPlugin plugin = (IPlugin) iterator.next();
+ if (plugin.isActive()) {
+ IViewPlugin viewPlugin = (IViewPlugin) plugin;
+ jTabbedPaneServer.addTab(viewPlugin.getName(), null, viewPlugin.getUI(), null);
}
}
}
@@ -1000,7 +980,7 @@
if (jTableHistory == null) {
myHistoryTableModel = new HistoryTableModel();
- // TODO: controller?
+ // TODO: controller
myRelay.getMessageHistory().addNewMessageListener(myHistoryTableModel);
jTableHistory = new JTable(myHistoryTableModel);
@@ -1018,7 +998,6 @@
int rowIndex = jTableHistory.getSelectedRow();
if (rowIndex >= 0 && rowIndex < jTableHistory.getRowCount()) {
int id = (Integer) jTableHistory.getValueAt(rowIndex, 1);
- // TODO: controller
myController.loadMessage(id);
myRelay.getMessageHistory().loadMessageByID(id);
}
Modified: trunk/DAVInspector/src/de/dlr/davinspector/ui/PluginConfigurationDialog.java
===================================================================
--- trunk/DAVInspector/src/de/dlr/davinspector/ui/PluginConfigurationDialog.java 2008-04-06 13:57:37 UTC (rev 107)
+++ trunk/DAVInspector/src/de/dlr/davinspector/ui/PluginConfigurationDialog.java 2008-04-06 15:17:09 UTC (rev 108)
@@ -50,7 +50,6 @@
import de.dlr.davinspector.common.Util;
import de.dlr.davinspector.configuration.PluginConfiguration;
import de.dlr.davinspector.plugin.IPlugin;
-import de.dlr.davinspector.plugin.PluginManager;
/**
* Displays the configuration dialog to configure the plugins.
@@ -126,8 +125,8 @@
/** Stores the availability of a plugin for client and server. */
private Map<String, Boolean[]> myAvailablePlugins = new HashMap<String, Boolean[]>();
- /** The plugin manager. */
- private PluginManager myPluginManager = null;
+ /** The Controller. */
+ private IMainController myController = null;
/** The main window. */
private MainView myMainView = null;
@@ -139,13 +138,12 @@
* Constructor of the plugin configuration dialog.
*
* @param owner Frame
- * @param pluginManager {@link PluginManager}
- * @param main MainView
+ * @param controller {@link IMainController}
*/
- public PluginConfigurationDialog(Frame owner, PluginManager pluginManager, MainView main) {
+ public PluginConfigurationDialog(Frame owner, IMainController controller) {
super(owner);
- myPluginManager = pluginManager;
- myMainView = main;
+ myController = controller;
+ myMainView = myController.getView();
initialize();
}
@@ -324,8 +322,8 @@
serverPlugins.add(pluginName);
}
}
- myPluginManager.setActivePluginsClient(clientPlugins);
- myPluginManager.setActivePluginsServer(serverPlugins);
+ myController.setActivePluginsClient(clientPlugins);
+ myController.setActivePluginsServer(serverPlugins);
// Store the states of the plugins to the configuration file.
PluginConfiguration myPluginConfiguration = new PluginConfiguration();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
