Initial refactoring

Author: Maertuerer

.gitignore

@@ -25,4 +25,5 @@ hs_err_pid*
 *.classpath
 *.project
 *.settings
-*target/*
+*target/*
+/target/

pom.xml

@@ -7,15 +7,6 @@
 	<version>0.0.1-SNAPSHOT</version>
 
 	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<resources>
-			<resource>
-				<directory>src</directory>
-				<excludes>
-					<exclude>**/*.java</exclude>
-				</excludes>
-			</resource>
-		</resources>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>

src/main/java/snowdesktop/SnowDesktopGUI.java src/main/java/de/dortmunddev/snowdesktop/SnowDesktop.java

@@ -14,15 +14,16 @@
 //		snowSimulator.start();
 //	}
 //}
-package snowdesktop;
+package de.dortmunddev.snowdesktop;
 
-import data.SnowSimulator;
+import de.dortmunddev.snowdesktop.logic.SnowSimulator;
+import de.dortmunddev.snowdesktop.ui.CustomTrayIcon;
 
-public class SnowDesktopGUI {
+public class SnowDesktop {
 
 	public static void main(final String[] args) throws Exception {
 
-		final TrayIconCustom trayIconCustom = new TrayIconCustom();
+		final CustomTrayIcon trayIconCustom = new CustomTrayIcon();
 		trayIconCustom.setTrayIcon();
 
 		final SnowSimulator snowSimulator = new SnowSimulator();

src/main/java/visual/Snowflake.java src/main/java/de/dortmunddev/snowdesktop/data/Snowflake.java

@@ -1,4 +1,4 @@
-package visual;
+package de.dortmunddev.snowdesktop.data;
 
 public class Snowflake {
 

src/main/java/data/Window.java src/main/java/de/dortmunddev/snowdesktop/data/WindowHandle.java

@@ -1,11 +1,11 @@
-package data;
+package de.dortmunddev.snowdesktop.data;
 
 import com.sun.jna.platform.win32.WinDef;
 import com.sun.jna.platform.win32.WinDef.HWND;
 import com.sun.jna.platform.win32.WinDef.RECT;
 
 //This represents a visible windows window
-public class Window {
+public class WindowHandle {
 
 	private final HWND windowHandle;
 	private final String title;
@@ -19,12 +19,12 @@ public int getWindowID() {
 
 	private static int windowCount = 0;
 
-	public Window(final HWND windowHandle, final String title, final RECT rect) {
+	public WindowHandle(final HWND windowHandle, final String title, final RECT rect) {
 		this.windowHandle = windowHandle;
 		this.title = title;
 		this.rect = rect;
-		this.windowID = Window.windowCount;
-		Window.windowCount++;
+		this.windowID = WindowHandle.windowCount;
+		WindowHandle.windowCount++;
 		this.setStillExists(true);
 	}
 

src/main/java/data/SnowSimulator.java src/main/java/de/dortmunddev/snowdesktop/logic/SnowSimulator.java

@@ -1,4 +1,4 @@
-package data;
+package de.dortmunddev.snowdesktop.logic;
 
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
@@ -7,9 +7,6 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import visual.SnowDesktop;
-import visual.SnowflakePanel;
-
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.platform.win32.WinDef;
@@ -18,9 +15,13 @@
 import com.sun.jna.platform.win32.WinUser.WINDOWINFO;
 import com.sun.jna.platform.win32.WinUser.WNDENUMPROC;
 
+import de.dortmunddev.snowdesktop.data.WindowHandle;
+import de.dortmunddev.snowdesktop.ui.SnowWindow;
+import de.dortmunddev.snowdesktop.ui.SnowflakePanel;
+
 public class SnowSimulator {
 
-	private static final ArrayList<SnowDesktop> desktops = new ArrayList<SnowDesktop>();
+	private static final ArrayList<SnowWindow> desktops = new ArrayList<SnowWindow>();
 
 	// Rect of the whole monitor setup
 	private final static WinDef.RECT totalScreenRect = new WinDef.RECT();
@@ -29,7 +30,7 @@ public class SnowSimulator {
 	private final WinDef.RECT cursorRect = new WinDef.RECT();
 
 	// Already known windows
-	private final ArrayList<Window> windowList = new ArrayList<Window>();
+	private final ArrayList<WindowHandle> windowList = new ArrayList<WindowHandle>();
 
 	// All occupied pixels by ALL visible windows
 	private static int[][] windows;
@@ -78,18 +79,18 @@ public SnowSimulator() {
 			currentMonitorRect.top = 0;
 			currentMonitorRect.bottom = 1050;
 
-			SnowSimulator.getDesktops().add(new SnowDesktop(currentMonitorRect));
+			SnowSimulator.getDesktops().add(new SnowWindow(currentMonitorRect));
 		}
 
-		for (final SnowDesktop snowDesktop : SnowSimulator.getDesktops()) {
+		for (final SnowWindow snowDesktop : SnowSimulator.getDesktops()) {
 			System.out.println(snowDesktop.getScreenRect());
 		}
 
-		final SnowDesktop[][] desktopsArray = new SnowDesktop[9][9];
+		final SnowWindow[][] desktopsArray = new SnowWindow[9][9];
 
 		desktopsArray[4][4] = SnowSimulator.desktops.get(0);
 
-		for (final SnowDesktop snowDesktop : SnowSimulator.getDesktops()) {
+		for (final SnowWindow snowDesktop : SnowSimulator.getDesktops()) {
 
 		}
 
@@ -129,7 +130,7 @@ public void run() {
 	// gets all the visible windows and adds them to the windowList
 	public void getAllWindows() throws InterruptedException {
 
-		for (final Window curWindow : SnowSimulator.this.windowList) {
+		for (final WindowHandle curWindow : SnowSimulator.this.windowList) {
 			curWindow.setStillExists(false);
 		}
 
@@ -145,15 +146,15 @@ public boolean callback(final HWND arg0, final Pointer arg1) {
 				if (User32.IsWindowVisible(arg0) && !title.equals("") && !title.equals("Program Manager")) {
 					boolean alreadyFound = false;
 
-					for (final Window curWindow : SnowSimulator.this.windowList) {
+					for (final WindowHandle curWindow : SnowSimulator.this.windowList) {
 						if (arg0.getPointer().equals(curWindow.getWindowHandle().getPointer())) {
 							alreadyFound = true;
 							curWindow.setStillExists(true);
 							break;
 						}
 					}
 					if (!alreadyFound) {
-						SnowSimulator.this.windowList.add(new Window(arg0, title, rect));
+						SnowSimulator.this.windowList.add(new WindowHandle(arg0, title, rect));
 						for (int x = rect.left; x < rect.right; x++) {
 							for (int y = rect.top; y < rect.bottom; y++) {
 								if (x - SnowSimulator.totalScreenRect.left > 0 && x - SnowSimulator.totalScreenRect.left < SnowSimulator.getWindows().length && y > 0 && y < SnowSimulator.getWindows()[0].length - 2) {
@@ -169,16 +170,16 @@ public boolean callback(final HWND arg0, final Pointer arg1) {
 			}
 		}, 0);
 
-		final Queue<Window> removeWindowQueue = new ConcurrentLinkedQueue<Window>();
+		final Queue<WindowHandle> removeWindowQueue = new ConcurrentLinkedQueue<WindowHandle>();
 
-		for (final Window curWindow : SnowSimulator.this.windowList) {
+		for (final WindowHandle curWindow : SnowSimulator.this.windowList) {
 			if (curWindow.stillExists() == false) {
 				removeWindowQueue.add(curWindow);
 			}
 		}
 
 		while (!removeWindowQueue.isEmpty()) {
-			final Window curWindow = removeWindowQueue.poll();
+			final WindowHandle curWindow = removeWindowQueue.poll();
 
 			SnowSimulator.this.windowList.remove(curWindow);
 
@@ -198,10 +199,10 @@ public boolean callback(final HWND arg0, final Pointer arg1) {
 	// updates the position and size of all visible windows
 	public void updateWindows() throws InterruptedException {
 		final long start = System.currentTimeMillis();
-		final Queue<Window> toUpdate = new ConcurrentLinkedQueue<Window>();
+		final Queue<WindowHandle> toUpdate = new ConcurrentLinkedQueue<WindowHandle>();
 
 		// Check for a changed Window position/size
-		for (final Window curWindow : SnowSimulator.this.windowList) {
+		for (final WindowHandle curWindow : SnowSimulator.this.windowList) {
 			final WinDef.RECT curRect = curWindow.getRect();
 
 			final WinDef.RECT rect = new WinDef.RECT();
@@ -212,7 +213,7 @@ public void updateWindows() throws InterruptedException {
 			}
 		}
 
-		for (final Window curWindow : toUpdate) {
+		for (final WindowHandle curWindow : toUpdate) {
 			final WinDef.RECT newRect = new WinDef.RECT();
 
 			User32.GetWindowRect(curWindow.getWindowHandle(), newRect);
@@ -304,7 +305,7 @@ public static RECT getTotalScreenRect() {
 		return SnowSimulator.totalScreenRect;
 	}
 
-	public static ArrayList<SnowDesktop> getDesktops() {
+	public static ArrayList<SnowWindow> getDesktops() {
 		return SnowSimulator.desktops;
 	}
 

src/main/java/snowdesktop/TrayIconCustom.java src/main/java/de/dortmunddev/snowdesktop/ui/CustomTrayIcon.java

@@ -1,4 +1,4 @@
-package snowdesktop;
+package de.dortmunddev.snowdesktop.ui;
 
 import java.awt.AWTException;
 import java.awt.CheckboxMenuItem;
@@ -14,16 +14,15 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
-import visual.SnowDesktop;
-import data.SnowSimulator;
+import de.dortmunddev.snowdesktop.logic.SnowSimulator;
 
-public class TrayIconCustom {
-	static Image image = Toolkit.getDefaultToolkit().getImage(TrayIconCustom.class.getResource("/snowflake.png"));
-	static TrayIcon trayIcon = new TrayIcon(TrayIconCustom.image, "Snowflake V " + SnowDesktop.getVersion());
+public class CustomTrayIcon {
+	static Image image = Toolkit.getDefaultToolkit().getImage(CustomTrayIcon.class.getResource("/snowflake_icon.png"));
+	static TrayIcon trayIcon = new TrayIcon(CustomTrayIcon.image, "Snowflake V " + SnowWindow.getVersion());
 
 	PopupMenu popupMenu = new PopupMenu();
 
-	public TrayIconCustom() {
+	public CustomTrayIcon() {
 
 	}
 
@@ -34,9 +33,9 @@ public TrayIconCustom() {
 	public void setTrayIcon() {
 		if (SystemTray.isSupported()) {
 			final SystemTray tray = SystemTray.getSystemTray();
-			TrayIconCustom.trayIcon.setImageAutoSize(true);
+			CustomTrayIcon.trayIcon.setImageAutoSize(true);
 			try {
-				tray.add(TrayIconCustom.trayIcon);
+				tray.add(CustomTrayIcon.trayIcon);
 			} catch (final AWTException e) {
 				System.err.println(e.getMessage());
 			}
@@ -106,24 +105,24 @@ public void actionPerformed(final ActionEvent e) {
 			this.popupMenu.addSeparator();
 			this.popupMenu.add(exitItem);
 
-			TrayIconCustom.trayIcon.setPopupMenu(this.popupMenu);
+			CustomTrayIcon.trayIcon.setPopupMenu(this.popupMenu);
 
 		}
 	}
 
 	public void showInfoMsg(final String msg, final String title) {
-		TrayIconCustom.trayIcon.displayMessage(title, msg, TrayIcon.MessageType.INFO);
+		CustomTrayIcon.trayIcon.displayMessage(title, msg, TrayIcon.MessageType.INFO);
 	}
 
 	public void showErrorMsg(final String msg, final String title) {
-		TrayIconCustom.trayIcon.displayMessage(title, msg, TrayIcon.MessageType.ERROR);
+		CustomTrayIcon.trayIcon.displayMessage(title, msg, TrayIcon.MessageType.ERROR);
 	}
 
 	public void showWarningMsg(final String msg, final String title) {
-		TrayIconCustom.trayIcon.displayMessage(title, msg, TrayIcon.MessageType.WARNING);
+		CustomTrayIcon.trayIcon.displayMessage(title, msg, TrayIcon.MessageType.WARNING);
 	}
 
 	public void showMsg(final String msg, final String title) {
-		TrayIconCustom.trayIcon.displayMessage(title, msg, TrayIcon.MessageType.NONE);
+		CustomTrayIcon.trayIcon.displayMessage(title, msg, TrayIcon.MessageType.NONE);
 	}
 }

src/main/java/visual/SnowDesktop.java src/main/java/de/dortmunddev/snowdesktop/ui/SnowWindow.java

@@ -1,19 +1,19 @@
-package visual;
+package de.dortmunddev.snowdesktop.ui;
 
 import java.awt.Color;
 
 import javax.swing.JWindow;
 
 import com.sun.jna.platform.win32.WinDef.RECT;
 
-public class SnowDesktop extends JWindow {
+public class SnowWindow extends JWindow {
 
 	private static final long serialVersionUID = 1L;
 	private static String version = "0.0.3";
 	private final RECT screenRect;
 	private final SnowflakePanel snowflakePanel;
 
-	public SnowDesktop(final RECT currentScreenRect) {
+	public SnowWindow(final RECT currentScreenRect) {
 		this.setSize(currentScreenRect.right - currentScreenRect.left, currentScreenRect.bottom - currentScreenRect.top);
 		this.setLocation(currentScreenRect.left, currentScreenRect.top);
 		this.setBackground(new Color(0, 0, 0, 0));
@@ -27,11 +27,11 @@ public SnowDesktop(final RECT currentScreenRect) {
 	}
 
 	public static String getVersion() {
-		return SnowDesktop.version;
+		return SnowWindow.version;
 	}
 
 	public static void setVersion(final String version) {
-		SnowDesktop.version = version;
+		SnowWindow.version = version;
 	}
 
 	public RECT getScreenRect() {

src/main/java/visual/SnowflakePanel.java src/main/java/de/dortmunddev/snowdesktop/ui/SnowflakePanel.java

@@ -1,4 +1,4 @@
-package visual;
+package de.dortmunddev.snowdesktop.ui;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -18,7 +18,8 @@
 
 import com.sun.jna.platform.win32.WinDef.RECT;
 
-import data.SnowSimulator;
+import de.dortmunddev.snowdesktop.data.Snowflake;
+import de.dortmunddev.snowdesktop.logic.SnowSimulator;
 
 //used to paint all the snowflakes of a specific monitor
 public class SnowflakePanel extends JPanel {