浏览代码

issue 2646

Change-Id: Ia6c6a5bc5e42da87d039bcf5aac2b09e5db8a9fd
Reviewed-on: http://gerrit.dmdirc.com/395
Reviewed-by: Chris Smith <chris@dmdirc.com>
Tested-by: Chris Smith <chris@dmdirc.com>
tags/0.6.3
Gregory Holmes 14 年前
父节点
当前提交
722ca881be
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7
    2
      src/com/dmdirc/addons/ui_swing/dialogs/about/LicenseLoader.java

+ 7
- 2
src/com/dmdirc/addons/ui_swing/dialogs/about/LicenseLoader.java 查看文件

@@ -27,6 +27,8 @@ import com.dmdirc.addons.ui_swing.components.GenericListModel;
27 27
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
28 28
 import com.dmdirc.logger.ErrorLevel;
29 29
 import com.dmdirc.logger.Logger;
30
+import com.dmdirc.plugins.PluginInfo;
31
+import com.dmdirc.plugins.PluginManager;
30 32
 import com.dmdirc.util.resourcemanager.ResourceManager;
31 33
 
32 34
 import java.io.BufferedReader;
@@ -67,9 +69,12 @@ public class LicenseLoader extends LoggingSwingWorker<Void, Void> {
67 69
                     "no resource manager");
68 70
         } else {
69 71
             final Map<String, InputStream> licenses =
70
-                    new TreeMap<String, InputStream>(rm.
71
-                    getResourcesStartingWithAsInputStreams(
72
+                    new TreeMap<String, InputStream>(String.CASE_INSENSITIVE_ORDER);
73
+            licenses.putAll(rm.getResourcesStartingWithAsInputStreams(
72 74
                     "com/dmdirc/licenses/"));
75
+            for (PluginInfo pi : PluginManager.getPluginManager().getPluginInfos()) {
76
+                licenses.putAll(pi.getLicenseStreams());
77
+            }
73 78
             for (Entry<String, InputStream> entry : licenses.entrySet()) {
74 79
                 final String licenseString = entry.getKey().substring(entry.
75 80
                         getKey().

正在加载...
取消
保存