Browse Source

Merge pull request #488 from csmith/configsource

Remove external usagees of ConfigSource.
pull/489/head
Greg Holmes 7 years ago
parent
commit
0b79931529

+ 1
- 3
debug/src/main/java/com/dmdirc/addons/debug/commands/ConfigInfo.java View File

62
     public void execute(@Nonnull final WindowModel origin,
62
     public void execute(@Nonnull final WindowModel origin,
63
             final CommandArguments args, final CommandContext context) {
63
             final CommandArguments args, final CommandContext context) {
64
         for (ConfigProvider source : origin.getConfigManager().getSources()) {
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 View File

72
     public void execute(@Nonnull final WindowModel origin,
72
     public void execute(@Nonnull final WindowModel origin,
73
             final CommandArguments args, final CommandContext context) {
73
             final CommandArguments args, final CommandContext context) {
74
         for (ConfigProvider source : globalConfig.getSources()) {
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 View File

83
 
83
 
84
         int i = 0;
84
         int i = 0;
85
         for (ConfigProvider source : identities) {
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
 }

Loading…
Cancel
Save