Author: [log in to unmask]
Date: Sat Oct 25 12:11:57 2014
New Revision: 1302
Log:
Et14 and evio back to default
Modified:
java/branches/hps-java_ecal-commissioning/datacat/pom.xml
java/branches/hps-java_ecal-commissioning/monitoring-app/src/main/java/org/hps/monitoring/plotting/MonitoringAnalysisFactory.java
java/branches/hps-java_ecal-commissioning/record-util/src/main/java/org/hps/record/et/EtConnection.java
java/branches/hps-java_ecal-commissioning/util/pom.xml
Modified: java/branches/hps-java_ecal-commissioning/datacat/pom.xml
=============================================================================
--- java/branches/hps-java_ecal-commissioning/datacat/pom.xml (original)
+++ java/branches/hps-java_ecal-commissioning/datacat/pom.xml Sat Oct 25 12:11:57 2014
@@ -8,7 +8,7 @@
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
<relativePath>../parent/pom.xml</relativePath>
- <version>3.0.2-SNAPSHOT</version>
+ <version>3.0.3-SNAPSHOT</version>
</parent>
<repositories>
<repository>
Modified: java/branches/hps-java_ecal-commissioning/monitoring-app/src/main/java/org/hps/monitoring/plotting/MonitoringAnalysisFactory.java
=============================================================================
--- java/branches/hps-java_ecal-commissioning/monitoring-app/src/main/java/org/hps/monitoring/plotting/MonitoringAnalysisFactory.java (original)
+++ java/branches/hps-java_ecal-commissioning/monitoring-app/src/main/java/org/hps/monitoring/plotting/MonitoringAnalysisFactory.java Sat Oct 25 12:11:57 2014
@@ -1,10 +1,10 @@
package org.hps.monitoring.plotting;
-import org.jfree.chart.ChartFactory;
-import org.jfree.chart.renderer.xy.XYBarRenderer;
+//import org.jfree.chart.ChartFactory;
+//import org.jfree.chart.renderer.xy.XYBarRenderer;
import hep.aida.IPlotterFactory;
-import hep.aida.jfree.chart.DefaultChartTheme;
+//import hep.aida.jfree.chart.DefaultChartTheme;
import hep.aida.ref.AnalysisFactory;
/**
@@ -30,9 +30,9 @@
/**
* Do some JFreeChart related configuration.
*/
- public static void configure() {
- ChartFactory.setChartTheme(new DefaultChartTheme());
- XYBarRenderer.setDefaultShadowsVisible(false);
+ public static void configure() {
+ // ChartFactory.setChartTheme(new DefaultChartTheme());
+ // XYBarRenderer.setDefaultShadowsVisible(false);
}
/**
Modified: java/branches/hps-java_ecal-commissioning/record-util/src/main/java/org/hps/record/et/EtConnection.java
=============================================================================
--- java/branches/hps-java_ecal-commissioning/record-util/src/main/java/org/hps/record/et/EtConnection.java (original)
+++ java/branches/hps-java_ecal-commissioning/record-util/src/main/java/org/hps/record/et/EtConnection.java Sat Oct 25 12:11:57 2014
@@ -12,7 +12,7 @@
import org.jlab.coda.et.enums.Mode;
import org.jlab.coda.et.enums.Modify;
import org.jlab.coda.et.exception.EtBusyException;
-//import org.jlab.coda.et.exception.EtClosedException;
+import org.jlab.coda.et.exception.EtClosedException;
import org.jlab.coda.et.exception.EtDeadException;
import org.jlab.coda.et.exception.EtEmptyException;
import org.jlab.coda.et.exception.EtException;
@@ -118,7 +118,7 @@
EtEvent[] readEtEvents()
throws IOException, EtException, EtDeadException,
EtEmptyException, EtBusyException, EtTimeoutException,
- // EtClosedException,
+ EtClosedException,
EtWakeUpException {
return getEtSystem().getEvents(
getEtAttachment(),
@@ -207,8 +207,8 @@
} catch (IOException |
EtException |
EtExistsException |
- // EtClosedException |
- // EtDeadException |
+ EtClosedException |
+ EtDeadException |
EtTooManyException e) {
throw new RuntimeException("Failed to create ET connection.", e);
}
@@ -233,4 +233,4 @@
1);
}
-}
+}
Modified: java/branches/hps-java_ecal-commissioning/util/pom.xml
=============================================================================
--- java/branches/hps-java_ecal-commissioning/util/pom.xml (original)
+++ java/branches/hps-java_ecal-commissioning/util/pom.xml Sat Oct 25 12:11:57 2014
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>hps-util</artifactId>
<name>util</name>
- <description>miscellaneous utility classes</description>
+ <description>various utility classes</description>
<parent>
<groupId>org.hps</groupId>
<artifactId>hps-parent</artifactId>
