| |
@@ -3,6 +3,7 @@ |
| 3 |
3 |
|
import org.litesoft.bo.views.*; |
| 4 |
4 |
|
import org.litesoft.commonfoundation.base.*; |
| 5 |
5 |
|
import org.litesoft.core.*; |
| |
6 |
+ |
import org.litesoft.commonfoundation.independence.*; |
| 6 |
7 |
|
import org.litesoft.core.util.*; |
| 7 |
8 |
|
import org.litesoft.security.*; |
| 8 |
9 |
|
|
| |
@@ -58,7 +59,7 @@ |
| 58 |
59 |
|
} |
| 59 |
60 |
|
|
| 60 |
61 |
|
public static SecurityUserView getCurrentUser() { |
| 61 |
|
- |
AbstractCurrentUserViewAccessor zAccessor = ClientContext.get().checkGet( AbstractCurrentUserViewAccessor.class ); |
| |
62 |
+ |
AbstractCurrentUserViewAccessor zAccessor = Instance.ofOptional( AbstractCurrentUserViewAccessor.class ); |
| 62 |
63 |
|
return zAccessor != null ? zAccessor.getUser() : null; |
| 63 |
64 |
|
} |
| 64 |
65 |
|
|
| |
@@ -74,12 +75,12 @@ |
| 74 |
75 |
|
} |
| 75 |
76 |
|
|
| 76 |
77 |
|
public static boolean checkForCurrentUser( SecurityUserView pUser ) { |
| 77 |
|
- |
AbstractCurrentUserViewAccessor zAccessor = ClientContext.get().checkGet( AbstractCurrentUserViewAccessor.class ); |
| |
78 |
+ |
AbstractCurrentUserViewAccessor zAccessor = Instance.ofOptional( AbstractCurrentUserViewAccessor.class ); |
| 78 |
79 |
|
return (zAccessor != null) && Currently.areEqual( pUser, zAccessor.getUser() ); |
| 79 |
80 |
|
} |
| 80 |
81 |
|
|
| 81 |
82 |
|
public static void updateContext( SecurityUserView pUserView ) { |
| 82 |
|
- |
AbstractCurrentUserViewAccessor zAccessor = ClientContext.get().checkGet( AbstractCurrentUserViewAccessor.class ); |
| |
83 |
+ |
AbstractCurrentUserViewAccessor zAccessor = Instance.ofOptional( AbstractCurrentUserViewAccessor.class ); |
| 83 |
84 |
|
if ( zAccessor != null ) { |
| 84 |
85 |
|
zAccessor.setUser( pUserView ); |
| 85 |
86 |
|
} |
| |
@@ -87,7 +88,7 @@ |
| 87 |
88 |
|
SecurityRestrictedResourceView zRestrictedResourceView = pUserView.getCurrentRestrictedResource(); // !null on Login! |
| 88 |
89 |
|
if ( zRestrictedResourceView != null ) { |
| 89 |
90 |
|
updateContext( zRestrictedResourceView ); |
| 90 |
|
- |
CurrentRestrictedResourceOptionsAccessor zOptionsAccessor = ClientContext.get().checkGet( CurrentRestrictedResourceOptionsAccessor.class ); |
| |
91 |
+ |
CurrentRestrictedResourceOptionsAccessor zOptionsAccessor = Instance.ofOptional( CurrentRestrictedResourceOptionsAccessor.class ); |
| 91 |
92 |
|
if ( zOptionsAccessor != null ) { |
| 92 |
93 |
|
zOptionsAccessor.setRestrictedResourceOptions( pUserView.getAlternateRestrictedResourceOptions() ); |
| 93 |
94 |
|
} |
| |
@@ -96,7 +97,7 @@ |
| 96 |
97 |
|
} |
| 97 |
98 |
|
|
| 98 |
99 |
|
public static SecurityRestrictedResourceView checkForCurrentRestrictedResourceInTransaction( TransactionSet pTransactionSet ) { |
| 99 |
|
- |
AbstractCurrentRestrictedResourceViewAccessor zAccessor = ClientContext.get().checkGet( AbstractCurrentRestrictedResourceViewAccessor.class ); |
| |
100 |
+ |
AbstractCurrentRestrictedResourceViewAccessor zAccessor = Instance.ofOptional( AbstractCurrentRestrictedResourceViewAccessor.class ); |
| 100 |
101 |
|
if ( zAccessor != null ) { |
| 101 |
102 |
|
SecurityRestrictedResourceView zCurrentRestrictedResource = zAccessor.getRestrictedResource(); |
| 102 |
103 |
|
if ( zCurrentRestrictedResource != null ) { |
| |
@@ -108,12 +109,12 @@ |
| 108 |
109 |
|
} |
| 109 |
110 |
|
|
| 110 |
111 |
|
public static boolean checkForCurrentRestrictedResource( SecurityRestrictedResourceView pRestrictedResource ) { |
| 111 |
|
- |
AbstractCurrentRestrictedResourceViewAccessor zAccessor = ClientContext.get().checkGet( AbstractCurrentRestrictedResourceViewAccessor.class ); |
| |
112 |
+ |
AbstractCurrentRestrictedResourceViewAccessor zAccessor = Instance.ofOptional( AbstractCurrentRestrictedResourceViewAccessor.class ); |
| 112 |
113 |
|
return (zAccessor != null) && Currently.areEqual( pRestrictedResource, zAccessor.getRestrictedResource() ); |
| 113 |
114 |
|
} |
| 114 |
115 |
|
|
| 115 |
116 |
|
public static void updateContext( SecurityRestrictedResourceView pRestrictedResourceView ) { |
| 116 |
|
- |
AbstractCurrentRestrictedResourceViewAccessor zAccessor = ClientContext.get().checkGet( AbstractCurrentRestrictedResourceViewAccessor.class ); |
| |
117 |
+ |
AbstractCurrentRestrictedResourceViewAccessor zAccessor = Instance.ofOptional( AbstractCurrentRestrictedResourceViewAccessor.class ); |
| 117 |
118 |
|
if ( zAccessor != null ) { |
| 118 |
119 |
|
zAccessor.setRestrictedResource( pRestrictedResourceView ); |
| 119 |
120 |
|
} |
View this file contents
View the full history
Commits for