litesoft

URLs

Explore

Commits

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

		@@ -1,9 +1,9 @@
1	1		package org.litesoft.initfrom.server.pos;
2	2
3	3		import org.litesoft.codec.*;
	4	+	import org.litesoft.commonfoundation.base.*;
4	5		import org.litesoft.commonfoundation.exceptions.*;
5	6		import org.litesoft.commonfoundation.typeutils.*;
6		-	import org.litesoft.commonfoundation.typeutils.Objects;
7	7		import org.litesoft.core.simpletypes.*;
8	8		import org.litesoft.core.util.*;
9	9		import org.litesoft.initfrom.client.boviews.*;
		@@ -59,7 +59,7 @@
59	59
60	60		@Override
61	61		public String getFullName() {
62		-	return ((Strings.deNull( getFirstName() ) + " " + Strings.deNull( getMiddleInitial() )).trim() + " " + Strings.deNull( getLastName() )).trim();
	62	+	return ((ConstrainTo.notNull( getFirstName() ) + " " + ConstrainTo.notNull( getMiddleInitial() )).trim() + " " + ConstrainTo.notNull( getLastName() )).trim();
63	63		}
64	64
65	65		@Override
		@@ -127,7 +127,7 @@
127	127		}
128	128
129	129		public UserRestrictedResourcePair loginToRestrictedResourceIfAcceptable( RestrictedResource pRestrictedResource ) {
130		-	Objects.assertNotNull( "RestrictedResource", pRestrictedResource );
	130	+	Confirm.isNotNull( "RestrictedResource", pRestrictedResource );
131	131		Object o = attemptRestrictedResourceLink( pRestrictedResource );
132	132		if ( o instanceof UserRestrictedResourcePair ) {
133	133		return (UserRestrictedResourcePair) o;
		@@ -186,7 +186,7 @@
186	186		public String acceptablePassword( String pPassword ) {
187	187		if ( !isDemo() ) {
188	188		if ( pPassword.length() < 8 ) {
189		-	String zCurrentPassword = Strings.noEmpty( getPassword() );
	189	+	String zCurrentPassword = ConstrainTo.significantOrNull( getPassword() );
190	190		if ( (zCurrentPassword == null) \|\| (pPassword.length() < zCurrentPassword.length()) ) {
191	191		return "Unacceptable New Password - Too Short";
192	192		}
		@@ -196,7 +196,7 @@
196	196		}
197	197
198	198		public boolean validatePassword( String pPassword ) {
199		-	return isDemo() \|\| Strings.deNull( pPassword ).trim().equals( getPassword() );
	199	+	return isDemo() \|\| ConstrainTo.notNull( pPassword ).trim().equals( getPassword() );
200	200		}
201	201
202	202		public RestrictedResource[] getAlternateRestrictedResourceOptions( RestrictedResource pRestrictedResource ) {

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