Author: [log in to unmask]
Date: Fri Feb 5 17:55:23 2016
New Revision: 4179
Log:
[HPSJAVA-652] Remove conditions tab from monitoring app.
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/MonitoringApplicationFrame.java
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 Feb 5 17:55:23 2016
@@ -954,7 +954,7 @@
// Add listener to push conditions changes to conditions panel.
final List<ConditionsListener> conditionsListeners = new ArrayList<ConditionsListener>();
- conditionsListeners.add(this.frame.getConditionsPanel().new ConditionsPanelListener());
+ //conditionsListeners.add(this.frame.getConditionsPanel().new ConditionsPanelListener());
// Instantiate the event processing wrapper.
this.processing = new EventProcessing(this, processors, drivers, conditionsListeners);
Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java
=============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java (original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/MonitoringApplicationFrame.java Fri Feb 5 17:55:23 2016
@@ -37,7 +37,7 @@
/**
* The conditions panel.
*/
- private final ConditionsPanel conditionsPanel;
+ //private final ConditionsPanel conditionsPanel;
/**
* The dashboard panel.
@@ -150,8 +150,8 @@
tableTabbedPane.addTab("Trigger Diagnostics", this.triggerPanel);
// Add the conditions panel.
- this.conditionsPanel = new ConditionsPanel();
- tableTabbedPane.addTab("Detector Conditions", this.conditionsPanel);
+ //this.conditionsPanel = new ConditionsPanel();
+ //tableTabbedPane.addTab("Detector Conditions", this.conditionsPanel);
// Vertical split pane in left panel.
this.leftSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, this.dashboardPanel, tableTabbedPane);
@@ -209,9 +209,9 @@
*
* @return the conditions panel
*/
- ConditionsPanel getConditionsPanel() {
- return this.conditionsPanel;
- }
+ //ConditionsPanel getConditionsPanel() {
+ // return this.conditionsPanel;
+ //}
/**
* Get the panel for the dashboard.
|