Author: [log in to unmask]
Date: Mon Nov 10 19:07:28 2014
New Revision: 1498

Log:
Change command classes to have package access.  They don't need to be public.

Modified:
    java/trunk/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java
    java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
    java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java
    java/trunk/conditions/src/main/java/org/hps/conditions/cli/PrintCommand.java

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java	Mon Nov 10 19:07:28 2014
@@ -13,7 +13,7 @@
  * 
  * @author Jeremy McCormick <[log in to unmask]>
  */
-public abstract class AbstractCommand {
+abstract class AbstractCommand {
 
     String name;
     String description;

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java	Mon Nov 10 19:07:28 2014
@@ -30,8 +30,6 @@
     Options options = new Options();
     Map<String, AbstractCommand> commands = new HashMap<String, AbstractCommand>();
     PosixParser parser = new PosixParser();
-    static final String CONNECTION_PROPERTIES_RESOURCE = "/org/hps/conditions/config/conditions_dev.properties";
-    static final String XML_CONFIG_RESOURCE = "/org/hps/conditions/config/conditions_dev.xml";
     DatabaseConditionsManager conditionsManager;
     boolean verbose = false;
 
@@ -103,11 +101,7 @@
             conditionsManager.configure(xmlConfigFile);
             if (verbose)
                 System.out.println("using XML config file " + xmlConfigFile.getPath());
-        } else {
-            if (verbose)
-                System.out.println("using XML config resource " + XML_CONFIG_RESOURCE);
-            conditionsManager.configure(XML_CONFIG_RESOURCE);
-        }
+        } 
         conditionsManager.openConnection();
     }
 

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java	Mon Nov 10 19:07:28 2014
@@ -4,8 +4,6 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
@@ -34,7 +32,7 @@
  * 
  * @author Jeremy McCormick <[log in to unmask]>
  */
-public class LoadCommand extends AbstractCommand {
+class LoadCommand extends AbstractCommand {
 
     LoadCommand() {
         super("load", "Load a set of conditions into the database from a text file");
@@ -45,13 +43,8 @@
 
     @Override
     public void execute(String[] arguments) {
-        CommandLine commandLine;
-        try {
-            commandLine = parser.parse(options, arguments);
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
-
+        super.execute(arguments);
+        
         String fileName = commandLine.getOptionValue("f");
         if (fileName == null) {
             throw new IllegalArgumentException("Missing file argument.");

Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/PrintCommand.java
 =============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/PrintCommand.java	(original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/PrintCommand.java	Mon Nov 10 19:07:28 2014
@@ -7,7 +7,6 @@
 import java.io.PrintStream;
 
 import org.apache.commons.cli.Option;
-import org.hps.conditions.ConditionsObject;
 import org.hps.conditions.ConditionsObjectCollection;
 import org.hps.conditions.ConditionsRecord;
 import org.hps.conditions.ConditionsRecord.ConditionsRecordCollection;
@@ -22,7 +21,7 @@
  * 
  * @author Jeremy McCormick <[log in to unmask]>
  */
-public class PrintCommand extends AbstractCommand {
+class PrintCommand extends AbstractCommand {
 
     private static int DEFAULT_RUN_NUMBER = 0;
     private static String DEFAULT_DETECTOR_NAME = "HPS-Proposal2014-v8-6pt6";