|
@@ -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().
|