Pārlūkot izejas kodu

Remove external usagees of ConfigSource.

This is an implementation detail, and it doesn't make sense to
expose it in an interface for everyone to access. The only use
of it outside of the config system is in debug displays.
pull/488/head
Chris Smith 7 gadus atpakaļ
vecāks
revīzija
557e4369c4

+ 1
- 3
debug/src/main/java/com/dmdirc/addons/debug/commands/ConfigInfo.java Parādīt failu

@@ -62,9 +62,7 @@ public class ConfigInfo extends DebugCommand {
62 62
     public void execute(@Nonnull final WindowModel origin,
63 63
             final CommandArguments args, final CommandContext context) {
64 64
         for (ConfigProvider source : origin.getConfigManager().getSources()) {
65
-            showOutput(origin, args.isSilent(), source.getTarget()
66
-                    + " - " + source + "(" + source.getTarget().getOrder()
67
-                    + ")");
65
+            showOutput(origin, args.isSilent(), String.valueOf(source));
68 66
         }
69 67
     }
70 68
 

+ 1
- 3
debug/src/main/java/com/dmdirc/addons/debug/commands/GlobalConfigInfo.java Parādīt failu

@@ -72,9 +72,7 @@ public class GlobalConfigInfo extends DebugCommand {
72 72
     public void execute(@Nonnull final WindowModel origin,
73 73
             final CommandArguments args, final CommandContext context) {
74 74
         for (ConfigProvider source : globalConfig.getSources()) {
75
-            showOutput(origin, args.isSilent(), source.getTarget()
76
-                    + " - " + source + "(" + source.getTarget().getOrder()
77
-                    + ")");
75
+            showOutput(origin, args.isSilent(), String.valueOf(source));
78 76
         }
79 77
     }
80 78
 

+ 2
- 5
debug/src/main/java/com/dmdirc/addons/debug/commands/Identities.java Parādīt failu

@@ -83,13 +83,10 @@ public class Identities extends DebugCommand {
83 83
 
84 84
         int i = 0;
85 85
         for (ConfigProvider source : identities) {
86
-            data[i++] = new String[]{source.getName(),
87
-                source.getTarget().getTypeName(), source.getTarget().getData(),
88
-                String.valueOf(source.getTarget().getOrder())};
86
+            data[i++] = new String[]{source.getName()};
89 87
         }
90 88
 
91
-        showOutput(origin, args.isSilent(),
92
-                doTable(new String[]{"Name", "Target", "Data", "Priority"}, data));
89
+        showOutput(origin, args.isSilent(), doTable(new String[]{"Name"}, data));
93 90
     }
94 91
 
95 92
 }

Notiek ielāde…
Atcelt
Saglabāt