X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fgui%2FSwingInterface.java;h=79b799d219021a8dc4ad30f08fdca61a70b54d4a;hb=d95bbab22cc083b81939a59c964a020231bd8b54;hp=02142a9f5764c1d4843a7a9446c5fbe8ad5e9671;hpb=8aec0d9aa06efc24ffc5bcfc2503d0ce06d74d54;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/gui/SwingInterface.java b/src/net/pterodactylus/jsite/gui/SwingInterface.java index 02142a9..79b799d 100644 --- a/src/net/pterodactylus/jsite/gui/SwingInterface.java +++ b/src/net/pterodactylus/jsite/gui/SwingInterface.java @@ -39,7 +39,7 @@ import net.pterodactylus.jsite.i18n.gui.I18nAction; import net.pterodactylus.util.io.Closer; /** - * TODO + * The Swing user interface. * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> * @version $Id$ @@ -48,9 +48,9 @@ public class SwingInterface implements CoreListener { /** The application core. */ private final Core core; - + /** The configuration directory. */ - private String configDirectory; + private final String configDirectory; /** The main window. */ private MainWindow mainWindow; @@ -106,10 +106,13 @@ public class SwingInterface implements CoreListener { * * @param core * The core to operate on + * @param configDirectory + * The directory the configuration is stored in */ - public SwingInterface(Core core) { + public SwingInterface(Core core, String configDirectory) { this.core = core; - I18n.setLocale(Locale.ENGLISH); /* TODO - load config */ + this.configDirectory = configDirectory; + I18n.setLocale(Locale.ENGLISH); loadConfig(); if (beautify) { System.setProperty("swing.aatext", "true"); @@ -223,16 +226,6 @@ public class SwingInterface implements CoreListener { return addProjectAction; } - /** - * Sets the configuration directory. - * - * @param configDirectory - * The directory the configuration is stored in - */ - public void setConfigDirectory(String configDirectory) { - this.configDirectory = configDirectory; - } - // // ACTIONS // @@ -259,6 +252,7 @@ public class SwingInterface implements CoreListener { /* initialize default stuff. */ beautify = false; /* now read config. */ + System.out.println("configDirectory: “" + configDirectory + "”"); File configFile = new File(configDirectory, "swing-interface.properties"); if (!configFile.exists() || !configFile.canRead() || !configFile.isFile()) { System.err.println("could not find “" + configFile.getAbsolutePath() + "”!");