litesoft

URLs

Explore

Commits

Diff Revisions 949 vs 950 for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/swing/mains/mementobeans/support/AttributeData.java

		@@ -3,6 +3,7 @@
3	3		import org.litesoft.aokeyhole.objects.*;
4	4		import org.litesoft.aokeyhole.objects.factories.*;
5	5		import org.litesoft.aokeyhole.objects.factories.mementobean.*;
	6	+	import org.litesoft.commonfoundation.base.*;
6	7		import org.litesoft.commonfoundation.typeutils.*;
7	8		import org.litesoft.commonfoundation.typeutils.Objects;
8	9
		@@ -85,7 +86,7 @@
85	86		}
86	87
87	88		public void setNotes( String[] pNotes ) {
88		-	mNotes = Strings.deNull( pNotes );
	89	+	mNotes = ConstrainTo.notNull( pNotes );
89	90		}
90	91
91	92		/**
		@@ -125,7 +126,7 @@
125	126		{
126	127		// "String" & "" \|\| "Mementoable" & "<DetailBean>"
127	128		if ( !MEMENTOABLE_ATTRIBUTE_PROXY_TYPE.equals( pPreType ) ) {
128		-	Strings.assertNullOrEmpty( "BracketedPostType", pBracketedPostType );
	129	+	Confirm.insignificant( "BracketedPostType", pBracketedPostType );
129	130		mType = Objects.assertOneOf( pPreType, VALID_TYPES );
130	131		return;
131	132		}
		@@ -287,8 +288,8 @@
287	288		}
288	289
289	290		public boolean isUpdatableFrom( BeanAttributeBuilder pAttribute ) {
290		-	return Objects.areNonArraysEqual( this.getName(), pAttribute.getName() ) && //
291		-	Objects.areNonArraysEqual( this.getType(), pAttribute.getType() ) && //
	291	+	return Currently.areEqual( this.getName(), pAttribute.getName() ) && //
	292	+	Currently.areEqual( this.getType(), pAttribute.getType() ) && //
292	293		(this.isRepeating() == pAttribute.isRepeating());
293	294		}
294	295
		@@ -310,7 +311,7 @@
310	311		}
311	312
312	313		private boolean isUpdatableFromRestIsEquivalent( BeanAttributeBuilder pAttribute ) {
313		-	return Objects.areArraysEqual( this.getNotes(), pAttribute.getNotes() ) && //
	314	+	return Currently.areEqual( this.getNotes(), pAttribute.getNotes() ) && //
314	315		(this.isNullEmpties() == pAttribute.isNullEmpties()) && //
315	316		(this.isNullZeros() == pAttribute.isNullZeros()) && //
316	317		(this.isNullFalses() == pAttribute.isNullFalses());

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/swing/mains/mementobeans/support/AttributeData.java