litesoft
Diff Revisions
952
vs
953
for /trunk/GWT_Sandbox/Prioritizer/src/org/litesoft/prioritizer/server/boviews/podataproviders/UserViewPoServerVoDataProvider.java
|
@@ -9,6 +9,7 @@ |
9 |
9 |
|
import org.litesoft.prioritizer.client.boviews.*; |
10 |
10 |
|
import org.litesoft.prioritizer.server.*; |
11 |
11 |
|
import org.litesoft.prioritizer.server.pos.*; |
|
12 |
+ |
import org.litesoft.prioritizer.server.pos.UserRestrictedResourcePair; |
12 |
13 |
|
import org.litesoft.security.*; |
13 |
14 |
|
|
14 |
15 |
|
import java.util.*; |
|
@@ -62,7 +63,7 @@ |
62 |
63 |
|
if ( zRestrictedResource == null ) { |
63 |
64 |
|
throw new DisplayableRuntimeException( "RestrictedResourceNotFound", pRestrictedResourceView.toString() ); |
64 |
65 |
|
} |
65 |
|
- |
UserRestrictedResourcePair<User, RestrictedResource> zPair = zUser.loginToRestrictedResourceIfAcceptable( zRestrictedResource ); |
|
66 |
+ |
UserRestrictedResourcePair zPair = zUser.loginToRestrictedResourceIfAcceptable( zRestrictedResource ); |
66 |
67 |
|
return finiUserLogin( zPair.getUser(), zPair.getRestrictedResource() ); |
67 |
68 |
|
} |
68 |
69 |
|
|
|
@@ -73,8 +74,8 @@ |
73 |
74 |
|
|
74 |
75 |
|
protected SecurityUserView finiUserLogin( SecurityUser<User> pUser, SecurityRestrictedResource<RestrictedResource> pRestrictedResource ) { |
75 |
76 |
|
UserRestrictedResourcePair zUserRestrictedResourcePair = ((User) pUser).getLoginRestrictedResource( (RestrictedResource) pRestrictedResource ); |
76 |
|
- |
User zUser = (User) zUserRestrictedResourcePair.getUser(); |
77 |
|
- |
RestrictedResource zRestrictedResource = (RestrictedResource) zUserRestrictedResourcePair.getRestrictedResource(); |
|
77 |
+ |
User zUser = zUserRestrictedResourcePair.getUser(); |
|
78 |
+ |
RestrictedResource zRestrictedResource = zUserRestrictedResourcePair.getRestrictedResource(); |
78 |
79 |
|
CurrentRestrictedResourceAccessor zRestrictedResourceAccessor = CurrentRestrictedResourceAccessor.get(); |
79 |
80 |
|
zRestrictedResourceAccessor.updateRestrictedResource( zRestrictedResource ); |
80 |
81 |
|
if ( !zRestrictedResource.equals( zUser.getLastRestrictedResource() ) ) { |