litesoft
Subversion Repository Public Repository

litesoft

URLs

Copy to Clipboard
Explore
Commits

Diff Revisions 947 vs 948 for /trunk/GWT_Sandbox/InitFrom/src/org/litesoft/initfrom/server/pos/User.java

Diff revisions: vs.
  @@ -1,11 +1,8 @@
1 1 package org.litesoft.initfrom.server.pos;
2 2
3 + import org.litesoft.codec.*;
3 4 import org.litesoft.commonfoundation.exceptions.*;
4 5 import org.litesoft.commonfoundation.typeutils.*;
5 -
6 - import java.util.*;
7 -
8 - import org.litesoft.codec.*;
9 6 import org.litesoft.commonfoundation.typeutils.Objects;
10 7 import org.litesoft.core.simpletypes.*;
11 8 import org.litesoft.core.util.*;
  @@ -14,92 +11,78 @@
14 11 import org.litesoft.orsup.selection.*;
15 12 import org.litesoft.orsup.transact.*;
16 13
17 - public class User extends UserGO
18 - {
14 + import java.util.*;
15 +
16 + public class User extends UserGO {
19 17 public User( Transaction pTransaction ) // Only used for New
20 18 {
21 19 super( pTransaction );
22 20 }
23 21
24 - public User( ConstructionControl pConstructionControl )
25 - {
22 + public User( ConstructionControl pConstructionControl ) {
26 23 super( pConstructionControl );
27 24 }
28 25
29 26 private boolean mDemo;
30 27
31 28 @Override
32 - public Boolean getDemoUser()
33 - {
29 + public Boolean getDemoUser() {
34 30 return mDemo;
35 31 }
36 32
37 33 @Override
38 - protected void LLclearDemoUser()
39 - {
34 + protected void LLclearDemoUser() {
40 35 }
41 36
42 - public boolean isDemo()
43 - {
37 + public boolean isDemo() {
44 38 return mDemo;
45 39 }
46 40
47 - public void setDemo()
48 - {
41 + public void setDemo() {
49 42 mDemo = true;
50 43 }
51 44
52 45 @Override
53 - public String getHexPassword()
54 - {
46 + public String getHexPassword() {
55 47 String zEncryptedPassword = LLgetPassword();
56 48 return (zEncryptedPassword == null) ? null : HexStringCodec.encode( zEncryptedPassword );
57 49 }
58 50
59 51 @Override
60 - protected void LLsetHexPassword( String pHexPassword )
61 - {
52 + protected void LLsetHexPassword( String pHexPassword ) {
62 53 LLsetPassword( (pHexPassword == null) ? null : new String( HexStringCodec.decode( pHexPassword ) ) );
63 54 }
64 55
65 56 @Override
66 - protected void LLclearHexPassword()
67 - {
57 + protected void LLclearHexPassword() {
68 58 }
69 59
70 60 @Override
71 - public String getFullName()
72 - {
61 + public String getFullName() {
73 62 return ((Strings.deNull( getFirstName() ) + " " + Strings.deNull( getMiddleInitial() )).trim() + " " + Strings.deNull( getLastName() )).trim();
74 63 }
75 64
76 65 @Override
77 - protected void LLclearFullName()
78 - {
66 + protected void LLclearFullName() {
79 67 }
80 68
81 69 @Override
82 - public Boolean getVisibleToCurrentRestrictedResource()
83 - {
70 + public Boolean getVisibleToCurrentRestrictedResource() {
84 71 UserXrefRestrictedResource zRestrictedResource = getCurrentRestrictedResource();
85 72
86 73 return (zRestrictedResource != null) ? zRestrictedResource.getVisible() : null;
87 74 }
88 75
89 76 @Override
90 - protected void LLclearVisibleToCurrentRestrictedResource()
91 - {
77 + protected void LLclearVisibleToCurrentRestrictedResource() {
92 78 }
93 79
94 80 @Override
95 - protected void LLsetVisibleToCurrentRestrictedResource( Boolean pVisibleToCurrentRestrictedResource )
96 - {
97 - if ( pVisibleToCurrentRestrictedResource != null )
98 - {
81 + protected void LLsetVisibleToCurrentRestrictedResource( Boolean pVisibleToCurrentRestrictedResource ) {
82 + if ( pVisibleToCurrentRestrictedResource != null ) {
99 83 UserXrefRestrictedResource zRestrictedResource = getCurrentRestrictedResource();
100 84
101 - if ( zRestrictedResource != null )
102 - {
85 + if ( zRestrictedResource != null ) {
103 86 zRestrictedResource.setVisible( pVisibleToCurrentRestrictedResource );
104 87 }
105 88 }
  @@ -109,31 +92,25 @@
109 92 private UserXrefRestrictedResource mLastUserXrefRestrictedResource;
110 93
111 94 @Override
112 - public UserXrefRestrictedResource getCurrentRestrictedResource()
113 - {
114 - if ( (mLastUserXrefRestrictedResource != null) && (getTransaction() != null) )
115 - {
95 + public UserXrefRestrictedResource getCurrentRestrictedResource() {
96 + if ( (mLastUserXrefRestrictedResource != null) && (getTransaction() != null) ) {
116 97 return mLastUserXrefRestrictedResource;
117 98 }
118 99 RestrictedResource zCurrentRestrictedResource = CurrentRestrictedResourceAccessor.get().getOptionalRestrictedResource();
119 - if ( zCurrentRestrictedResource != null )
120 - {
121 - if ( zCurrentRestrictedResource.equals( mLastCurrentRestrictedResource ) && zCurrentRestrictedResource.getRecordVersion().equals( mLastCurrentRestrictedResource.getRecordVersion() ) )
122 - {
100 + if ( zCurrentRestrictedResource != null ) {
101 + if ( zCurrentRestrictedResource.equals( mLastCurrentRestrictedResource ) &&
102 + zCurrentRestrictedResource.getRecordVersion().equals( mLastCurrentRestrictedResource.getRecordVersion() ) ) {
123 103 return mLastUserXrefRestrictedResource;
124 104 }
125 - for ( UserXrefRestrictedResource zUserXrefRestrictedResource : getRestrictedResources() )
126 - {
105 + for ( UserXrefRestrictedResource zUserXrefRestrictedResource : getRestrictedResources() ) {
127 106 RestrictedResource zRestrictedResource = zUserXrefRestrictedResource.getRestrictedResource();
128 - if ( zCurrentRestrictedResource.equals( zRestrictedResource ) )
129 - {
107 + if ( zCurrentRestrictedResource.equals( zRestrictedResource ) ) {
130 108 mLastCurrentRestrictedResource = zRestrictedResource;
131 109 return mLastUserXrefRestrictedResource = zUserXrefRestrictedResource;
132 110 }
133 111 }
134 112 // todo: Is Next Appropriate for Super Users?
135 - if ( getTransaction() != null )
136 - {
113 + if ( getTransaction() != null ) {
137 114 mLastUserXrefRestrictedResource = new UserXrefRestrictedResource( getTransaction(), this, zCurrentRestrictedResource );
138 115 mLastCurrentRestrictedResource = mLastUserXrefRestrictedResource.getRestrictedResource();
139 116 return mLastUserXrefRestrictedResource;
  @@ -144,68 +121,53 @@
144 121 }
145 122
146 123 @Override
147 - protected void LLclearCurrentRestrictedResource()
148 - {
124 + protected void LLclearCurrentRestrictedResource() {
149 125 mLastCurrentRestrictedResource = null;
150 126 mLastUserXrefRestrictedResource = null;
151 127 }
152 128
153 - public UserRestrictedResourcePair loginToRestrictedResourceIfAcceptable( RestrictedResource pRestrictedResource )
154 - {
129 + public UserRestrictedResourcePair loginToRestrictedResourceIfAcceptable( RestrictedResource pRestrictedResource ) {
155 130 Objects.assertNotNull( "RestrictedResource", pRestrictedResource );
156 131 Object o = attemptRestrictedResourceLink( pRestrictedResource );
157 - if ( o instanceof UserRestrictedResourcePair )
158 - {
132 + if ( o instanceof UserRestrictedResourcePair ) {
159 133 return (UserRestrictedResourcePair) o;
160 134 }
161 135 throw new DisplayableRuntimeException( "RestrictedResource Not Authorized" );
162 136 }
163 137
164 - public UserRestrictedResourcePair getLoginRestrictedResource( RestrictedResource pCurrentRestrictedResource )
165 - {
138 + public UserRestrictedResourcePair getLoginRestrictedResource( RestrictedResource pCurrentRestrictedResource ) {
166 139 Object o = attemptRestrictedResourceLink( pCurrentRestrictedResource );
167 - if ( o instanceof UserRestrictedResourcePair )
168 - {
140 + if ( o instanceof UserRestrictedResourcePair ) {
169 141 return (UserRestrictedResourcePair) o;
170 142 }
171 143 @SuppressWarnings({"unchecked"}) List<RestrictedResource> zAuthorizedRestrictedResources = (List<RestrictedResource>) o;
172 144 RestrictedResource zLastRestrictedResource = getLastRestrictedResource();
173 - if ( zLastRestrictedResource != null )
174 - {
175 - for ( RestrictedResource zRestrictedResource : zAuthorizedRestrictedResources )
176 - {
177 - if ( zRestrictedResource.equals( zLastRestrictedResource ) )
178 - {
145 + if ( zLastRestrictedResource != null ) {
146 + for ( RestrictedResource zRestrictedResource : zAuthorizedRestrictedResources ) {
147 + if ( zRestrictedResource.equals( zLastRestrictedResource ) ) {
179 148 return new UserRestrictedResourcePair( this, zLastRestrictedResource );
180 149 }
181 150 }
182 151 }
183 - if ( zAuthorizedRestrictedResources.isEmpty() )
184 - {
152 + if ( zAuthorizedRestrictedResources.isEmpty() ) {
185 153 throw new DisplayableRuntimeException( "NoAuthorizedRestrictedResources" );
186 154 }
187 155 return new UserRestrictedResourcePair( this, zAuthorizedRestrictedResources.get( 0 ) );
188 156 }
189 157
190 - private Object attemptRestrictedResourceLink( RestrictedResource pRestrictedResource )
191 - {
158 + private Object attemptRestrictedResourceLink( RestrictedResource pRestrictedResource ) {
192 159 List<RestrictedResource> zAuthorizedRestrictedResources = new ArrayList<RestrictedResource>();
193 - for ( UserXrefRestrictedResource zUserXrefRestrictedResource : getRestrictedResources() )
194 - {
195 - if ( zUserXrefRestrictedResource.isLoginAllowed() )
196 - {
160 + for ( UserXrefRestrictedResource zUserXrefRestrictedResource : getRestrictedResources() ) {
161 + if ( zUserXrefRestrictedResource.isLoginAllowed() ) {
197 162 RestrictedResource zRestrictedResource = zUserXrefRestrictedResource.getRestrictedResource();
198 - if ( zRestrictedResource.equals( pRestrictedResource ) )
199 - {
163 + if ( zRestrictedResource.equals( pRestrictedResource ) ) {
200 164 return new UserRestrictedResourcePair( this, pRestrictedResource );
201 165 }
202 166 zAuthorizedRestrictedResources.add( zRestrictedResource );
203 167 }
204 168 }
205 - if ( canAccessAllRestrictedResources() )
206 - {
207 - if ( pRestrictedResource == null )
208 - {
169 + if ( canAccessAllRestrictedResources() ) {
170 + if ( pRestrictedResource == null ) {
209 171 return zAuthorizedRestrictedResources;
210 172 }
211 173 Transaction zTransaction = getFinder().createTransaction();
  @@ -215,22 +177,17 @@
215 177 zTransaction.commit();
216 178 return new UserRestrictedResourcePair( zUser, zRestrictedResource );
217 179 }
218 - if ( zAuthorizedRestrictedResources.isEmpty() )
219 - {
180 + if ( zAuthorizedRestrictedResources.isEmpty() ) {
220 181 throw new DisplayableRuntimeException( "NoAuthorizedRestrictedResources" );
221 182 }
222 183 return zAuthorizedRestrictedResources;
223 184 }
224 185
225 - public String acceptablePassword( String pPassword )
226 - {
227 - if ( !isDemo() )
228 - {
229 - if ( pPassword.length() < 8 )
230 - {
186 + public String acceptablePassword( String pPassword ) {
187 + if ( !isDemo() ) {
188 + if ( pPassword.length() < 8 ) {
231 189 String zCurrentPassword = Strings.noEmpty( getPassword() );
232 - if ( (zCurrentPassword == null) || (pPassword.length() < zCurrentPassword.length()) )
233 - {
190 + if ( (zCurrentPassword == null) || (pPassword.length() < zCurrentPassword.length()) ) {
234 191 return "Unacceptable New Password - Too Short";
235 192 }
236 193 }
  @@ -238,32 +195,26 @@
238 195 return null;
239 196 }
240 197
241 - public boolean validatePassword( String pPassword )
242 - {
198 + public boolean validatePassword( String pPassword ) {
243 199 return isDemo() || Strings.deNull( pPassword ).trim().equals( getPassword() );
244 200 }
245 201
246 - public RestrictedResource[] getAlternateRestrictedResourceOptions( RestrictedResource pRestrictedResource )
247 - {
202 + public RestrictedResource[] getAlternateRestrictedResourceOptions( RestrictedResource pRestrictedResource ) {
248 203 List<RestrictedResource> zOptions = new ArrayList<RestrictedResource>();
249 - for ( UserXrefRestrictedResource zUserXrefRestrictedResource : getRestrictedResources() )
250 - {
204 + for ( UserXrefRestrictedResource zUserXrefRestrictedResource : getRestrictedResources() ) {
251 205 RestrictedResource zRestrictedResource = zUserXrefRestrictedResource.getRestrictedResource();
252 - if ( !zRestrictedResource.equals( pRestrictedResource ) )
253 - {
206 + if ( !zRestrictedResource.equals( pRestrictedResource ) ) {
254 207 zOptions.add( zRestrictedResource );
255 208 }
256 209 }
257 210 return zOptions.toArray( new RestrictedResource[zOptions.size()] );
258 211 }
259 212
260 - public boolean canAccessAllRestrictedResources()
261 - {
213 + public boolean canAccessAllRestrictedResources() {
262 214 return Booleans.isAnyTrue( getRestrictedResourceManage(), getSuperAdmin(), getHelpDeskMember() );
263 215 }
264 216
265 - public static WhereClause getLimitToCurrentRestrictedResourceAndVisible()
266 - {
217 + public static WhereClause getLimitToCurrentRestrictedResourceAndVisible() {
267 218 // Add filter to where clause to only select based on site.
268 219 RestrictedResource zRestrictedResource = CurrentRestrictedResourceAccessor.get().getRequiredRestrictedResource();
269 220 WhereClauseFactory zWCF = WhereClauseFactory.INSTANCE;
  @@ -274,8 +225,7 @@
274 225 }
275 226
276 227 @Override
277 - public TextLines getCurrentRestrictedResourceAllowedRoles()
278 - {
228 + public TextLines getCurrentRestrictedResourceAllowedRoles() {
279 229 return new TextLines( Role.OPTIONS ); // todo: Make to work for real.
280 230 }
281 231
  @@ -283,14 +233,11 @@
283 233 * Depends upon CurrentRestrictedResource.LastRole
284 234 */
285 235 @Override
286 - public String getLastRestrictedResourceRole()
287 - {
236 + public String getLastRestrictedResourceRole() {
288 237 UserXrefRestrictedResource zCurrentRestrictedResource = getCurrentRestrictedResource();
289 - if ( zCurrentRestrictedResource != null )
290 - {
238 + if ( zCurrentRestrictedResource != null ) {
291 239 String zLastRole = zCurrentRestrictedResource.getLastRole();
292 - if ( zLastRole != null )
293 - {
240 + if ( zLastRole != null ) {
294 241 return zLastRole;
295 242 }
296 243 }
  @@ -298,21 +245,17 @@
298 245 }
299 246
300 247 @Override
301 - protected void LLclearCurrentRestrictedResourceAllowedRoles()
302 - {
248 + protected void LLclearCurrentRestrictedResourceAllowedRoles() {
303 249 }
304 250
305 251 @Override
306 - protected void LLclearLastRestrictedResourceRole()
307 - {
252 + protected void LLclearLastRestrictedResourceRole() {
308 253 }
309 254
310 255 @Override
311 - protected void LLsetLastRestrictedResourceRole( String pLastRestrictedResourceRole )
312 - {
256 + protected void LLsetLastRestrictedResourceRole( String pLastRestrictedResourceRole ) {
313 257 UserXrefRestrictedResource zCurrentRestrictedResource = getCurrentRestrictedResource();
314 - if ( zCurrentRestrictedResource != null )
315 - {
258 + if ( zCurrentRestrictedResource != null ) {
316 259 zCurrentRestrictedResource.setLastRole( pLastRestrictedResourceRole );
317 260 }
318 261 }

View View this file contents

History View the full history

Feeds

Commits for /trunk/GWT_Sandbox/InitFrom/src/org/litesoft/initfrom/server/pos/User.java

Need assistance?   Get in touch, or head to our documentation site.