[MERGE] Development into master

.gitignore

@@ -1,5 +1,7 @@
 .idea
 *.class
 *.jar
-Parabot Launcher.iml
-.DS_Store
+*.iml
+.DS_Store
+out/
+target/

pom.xml

@@ -6,7 +6,94 @@
 
     <groupId>org.parabot</groupId>
     <artifactId>launcher</artifactId>
-    <version>0.1</version>
+    <version>0.2.1</version>
 
+    <packaging>jar</packaging>
 
+    <properties>
+        <jdk.version>1.7</jdk.version>
+        <build.version></build.version>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>parabot-maven</id>
+            <name>Parabot its Maven Repository</name>
+            <url>http://maven.parabot.org/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.parabot</groupId>
+            <artifactId>internal-api</artifactId>
+            <version>1.51.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.jfoenix</groupId>
+            <artifactId>jfoenix</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>Parabot-Launcher-V${version}${build.version}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>deploy</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5.3</version>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.parabot.launcher.Core</mainClass>
+                        </manifest>
+                    </archive>
+                    <outputDirectory>${project.build.directory}/final/</outputDirectory>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

src/main/java/org/parabot/launcher/Controller.java

@@ -1,63 +1,219 @@
 package org.parabot.launcher;
 
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXTextField;
+import com.jfoenix.controls.JFXToggleButton;
+import javafx.application.Platform;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.ComboBox;
+import javafx.fxml.Initializable;
 import javafx.scene.control.Label;
-import javafx.scene.control.PasswordField;
-import javafx.scene.control.TextField;
+import org.parabot.api.misc.JavaUtil;
+import org.parabot.launcher.helpers.Launcher;
+import org.parabot.launcher.helpers.SettingHelper;
+import org.parabot.launcher.helpers.VersionHelper;
+import org.parabot.launcher.io.CacheManager;
+import org.parabot.launcher.io.Reader;
+import org.parabot.launcher.models.Setting;
 
