Changeset 1393 for trunk/src/org/expeditee/settings/Settings.java

Timestamp:

05/30/19 11:09:16 (5 years ago)

Author:

bln4

Message:

Maintain caseing for settings.

File:

• trunk/src/org/expeditee/settings/Settings.java (modified) (4 diffs)

trunk/src/org/expeditee/settings/Settings.java

@@ -93 +93 @@
                                 
                                 String settingsPageName = clazz.getPackage().getName().toLowerCase().substring(SETTINGS_PACKAGE_PARENT.length());
+                                
                                 // System.out.println(settingsPage + " : " + clazz.getName());
                                 _pages.put(settingsPageName, new PageDescriptor(clazz));
@@ -262 +263 @@
                 }
                 
-                
-                Iterator<String> keys = pd.orderedEntries.stream().map(t -> t.toLowerCase()).iterator();
+                //Iterator<String> keys = pd.orderedEntries.stream().map(t -> t.toLowerCase()).iterator();
+                Iterator<String> keys = pd.orderedEntries.iterator();
                 while(keys.hasNext()) {
                         String key = keys.next();
-                        Setting setting = pd.settings.get(key);
+                        Setting setting = pd.settings.get(key.toLowerCase());
                         if (setting == null) {
                                 continue;
@@ -274 +275 @@
                         int x = 0, y = 0;
                         
-                        if (key.equals("pass")) {
+                        if (key.toLowerCase().equals("pass")) {
                                 // Special case for Password widgets
                                 Text passwordWidgetText = frames.addText("iw: org.expeditee.items.widgets.Passwsord", null, null, null, false);
@@ -285 +286 @@
                         } else {
                                 // Determine the content for a setting label.
-                                String name = key.substring(0, 1).toUpperCase() + key.substring(1);
+                                //String name = key.substring(0, 1).toUpperCase() + key.substring(1);
+                                //String name = key;
                                 
                                 // Construct and add text representation for setting.  
                                 // If a setting has no initialised value then it is not included.
-                                Text settingRepresentation = setting.generateRepresentation(name, frames.getCurrentFrame().getFramesetName()).copy();
+                                Text settingRepresentation = setting.generateRepresentation(key, frames.getCurrentFrame().getFramesetName()).copy();
                                 if (settingRepresentation.getBounds() == null) {
                                         continue;