Changeset 1431 for trunk/src/org/expeditee/settings/identity/secrets/KeyList.java

Timestamp:

08/15/19 12:57:28 (5 years ago)

Author:

bln4

Message:

Recoding of the Labels class to improve surrogate mode functionality. Surrogate mode is now maintained when you navigate from one frame to another, even if that frame has a different set of labels. Completely different sets of labels cause Expeditee to exit surrogate mode with a message to the user.

File:

• trunk/src/org/expeditee/settings/identity/secrets/KeyList.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package org.expeditee.settings.identity.secrets;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.expeditee.gui.Frame;
@@ -57 +60 @@
                 }
         };
+        
+        public static List<String> getLabelsNameOnly() {
+                Text[] allLabels = UserLabels.get();
+                Stream<String> allLabelsNames = Arrays.asList(allLabels).stream().map(label -> label.getText());
+                return allLabelsNames.collect(Collectors.toList());
+        }
+
+        public static Text getByName(String labelName) {
+                Text[] allLabels = UserLabels.get();
+                for (Text label: allLabels) {
+                        if (label.getText().equals(labelName)) {
+                                return label;
+                        }
+                }
+                
+                return null;
+        }
 }