empty

rjolly · May 5, 2018 · 3ef39aa · 3ef39aa
1 parent 60fb1c7
commit 3ef39aa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/application/src/main/java/linoleum/application/ApplicationManager.java b/application/src/main/java/linoleum/application/ApplicationManager.java
@@ -144,10 +144,6 @@ public List<App> getApplications() {
 		return apps;
 	}
 
-	public Packages getPackages() {
-		return instance;
-	}
-
 	private MimeType getMimeType(final String str) {
 		try {
 			return new MimeType(str);
@@ -428,6 +424,10 @@ private void open(final int index) {
 		}
 	}
 
+	public boolean addToClassPath(final Path path) {
+		return instance.add(path.toFile());
+	}
+
 	public void addClassPathListener(final ClassPathListener listener) {
 		listeners.add(listener);
 	}

diff --git a/application/src/main/java/linoleum/application/Packages.java b/application/src/main/java/linoleum/application/Packages.java
@@ -11,6 +11,7 @@
 import java.util.Collection;
 import java.util.jar.Manifest;
 import java.util.jar.Attributes;
+import java.net.MalformedURLException;
 import java.net.URL;
 
 public class Packages {
@@ -94,14 +95,14 @@ private void add1(final File file) {
 		}
 	}
 
-	public boolean add(final File file) {
+	boolean add(final File file) {
 		final Package pkg = new Package(file);
 		final String name = pkg.getName();
 		if (!pkg.isSourcesOrJavadoc() && !map.containsKey(name) && ClassLoader.getSystemClassLoader() instanceof ClassLoader) try {
 			((ClassLoader) ClassLoader.getSystemClassLoader()).addURL(file.toURI().toURL());
 			put(name, file);
 			return true;
-		} catch (final IOException e) {
+		} catch (final MalformedURLException e) {
 			e.printStackTrace();
 		}
 		return false;

diff --git a/pkg/src/linoleum/pkg/PackageManager.java b/pkg/src/linoleum/pkg/PackageManager.java
@@ -13,7 +13,6 @@
 import linoleum.application.ApplicationManager;
 import linoleum.application.Frame;
 import linoleum.application.Package;
-import linoleum.application.Packages;
 import linoleum.application.event.ClassPathListener;
 import linoleum.application.event.ClassPathChangeEvent;
 import org.apache.ivy.Ivy;
@@ -121,7 +120,6 @@ public void install(final String name, final String conf) {
 
 	public void install(final String name, final String conf, final File dir) {
 		final ApplicationManager apps = getApplicationManager();
-		final Packages pkgs = apps.getPackages();
 		final ModuleRevisionId mRID = ModuleRevisionId.parse(name);
 		final ResolveOptions resolveOptions = new ResolveOptions();
 		resolveOptions.setConfs(new String[] { conf });
@@ -135,7 +133,7 @@ public void install(final String name, final String conf, final File dir) {
 			for (final Object obj : retrieveReport.getCopiedFiles()) {
 				final File file = (File) obj;
 				if (file.getName().endsWith(".jar")) {
-					changed |= pkgs.add(file);
+					changed |= apps.addToClassPath(file.toPath());
 				}
 			}
 			if(changed) {