X-Git-Url: http://jaekl.net/gitweb/?p=squelch.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fjaekl%2Fsquelch%2FArgs.java;h=f48012a17c70f9c03c06f8d91b13a1744a92b6fb;hp=9052734734708eb4b14854fd161dbac3d71860ab;hb=63163502c2d86fad43c38ae4041c8bf4b2e4b387;hpb=7fdeab39832c2339711250dfb0a9a5c531ab7033 diff --git a/src/main/java/net/jaekl/squelch/Args.java b/src/main/java/net/jaekl/squelch/Args.java index 9052734..f48012a 100644 --- a/src/main/java/net/jaekl/squelch/Args.java +++ b/src/main/java/net/jaekl/squelch/Args.java @@ -19,6 +19,7 @@ public class Args { private static final String DB_PASSWORD = "db.password"; private static final String DB_USER = "db.user"; private static final String DEFAULT_CONFIG_FILENAME = "config.properties"; + public static final String DEFAULT_JDBC_URL = "jdbc:postgresql:postgres"; // default PostgreSQL database private String m_className; // name of the main class that launches this program private boolean m_help; @@ -29,7 +30,7 @@ public class Args { public Args(String className) { m_className = className; m_help = false; - m_url = ""; + m_url = DEFAULT_JDBC_URL; m_pass = ""; m_user = ""; } @@ -60,7 +61,7 @@ public class Args { String configFilename = (line.hasOption("c")) ? (line.getOptionValue("c")) : (DEFAULT_CONFIG_FILENAME); File configFile = FileUtil.getInst().newFile(configFilename); - if (configFile.canRead()) { + if (line.hasOption("c") || configFile.canRead()) { readConfigFile(configFile); }