ソースを参照

Stop using ResourceManagers some more.

Depends-On: Ie8f2c6abe05eac9897cada8e17b67ed1d982d95e
Change-Id: Ic48f35315ff795c6dd44bf24190ca19581ca71d3
Reviewed-on: http://gerrit.dmdirc.com/4076
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
pull/1/head
Greg Holmes 9年前
コミット
8b79db53a5

+ 7
- 8
src/com/dmdirc/actions/ActionManager.java ファイルの表示

41
 import com.dmdirc.updater.components.ActionGroupComponent;
41
 import com.dmdirc.updater.components.ActionGroupComponent;
42
 import com.dmdirc.updater.manager.UpdateManager;
42
 import com.dmdirc.updater.manager.UpdateManager;
43
 import com.dmdirc.util.collections.MapList;
43
 import com.dmdirc.util.collections.MapList;
44
-import com.dmdirc.util.resourcemanager.ZipResourceManager;
44
+import com.dmdirc.util.io.FileUtils;
45
 
45
 
46
 import java.io.File;
46
 import java.io.File;
47
 import java.io.IOException;
47
 import java.io.IOException;
48
 import java.lang.reflect.Method;
48
 import java.lang.reflect.Method;
49
+import java.nio.file.Files;
50
+import java.nio.file.Path;
51
+import java.nio.file.Paths;
49
 import java.util.ArrayList;
52
 import java.util.ArrayList;
50
 import java.util.Collections;
53
 import java.util.Collections;
51
 import java.util.HashMap;
54
 import java.util.HashMap;
678
      *
681
      *
679
      * @throws IOException If the zip cannot be extracted
682
      * @throws IOException If the zip cannot be extracted
680
      */
683
      */
681
-    public static void installActionPack(final String path) throws IOException {
682
-        final ZipResourceManager ziprm = ZipResourceManager.getInstance(path);
683
-
684
-        ziprm.extractResources("", getActionManager().directory);
685
-
684
+    public static void installActionPack(final Path path) throws IOException {
685
+        FileUtils.copyRecursively(path, Paths.get(getActionManager().directory));
686
         getActionManager().loadUserActions();
686
         getActionManager().loadUserActions();
687
-
688
-        new File(path).delete();
687
+        Files.delete(path);
689
     }
688
     }
690
 
689
 
691
     @Override
690
     @Override

+ 2
- 1
src/com/dmdirc/updater/components/ActionGroupComponent.java ファイルの表示

28
 import com.dmdirc.updater.Version;
28
 import com.dmdirc.updater.Version;
29
 
29
 
30
 import java.io.IOException;
30
 import java.io.IOException;
31
+import java.nio.file.Paths;
31
 
32
 
32
 /**
33
 /**
33
  * Update component for action groups.
34
  * Update component for action groups.
77
 
78
 
78
     @Override
79
     @Override
79
     public boolean doInstall(final String path) throws IOException {
80
     public boolean doInstall(final String path) throws IOException {
80
-        ActionManager.installActionPack(path);
81
+        ActionManager.installActionPack(Paths.get(path));
81
         return false;
82
         return false;
82
     }
83
     }
83
 
84
 

読み込み中…
キャンセル
保存