litesoft

URLs

Explore

Commits

Diff Revisions 2 vs 17 for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/objects/AttributeMetaDataRelated.java

		@@ -23,6 +23,7 @@
23	23		return A_ToMany.TYPE.equals( getAttributeSet().getType() );
24	24		}
25	25
	26	+	@Override
26	27		public boolean isRelated()
27	28		{
28	29		return true;
		@@ -52,10 +53,10 @@
52	53		*/
53	54		protected String updateRelatedTo( String pRelatedToName )
54	55		{
55		-	ObjectMetaData owner = getOwner();
	56	+	ObjectMetaData zOwner = getOwner();
56	57		try
57	58		{
58		-	if ( mRelatedTo.setObjectName( pRelatedToName, owner, null ) )
	59	+	if ( mRelatedTo.setObjectName( pRelatedToName, zOwner, null ) )
59	60		{
60	61		changed();
61	62		}
		@@ -67,21 +68,26 @@
67	68		}
68	69		}
69	70
	71	+	@Override
70	72		public void setRehydrated()
71	73		{
72		-	ObjectMetaData owner = getOwner();
73		-	mRelatedTo.unpersistFini( getSystemMetaData(), owner.getNameValidator(), owner, null );
	74	+	ObjectMetaData zOwner = getOwner();
	75	+	mRelatedTo.unpersistFini( getSystemMetaData(), zOwner.getNameValidator(), zOwner, null );
74	76		super.setRehydrated();
75	77		}
76	78
	79	+	@Override
77	80		protected void addLineExtra( StringBuilder pSb )
78	81		{
79	82		pSb.append( '\|' );
80	83
81		-	String relatedTo = getRelatedTo();
82		-	if ( relatedTo != null )
	84	+	String zRelatedTo = getRelatedTo();
	85	+	if ( zRelatedTo != null )
83	86		{
84		-	pSb.append( relatedTo );
	87	+	if ( !ObjectNames.VARIES_RELATED_TO.equals( zRelatedTo ) )
	88	+	{
	89	+	pSb.append( zRelatedTo );
	90	+	}
85	91		}
86	92		}
87	93
		@@ -98,7 +104,8 @@
98	104		pNameValuesComponent.setValue( AttribNamesRelated.RELATED_TO, getRelatedTo() );
99	105		if ( isEditable() )
100	106		{
101		-	pNameValuesComponent.setOptions( AttribNamesRelated.RELATED_TO, getObjectMetaData().getPotentialRelateToObjectNamesFor( getAttributeSet() ) ); // todo: ...
	107	+	pNameValuesComponent.setOptions( AttribNamesRelated.RELATED_TO, //
	108	+	getObjectMetaData().getPotentialRelateToObjectNamesFor( getAttributeSet(), isVirtual() ) );
102	109		}
103	110		}
104	111
		@@ -156,6 +163,7 @@
156	163		mNewRelatedTo = pNewRelatedTo;
157	164		}
158	165
	166	+	@Override
159	167		public void commitChange()
160	168		{
161	169		setRelatedTo( mNewRelatedTo );

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/KeyHole/src/org/litesoft/aokeyhole/objects/AttributeMetaDataRelated.java