[client] Fix stuff FindBugs complained about

14 files changed, 37 insertions, 31 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/AbstractControlWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/AbstractControlWrapper.java
index 460f457e..9b475bcb 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/AbstractControlWrapper.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/AbstractControlWrapper.java
@@ -138,7 +138,8 @@ public abstract class AbstractControlWrapper<T> {
 			if (error != null)
 				break;
 		}
-		if (error != currentError) {
+		if ((error == null && currentError != null) || (error != null && currentError == null)
+				|| (error != null && !error.equals(currentError))) {
 			currentError = error;
 			dcm.validityChanged(this);
 		}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/TimeSpinnerWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/TimeSpinnerWrapper.java
index a7d94f5d..c52459a1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/TimeSpinnerWrapper.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/changemonitor/TimeSpinnerWrapper.java
@@ -9,7 +9,7 @@ import javax.swing.event.ChangeListener;
 
 class TimeSpinnerWrapper extends AbstractControlWrapper<Object> {
 	
-	private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("k:m");
+	private final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("k:m");
 	
 	private final JSpinner component;
 	
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/RunscriptConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/RunscriptConfigurator.java
index 52a686bb..ead06c0c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/RunscriptConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/RunscriptConfigurator.java
@@ -17,14 +17,13 @@ import javax.swing.DefaultComboBoxModel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
-import javax.swing.event.EventListenerList;
 
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor;
 import org.openslx.dozmod.gui.configurator.RunscriptConfigurator.RunscriptType;
 import org.openslx.dozmod.gui.control.ComboBox;
+import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
 import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.control.WordWrapLabel;
-import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
 import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.helper.TextChangeListener;
 
@@ -162,8 +161,6 @@ public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
 	 * Custom event mechanism to detect changes to the user list (Mostly needed
 	 * for the reactToChange() stuff in LectureDetailsWindow)
 	 */
-	protected EventListenerList listenerList = new EventListenerList();
-
 	public class RunscriptConfigurationChangeEvent extends EventObject {
 
 		private static final long serialVersionUID = -8779550754760035845L;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/JCheckBoxTree.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/JCheckBoxTree.java
index 16f260b7..eb0fc85a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/JCheckBoxTree.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/JCheckBoxTree.java
@@ -14,7 +14,6 @@ import java.util.Map.Entry;
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
 import javax.swing.JTree;
-import javax.swing.event.EventListenerList;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeSelectionModel;
 import javax.swing.tree.TreeCellRenderer;
@@ -61,7 +60,6 @@ public class JCheckBoxTree extends JTree {
 
 	// Defining a new event type for the checking mechanism and preparing
 	// event-handling mechanism
-	protected EventListenerList listenerList = new EventListenerList();
 
 	public class CheckChangeEvent extends EventObject {
 		private static final long serialVersionUID = -8100230309044193368L;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java
index 542b278e..a1a28d96 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java
@@ -96,6 +96,7 @@ public class VirtConfigEditorWindow extends VirtConfigEditorWindowLayout impleme
 		}
 		if (metaCandidate == null) {
 			dispose();
+			return;
 		}
 
 		byte[] uiBytesFiltered = metaCandidate.getDefinitionArray();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
index 5266e157..6dba2a08 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java
@@ -56,12 +56,15 @@ public class VirtDropDownConfigEditorWindow extends VirtDropDownConfigEditorWind
 		} catch (IOException e) {
 			LOGGER.error("Could not get VmMetaData instance from given machine description: ", e);
 		}
+
+		meta = metaCandidate;
+		
 		if (metaCandidate == null) {
+			this.originalMachineDescription = null;
 			dispose();
+			return;
 		}
 
-		meta = metaCandidate;
-
 		initializeSoundBox(meta.getSupportedSoundCards());
 		initializeDDABox(meta.getSupportedDDAccs());
 		initializeHWVersBox(meta.getSupportedHWVersions());
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
index 9c20e88c..8667c944 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java
@@ -84,6 +84,8 @@ public abstract class CheckUpdateWindowLayout extends JDialog {
 
 		add(buttonPanel, BorderLayout.PAGE_END);
 		pack();
-		Gui.centerShellOverShell(modalParent, this);
+		if (modalParent != null) {
+			Gui.centerShellOverShell(modalParent, this);
+		}
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java
index 56713dd5..022950d1 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java
@@ -82,7 +82,9 @@ public abstract class GenericNoticeWindowLayout extends JDialog {
 		grid.finish(false);
 
 		pack();
-		Gui.centerShellOverShell(modalParent, this);
+		if (modalParent != null) {
+			Gui.centerShellOverShell(modalParent, this);
+		}
 	}
 
 	public void setNoticeText(String text) {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java
index 4ddf25e8..f8640c19 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java
@@ -59,6 +59,8 @@ public class LocationSelectionWindowLayout extends JDialog {
 		grid.finish(false);
 		setPreferredSize(Gui.getScaledDimension(550, 500));
 		pack();
-		Gui.centerShellOverShell(modalParent, this);
+		if (modalParent != null) {
+			Gui.centerShellOverShell(modalParent, this);
+		}
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java
index af06b5fe..c8cc7f62 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java
@@ -58,6 +58,8 @@ public class VirtConfigEditorWindowLayout extends JDialog {
 
 		setPreferredSize(Gui.getScaledDimension(650, 750));
 		setMinimumSize(Gui.getScaledDimension(550, 650));
-		Gui.centerShellOverShell(modalParent, this);
+		if (modalParent != null) {
+			Gui.centerShellOverShell(modalParent, this);
+		}
 	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java
index 28dd5e4e..a73bb60e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java
@@ -135,7 +135,9 @@ public class VirtDropDownConfigEditorWindowLayout extends JDialog {
 
 		setPreferredSize(Gui.getScaledDimension(600, 400));
 		setMinimumSize(Gui.getScaledDimension(450, 350));
-		Gui.centerShellOverShell(modalParent, this);
+		if (modalParent != null) {
+			Gui.centerShellOverShell(modalParent, this);
+		}
 	}
 
 	// SoundBox
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java
index 47b8fa85..aa43601e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java
@@ -30,7 +30,7 @@ public class Session {
 	
 	private static Set<Feature> features = null;
 
-	public static void initialize(WhoamiInfo whoami, String satAddress, String satToken, String masToken,
+	public static synchronized void initialize(WhoamiInfo whoami, String satAddress, String satToken, String masToken,
 			long satApiVersion) {
 		if (whoami == null || whoami.user == null || whoami.user.userId == null) {
 			throw new IllegalArgumentException(
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java
index 44925b4a..4a6528a3 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java
@@ -5,6 +5,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URLEncoder;
+import java.util.Arrays;
 
 import org.apache.log4j.Logger;
 
@@ -113,7 +114,7 @@ public class DesktopEnvironment {
 		try {
 			exitCode = Runtime.getRuntime().exec(execCommand).waitFor();
 		} catch (InterruptedException | IOException e) {
-			LOGGER.debug("Failed to execute: " + execCommand + "\nTrace: ", e);
+			LOGGER.debug("Failed to execute: " + Arrays.toString(execCommand) + " -- Trace: ", e);
 			return false;
 		}
 		return exitCode == 0;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java
index a1264da5..98b48df8 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/FormatHelper.java
@@ -140,23 +140,18 @@ public class FormatHelper {
 	 * the same as longDate
 	 */
 	public static String daysTil(final long timestamp) {
-		long minutesLeft = (timestamp * 1000 - System.currentTimeMillis()) / ( 1000 * 60 );
-		long hoursLeft = minutesLeft / 60;
-		long daysLeft = hoursLeft / 24;
+		long minutesLeft = (timestamp * 1000 - System.currentTimeMillis()) / (1000 * 60);
 		if (minutesLeft <= 0)
 			return "-";
-		if (daysLeft > 14) {
-			return longDate(timestamp);
-		} else if (daysLeft >= 1) {
-			return new String(daysLeft + " Tag(e)");
-		} else if (hoursLeft > 0) {
-			return new String(hoursLeft + " Stunde(n)");
-		} else if (minutesLeft > 0){
+		if (minutesLeft < 60)
 			return new String(minutesLeft + " Minute(n)");
-		} else {
-			return "-";
-		}
-
+		long hoursLeft = minutesLeft / 60;
+		if (hoursLeft < 24)
+			return new String(hoursLeft + " Stunde(n)");
+		long daysLeft = hoursLeft / 24;
+		if (daysLeft < 14)
+			return new String(daysLeft + " Tag(e)");
+		return longDate(timestamp);
 	}
 
 	/**