Formatting

src/main/java/envoy/client/Settings.java

@@ -163,7 +163,7 @@ public class Settings {
 	 * @return the current on close mode.
 	 * @since Envoy v0.3-alpha
 	 */
-	public int getCurrentOnCloseMode () {return currentOnCloseMode;}
+	public int getCurrentOnCloseMode() { return currentOnCloseMode; }
 
 	/**
 	 * Sets the current on close mode.
@@ -171,5 +171,5 @@ public class Settings {
 	 * @param currentOnCloseMode the on close mode that should be set.
 	 * @since Envoy v0.3-alpha
 	 */
-	public void setCurrentOnCloseMode(int currentOnCloseMode) {this.currentOnCloseMode = currentOnCloseMode;}
+	public void setCurrentOnCloseMode(int currentOnCloseMode) { this.currentOnCloseMode = currentOnCloseMode; }
 }

src/main/java/envoy/client/event/OnCloseChangeEvent.java

@@ -8,16 +8,19 @@ package envoy.client.event;
  * @author Maximilian Käfer
  * @since Envoy v0.3-alpha
  */
-public class OnCloseChangeEvent implements Event<Integer>{
+public class OnCloseChangeEvent implements Event<Integer> {
 
 	private Integer closeMode;
 
 	/**
-	 * @param closeMode This is the on close mode for the client, that should be set.
+	 * @param closeMode This is the on close mode for the client, that should be
-	 * </br> 0 = ExitOnClose </br> 1 = HideOnClose
+	 *                  set.
+	 *                  </br>
+	 *                  0 = ExitOnClose </br>
+	 *                  1 = HideOnClose
 	 * @since Envoy 0.3-alpha
 	 */
-	public OnCloseChangeEvent(int closeMode) {this.closeMode = closeMode;}
+	public OnCloseChangeEvent(int closeMode) { this.closeMode = closeMode; }
 
 	@Override
 	public Integer get() { return closeMode; }

src/main/java/envoy/client/ui/PrimaryToggleSwitch.java

@@ -1,7 +1,7 @@
 package envoy.client.ui;
+
 import java.awt.*;
 import java.lang.reflect.Constructor;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.swing.*;
@@ -9,13 +9,12 @@ import javax.swing.*;
 import envoy.client.Settings;
 import envoy.client.event.Event;
 import envoy.client.event.EventBus;
-import envoy.client.event.EventHandler;
-import envoy.client.event.OnCloseChangeEvent;
-import envoy.client.ui.settings.ThemeCustomizationPanel;
 import envoy.client.util.EnvoyLog;
 
 /**
- * This Component can be used to toggle between two options. e.g. on and off </br></br>
+ * This Component can be used to toggle between two options. e.g. on and off
+ * </br>
+ * </br>
  * 
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>PrimaryToggleSwitch.java</strong><br>
@@ -24,10 +23,9 @@ import envoy.client.util.EnvoyLog;
  * @author Maximilian K&auml;fer
  * @since Envoy v0.3-alpha
  */
-public class PrimaryToggleSwitch extends JPanel{
+public class PrimaryToggleSwitch extends JPanel {
 
 	private static final long	serialVersionUID	= -721155303106833184L;
-	private boolean initialState;
 	JButton						b					= new JButton("");
 	private boolean				currentState;
 	private int					variable;
@@ -36,7 +34,9 @@ public class PrimaryToggleSwitch extends JPanel{
 	/**
 	 * This is the constructor for the PrimaryToggleSwitch.
 	 * 
-	 * @param initialState The state the toggleSwitch is standardly set to. </br> true: off </br> false: on
+	 * @param initialState The state the toggleSwitch is standardly set to. </br>
+	 *                     true: off </br>
+	 *                     false: on
 	 * @param eventName    the path of the event class
 	 * @since Envoy v0.3-alpha
 	 */
@@ -45,7 +45,6 @@ public class PrimaryToggleSwitch extends JPanel{
 		super();
 		setEnabled(true);
 		setVisible(true);
-		this.initialState = initialState;
 
 		setPreferredSize(new Dimension(50, 25));
 		setMinimumSize(new Dimension(50, 25));
@@ -55,14 +54,13 @@ public class PrimaryToggleSwitch extends JPanel{
 		b.setMinimumSize(new Dimension(25, 25));
 		b.setMaximumSize(new Dimension(25, 25));
 
-		b.setBackground(Settings.getInstance().getThemes()
+		b.setBackground(Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()).getInteractableBackgroundColor());
-		.get(Settings.getInstance().getCurrentTheme()).getInteractableBackgroundColor());
 
 		GridBagLayout gbl_toggleSwitch = new GridBagLayout();
 		gbl_toggleSwitch.columnWidths	= new int[] { 1, 1 };
-		gbl_toggleSwitch.rowHeights = new int[] { 1};
+		gbl_toggleSwitch.rowHeights		= new int[] { 1 };
 		gbl_toggleSwitch.columnWeights	= new double[] { 1.0, 1.0 };
-		gbl_toggleSwitch.rowWeights = new double[] {1.0 };
+		gbl_toggleSwitch.rowWeights		= new double[] { 1.0 };
 
 		setLayout(gbl_toggleSwitch);
 
@@ -71,10 +69,10 @@ public class PrimaryToggleSwitch extends JPanel{
 		b.addActionListener((evt) -> {
 			try {
 				Class<?>	c			= Class.forName(eventName);
-				Class[] types = {int.class};
+				Class[]		types		= { int.class };
 				Constructor	constructor	= c.getConstructor(types);
 
-				Object[] parameters = {variable};
+				Object[]	parameters	= { variable };
 				Object		instanceOfC	= constructor.newInstance(parameters);
 
 				EventBus.getInstance().dispatch((Event<?>) constructor.newInstance(parameters));
@@ -100,11 +98,14 @@ public class PrimaryToggleSwitch extends JPanel{
 	/**
 	 * This method sets the state of the {@link PrimaryToggleSwitch}.
 	 * 
-	 * @param state This is the state of the {@link PrimaryToggleSwitch}, that should be set. </br> true: off </br> false: on
+	 * @param state This is the state of the {@link PrimaryToggleSwitch}, that
+	 *              should be set. </br>
+	 *              true: off </br>
+	 *              false: on
 	 * @since Envoy 0.3-alpha
 	 */
-	public void setState (boolean state){
+	public void setState(boolean state) {
-		if(state) {
+		if (state) {
 			GridBagConstraints gbc_toggleButton = new GridBagConstraints();
 			gbc_toggleButton.anchor	= GridBagConstraints.WEST;
 			gbc_toggleButton.gridx	= 0;
@@ -113,7 +114,7 @@ public class PrimaryToggleSwitch extends JPanel{
 			add(b, gbc_toggleButton);
 			currentState	= true;
 			variable		= 1;
-		}else {
+		} else {
 			GridBagConstraints gbc_toggleButton = new GridBagConstraints();
 			gbc_toggleButton.anchor	= GridBagConstraints.EAST;
 			gbc_toggleButton.gridx	= 1;

src/main/java/envoy/client/ui/Startup.java

@@ -132,9 +132,9 @@ public class Startup {
 					new StatusTrayIcon(chatWindow).show();
 
 					// If the tray icon is supported, hide the chat window on close
-					if(Settings.getInstance().getCurrentOnCloseMode() == 1) {
+					if (Settings.getInstance().getCurrentOnCloseMode() == 1) {
 						chatWindow.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-					}else {
+					} else {
 						chatWindow.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 					}
 

src/main/java/envoy/client/ui/settings/General.java

@@ -4,8 +4,6 @@ import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.event.ActionListener;
-import java.util.Arrays;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.swing.JOptionPane;
@@ -14,7 +12,6 @@ import javax.swing.JTextPane;
 import envoy.client.Settings;
 import envoy.client.event.EventBus;
 import envoy.client.event.OnCloseChangeEvent;
-import envoy.client.event.ThemeChangeEvent;
 import envoy.client.ui.PrimaryToggleSwitch;
 import envoy.client.ui.Theme;
 import envoy.client.util.EnvoyLog;
@@ -42,25 +39,27 @@ public class General extends SettingsPanel {
 	JTextPane			onCloseModeState	= new JTextPane();
 
 	/**
-	 * This is the constructor for the General class. Here the user can set general settings for the client.
+	 * This is the constructor for the General class. Here the user can set general
+	 * settings for the client.
+	 * 
 	 * @since Envoy 0.3-alpha
 	 */
 	public General() {
 		Theme theme = Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme());
 
 		state = Settings.getInstance().getCurrentOnCloseMode();
-		if(state == 1) {
+		if (state == 1) {
-			toggleSwitch = new PrimaryToggleSwitch(false,"envoy.client.event.OnCloseChangeEvent");
+			toggleSwitch = new PrimaryToggleSwitch(false, "envoy.client.event.OnCloseChangeEvent");
-		}else {
+		} else {
-			toggleSwitch = new PrimaryToggleSwitch(true,"envoy.client.event.OnCloseChangeEvent");
+			toggleSwitch = new PrimaryToggleSwitch(true, "envoy.client.event.OnCloseChangeEvent");
 		}
 
 		setBackground(theme.getCellColor());
 
 		GridBagLayout gbl_general = new GridBagLayout();
-		gbl_general.columnWidths = new int[] { 1, 1};
+		gbl_general.columnWidths	= new int[] { 1, 1 };
 		gbl_general.rowHeights		= new int[] { 1, 1, 1 };
-		gbl_general.columnWeights = new double[] { 1.0, 0.1};
+		gbl_general.columnWeights	= new double[] { 1.0, 0.1 };
 		gbl_general.rowWeights		= new double[] { 0.02, 0.0005, 1.0 };
 
 		setLayout(gbl_general);
@@ -71,9 +70,9 @@ public class General extends SettingsPanel {
 
 		add(toggleSwitch, gbc_toggleSwitch);
 
-		if(state == 0) {
+		if (state == 0) {
 			onCloseModeState.setText("OFF");
-		}else {
+		} else {
 			onCloseModeState.setText("ON");
 		}
 
@@ -89,7 +88,7 @@ public class General extends SettingsPanel {
 
 		onCloseModeText.setText("Client runs in the background, when window is closed");
 		onCloseModeText.setBackground(theme.getBackgroundColor());
-		//TODO: Change to inverted color.
+		// TODO: Change to inverted color.
 		onCloseModeText.setForeground(theme.getUserNameColor());
 
 		GridBagConstraints gbc_onCloseModeText = new GridBagConstraints();
@@ -107,16 +106,17 @@ public class General extends SettingsPanel {
 	/**
 	 * This method changes the on close mode of the client.
 	 * 
-	 * @param state This is the integer that defines weather the toggleSwitch is on or off.
+	 * @param state This is the integer that defines weather the toggleSwitch is on
+	 *              or off.
 	 * @since Envoy v0.3-alpha
 	 */
 	public void changeOnClose(int state) {
 		System.out.println(state);
 		this.state = state;
 
-		if(state == 0) {
+		if (state == 0) {
 			onCloseModeState.setText("OFF");
-		}else {
+		} else {
 			onCloseModeState.setText("ON");
 		}
 		this.revalidate();

src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java

@@ -51,8 +51,7 @@ public class ThemeCustomizationPanel extends SettingsPanel {
 	 * @since Envoy v0.2-alpha
 	 */
 	public ThemeCustomizationPanel() {
-		temporaryTheme = new Theme("temporaryTheme",
+		temporaryTheme = new Theme("temporaryTheme", Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()));
-				Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()));
 
 		GridBagLayout gbl_themeLayout = new GridBagLayout();
 
@@ -125,8 +124,7 @@ public class ThemeCustomizationPanel extends SettingsPanel {
 					themeArray							= Arrays.copyOf(themeArray, themeArray.length + 1);
 					themeArray[themeArray.length - 1]	= Settings.getInstance().getThemes().get(name).getThemeName();
 
-					temporaryTheme = new Theme("temporaryTheme",
+					temporaryTheme = new Theme("temporaryTheme", Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()));
-							Settings.getInstance().getThemes().get(Settings.getInstance().getCurrentTheme()));
 
 					themes.addItem(themeArray[themeArray.length - 1]);
 					themes.setSelectedIndex(themeArray.length - 1);
@@ -172,10 +170,8 @@ public class ThemeCustomizationPanel extends SettingsPanel {
 	private void buildCustomizeElements(Theme theme) {
 		buildCustomizeElement(theme, theme.getBackgroundColor(), "Background", "backgroundColor", 1);
 		buildCustomizeElement(theme, theme.getCellColor(), "Cells", "cellColor", 2);
-		buildCustomizeElement(theme, theme.getInteractableForegroundColor(), "Interactable Foreground",
+		buildCustomizeElement(theme, theme.getInteractableForegroundColor(), "Interactable Foreground", "interactableForegroundColor", 3);
-				"interactableForegroundColor", 3);
+		buildCustomizeElement(theme, theme.getInteractableBackgroundColor(), "Interactable Background", "interactableBackgroundColor", 4);
-		buildCustomizeElement(theme, theme.getInteractableBackgroundColor(), "Interactable Background",
-				"interactableBackgroundColor", 4);
 		buildCustomizeElement(theme, theme.getMessageColorChat(), "Messages Chat", "messageColorChat", 5);
 		buildCustomizeElement(theme, theme.getDateColorChat(), "Date Chat", "dateColorCat", 6);
 		buildCustomizeElement(theme, theme.getSelectionColor(), "Selection", "selectionColor", 7);
@@ -233,7 +229,5 @@ public class ThemeCustomizationPanel extends SettingsPanel {
 		colorsPanel.add(button, gbc_button);
 	}
 
-	private Color getInvertedColor(Color color) {
+	private Color getInvertedColor(Color color) { return new Color(255 - color.getRed(), 255 - color.getGreen(), 255 - color.getBlue()); }
-		return new Color(255 - color.getRed(), 255 - color.getGreen(), 255 - color.getBlue());
-	}
 }