Commit in java/trunk/monitoring-app/src/main/java/org/hps/monitoring on MAIN
JobPanel.java+4-1427 -> 428
JobSettings.java+2-2427 -> 428
SteeringFileUtil.java+2-2427 -> 428
+8-5
3 modified files
Filter available steering files so only those in the package org.hps.steering.monitoring are available for use.  Otherwise it is too many.

java/trunk/monitoring-app/src/main/java/org/hps/monitoring
JobPanel.java 427 -> 428
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/JobPanel.java	2014-04-01 18:37:17 UTC (rev 427)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/JobPanel.java	2014-04-01 18:38:36 UTC (rev 428)
@@ -36,6 +36,8 @@
     private JComboBox logLevelComboBox;
     private JTextField aidaSaveField;
     private JCheckBox aidaSaveCheckBox;
+    
+    private String steeringPackage = "org/hps/steering/monitoring/";
 
     private String defaultEventBuilderClassName = (new JobSettings()).eventBuilderClassName;
 
@@ -72,7 +74,8 @@
         logLevelComboBox.setActionCommand(MonitoringCommands.logLevelCmd);
         steeringTypeComboBox = addComboBox("Steering Type", steeringTypes);  
         steeringFileField = addField("Steering File", 35);  	      
-        steeringResourcesComboBox = addComboBoxMultiline("Steering File Resource", SteeringFileUtil.getAvailableSteeringFileResources());
+        steeringResourcesComboBox = addComboBoxMultiline("Steering File Resource", 
+                SteeringFileUtil.getAvailableSteeringFileResources(steeringPackage));
         //steeringResourcesComboBox = addComboBox("Steering File Resource", new String[]{});
         steeringResourcesComboBox.setActionCommand(MonitoringCommands.steeringResourceCmd);
         detectorNameField = addField("Detector Name", 20);

java/trunk/monitoring-app/src/main/java/org/hps/monitoring
JobSettings.java 427 -> 428
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/JobSettings.java	2014-04-01 18:37:17 UTC (rev 427)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/JobSettings.java	2014-04-01 18:38:36 UTC (rev 428)
@@ -19,10 +19,10 @@
     boolean warnBeforeDisconnect = true;
     Level logLevel = Level.ALL;
     int steeringType = 0; // resource = 0; file = 1
-    String steeringResource = "org/lcsim/hps/steering/monitoring/TestRunMonitoring.lcsim";
+    String steeringResource = "org/hps/steering/monitoring/TestRunMonitoring.lcsim";
     String steeringFile = "";
     String detectorName = "HPS-TestRun-v5";
-    String eventBuilderClassName = "org.lcsim.hps.evio.LCSimTestRunEventBuilder";
+    String eventBuilderClassName = "org.hps.evio.LCSimTestRunEventBuilder";
     boolean logToFile = false;
     String logFileName = "";
     boolean autoSaveAida = false;

java/trunk/monitoring-app/src/main/java/org/hps/monitoring
SteeringFileUtil.java 427 -> 428
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/SteeringFileUtil.java	2014-04-01 18:37:17 UTC (rev 427)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/SteeringFileUtil.java	2014-04-01 18:38:36 UTC (rev 428)
@@ -21,7 +21,7 @@
      * Get the files that end in .lcsim from all loaded jar files.
      * @return
      */
-    public static String[] getAvailableSteeringFileResources() {
+    public static String[] getAvailableSteeringFileResources(String packageName) {
         List<String> resources = new ArrayList<String>();
         URL url = SteeringFileUtil.class.getResource("SteeringFileUtil.class");
         String scheme = url.getProtocol();
@@ -34,7 +34,7 @@
             Enumeration<JarEntry> entries = archive.entries();
             while (entries.hasMoreElements()) {
                 JarEntry entry = entries.nextElement();
-                if (entry.getName().endsWith(".lcsim")) {
+                if (entry.getName().endsWith(".lcsim") && entry.getName().contains(packageName)) {
                     resources.add(entry.getName());
                 }
             }
SVNspam 0.1