Author: [log in to unmask]
Date: Tue Mar 10 18:37:26 2015
New Revision: 2396
Log:
Fix up issues with setting steering file from file chooser and input settings.
Modified:
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/EventProcessing.java
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/JobSettingsPanel.java
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/model/ConfigurationModel.java
Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/EventProcessing.java
=============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/EventProcessing.java (original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/EventProcessing.java Tue Mar 10 18:37:26 2015
@@ -84,14 +84,11 @@
// Get steering resource or file as a String parameter.
String steering = null;
SteeringType steeringType = configurationModel.getSteeringType();
- if (steeringType.equals(SteeringType.FILE))
- try {
- steering = configurationModel.getSteeringFile().getCanonicalPath();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- else
+ if (steeringType.equals(SteeringType.FILE)) {
+ steering = configurationModel.getSteeringFile();
+ } else {
steering = configurationModel.getSteeringResource();
+ }
MonitoringApplication.logger.config("Set steering to " + steering + " with type " + (steeringType == SteeringType.RESOURCE ? "RESOURCE" : "FILE"));
@@ -393,20 +390,11 @@
if (sessionState.connection != null) {
logger.fine("closing ET connection");
if (sessionState.connection.getEtSystem().alive()) {
- try {
- logger.fine("waking up the ET station");
- sessionState.connection.getEtSystem().wakeUpAll(sessionState.connection.getEtStation());
- sessionState.connection.getEtStation().getStatus();
- } catch (Exception e) {
- logger.warning(e.getMessage());
- e.printStackTrace();
- }
- logger.fine("cleaning up the connection");
+ logger.fine("cleaning up the connection ...");
sessionState.connection.cleanup();
logger.fine("connection cleanup successful");
}
sessionState.connection = null;
- logger.fine("connection invalid now");
logger.fine("ET connection closed");
}
}
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 Tue Mar 10 18:37:26 2015
@@ -85,7 +85,7 @@
steeringResourcesComboBox.setActionCommand(STEERING_RESOURCE_CHANGED);
steeringResourcesComboBox.addActionListener(this);
- steeringFileField = addField("Steering File", 35);
+ steeringFileField = addField("Steering File", 50);
steeringFileField.addPropertyChangeListener("value", this);
JButton steeringFileButton = addButton("Select Steering File");
@@ -114,8 +114,7 @@
userRunNumberField.setActionCommand(USER_RUN_NUMBER_CHANGED);
userRunNumberField.setEnabled(true);
userRunNumberField.setEditable(true);
-
-
+
conditionsTagComboBox = addComboBox("Conditions Tag", ResourceUtil.getConditionsTags());
conditionsTagComboBox.addItem("");
conditionsTagComboBox.setSelectedItem("");
@@ -183,6 +182,7 @@
try {
checkSteeringFile(file);
configurationModel.setSteeringFile(file.getCanonicalPath());
+ configurationModel.setSteeringType(SteeringType.FILE);
} catch (IOException | JDOMException e) {
throw new RuntimeException("Error parsing the selected steering file.", e);
}
@@ -246,10 +246,6 @@
@Override
public void actionPerformed(ActionEvent event) {
-
- //System.out.println("JobSettingsPanel.actionPerformed - " + event.getActionCommand());
- //System.out.println(" source: " + event.getSource());
-
try {
configurationModel.removePropertyChangeListener(this);
if (event.getActionCommand().equals(Commands.CHOOSE_STEERING_FILE)) {
@@ -304,7 +300,6 @@
} else if (source == userRunNumberField) {
// Is run number being reset to null or empty?
if (userRunNumberField.getText() == null || userRunNumberField.getText().isEmpty()) {
- // System.out.println("resetting user run number back to null");
// Update the model to null user run number and do not freeze the conditions system.
configurationModel.setUserRunNumber(null);
configurationModel.setFreezeConditions(false);
@@ -352,12 +347,6 @@
private class JobSettingsChangeListener implements PropertyChangeListener {
@Override
public void propertyChange(PropertyChangeEvent evt) {
- //System.out.println("JobSettingsChangeListener.propertyChange");
- //System.out.println(" src: " + evt.getSource());
- //System.out.println(" propName: " + evt.getPropertyName());
- //System.out.println(" oldValue: " + evt.getOldValue());
- //System.out.println(" newValue: " + evt.getNewValue());
- //System.out.println(" propId: " + evt.getPropagationId());
if (evt.getSource() instanceof ConfigurationModel) {
Object value = evt.getNewValue();
configurationModel.removePropertyChangeListener(this);
@@ -382,7 +371,7 @@
steeringTypeComboBox.setSelectedIndex(((SteeringType) value).ordinal());
} else if (evt.getPropertyName().equals(STEERING_FILE_PROPERTY)) {
if (value != null) {
- steeringFileField.setText(((File) value).getAbsolutePath());
+ steeringFileField.setText((String) evt.getNewValue());
} else {
// A null value here is actually okay and means this field should be reset to have no value.
steeringFileField.setText(null);
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 Tue Mar 10 18:37:26 2015
@@ -105,18 +105,14 @@
firePropertyChange(STEERING_TYPE_PROPERTY, oldValue, getSteeringType());
}
- public File getSteeringFile() {
- if (configuration.hasKey(STEERING_FILE_PROPERTY)) {
- return new File(configuration.get(STEERING_FILE_PROPERTY));
- } else {
- return null;
- }
+ public String getSteeringFile() {
+ return configuration.get(STEERING_FILE_PROPERTY);
}
public void setSteeringFile(String steeringFile) {
- File oldValue = getSteeringFile();
+ String oldValue = getSteeringFile();
configuration.set(STEERING_FILE_PROPERTY, steeringFile);
- firePropertyChange(STEERING_FILE_PROPERTY, oldValue, getSteeringFile().getPath());
+ firePropertyChange(STEERING_FILE_PROPERTY, oldValue, getSteeringFile());
}
public String getSteeringResource() {
