Parcourir la source

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 il y a 14 ans
Parent
révision
722ca881be

+ 7
- 2
src/com/dmdirc/addons/ui_swing/dialogs/about/LicenseLoader.java Voir le fichier

27
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
27
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
28
 import com.dmdirc.logger.ErrorLevel;
28
 import com.dmdirc.logger.ErrorLevel;
29
 import com.dmdirc.logger.Logger;
29
 import com.dmdirc.logger.Logger;
30
+import com.dmdirc.plugins.PluginInfo;
31
+import com.dmdirc.plugins.PluginManager;
30
 import com.dmdirc.util.resourcemanager.ResourceManager;
32
 import com.dmdirc.util.resourcemanager.ResourceManager;
31
 
33
 
32
 import java.io.BufferedReader;
34
 import java.io.BufferedReader;
67
                     "no resource manager");
69
                     "no resource manager");
68
         } else {
70
         } else {
69
             final Map<String, InputStream> licenses =
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
                     "com/dmdirc/licenses/"));
74
                     "com/dmdirc/licenses/"));
75
+            for (PluginInfo pi : PluginManager.getPluginManager().getPluginInfos()) {
76
+                licenses.putAll(pi.getLicenseStreams());
77
+            }
73
             for (Entry<String, InputStream> entry : licenses.entrySet()) {
78
             for (Entry<String, InputStream> entry : licenses.entrySet()) {
74
                 final String licenseString = entry.getKey().substring(entry.
79
                 final String licenseString = entry.getKey().substring(entry.
75
                         getKey().
80
                         getKey().

Chargement…
Annuler
Enregistrer