-public class Controller {
+import java.net.URL;
+import java.util.HashMap;
+import java.util.ResourceBundle;
 
-    public static boolean useServer;
-    public static boolean useLogin;
+public class Controller implements Initializable, ControllerImpl {
 
-    public static String server;
-    public static String username;
-    public static String password;
+    @FXML // fx:id="clearCacheButton"
+    private JFXButton clearCacheButton;
 
-    @FXML
-    ComboBox serverComboBox;
+    @FXML // fx:id="loadLocalToggleButton"
+    private JFXToggleButton loadLocalToggleButton;
 
-    @FXML
-    TextField usernameTextField;
+    @FXML // fx:id="versionLabel"
+    private Label versionLabel;
 
-    @FXML
-    PasswordField passwordPassField;
+    @FXML // fx:id="startButton"
+    private JFXButton startButton;
 
-    @FXML
-    Label versionLabel,statusLabel,javaVersionLabel;
+    @FXML // fx:id="noVerifyToggleButton"
+    private JFXToggleButton noVerifyToggleButton;
+
+    @FXML // fx:id="verboseToggleButton"
+    private JFXToggleButton verboseToggleButton;
 
+    @FXML // fx:id="debugToggleButton"
+    private JFXToggleButton debugToggleButton;
 
+    @FXML // fx:id="serverTextField"
+    private JFXTextField serverTextField;
 
-    public void clearCache(){
+    @FXML // fx:id="javaVersionLabel"
+    private Label javaVersionLabel;
 
+    @FXML // fx:id="serverToggleButton"
+    private JFXToggleButton serverToggleButton;
+
+    @FXML // fx:id="statusLabel"
+    private Label statusLabel;
+
+    private HashMap<String, String> defaultLabelValues;
+
+    public Controller() {
+        defaultLabelValues = new HashMap<>();
     }
 
-    public void clearWorkingDir(){
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        //Set Status TextField
+        setLabel(statusLabel, "Starting up");
+
+        //Remove the ServerTextField on launch if needed.
+        handleServerTextField();
 
+        //Set serverTextField text color to white
+        serverTextField.setStyle("-fx-text-fill: white;");
+
+        fillComponents();
+
+        setStatus("Ready");
     }
 
-    public void startClient(){
+    @Override
+    public void fillComponentsFromOtherThread() {
+        Platform.runLater(new Runnable() {
+            @Override
+            public void run() {
+                fillComponents();
+            }
+        });
+    }
 
+    @Override
+    public void setReady(final int sleep) {
+        new Thread() {
+            @Override
+            public void run() {
+                try {
+                    Thread.sleep(sleep);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                setStatus("Ready", true);
+                startButton.setDisable(false);
+            }
+        }.start();
     }
 
-    public void setServer(){
-        if(useServer) {
-            server = serverComboBox.getSelectionModel().getSelectedItem().toString();
+    @Override
+    public void disableStart(boolean otherThread) {
+        if (otherThread) {
+            Platform.runLater(new Runnable() {
+                @Override
+                public void run() {
+                    startButton.setDisable(true);
+                }
+            });
+        } else {
+            startButton.setDisable(true);
         }
     }
 
-    public void setUsername(){
-        if(useLogin) {
-            username = usernameTextField.getText();
+    private void fillComponents() {
+        //Set Java Version.
+        setLabel(javaVersionLabel, String.valueOf(JavaUtil.JAVA_VERSION));
+
+        Reader.parseConfiguration();
+        for (Setting setting : SettingHelper.getSettings()) {
+            switch (setting.getSetting().toLowerCase()) {
+                case "noverify":
+                    noVerifyToggleButton.setSelected(setting.isEnabled());
+                    break;
+                case "loadlocal":
+                    loadLocalToggleButton.setSelected(setting.isEnabled());
+                    break;
+                case "verbose":
+                    verboseToggleButton.setSelected(setting.isEnabled());
+                    break;
+                case "debug":
+                    debugToggleButton.setSelected(setting.isEnabled());
+                    break;
+            }
         }
+
+        setLabel(versionLabel, String.valueOf(VersionHelper.getCurrentVersion()));
     }
 
-    public void setPassword(){
-        if(useLogin) {
-            password = passwordPassField.getText();
+    @FXML
+    private void clearCache(ActionEvent event) {
+        setReady(1500);
+        setLabel(statusLabel, "Clearing cache");
+        CacheManager.clearCache();
+        setLabel(statusLabel, "Cache cleared");
+    }
+
+    @FXML
+    private void startClient(ActionEvent event) {
+        disableStart(false);
+        setStatus("Starting client");
+
+        for (Setting setting : SettingHelper.getSettings()) {
+            switch (setting.getSetting().toLowerCase()) {
+                case "noverify":
+                    setting.setEnabled(noVerifyToggleButton.isSelected());
+                    break;
+                case "loadlocal":
+                    setting.setEnabled(loadLocalToggleButton.isSelected());
+                    break;
+                case "verbose":
+                    setting.setEnabled(verboseToggleButton.isSelected());
+                    break;
+                case "debug":
+                    setting.setEnabled(debugToggleButton.isSelected());
+                    break;
+            }
         }
+
+        new Launcher(this).start();
+    }
+
+    @FXML
+    private void getServerSelected() {
+        handleServerTextField();
+    }
+
+    private void handleServerTextField() {
+        if (!serverToggleButton.isSelected() && serverTextField.isVisible()) {
+            serverTextField.setVisible(false);
+        } else {
+            serverTextField.setVisible(true);
+        }
+    }
+
+    private void setLabel(Label label, String append) {
+        if (!defaultLabelValues.containsKey(label.getId())) {
+            defaultLabelValues.put(label.getId(), label.getText());
+        }
+
+        label.setText(defaultLabelValues.get(label.getId()) + append);
+    }
+
+    @Override
+    public void setStatus(String status) {
+        setLabel(statusLabel, status);
     }
 
+    @Override
+    public void setStatus(final String status, boolean otherThread) {
+        if (otherThread) {
+            Platform.runLater(new Runnable() {
+                @Override
+                public void run() {
+                    setStatus(status);
+                }
+            });
+        } else {
+            setStatus(status);
+        }
+    }
 
 }
+

src/main/java/org/parabot/launcher/ControllerImpl.java

@@ -0,0 +1,16 @@
+package org.parabot.launcher;
+
+/**
+ * @author JKetelaar
+ */
+public interface ControllerImpl {
+    void setStatus(String status);
+
+    void setStatus(String status, boolean otherThread);
+
+    void fillComponentsFromOtherThread();
+
+    void setReady(int sleep);
+
+    void disableStart(boolean otherThread);
+}