Changeset 1241 for trunk

Timestamp:

03/15/19 16:46:40 (5 years ago)

Author:

bln4

Message:

Renamed these settings

Location:

trunk/src/org/expeditee/settings

Files:

• auth (deleted)
• identity (added)
• identity/IdentityCard.java (copied) (copied from trunk/src/org/expeditee/settings/auth/KeyList.java ) (1 diff)
• identity/secrets (copied) (copied from trunk/src/org/expeditee/settings/auth/secrets )
• identity/secrets/KeyList.java (copied) (copied from trunk/src/org/expeditee/settings/auth/secrets/KeyList.java ) (1 diff)

trunk/src/org/expeditee/settings/identity/IdentityCard.java

@@ -1 @@
-package org.expeditee.settings.auth;
+package org.expeditee.settings.identity;
 
-import java.util.Collection;
+import org.expeditee.items.Text;
+import org.expeditee.setting.StringSetting;
+import org.expeditee.setting.TextSetting;
 
-import org.expeditee.core.Colour;
-import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameIO;
-import org.expeditee.items.Item;
-import org.expeditee.items.Text;
-import org.expeditee.setting.TextSetting;
-import org.expeditee.settings.UserSettings;
+public class IdentityCard {
 
-public class KeyList {
-
-        public static final TextSetting PublicKey = new TextSetting("The RSA key used to decrypt things encrypted with your RSA public key.") {
-                
+        public static final TextSetting PublicKey = new TextSetting(
+                        "The RSA key used to decrypt things encrypted with your RSA public key.", "PublicKey") {
                 @Override
                 public Text generateText() {
-                        Text t = new Text("");
-                t.setColor(Colour.BLACK);
-                t.setBackgroundColor(new Colour(0.7F, 0.7F, 0.9F));
-                t.setSize(14);
-                return t;
+                        Text t = new Text("PublicKey");
+                        return t;
                 }
-                
-                public boolean setSetting(final Text text) {
-                        final String value = text.getText();
-                        this._value.setData(value);
-                        
-                        String profileName = UserSettings.ProfileName.get();
-                        int lastNumber = FrameIO.getLastNumber(profileName);
-                        for (int i = 1; i <= lastNumber; i++) {
-                                Frame frame = FrameIO.LoadFrame(profileName + i);
-                                Collection<Item> items = frame.getAllItems();
-                                boolean found = false;
-                                for (Item item: items) {
-                                        if (item.getText().compareTo("PublicKey") == 0) {
-                                                item.setData(this._value.getData());
-                                                found = true;
-                                                break;
-                                        }
-                                }
-                                if (found) { break; }
-                        }
-                        
-                        return true;
-                };
         };
+
+        public static final StringSetting Email = new StringSetting("Your public-facing email address.", null);
 }

trunk/src/org/expeditee/settings/identity/secrets/KeyList.java

@@ -1 @@
-package org.expeditee.settings.auth.secrets;
+package org.expeditee.settings.identity.secrets;
 
-import java.util.Collection;
-
-import org.expeditee.core.Colour;
-import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameIO;
-import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 import org.expeditee.setting.TextSetting;
-import org.expeditee.settings.UserSettings;
 
 public class KeyList {
-        public static final TextSetting PersonalKey = new TextSetting("The AES key used to secure your profile frame - do not share with anyone!") {
-                
+        public static final TextSetting PersonalKey = new TextSetting("The AES key used to secure your profile frame - do not share with anyone!", "PersonalKey") {     
                 @Override
                 public Text generateText() {
-                        Text t = new Text("");
-                t.setColor(Colour.BLACK);
-                t.setBackgroundColor(new Colour(0.7F, 0.7F, 0.9F));
-                t.setSize(14);
+                        Text t = new Text("PersonalKey");
                 return t;
                 }
-                
-                public boolean setSetting(final Text text) {
-                        final String value = text.getText();
-                        this._value.setData(value);
-
-                        String profileName = UserSettings.ProfileName.get();
-                        int lastNumber = FrameIO.getLastNumber(profileName);
-                        for (int i = 1; i <= lastNumber; i++) {
-                                Frame frame = FrameIO.LoadFrame(profileName + i);
-                                Collection<Item> items = frame.getAllItems();
-                                boolean found = false;
-                                for (Item item: items) {
-                                        if (item.getText().compareTo("PersonalKey") == 0) {
-                                                item.setData(this._value.getData());
-                                                found = true;
-                                                break;
-                                        }
-                                }
-                                if (found) { break; }
-                        }
-                                
-                        return true;
-                };
         };
         
-        public static final TextSetting PrivateKey = new TextSetting("The RSA key used to decrypt things encrypted with your RSA public key - do not share with anyone!") {
-                
+        public static final TextSetting PrivateKey = new TextSetting("The RSA key used to decrypt things encrypted with your RSA public key - do not share with anyone!", "PrivateKey") {       
                 @Override
                 public Text generateText() {
-                        Text t = new Text("");
-                t.setColor(Colour.BLACK);
-                t.setBackgroundColor(new Colour(0.7F, 0.7F, 0.9F));
-                t.setSize(14);
+                        Text t = new Text("PrivateKey");
                 return t;
                 }
-                
-                public void set(Text value) {
-                        super.set(value);
-                };
-                
-                public boolean setSetting(final Text text) {
-                        System.err.println("KeyList::PrivateKey::setSetting:setting private key for " + UserSettings.UserName.get() + " to: " + text.getText());
-                        final String value = text.getText();
-                        this._value.setData(value);
-                        
-                        String profileName = UserSettings.ProfileName.get();
-                        int lastNumber = FrameIO.getLastNumber(profileName);
-                        for (int i = 1; i <= lastNumber; i++) {
-                                Frame frame = FrameIO.LoadFrame(profileName + i);
-                                Collection<Item> items = frame.getAllItems();
-                                boolean found = false;
-                                for (Item item: items) {
-                                        if (item.getText().compareTo("PrivateKey") == 0) {
-                                                item.setData(this._value.getData());
-                                                found = true;
-                                                break;
-                                        }
-                                }
-                                if (found) { break; }
-                        }
-                        
-                        return true;
-                };
         };
 }