[Tm4j-commits] tm4j/src/org/tm4j/topicmap/tmdm/merged MergedOccurrenceKey.java, 1.2, 1.3 MergedOccurrence.java, 1.3, 1.4

[Xuan B. <med...@us...>]

Update of /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23113/src/org/tm4j/topicmap/tmdm/merged

Modified Files:
	MergedOccurrenceKey.java MergedOccurrence.java 
Log Message:
Support for MergedOccurrence.src/org/tm4j/topicmap/tmdm/merged/MergedTopicMapView.java

Index: MergedOccurrenceKey.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedOccurrenceKey.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MergedOccurrenceKey.java	21 Jan 2008 20:00:27 -0000	1.2
--- MergedOccurrenceKey.java	23 Jan 2008 22:37:59 -0000	1.3
***************
*** 24,37 ****
  	protected MergedTopic	type;
  	
  	protected String			value;
  	
  	// FIXME: variants missing
- 	// FIXME: scope missing
  	
! 	protected MergedOccurrenceKey(MergedTopic parent,MergedTopic type,String value,MergedScopeKey scope) {
  		super(scope);
! 		this.parent	= parent;
! 		this.type		=	type;
! 		this.value	=	value;
  		
  		// FIXME: register at MergedTopics
--- 24,39 ----
  	protected MergedTopic	type;
  	
+ 	protected Locator			datatype;
+ 	
  	protected String			value;
  	
  	// FIXME: variants missing
  	
! 	protected MergedOccurrenceKey(MergedTopic parent,MergedTopic type,Locator datatype,String value,MergedScopeKey scope) {
  		super(scope);
! 		this.parent		= parent;
! 		this.type			=	type;
! 		this.datatype	=	datatype;
! 		this.value		=	value;
  		
  		// FIXME: register at MergedTopics
***************
*** 52,60 ****
  	
  	public boolean equals(MergedOccurrenceKey o) {
! 		return parent.equals(o.parent)&&type.equals(o.type)&&value.equals(o.value)&&super.equals(o);
  	}
  	
  	public int hashCode() {
! 		return parent.hashCode()^type.hashCode()^value.hashCode()^super.hashCode();
  	}
  	
--- 54,62 ----
  	
  	public boolean equals(MergedOccurrenceKey o) {
! 		return parent.equals(o.parent)&&type.equals(o.type)&&datatype.equals(o.datatype)&&value.equals(o.value)&&super.equals(o);
  	}
  	
  	public int hashCode() {
! 		return parent.hashCode()^type.hashCode()^datatype.hashCode()^value.hashCode()^super.hashCode();
  	}
  	
***************
*** 70,74 ****
  	
  	public String toString() {
! 		return "MergedOccurrenceKey("+parent+","+type+",\""+value+"\")";
  	}
  }
--- 72,76 ----
  	
  	public String toString() {
! 		return "MergedOccurrenceKey("+parent+","+type+","+datatype+",\""+value+"\")";
  	}
  }

Index: MergedOccurrence.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/tmdm/merged/MergedOccurrence.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MergedOccurrence.java	23 Jan 2008 00:07:53 -0000	1.3
--- MergedOccurrence.java	23 Jan 2008 22:37:59 -0000	1.4
***************
*** 18,26 ****
  public class MergedOccurrence extends MergedScopeable<ReadableOccurrence,MergedOccurrenceKey> implements ReadableOccurrence {
  	
! 	protected MergedTopic parent;
  	
! 	protected MergedOccurrence(MergedTopic parent,MergedOccurrenceKey key,Occurrence firstComponent) {
! 		super(parent.getContainer(),key,firstComponent);
! 		this.parent = parent;
  	}
  	
--- 18,26 ----
  public class MergedOccurrence extends MergedScopeable<ReadableOccurrence,MergedOccurrenceKey> implements ReadableOccurrence {
  	
! //protected MergedTopic parent;
  	
! 	protected MergedOccurrence(MergedTopicMapView container,MergedOccurrenceKey key,ReadableOccurrence firstComponent) {
! 		super(container,key,firstComponent);
! //	this.parent = parent;
  	}
  	
***************
*** 44,48 ****
  	@TMDM
  	public MergedTopic getParent() {
! 		return parent;
  	}
  }
--- 44,48 ----
  	@TMDM
  	public MergedTopic getParent() {
! 		return getContainer().getMergedTopic(getRandomComponent().getParent());
  	}
  }