bug fixes. version update

Author: enoy19

.gitignore

@@ -2,4 +2,5 @@ keyboard-light-composer-device-logitech/lib/logiled.jar
 **/.settings
 **/.project
 **/.classpath
-**/target
+**/target
+/keyboard-light-composer-application/plugins

keyboard-light-composer-application/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.enoy</groupId>
 		<artifactId>keyboard-light-composer</artifactId>
-		<version>1.0.0-ALPHA</version>
+		<version>1.0.1-ALPHA</version>
 	</parent>
 	<artifactId>keyboard-light-composer-application</artifactId>
 
@@ -20,6 +20,7 @@
 		<dependency>
 			<groupId>org.enoy</groupId>
 			<artifactId>keyboard-light-composer-device-logitech</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.enoy</groupId>

keyboard-light-composer-application/src/main/java/org/enoy/klc/app/KeyboardLightComposerApplication.java

@@ -19,33 +19,32 @@
 import javafx.stage.Stage;
 
 public class KeyboardLightComposerApplication extends Application {
-	
+
 	private Updater updater;
-	
+
 	private LayerRenderer layerRenderer;
 
 	@Override
 	public void start(Stage primaryStage) throws Exception {
-		Thread.currentThread()
-				.setUncaughtExceptionHandler(this::showJavaFxException);
+		Thread.currentThread().setUncaughtExceptionHandler(this::showJavaFxException);
 		registerPropertyValueEditors();
 
 		updater = new Updater();
 		updater.setUpdatableRegister(UpdatableRegister.getInstance());
 		Thread updateThread = new Thread(updater, "Update Thread");
 		updateThread.setDaemon(true);
 		updateThread.start();
-		
+
 		layerRenderer = new DefaultRenderer();
 		Thread renderThread = new Thread(layerRenderer, "Render Thread");
 		renderThread.setDaemon(true);
 		renderThread.start();
-		
+
 		ResourceBundle resources = ResourceBundle.getBundle("fxml/i18n/klc");
 		URL location = this.getClass().getResource("/fxml/KlcApplication.fxml");
 		FXMLLoader loader = new FXMLLoader(location, resources);
 		loader.load();
-		
+
 		KlcApplication controller = loader.getController();
 		controller.setUpdater(updater);
 		controller.setRenderer(layerRenderer);

keyboard-light-composer-common/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.enoy</groupId>
 		<artifactId>keyboard-light-composer</artifactId>
-		<version>1.0.0-ALPHA</version>
+		<version>1.0.1-ALPHA</version>
 	</parent>
 	<artifactId>keyboard-light-composer-common</artifactId>
 	<name>Keyboard Light Composer Common</name>

keyboard-light-composer-controller/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.enoy</groupId>
 		<artifactId>keyboard-light-composer</artifactId>
-		<version>1.0.0-ALPHA</version>
+		<version>1.0.1-ALPHA</version>
 	</parent>
 	<artifactId>keyboard-light-composer-controller</artifactId>
 

keyboard-light-composer-controller/src/main/java/org/enoy/klc/control/PluginClassLoader.java

@@ -9,37 +9,50 @@
 
 public class PluginClassLoader {
 
-	private static final File PLUGIN_DIR = new File("./plugins");
+	private static final File PLUGIN_DIR = new File("plugins");
 
 	public static final void setupPluginClassLoader() throws PluginLoadingException {
 		Thread currentThread = Thread.currentThread();
 		ClassLoader contextClassLoader = currentThread.getContextClassLoader();
-		currentThread.setContextClassLoader(getPluginClassLoader(contextClassLoader));
+		ClassLoader pluginClassLoader = getPluginClassLoader(contextClassLoader);
+		
+		currentThread.setContextClassLoader(pluginClassLoader);
 	}
 
-	public static final ClassLoader getPluginClassLoader(ClassLoader parent)
-			throws PluginLoadingException {
+	private static final ClassLoader getPluginClassLoader(ClassLoader parent) throws PluginLoadingException {
 
 		createPluginDirectoryIfNotExists();
 
-		URL pluginUrl;
+		URL[] jarUrls;
 		try {
-			pluginUrl = PLUGIN_DIR.toURI().toURL();
-			return new URLClassLoader(new URL[]{pluginUrl}, parent);
+
+			File[] jars = PLUGIN_DIR.listFiles((dir, name) -> {
+				return dir.equals(PLUGIN_DIR) && name.endsWith(".jar");
+			});
+
+			jarUrls = new URL[jars.length];
+
+			for (int i = 0; i < jars.length; i++) {
+				jarUrls[i] = jars[i].toURI().toURL();
+			}
+
+			if(jarUrls.length > 0){
+				return new URLClassLoader(jarUrls, parent);
+			}
+			
+			return parent;
 		} catch (MalformedURLException e) {
 			e.printStackTrace();
-			throw new PluginLoadingException("failed to parse file to url", e);
+			throw new PluginLoadingException("could not load plugin", e);
 			// TODO: logging
 		}
 
 	}
 
-	private static void createPluginDirectoryIfNotExists()
-			throws PluginLoadingException {
+	private static void createPluginDirectoryIfNotExists() throws PluginLoadingException {
 		if (!PLUGIN_DIR.exists()) {
 			if (!PLUGIN_DIR.mkdirs()) {
-				throw new PluginLoadingException(
-						"Failed to create plugin directory");
+				throw new PluginLoadingException("Failed to create plugin directory");
 			}
 		}
 	}

keyboard-light-composer-device-logitech/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.enoy</groupId>
 		<artifactId>keyboard-light-composer</artifactId>
-		<version>1.0.0-ALPHA</version>
+		<version>1.0.1-ALPHA</version>
 	</parent>
 	<artifactId>keyboard-light-composer-device-logitech</artifactId>
 	<name>Device Provider for Logitech Keyboards</name>

keyboard-light-composer-standard-effects/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.enoy</groupId>
 		<artifactId>keyboard-light-composer</artifactId>
-		<version>1.0.0-ALPHA</version>
+		<version>1.0.1-ALPHA</version>
 	</parent>
 	<artifactId>keyboard-light-composer-standard-effects</artifactId>
 

pom.xml

@@ -3,15 +3,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.enoy</groupId>
 	<artifactId>keyboard-light-composer</artifactId>
-	<version>1.0.0-ALPHA</version>
+	<version>1.0.1-ALPHA</version>
 	<packaging>pom</packaging>
 	<name>Keyboard Light Composer</name>
 	<modules>
 		<module>keyboard-light-composer-common</module>
 		<module>keyboard-light-composer-controller</module>
 		<module>keyboard-light-composer-device-logitech</module>
-		<module>keyboard-light-composer-application</module>
 		<module>keyboard-light-composer-standard-effects</module>
+		<module>keyboard-light-composer-application</module>
 	</modules>
 
 	<build>