Subversion Repository Public Repository

litesoft

Diff Revisions 947 vs 948 for /trunk/Java/DATT/src/org/litesoft/datt/server/boviews/podataproviders/UserViewPoServerVoDataProvider.java

Diff revisions: vs.
  @@ -1,7 +1,5 @@
1 1 package org.litesoft.datt.server.boviews.podataproviders;
2 2
3 - import java.util.*;
4 -
5 3 import org.litesoft.bo.views.*;
6 4 import org.litesoft.bo.views.server.*;
7 5 import org.litesoft.commonfoundation.exceptions.*;
  @@ -13,10 +11,10 @@
13 11 import org.litesoft.orsup.transact.*;
14 12 import org.litesoft.security.*;
15 13
16 - public class UserViewPoServerVoDataProvider extends SecurityUserViewPoServerVoDataProvider<UserView, User, RestrictedResource>
17 - {
18 - public UserViewPoServerVoDataProvider( MetaDataStore pMetaDataStore )
19 - {
14 + import java.util.*;
15 +
16 + public class UserViewPoServerVoDataProvider extends SecurityUserViewPoServerVoDataProvider<UserView, User, RestrictedResource> {
17 + public UserViewPoServerVoDataProvider( MetaDataStore pMetaDataStore ) {
20 18 super( UserViewMetaData.getInstance(), pMetaDataStore, //
21 19 "akern@testsite.com", // ....... Anthony Kern
22 20 "saly@testsite.com", // ........ Sally Operator
  @@ -30,42 +28,39 @@
30 28 }
31 29
32 30 @Override
33 - protected SecurityUser<User> findUserByEmail( Finder pFinder, String pLogonEmail )
34 - {
31 + protected SecurityUser<User> findUserByEmail( Finder pFinder, String pLogonEmail ) {
35 32 return pFinder.findOne( User.class, WCF.isEqual( User.CD_LogonEmail, pLogonEmail ) );
36 33 }
37 34
38 35 @Override
39 - protected WhereClause augment_getMatchingVOs( WhereClause pWhereClause )
40 - {
36 + protected WhereClause augment_getMatchingVOs( WhereClause pWhereClause ) {
41 37 SecurityUser<User> zUser = CurrentUserAccessor.get().getRequiredUser();
42 38 if ( !zUser.canAccessAllRestrictedResources() ) // If no user it will blow up with a null pointer exception which is appropriate.
43 39 {
44 - pWhereClause = WCF.and( pWhereClause, User.getLimitToCurrentRestrictedResourceAndVisible() ); // Add filter to where clause to only select based on RestrictedResource.
40 + pWhereClause = WCF.and( pWhereClause,
41 + User.getLimitToCurrentRestrictedResourceAndVisible() ); // Add filter to where clause to only select based on
42 + // RestrictedResource.
45 43 }
46 44 return super.augment_getMatchingVOs( pWhereClause );
47 45 }
48 46
49 47 @Override
50 - public UserView currentLoggedInUserView()
51 - {
48 + public UserView currentLoggedInUserView() {
52 49 return CurrentUserAccessor.get().getUserView( getDefaultUserLoginEmail() );
53 50 }
54 51
55 52 @Override
56 - public void logoutUser()
57 - {
53 + public void logoutUser() {
58 54 CurrentUserAccessor.get().logout();
59 55 CurrentRestrictedResourceAccessor.get().logout();
60 56 }
61 57
62 58 @Override
63 - public SecurityUserView switchRestrictedResources( SecurityRestrictedResourceView pRestrictedResourceView )
64 - {
59 + public SecurityUserView switchRestrictedResources( SecurityRestrictedResourceView pRestrictedResourceView ) {
65 60 User zUser = CurrentUserAccessor.get().getRequiredUser();
66 - RestrictedResource zRestrictedResource = (RestrictedResource) getNotUsDataProvider( RestrictedResourceView.class ).getExistingPO( DataStoreLocator.get().getUnfilteredFinder(), (RestrictedResourceView) pRestrictedResourceView );
67 - if ( zRestrictedResource == null )
68 - {
61 + RestrictedResource zRestrictedResource = (RestrictedResource) getNotUsDataProvider( RestrictedResourceView.class )
62 + .getExistingPO( DataStoreLocator.get().getUnfilteredFinder(), (RestrictedResourceView) pRestrictedResourceView );
63 + if ( zRestrictedResource == null ) {
69 64 throw new DisplayableRuntimeException( "RestrictedResourceNotFound", pRestrictedResourceView.toString() );
70 65 }
71 66 UserRestrictedResourcePair<User, RestrictedResource> zPair = zUser.loginToRestrictedResourceIfAcceptable( zRestrictedResource );
  @@ -73,20 +68,17 @@
73 68 }
74 69
75 70 @Override
76 - protected SecurityUserView finiUserLogin( SecurityUser<User> pUser )
77 - {
71 + protected SecurityUserView finiUserLogin( SecurityUser<User> pUser ) {
78 72 return finiUserLogin( pUser, CurrentRestrictedResourceAccessor.get().getOptionalRestrictedResource() );
79 73 }
80 74
81 - protected SecurityUserView finiUserLogin( SecurityUser<User> pUser, SecurityRestrictedResource<RestrictedResource> pRestrictedResource )
82 - {
75 + protected SecurityUserView finiUserLogin( SecurityUser<User> pUser, SecurityRestrictedResource<RestrictedResource> pRestrictedResource ) {
83 76 UserRestrictedResourcePair zUserRestrictedResourcePair = ((User) pUser).getLoginRestrictedResource( (RestrictedResource) pRestrictedResource );
84 77 User zUser = (User) zUserRestrictedResourcePair.getUser();
85 78 RestrictedResource zRestrictedResource = (RestrictedResource) zUserRestrictedResourcePair.getRestrictedResource();
86 79 CurrentRestrictedResourceAccessor zRestrictedResourceAccessor = CurrentRestrictedResourceAccessor.get();
87 80 zRestrictedResourceAccessor.updateRestrictedResource( zRestrictedResource );
88 - if ( !zRestrictedResource.equals( zUser.getLastRestrictedResource() ) )
89 - {
81 + if ( !zRestrictedResource.equals( zUser.getLastRestrictedResource() ) ) {
90 82 Transaction zTransaction = zUser.getFinder().createTransaction();
91 83 zUser = zUser.copyInto( zTransaction );
92 84 zUser.setLastRestrictedResource( zRestrictedResource );
  @@ -95,19 +87,17 @@
95 87 zRestrictedResourceAccessor.updateRestrictedResource( zRestrictedResource );
96 88 UserView zUserView = CurrentUserAccessor.get().updateUser( zUser );
97 89 zUserView.setCurrentRestrictedResource( zRestrictedResourceAccessor.getRestrictedResourceView() );
98 - if ( !zUser.canAccessAllRestrictedResources() )
99 - {
100 - zUserView.setAlternateRestrictedResourceOptions( convertToRestrictedResourceOptions( zUser.getAlternateRestrictedResourceOptions( zRestrictedResource ) ) );
90 + if ( !zUser.canAccessAllRestrictedResources() ) {
91 + zUserView.setAlternateRestrictedResourceOptions(
92 + convertToRestrictedResourceOptions( zUser.getAlternateRestrictedResourceOptions( zRestrictedResource ) ) );
101 93 }
102 94 return zUserView;
103 95 }
104 96
105 - private AlternateRestrictedResourceOption[] convertToRestrictedResourceOptions( RestrictedResource[] pRestrictedResources )
106 - {
97 + private AlternateRestrictedResourceOption[] convertToRestrictedResourceOptions( RestrictedResource[] pRestrictedResources ) {
107 98 AlternateRestrictedResourceOption[] rv = new AlternateRestrictedResourceOption[pRestrictedResources.length];
108 99 PoServerVoDataProvider<RestrictedResourceView> zRestrictedResourceViewDP = getNotUsDataProvider( RestrictedResourceView.class );
109 - for ( int i = 0; i < pRestrictedResources.length; i++ )
110 - {
100 + for ( int i = 0; i < pRestrictedResources.length; i++ ) {
111 101 rv[i] = zRestrictedResourceViewDP.createView( pRestrictedResources[i], false );
112 102 }
113 103 Arrays.sort( rv );