[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/predicates TopicNamePredicate.java,1.1,1.2

[Lars H. <lh...@us...>]

Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14734/src/org/tmapiutils/query/tolog/predicates

Modified Files:
	TopicNamePredicate.java 
Log Message:
More TM4J -> TMAPI translations

Index: TopicNamePredicate.java
===================================================================
RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/TopicNamePredicate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TopicNamePredicate.java	6 Mar 2005 17:30:00 -0000	1.1
--- TopicNamePredicate.java	6 Mar 2005 22:44:55 -0000	1.2
***************
*** 20,27 ****
  import org.tmapiutils.query.tolog.predicates.PredicateBase;
  import org.tmapiutils.query.tolog.utils.VariableSet;
! import org.tmapi.core.TopicName;
! import org.tmapi.core.Topic;
  import org.tmapi.core.TopicMap;
! import org.tmapi.core.index.IndexManagerException;
  import org.tmapi.index.core.TopicNamesIndex;
  
--- 20,28 ----
  import org.tmapiutils.query.tolog.predicates.PredicateBase;
  import org.tmapiutils.query.tolog.utils.VariableSet;
! // TMAPI
  import org.tmapi.core.TopicMap;
! import org.tmapi.core.Topic;
! import org.tmapi.core.TopicName;
! import org.tmapi.core.TMAPIException;
  import org.tmapi.index.core.TopicNamesIndex;
  
***************
*** 32,36 ****
   */
  public class TopicNamePredicate extends PredicateBase {
! 	private TopicNamesIndex idx=null;
  	public static final String PREDICATE_NAME = "topic-name";
      
--- 33,37 ----
   */
  public class TopicNamePredicate extends PredicateBase {
! 	// private TopicNamesIndex idx=null;
  	public static final String PREDICATE_NAME = "topic-name";
      
***************
*** 85,89 ****
  			*/
  			/* Simple version returns only the parent of the paramName parameter */
! 			addResultsRow(ret, new Object [] { ((TopicName)paramName).getParent(), paramName});
  		}
  		else if((paramName instanceof Variable) && (paramTopic instanceof Topic)) {
--- 86,90 ----
  			*/
  			/* Simple version returns only the parent of the paramName parameter */
! 			addResultsRow(ret, new Object [] { ((TopicName)paramName).getTopic(), paramName});
  		}
  		else if((paramName instanceof Variable) && (paramTopic instanceof Topic)) {
***************
*** 97,101 ****
  		else if((paramName instanceof TopicName) && (paramTopic instanceof Topic)) {
  			// KA: Only add the row if paramName is a name of paramTopic
! 			if (((TopicName)paramName).getParent().equals(paramTopic)) {
  				addResultsRow(ret, new Object[] {paramTopic, paramName});
  			}
--- 98,102 ----
  		else if((paramName instanceof TopicName) && (paramTopic instanceof Topic)) {
  			// KA: Only add the row if paramName is a name of paramTopic
! 			if (((TopicName)paramName).getTopic().equals(paramTopic)) {
  				addResultsRow(ret, new Object[] {paramTopic, paramName});
  			}
***************
*** 111,119 ****
  		super.initialise(tm);
  		
  		try {
! 			idx = getTopicMap().getIndexManager().getTopicNamesIndex();
! 		} catch (IndexManagerException e) {
  			throw new TologParserException("Cannot initialize " + getPredicateName() + " predicate class", e);
  		}
  	}
  }
--- 112,122 ----
  		super.initialise(tm);
  		
+ 		/*
  		try {
! 			_tnIdx = (TopicNamesIndex) getTopicMap().getHelperObject(TopicNamesIndex.class);
! 		} catch (TMAPIException e) {
  			throw new TologParserException("Cannot initialize " + getPredicateName() + " predicate class", e);
  		}
+ 		*/
  	}
  }
***************
*** 121,124 ****
--- 124,130 ----
  /*
   * $Log$
+  * Revision 1.2  2005/03/06 22:44:55  lheuer
+  * More TM4J -> TMAPI translations
+  *
   * Revision 1.1  2005/03/06 17:30:00  lheuer
   * Initial tolog import