Selaa lähdekoodia

Fix plugin mta data URIs to work under windows

Change-Id: Ia09cde20a8899e07e20ffab79f4cd64a1d30dec6
Reviewed-on: http://gerrit.dmdirc.com/2068
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.6b1
Greg Holmes 13 vuotta sitten
vanhempi
commit
4a0789f5b4

+ 2
- 2
src/com/dmdirc/logger/ErrorManager.java Näytä tiedosto

@@ -45,7 +45,7 @@ public final class ErrorManager implements ConfigChangeListener {
45 45
     private static final ErrorManager ME = new ErrorManager();
46 46
 
47 47
     /** A list of exceptions which we don't consider bugs and thus don't report. */
48
-    private static final Class[] BANNED_EXCEPTIONS = new Class[]{
48
+    private static final Class<?>[] BANNED_EXCEPTIONS = new Class<?>[]{
49 49
         NoSuchMethodError.class, NoClassDefFoundError.class,
50 50
         UnsatisfiedLinkError.class, AbstractMethodError.class,
51 51
         IllegalAccessError.class, OutOfMemoryError.class,
@@ -236,7 +236,7 @@ public final class ErrorManager implements ConfigChangeListener {
236 236
         Throwable target = exception;
237 237
 
238 238
         while (target != null) {
239
-            for (Class bad : BANNED_EXCEPTIONS) {
239
+            for (Class<?> bad : BANNED_EXCEPTIONS) {
240 240
                 if (bad.equals(target.getClass())) {
241 241
                     return false;
242 242
                 }

+ 2
- 2
src/com/dmdirc/plugins/PluginManager.java Näytä tiedosto

@@ -268,7 +268,7 @@ public class PluginManager implements ActionListener {
268 268
 
269 269
         try {
270 270
             final PluginMetaData metadata = new PluginMetaData(
271
-                    new URL("jar:file://" + getDirectory() + filename
271
+                    new URL("jar:file:" + getDirectory() + filename
272 272
                     + "!/META-INF/plugin.config"),
273 273
                     new URL("file:" + getDirectory() + filename));
274 274
             metadata.load();
@@ -494,7 +494,7 @@ public class PluginManager implements ActionListener {
494 494
         for (String target : pluginPaths) {
495 495
             try {
496 496
                 final PluginMetaData targetMetaData = new PluginMetaData(
497
-                        new URL("jar:file://" + getDirectory() + target
497
+                        new URL("jar:file:" + getDirectory() + target
498 498
                         + "!/META-INF/plugin.config"),
499 499
                         new URL("file:" + getDirectory() + target));
500 500
                 targetMetaData.load();

Loading…
Peruuta
Tallenna