Changeset 1393

Timestamp:

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

Author:

bln4

Message:

Maintain caseing for settings.

Location:

trunk/src/org/expeditee

Files:

• auth/account/Create.java (modified) (1 diff)
• gui/FrameUtils.java (modified) (1 diff)
• settings/Settings.java (modified) (4 diffs)

trunk/src/org/expeditee/auth/account/Create.java

@@ -207 +207 @@
                 initialSettings.put("settings.identity.PublicKey", constructTextSetting("The RSA key used to decrypt things encrypted with your RSA public key.", "PublicKey", publicKey));
                 initialSettings.put("settings.identity.Email", constructGenericSetting(String.class, "Your public-facing email address.", "Email", email, username));
-                initialSettings.put("settings.UserSettings.UserName", constructGenericSetting(String.class, "Username", "Username", username, username));
-                initialSettings.put("settings.UserSettings.ProfileName", constructGenericSetting(String.class, "Profilename", "Profilename", username, username));
+                initialSettings.put("settings.UserSettings.UserName", constructGenericSetting(String.class, "UserName", "UserName", username, username));
+                initialSettings.put("settings.UserSettings.ProfileName", constructGenericSetting(String.class, "ProfileName", "ProfileName", username, username));
                 initialSettings.put("settings.UserSettings.HomeFrame", constructGenericSetting(String.class, "The home frame", "HomeFrame", username + 1, username));
                 initialSettings.put("org.expeditee.gui.folders.FolderSettings.FrameDirs", FolderSettings.FrameDirs);

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -1604 +1604 @@
                                                 Setting setting = specifiedSettings.get(key);
                                                 String name = setting.getName();
-                                                Text representation = setting.generateRepresentation(name.substring(0, 1).toUpperCase() + name.substring(1).toLowerCase(), profile.getFramesetName());
+                                                Text representation = setting.generateRepresentation(name, profile.getFramesetName());
                                                 Collection<Text> canditates = profile.getTextItems();
                                                 canditates.removeIf(text -> !text.getText().startsWith(representation.getText().split(" ")[0]));

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;