|
@@ -9,9 +9,10 @@ |
9 |
9 |
|
import org.litesoft.orsup.transact.*; |
10 |
10 |
|
import org.litesoft.prioritizer.client.support.*; |
11 |
11 |
|
import org.litesoft.prioritizer.server.*; |
|
12 |
+ |
import org.litesoft.security.*; |
12 |
13 |
|
import org.litesoft.util.*; |
13 |
14 |
|
|
14 |
|
- |
public class User extends UserGO |
|
15 |
+ |
public class User extends UserGO implements SecurityUser<User> |
15 |
16 |
|
{ |
16 |
17 |
|
public User( Transaction pTransaction ) // Only used for New |
17 |
18 |
|
{ |
|
@@ -36,11 +37,13 @@ |
36 |
37 |
|
{ |
37 |
38 |
|
} |
38 |
39 |
|
|
|
40 |
+ |
@Override |
39 |
41 |
|
public boolean isDemo() |
40 |
42 |
|
{ |
41 |
43 |
|
return mDemo; |
42 |
44 |
|
} |
43 |
45 |
|
|
|
46 |
+ |
@Override |
44 |
47 |
|
public void setDemo() |
45 |
48 |
|
{ |
46 |
49 |
|
mDemo = true; |
|
@@ -147,25 +150,25 @@ |
147 |
150 |
|
mLastUserXrefRestrictedResource = null; |
148 |
151 |
|
} |
149 |
152 |
|
|
150 |
|
- |
public UserRestrictedResourcePair loginToRestrictedResourceIfAcceptable( RestrictedResource pRestrictedResource ) |
|
153 |
+ |
public UserRestrictedResourcePair<User, RestrictedResource> loginToRestrictedResourceIfAcceptable( RestrictedResource pRestrictedResource ) |
151 |
154 |
|
{ |
152 |
155 |
|
Utils.assertNotNull( "RestrictedResource", pRestrictedResource ); |
153 |
156 |
|
Object o = attemptRestrictedResourceLink( pRestrictedResource ); |
154 |
157 |
|
if ( o instanceof UserRestrictedResourcePair ) |
155 |
158 |
|
{ |
156 |
|
- |
return (UserRestrictedResourcePair) o; |
|
159 |
+ |
return (UserRestrictedResourcePair<User, RestrictedResource>) o; |
157 |
160 |
|
} |
158 |
161 |
|
throw new DisplayableRuntimeException( "RestrictedResource Not Authorized" ); |
159 |
162 |
|
} |
160 |
163 |
|
|
161 |
|
- |
public UserRestrictedResourcePair getLoginRestrictedResource( RestrictedResource pCurrentRestrictedResource ) |
|
164 |
+ |
public UserRestrictedResourcePair<User, RestrictedResource> getLoginRestrictedResource( RestrictedResource pCurrentRestrictedResource ) |
162 |
165 |
|
{ |
163 |
166 |
|
Object o = attemptRestrictedResourceLink( pCurrentRestrictedResource ); |
164 |
167 |
|
if ( o instanceof UserRestrictedResourcePair ) |
165 |
168 |
|
{ |
166 |
|
- |
return (UserRestrictedResourcePair) o; |
|
169 |
+ |
return (UserRestrictedResourcePair<User, RestrictedResource>) o; |
167 |
170 |
|
} |
168 |
|
- |
@SuppressWarnings({"unchecked"}) List<RestrictedResource> zAuthorizedRestrictedResources = (List<RestrictedResource>) o; |
|
171 |
+ |
@SuppressWarnings({"unchecked"}) List<RestrictedResource> zAuthorizedRestrictedResources = (List) o; |
169 |
172 |
|
RestrictedResource zLastRestrictedResource = getLastRestrictedResource(); |
170 |
173 |
|
if ( zLastRestrictedResource != null ) |
171 |
174 |
|
{ |
|
@@ -173,7 +176,7 @@ |
173 |
176 |
|
{ |
174 |
177 |
|
if ( zRestrictedResource.equals( zLastRestrictedResource ) ) |
175 |
178 |
|
{ |
176 |
|
- |
return new UserRestrictedResourcePair( this, zLastRestrictedResource ); |
|
179 |
+ |
return new UserRestrictedResourcePair<User, RestrictedResource>( this, zLastRestrictedResource ); |
177 |
180 |
|
} |
178 |
181 |
|
} |
179 |
182 |
|
} |
|
@@ -181,7 +184,7 @@ |
181 |
184 |
|
{ |
182 |
185 |
|
throw new DisplayableRuntimeException( "NoAuthorizedRestrictedResources" ); |
183 |
186 |
|
} |
184 |
|
- |
return new UserRestrictedResourcePair( this, zAuthorizedRestrictedResources.get( 0 ) ); |
|
187 |
+ |
return new UserRestrictedResourcePair<User, RestrictedResource>( this, zAuthorizedRestrictedResources.get( 0 ) ); |
185 |
188 |
|
} |
186 |
189 |
|
|
187 |
190 |
|
private Object attemptRestrictedResourceLink( RestrictedResource pRestrictedResource ) |
|
@@ -194,7 +197,7 @@ |
194 |
197 |
|
RestrictedResource zRestrictedResource = zUserXrefRestrictedResource.getRestrictedResource(); |
195 |
198 |
|
if ( zRestrictedResource.equals( pRestrictedResource ) ) |
196 |
199 |
|
{ |
197 |
|
- |
return new UserRestrictedResourcePair( this, pRestrictedResource ); |
|
200 |
+ |
return new UserRestrictedResourcePair<User, RestrictedResource>( this, pRestrictedResource ); |
198 |
201 |
|
} |
199 |
202 |
|
zAuthorizedRestrictedResources.add( zRestrictedResource ); |
200 |
203 |
|
} |
|
@@ -210,7 +213,7 @@ |
210 |
213 |
|
RestrictedResource zRestrictedResource = pRestrictedResource.copyInto( zTransaction ); |
211 |
214 |
|
new UserXrefRestrictedResource( zTransaction, zUser, zRestrictedResource ).setVisible( false ); |
212 |
215 |
|
zTransaction.commit(); |
213 |
|
- |
return new UserRestrictedResourcePair( zUser, zRestrictedResource ); |
|
216 |
+ |
return new UserRestrictedResourcePair<User, RestrictedResource>( zUser, zRestrictedResource ); |
214 |
217 |
|
} |
215 |
218 |
|
if ( zAuthorizedRestrictedResources.isEmpty() ) |
216 |
219 |
|
{ |