[Tm4j-commits] tm4j/src/org/tm4j/topicmap/utils XTMBuilder.java, 1.79, 1.80

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

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

Modified Files:
	XTMBuilder.java 
Log Message:
Support for subjectLocator.

Index: XTMBuilder.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/org/tm4j/topicmap/utils/XTMBuilder.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** XTMBuilder.java	11 Jun 2008 06:16:21 -0000	1.79
--- XTMBuilder.java	11 Jun 2008 06:21:58 -0000	1.80
***************
*** 1016,1022 ****
  
              case REFTYPE_SUBJECTLOCATOR:
! 
!                     refTopic = getTopicBySubject(expandedRef);
! 
                  break;
  
--- 1016,1020 ----
  
              case REFTYPE_SUBJECTLOCATOR:
! 				// No need to do anything. We do not reference a topic.
                  break;
  
***************
*** 1122,1134 ****
  
  				break;
!             case 0:
                  switch (refType) {
  					case REFTYPE_SUBJECTIDENTIFIER:
  						m_currTopic.addSubjectIndicator(m_locatorFactory.createLocator("URI", expandedRef.getAddress()));
  					break;
! /*					case REFTYPE_SUBJECTLOCATOR:
! 						m_currTopic.setSubjectIdentity(m_locatorFactory.createLocator("URI", expandedRef.getAddress()));
  					break;
! */              }
  
                  break;
--- 1120,1132 ----
  
  				break;
!             case 0: // we just set the properties of the current topic
                  switch (refType) {
  					case REFTYPE_SUBJECTIDENTIFIER:
  						m_currTopic.addSubjectIndicator(m_locatorFactory.createLocator("URI", expandedRef.getAddress()));
  					break;
! 					case REFTYPE_SUBJECTLOCATOR: // note that the correct method would be m_currTopic.addSubjectLocator(). However, the TM4J1 supports only one subjectLocator at most.  
! 						m_currTopic.setSubject(m_locatorFactory.createLocator("URI", expandedRef.getAddress()));
  					break;
!                 }
  
                  break;
***************
*** 1788,1791 ****
--- 1786,1792 ----
  /*
   * $Log$
+  * Revision 1.80  2008/06/11 06:21:58  mediumnet
+  * Support for subjectLocator.
+  *
   * Revision 1.79  2008/06/11 06:16:21  mediumnet
   * Support for subjectLocator.