hps-java/src/main/java/org/lcsim/hps/monitoring
diff -u -r1.45 -r1.46
--- MonitoringApplication.java 10 May 2012 23:35:54 -0000 1.45
+++ MonitoringApplication.java 10 May 2012 23:39:37 -0000 1.46
@@ -63,7 +63,7 @@
* ring. This class is accessible to users by calling its main() method.
*
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: MonitoringApplication.java,v 1.45 2012/05/10 23:35:54 jeremy Exp $
+ * @version $Id: MonitoringApplication.java,v 1.46 2012/05/10 23:39:37 jeremy Exp $
*/
public class MonitoringApplication {
@@ -600,17 +600,7 @@
} else if (steeringFileCmd.equals(cmd)) {
selectSteeringFile();
}
- }
-
- private void startDisconnectThread() {
- Runnable r = new Runnable() {
- public void run() {
- disconnect();
- }
- };
- Thread t = new Thread(r, "Disconnect Thread");
- t.start();
- }
+ }
}
/**
@@ -962,7 +952,7 @@
if (fcs == JFileChooser.APPROVE_OPTION) {
final File logFile = fc.getSelectedFile();
if (logFile.exists()) {
- JOptionPane.showMessageDialog(this.mainPanel, "Log file already exists.");
+ showDialog("Log file already exists.");
} else {
try {
if (!logFile.createNewFile()) {
@@ -972,7 +962,6 @@
redirectStdOutAndErrToFile(logFile);
SwingUtilities.invokeLater(new Runnable() {
-
public void run() {
jobPanel.setLogToFile(true);
jobPanel.setLogFile(logFile.getPath());
@@ -1535,6 +1524,19 @@
logger.log(Level.CONFIG, "Successfully initialized event builder <" + eventBuilderClassName + ">.");
}
+
+ /**
+ * Disconnect from the ET system using a separate thread of execution.
+ */
+ private void startDisconnectThread() {
+ Runnable r = new Runnable() {
+ public void run() {
+ disconnect();
+ }
+ };
+ Thread t = new Thread(r, "Disconnect Thread");
+ t.start();
+ }
/**
* Create a connection to an ET system using current parameters from the GUI.
@@ -1641,7 +1643,7 @@
*
* @return True if connected to ET system; false if not.
*/
- boolean connected() {
+ private boolean connected() {
return connectionStatus == ConnectionStatus.CONNECTED;
}