diff options
| author | abranson <andrew.branson@cern.ch> | 2011-11-23 10:35:53 +0100 |
|---|---|---|
| committer | abranson <andrew.branson@cern.ch> | 2011-11-23 10:35:53 +0100 |
| commit | 63219230f343598b449c817890b730a2f02edc49 (patch) | |
| tree | ccc56f742e9e468b0e3551ca2c40c4a4be8e6772 /source/com/c2kernel/gui/Console.java | |
| parent | e7b92e1640be005db77804f018e3cdbc2aff90cf (diff) | |
| parent | 349144cc196e85a8ee0383be4646f5932fe63146 (diff) | |
Merge branch 'modules'2.3
Diffstat (limited to 'source/com/c2kernel/gui/Console.java')
| -rw-r--r-- | source/com/c2kernel/gui/Console.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/com/c2kernel/gui/Console.java b/source/com/c2kernel/gui/Console.java index a16e6f6..3427f82 100644 --- a/source/com/c2kernel/gui/Console.java +++ b/source/com/c2kernel/gui/Console.java @@ -130,7 +130,9 @@ public class Console extends JFrame { getContentPane().add(inputBox);
try {
- Properties utilProps = FileStringUtility.loadConfigFile( Resource.getDomainResourceURL("ScriptUtils.conf").toString());
+ // TODO: merge module script utilities together and prepend with namespace
+ Properties utilProps = FileStringUtility.loadConfigFile( Resource.findTextResource("ScriptUtils.conf") );
+
Box utilBox = Box.createHorizontalBox();
for (Object name2 : utilProps.keySet()) {
String name = (String) name2;
|