Subversion Repository Public Repository

litesoft

Diff Revisions 430 vs 496 for /trunk/Java/DATT/src/org/litesoft/datt/client/ViewDefs.java

Diff revisions: vs.
  @@ -2,7 +2,7 @@
2 2
3 3 import java.util.*;
4 4
5 - import org.litesoft.datt.client.boviews.*;
5 + import org.litesoft.datt.client.support.*;
6 6 import org.litesoft.uispecification.*;
7 7
8 8 public interface ViewDefs
  @@ -81,45 +81,43 @@
81 81 public static final ViewDef ADMIN_RESTRICTED_RESOURCE_EDITOR = new ViewDef( "RestrictedResourceEditor", "EDIT PROJECT" );
82 82 public static final ViewDef ADMIN_RESTRICTED_RESOURCE_MANAGEMENT = new ViewDef( "RestrictedResourceManagement", "MANAGE PROJECT(S)" );
83 83
84 - // Security Sets
85 - public static final ViewDef[] ANY_USER = //
84 + public static final ViewDefSecuredSet[] SECURITY_SETS = //
86 85 { //
87 - HOME, //
88 - };
89 - public static final ViewDef[] ANY_NON_GUEST = //
90 - { //
91 - ADMIN_CHANGE_PASSWORD, ADMIN_MY_PROFILE, ADMIN_REPORTS, ADMIN_STORIES, //
92 - // MERGE STORIES
93 - ADMIN_MERGE_STORIES, ADMIN_MERGE_STORIES_STEP_TWO, ADMIN_MERGE_STORIES_STEP_THREE //
94 - };
95 - public static final ViewDef[] CAN_RESTRICTED_RESOURCE_ADMIN = //
96 - { //
97 - ADMIN_USERS, ADMIN_RESTRICTED_RESOURCE_EDITOR, //
98 - // Reports:
99 - // todo: XXX_REPORT_BASIC, XXX_REPORT_DETAILED, //
100 - };
101 - public static final ViewDef[] CAN_HELP_DESK = //
102 - { //
103 - ADMIN_USERS, //
104 - // Reports:
105 - };
106 - public static final ViewDef[] CAN_MANAGE_RESTRICTED_RESOURCES = //
107 - { //
108 - ADMIN_USERS, ADMIN_RESTRICTED_RESOURCE_MANAGEMENT, //
109 - // Reports:
110 - };
111 - public static final ViewDef[] CAN_SUPER_ADMIN = //
112 - { //
113 - ADMIN_USERS, ADMIN_RESTRICTED_RESOURCE_MANAGEMENT, //
114 - // Reports:
86 + new ViewDefSecuredSet( Permissions.sAdminFlag, //
87 + ADMIN_USERS, ADMIN_RESTRICTED_RESOURCE_EDITOR, //
88 + // Reports:
89 + // todo: XXX_REPORT_BASIC, XXX_REPORT_DETAILED, //
90 + HOME ), //
91 + new ViewDefSecuredSet( Permissions.sRestrictedResourceMgrFlag, //
92 + ADMIN_USERS, ADMIN_RESTRICTED_RESOURCE_MANAGEMENT, //
93 + // Reports:
94 + HOME ), //
95 + new ViewDefSecuredSet( Permissions.sSprAdminFlag, //
96 + ADMIN_USERS, ADMIN_RESTRICTED_RESOURCE_MANAGEMENT, //
97 + // Reports:
98 + HOME ), //
99 + new ViewDefSecuredSet( Permissions.sHelpDeskFlag, //
100 + ADMIN_USERS, //
101 + // Reports:
102 + HOME ), //
103 + new ViewDefSecuredSet( Permissions.sNonGuestFlag, //
104 + ADMIN_STORIES, //
105 + // MERGE STORIES
106 + ADMIN_MERGE_STORIES, ADMIN_MERGE_STORIES_STEP_TWO, ADMIN_MERGE_STORIES_STEP_THREE, //
107 + // Reports:
108 + HOME ), //
109 + new ViewDefSecuredSet( // Any User
110 + ADMIN_CHANGE_PASSWORD, ADMIN_MY_PROFILE, ADMIN_REPORTS, //
111 + HOME ) //
115 112 };
113 +
116 114 public static final Map<Role, ViewDef[]> ROLES_MAP = Helper.createRolesMap();
117 115
118 116 class Helper
119 117 {
120 118 public static Map<Role, ViewDef[]> createRolesMap()
121 119 {
122 - HashMap<Role, ViewDef[]> zMap = new HashMap<Role, ViewDef[]>();
120 + Map<Role, ViewDef[]> zMap = new HashMap<Role, ViewDef[]>();
123 121 zMap.put( Role.EndUser, EndUser_Options );
124 122 zMap.put( Role.EndUserManager, EndUserManager_Options );
125 123 zMap.put( Role.Developer, Developer_Options );
  @@ -128,4 +126,4 @@
128 126 return zMap;
129 127 }
130 128 }
131 - }
129 + }