Changeset 1193 for trunk/src/org/expeditee/items/UserAppliedPermission.java

Timestamp:

11/05/18 16:32:46 (6 years ago)

Author:

bln4

Message:

org.expeditee.gui.Frame ->
org.expeditee.gui.FrameUtils ->
org.expeditee.items.Permission ->
org.expeditee.items.PermissionPair ->
org.expeditee.items.UserAppliedPermission ->
The beginnings of the new denied level of permissions. A frame with a denied level of permission cannot be navigated too. Denied level permission for items coming soon.

File:

• trunk/src/org/expeditee/items/UserAppliedPermission.java (modified) (2 diffs)

trunk/src/org/expeditee/items/UserAppliedPermission.java

@@ -16 +16 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.expeditee.items;
 
+public enum UserAppliedPermission {
+        denied(-1), none(0), followLinks(1), copy(2), createFrames(3), full(4);
 
-public enum UserAppliedPermission {
-        none, followLinks, copy, createFrames, full;
-        
-        
-        public static UserAppliedPermission getPermission(String permissionCode,
-                        UserAppliedPermission defaultPermission) 
-        {
-                if (permissionCode == null)
+        private final int val;
+
+        private UserAppliedPermission(final int val) {
+                this.val = val;
+        }
+
+        public static UserAppliedPermission getPermission(String permissionCode, final UserAppliedPermission defaultPermission) {
+                if (permissionCode == null) {
                         return defaultPermission;
+                }
 
                 permissionCode = permissionCode.trim().toLowerCase();
-                if (permissionCode.length() == 0)
+                if (permissionCode.length() == 0) {
                         return defaultPermission;
+                }
 
-                // if it is a single char just match the first character
                 try {
-                        return values()[Integer.parseInt(permissionCode)];
-                        // Otherwise match the whole string
-                } catch (Exception ex) {
+                        return resolve(Integer.parseInt(permissionCode), defaultPermission);
+                } catch (final NumberFormatException e) {
                         try {
                                 return valueOf(permissionCode);
-                        } 
-                        catch (Exception e) {
+                        } catch (final Exception ex) {
+                                return defaultPermission;
                         }
                 }
-
-                // default permission
-                return defaultPermission;
         }
 
         public int getCode() {
-                return ordinal();
+                return val;
         }
 
@@ -59 +57 @@
 
         public static UserAppliedPermission min(UserAppliedPermission p1, UserAppliedPermission p2) {
-                return p1.ordinal() < p2.ordinal() ? p1 : p2;
+                return p1.val < p2.val ? p1 : p2;
         }
 
         public static UserAppliedPermission max(UserAppliedPermission p1, UserAppliedPermission p2) {
-                return p1.ordinal() > p2.ordinal() ? p1 : p2;
+                return p1.val > p2.val ? p1 : p2;
+        }
+
+        private static UserAppliedPermission resolve(final int val, final UserAppliedPermission defaultPermission) {
+                for (UserAppliedPermission p : UserAppliedPermission.values()) {
+                        if (p.val == val) {
+                                return p;
+                        }
+                }
+                return defaultPermission;
         }
 }
+//public enum UserAppliedPermission {
+//      none, followLinks, copy, createFrames, full;
+//      
+//      
+//      public static UserAppliedPermission getPermission(String permissionCode,
+//                      UserAppliedPermission defaultPermission) 
+//      {
+//              if (permissionCode == null)
+//                      return defaultPermission;
+//
+//              permissionCode = permissionCode.trim().toLowerCase();
+//              if (permissionCode.length() == 0)
+//                      return defaultPermission;
+//
+//              // if it is a single char just match the first character
+//              try {
+//                      return values()[Integer.parseInt(permissionCode)];
+//                      // Otherwise match the whole string
+//              } catch (Exception ex) {
+//                      try {
+//                              return valueOf(permissionCode);
+//                      } 
+//                      catch (Exception e) {
+//                      }
+//              }
+//
+//              // default permission
+//              return defaultPermission;
+//      }
+//
+//      public int getCode() {
+//              return ordinal();
+//      }
+//
+//      public String toString() {
+//              return this.name();
+//      }
+//
+//      public static UserAppliedPermission min(UserAppliedPermission p1, UserAppliedPermission p2) {
+//              return p1.ordinal() < p2.ordinal() ? p1 : p2;
+//      }
+//
+//      public static UserAppliedPermission max(UserAppliedPermission p1, UserAppliedPermission p2) {
+//              return p1.ordinal() > p2.ordinal() ? p1 : p2;
+//      }
+//}