litesoft

URLs

Explore

Commits

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

		@@ -4,7 +4,6 @@
4	4		import org.litesoft.commonfoundation.base.*;
5	5		import org.litesoft.commonfoundation.exceptions.*;
6	6		import org.litesoft.commonfoundation.typeutils.*;
7		-	import org.litesoft.commonfoundation.typeutils.Objects;
8	7		import org.litesoft.core.simpletypes.*;
9	8		import org.litesoft.core.util.*;
10	9		import org.litesoft.orsup.selection.*;
		@@ -63,7 +62,7 @@
63	62
64	63		@Override
65	64		public String getFullName() {
66		-	return ((Strings.deNull( getFirstName() ) + " " + Strings.deNull( getMiddleInitial() )).trim() + " " + Strings.deNull( getLastName() )).trim();
	65	+	return ((ConstrainTo.notNull( getFirstName() ) + " " + ConstrainTo.notNull( getMiddleInitial() )).trim() + " " + ConstrainTo.notNull( getLastName() )).trim();
67	66		}
68	67
69	68		@Override
		@@ -131,7 +130,7 @@
131	130		}
132	131
133	132		public UserRestrictedResourcePair<User, RestrictedResource> loginToRestrictedResourceIfAcceptable( RestrictedResource pRestrictedResource ) {
134		-	Objects.assertNotNull( "RestrictedResource", pRestrictedResource );
	133	+	Confirm.isNotNull( "RestrictedResource", pRestrictedResource );
135	134		Object o = attemptRestrictedResourceLink( pRestrictedResource );
136	135		if ( o instanceof UserRestrictedResourcePair ) {
137	136		return Cast.it( o );
		@@ -190,7 +189,7 @@
190	189		public String acceptablePassword( String pPassword ) {
191	190		if ( !isDemo() ) {
192	191		if ( pPassword.length() < 8 ) {
193		-	String zCurrentPassword = Strings.noEmpty( getPassword() );
	192	+	String zCurrentPassword = ConstrainTo.significantOrNull( getPassword() );
194	193		if ( (zCurrentPassword == null) \|\| (pPassword.length() < zCurrentPassword.length()) ) {
195	194		return "Unacceptable New Password - Too Short";
196	195		}
		@@ -200,7 +199,7 @@
200	199		}
201	200
202	201		public boolean validatePassword( String pPassword ) {
203		-	return isDemo() \|\| Strings.deNull( pPassword ).trim().equals( getPassword() );
	202	+	return isDemo() \|\| ConstrainTo.notNull( pPassword ).trim().equals( getPassword() );
204	203		}
205	204
206	205		public RestrictedResource[] getAlternateRestrictedResourceOptions( RestrictedResource pRestrictedResource ) {

View View this file contents

History View the full history

Feeds

Commits for /trunk/GWT_Sandbox/Prioritizer/src/org/litesoft/prioritizer/server/pos/User.java