X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=a2ba940699666fe293efe40d59c8080f058e18a4;hb=e7b545e8c74f4ac8ffdc94959fb3fb96931a2cfe;hp=75c145385da37e19960f5bcd3fdfec150b1e9fba;hpb=3b53ea254e50420df8fe2ea9121855d600560f88;p=jSite.git diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java index 75c1453..a2ba940 100644 --- a/src/de/todesbaum/jsite/main/Main.java +++ b/src/de/todesbaum/jsite/main/Main.java @@ -30,6 +30,10 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.Map.Entry; +import java.util.logging.ConsoleHandler; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.AbstractAction; import javax.swing.Action; @@ -48,13 +52,13 @@ import de.todesbaum.jsite.application.FileOption; import de.todesbaum.jsite.application.Freenet7Interface; import de.todesbaum.jsite.application.Node; import de.todesbaum.jsite.application.Project; +import de.todesbaum.jsite.application.UpdateChecker; +import de.todesbaum.jsite.application.UpdateListener; import de.todesbaum.jsite.gui.NodeManagerListener; import de.todesbaum.jsite.gui.NodeManagerPage; import de.todesbaum.jsite.gui.ProjectFilesPage; import de.todesbaum.jsite.gui.ProjectInsertPage; import de.todesbaum.jsite.gui.ProjectPage; -import de.todesbaum.jsite.gui.UpdateChecker; -import de.todesbaum.jsite.gui.UpdateListener; import de.todesbaum.jsite.i18n.I18n; import de.todesbaum.jsite.i18n.I18nContainer; import de.todesbaum.util.image.IconLoader; @@ -69,11 +73,8 @@ import de.todesbaum.util.swing.WizardListener; */ public class Main implements ActionListener, ListSelectionListener, WizardListener, NodeManagerListener, UpdateListener { - /** Whether the debug mode is activated. */ - private static boolean debug = false; - /** The version. */ - private static final Version VERSION = new Version(0, 7); + private static final Version VERSION = new Version(0, 7, 1); /** The configuration. */ private Configuration configuration; @@ -304,7 +305,6 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen pages.put(PageType.PAGE_PROJECT_FILES, projectFilesPage); ProjectInsertPage projectInsertPage = new ProjectInsertPage(wizard); - projectInsertPage.setDebug(debug); projectInsertPage.setName("page.project.insert"); projectInsertPage.setFreenetInterface(freenetInterface); pages.put(PageType.PAGE_INSERT_PROJECT, projectInsertPage); @@ -611,6 +611,10 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen * The command-line arguments */ public static void main(String[] args) { + /* initialize logger. */ + Logger logger = Logger.getLogger("de.todesbaum"); + Handler handler = new ConsoleHandler(); + logger.addHandler(handler); String configFilename = null; boolean nextIsConfigFilename = false; for (String argument : args) { @@ -622,7 +626,8 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen printHelp(); return; } else if ("--debug".equals(argument)) { - debug = true; + logger.setLevel(Level.ALL); + handler.setLevel(Level.ALL); } else if ("--config-file".equals(argument)) { nextIsConfigFilename = true; }