summaryrefslogtreecommitdiff
path: root/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2012-11-13 16:14:35 +0100
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2012-11-13 16:14:35 +0100
commitc6ec90efb84410be02a49ba7b1d10378f2b82463 (patch)
tree8e10622abb1ab5ed735e0be0f1f4e655cd4164af /trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui
parent94cebec29ed45667389f25b6001a143cc4b410aa (diff)
downloadpdf-over-c6ec90efb84410be02a49ba7b1d10378f2b82463.tar.gz
pdf-over-c6ec90efb84410be02a49ba7b1d10378f2b82463.tar.bz2
pdf-over-c6ec90efb84410be02a49ba7b1d10378f2b82463.zip
improved log4j property loading
Diffstat (limited to 'trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui')
-rw-r--r--trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/DeveloperMain.java7
-rw-r--r--trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java7
2 files changed, 10 insertions, 4 deletions
diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/DeveloperMain.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/DeveloperMain.java
index 39244f4f..3bea5d08 100644
--- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/DeveloperMain.java
+++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/DeveloperMain.java
@@ -49,8 +49,11 @@ public class DeveloperMain {
File configDir = new File(System.getProperty("user.home")+"/.pdfover"); //$NON-NLS-1$//$NON-NLS-2$
if(!configDir.exists()) {
configDir.mkdir();
- } else {
- PropertyConfigurator.configure(configDir.getAbsolutePath() + "/" + ConfigManipulator.DEFAULT_LOG4J_FILE); //$NON-NLS-1$
+ }
+
+ File log4j = new File(configDir.getAbsolutePath() + "/" + ConfigManipulator.DEFAULT_LOG4J_FILE); //$NON-NLS-1$
+ if(log4j.exists()) {
+ PropertyConfigurator.configure(log4j.getAbsolutePath());
}
StringBuilder sb = new StringBuilder();
diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
index 7318ec7c..98ca7ac8 100644
--- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
+++ b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/Main.java
@@ -58,8 +58,11 @@ public class Main {
File configDir = new File(System.getProperty("user.home")+"/.pdfover"); //$NON-NLS-1$//$NON-NLS-2$
if(!configDir.exists()) {
configDir.mkdir();
- } else {
- PropertyConfigurator.configure(configDir.getAbsolutePath() + "/" + ConfigManipulator.DEFAULT_LOG4J_FILE); //$NON-NLS-1$
+ }
+
+ File log4j = new File(configDir.getAbsolutePath() + "/" + ConfigManipulator.DEFAULT_LOG4J_FILE); //$NON-NLS-1$
+ if(log4j.exists()) {
+ PropertyConfigurator.configure(log4j.getAbsolutePath());
}
StateMachineImpl stateMachine = new StateMachineImpl(args);