Subversion Repository Public Repository

litesoft

Diff Revisions 477 vs 478 for /trunk/GWT_Sandbox/Prioritizer/src/org/litesoft/prioritizer/client/boviews/Role.java

Diff revisions: vs.
  @@ -2,7 +2,7 @@
2 2
3 3 import org.litesoft.core.util.*;
4 4
5 - public enum Role
5 + public enum Role implements BitAccessor
6 6 {
7 7 EndUser,
8 8 EndUserManager,
  @@ -12,7 +12,7 @@
12 12
13 13 public static String[] OPTIONS = UtilsCommon.toStringArray( Role.values() );
14 14
15 - private int mBit = BITS.BIT.next();
15 + private int mBit = Permissions.BIT.next();
16 16
17 17 public int getBit()
18 18 {
  @@ -21,36 +21,11 @@
21 21
22 22 public static int getBitFor( String pRole )
23 23 {
24 - try
25 - {
26 - return valueOf( pRole ).getBit();
27 - }
28 - catch ( IllegalArgumentException e )
29 - {
30 - return BITS.BIT.none();
31 - }
24 + return UtilsCommon.deNull( valueFor( pRole ), Permissions.BIT ).getBit();
32 25 }
33 26
34 27 public static Role valueFor( String pRole )
35 28 {
36 - try
37 - {
38 - return valueOf( pRole );
39 - }
40 - catch ( IllegalArgumentException e )
41 - {
42 - return EndUser;
43 - }
44 - }
45 -
46 - public static interface BITS
47 - {
48 - public static final BitFlag BIT = new BitFlag();
49 -
50 - public static final int sAdminFlag = BIT.next();
51 - public static final int sRestrictedResourceMgrFlag = BIT.next();
52 - public static final int sSprAdminFlag = BIT.next();
53 - public static final int sHelpDeskFlag = BIT.next();
54 - public static final int sNonGuestFlag = BIT.next();
29 + return UtilsCommon.enumFromString( Role.class, pRole );
55 30 }
56 31 }