Author: [log in to unmask]
Date: Fri Aug 28 18:14:03 2015
New Revision: 3456
Log:
Remove aida remote because it is not up to date with aida distribution.
Removed:
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/util/AIDAServer.java
Modified:
java/trunk/monitoring-app/pom.xml
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/JobSettingsPanel.java
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MenuBar.java
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplication.java
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/model/ConfigurationModel.java
Modified: java/trunk/monitoring-app/pom.xml
=============================================================================
--- java/trunk/monitoring-app/pom.xml (original)
+++ java/trunk/monitoring-app/pom.xml Fri Aug 28 18:14:03 2015
@@ -134,20 +134,5 @@
<artifactId>jlfgr</artifactId>
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>org.freehep</groupId>
- <artifactId>freehep-jaida-remote</artifactId>
- <version>3.4.11</version>
- <exclusions>
- <exclusion>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-math</groupId>
- <artifactId>commons-math</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</project>
Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/JobSettingsPanel.java
=============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/JobSettingsPanel.java (original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/JobSettingsPanel.java Fri Aug 28 18:14:03 2015
@@ -128,9 +128,7 @@
}
} else if (property.equals(ConfigurationModel.PROCESSING_STAGE_PROPERTY)) {
JobSettingsPanel.this.processingStageComboBox.setSelectedItem(evt.getNewValue());
- } else if (property.equals(ConfigurationModel.AIDA_SERVER_NAME_PROPERTY)) {
- JobSettingsPanel.this.aidaServerNameField.setText((String) evt.getNewValue());
- }
+ }
} finally {
JobSettingsPanel.this.getConfigurationModel().addPropertyChangeListener(this);
}
@@ -149,11 +147,6 @@
* The package where steering resources must be located.
*/
private static final String STEERING_PACKAGE = "org/hps/steering/monitoring/";
-
- /**
- * Field for name of remote AIDA server.
- */
- private final JTextField aidaServerNameField;
/**
* Combo box for selecting a conditions system tag.
@@ -332,9 +325,6 @@
this.logFileNameField = this.addField("Log File Name", "", "Full path to log file", 50, false);
this.logFileNameField.setEditable(false);
-
- this.aidaServerNameField = this.addField("AIDA Server Name", "", "Name of AIDA server", 30, true);
- this.aidaServerNameField.addPropertyChangeListener("value", this);
}
/**
@@ -487,8 +477,6 @@
} else if (source == this.maxEventsField) {
this.getConfigurationModel().setMaxEvents(Long.parseLong(this.maxEventsField.getText()));
// System.out.println("setMaxEvents - " + configurationModel.getMaxEvents());
- } else if (source == this.aidaServerNameField) {
- this.getConfigurationModel().setAIDAServerName(this.aidaServerNameField.getText());
} else if (evt.getPropertyName().equals(ConfigurationModel.LOG_TO_FILE_PROPERTY)) {
// This is getting the log to file prop change from the ConfigurationModel to update a read only
// component.
Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MenuBar.java
=============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MenuBar.java (original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MenuBar.java Fri Aug 28 18:14:03 2015
@@ -85,12 +85,7 @@
* Menu with list of recent files (10 max).
*/
private final JMenu recentFilesMenu;
-
- /**
- * Menu item for activating the remote AIDA server.
- */
- private final JMenuItem serverItem;
-
+
/**
* Menu item for opening the settings dialog window.
*/
@@ -219,14 +214,6 @@
this.logItem.setEnabled(true);
this.logItem.setToolTipText("Redirect System.out to a file instead of terminal");
toolsMenu.add(this.logItem);
-
- this.serverItem = new JMenuItem("Start AIDA Server ...");
- this.serverItem.setMnemonic(KeyEvent.VK_A);
- this.serverItem.setActionCommand(Commands.START_AIDA_SERVER);
- this.serverItem.setEnabled(true);
- this.serverItem.setToolTipText("Start AIDA RMI Server");
- this.serverItem.addActionListener(listener);
- toolsMenu.add(this.serverItem);
final JMenu windowMenu = new JMenu("Window");
windowMenu.setMnemonic(KeyEvent.VK_W);
@@ -332,22 +319,4 @@
++fileMnemonic;
}
}
-
- /**
- * Set state for AIDA server started.
- */
- void startAIDAServer() {
- this.serverItem.setActionCommand(Commands.STOP_AIDA_SERVER);
- this.serverItem.setText("Stop AIDA Server");
- this.serverItem.setToolTipText("Stop the remote AIDA server");
- }
-
- /**
- * Set state for AIDA server stopped.
- */
- void stopAIDAServer() {
- this.serverItem.setActionCommand(Commands.START_AIDA_SERVER);
- this.serverItem.setText("Start AIDA Server");
- this.serverItem.setToolTipText("Start the remote AIDA server");
- }
}
Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplication.java
=============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplication.java (original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplication.java Fri Aug 28 18:14:03 2015
@@ -41,7 +41,6 @@
import org.hps.monitoring.application.model.ConnectionStatus;
import org.hps.monitoring.application.model.ConnectionStatusModel;
import org.hps.monitoring.application.model.RunModel;
-import org.hps.monitoring.application.util.AIDAServer;
import org.hps.monitoring.application.util.DialogUtil;
import org.hps.monitoring.application.util.ErrorHandler;
import org.hps.monitoring.application.util.EvioFileFilter;
@@ -224,11 +223,6 @@
* The model which has information about the current run and events being processed.
*/
private final RunModel runModel = new RunModel();
-
- /**
- * A remote AIDA server instance.
- */
- private final AIDAServer server = new AIDAServer("hps-monitoring-app");
/**
* The handler for putting messages into the log table.
@@ -376,11 +370,7 @@
chooseLogFile();
} else if (Commands.LOG_TO_TERMINAL.equals(command)) {
logToTerminal();
- } else if (Commands.START_AIDA_SERVER.equals(command)) {
- startAIDAServer();
- } else if (Commands.STOP_AIDA_SERVER.equals(command)) {
- stopAIDAServer();
- }
+ }
}
/**
@@ -936,27 +926,7 @@
private void showSettingsDialog() {
this.frame.getSettingsDialog().setVisible(true);
}
-
- /**
- * Start the AIDA server instance.
- */
- private void startAIDAServer() {
- if (this.configurationModel.hasValidProperty(ConfigurationModel.AIDA_SERVER_NAME_PROPERTY)) {
- this.server.setName(this.configurationModel.getAIDAServerName());
- }
- final boolean started = this.server.start();
- if (started) {
- this.frame.getApplicationMenu().startAIDAServer();
- LOGGER.info("AIDA server started at " + this.server.getName());
- DialogUtil
- .showInfoDialog(this.frame, "AIDA Server Started", "The remote AIDA server started successfully.");
- } else {
- LOGGER.warning("AIDA server failed to start");
- DialogUtil.showErrorDialog(this.frame, "Failed to Start AIDA Server",
- "The remote AIDA server failed to start.");
- }
- }
-
+
/**
* Start a new monitoring session.
*/
@@ -1021,16 +991,6 @@
LOGGER.severe("failed to start new session");
}
- }
-
- /**
- * Stop the AIDA server instance.
- */
- private void stopAIDAServer() {
- this.server.disconnect();
- this.frame.getApplicationMenu().stopAIDAServer();
- LOGGER.info("AIDA server was stopped");
- DialogUtil.showInfoDialog(this.frame, "AIDA Server Stopped", "The AIDA server was stopped.");
}
/**
Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/model/ConfigurationModel.java
=============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/model/ConfigurationModel.java (original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/model/ConfigurationModel.java Fri Aug 28 18:14:03 2015
@@ -15,11 +15,6 @@
* @author <a href="mailto:[log in to unmask]">Jeremy McCormick</a>
*/
public final class ConfigurationModel extends AbstractModel {
-
- /**
- * Name of AIDA server.
- */
- public static final String AIDA_SERVER_NAME_PROPERTY = "AIDAServerName";
/**
* ET blocking setting.
@@ -255,15 +250,6 @@
}
/**
- * Get the AIDA server name.
- *
- * @return the AIDA server name
- */
- public String getAIDAServerName() {
- return this.configuration.get(AIDA_SERVER_NAME_PROPERTY);
- }
-
- /**
* Get the ET blocking setting.
*
* @return the ET blocking setting
@@ -659,17 +645,6 @@
}
/**
- * Set the name of the AIDA server.
- *
- * @param aidaServerName the name of the AIDA server
- */
- public void setAIDAServerName(final String aidaServerName) {
- final String oldValue = this.getAIDAServerName();
- this.configuration.set(AIDA_SERVER_NAME_PROPERTY, aidaServerName);
- this.firePropertyChange(AIDA_SERVER_NAME_PROPERTY, oldValue, this.getAIDAServerName());
- }
-
- /**
* Set whether the ET station is blocking (generally this should not be set to <code>true</code>!)
*
* @param blocking <code>true</code> if station should be blocking
