Menu
▾
▴
[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/predicates DirectInstanceOfPredicate.java,1.2,1.3 DynamicAssociationPredicate.java,1.2,1.3 TypePredicate.java,1.1,1.2
|
From: Lars H. <lh...@us...> - 2005-03-06 21:11:43
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20057/src/org/tmapiutils/query/tolog/predicates Modified Files: DirectInstanceOfPredicate.java DynamicAssociationPredicate.java TypePredicate.java Log Message: More TM4J -> TMAPI translations Index: TypePredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/TypePredicate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TypePredicate.java 6 Mar 2005 17:30:00 -0000 1.1 --- TypePredicate.java 6 Mar 2005 21:11:33 -0000 1.2 *************** *** 24,28 **** import org.tmapi.core.TopicMap; import org.tmapi.core.TopicMapObject; ! import org.tmapi.index.core.AssociationTypesIndex; import org.tmapi.index.core.AssociationRolesIndex; import org.tmapi.index.core.OccurrencesIndex; --- 24,28 ---- import org.tmapi.core.TopicMap; import org.tmapi.core.TopicMapObject; ! import org.tmapi.index.core.AssociationsIndex; import org.tmapi.index.core.AssociationRolesIndex; import org.tmapi.index.core.OccurrencesIndex; *************** *** 36,40 **** private AssociationRolesIndex m_mti; private OccurrencesIndex m_oti; ! private AssociationTypesIndex m_ati; public static final String PREDICATE_NAME = "type"; private static final ParameterInfo PARAM_INFO [] = new ParameterInfo[] { --- 36,40 ---- private AssociationRolesIndex m_mti; private OccurrencesIndex m_oti; ! private AssociationsIndex m_ati; public static final String PREDICATE_NAME = "type"; private static final ParameterInfo PARAM_INFO [] = new ParameterInfo[] { *************** *** 104,108 **** it = m_oti.getOccurrencesByType(type).iterator(); addInstances(type, it, ret); ! it = m_mti.getAssociationRolesOfType(type).iterator(); addInstances(type, it, ret); } --- 104,108 ---- it = m_oti.getOccurrencesByType(type).iterator(); addInstances(type, it, ret); ! it = m_mti.getAssociationRolesByType(type).iterator(); addInstances(type, it, ret); } *************** *** 156,160 **** for (Iterator types = m_mti.getAssociationRoleTypes().iterator(); types.hasNext();) { Topic type = (Topic)types.next(); ! for (Iterator instances = m_mti.getAssociationRolesOfType(type).iterator(); instances.hasNext();) { addResultsRow(ret, new Object[] { instances.next(), type }); } --- 156,160 ---- for (Iterator types = m_mti.getAssociationRoleTypes().iterator(); types.hasNext();) { Topic type = (Topic)types.next(); ! for (Iterator instances = m_mti.getAssociationRolesByType(type).iterator(); instances.hasNext();) { addResultsRow(ret, new Object[] { instances.next(), type }); } *************** *** 168,172 **** super.initialise(tm); try { ! m_ati = tm.getIndexManager().getAssociationTypesIndex(); if (!m_ati.isOpen()) m_ati.open(); m_oti = tm.getIndexManager().getOccurrencesIndex(); --- 168,172 ---- super.initialise(tm); try { ! m_ati = tm.getIndexManager().getAssociationsIndex(); if (!m_ati.isOpen()) m_ati.open(); m_oti = tm.getIndexManager().getOccurrencesIndex(); *************** *** 184,187 **** --- 184,190 ---- /* * $Log$ + * Revision 1.2 2005/03/06 21:11:33 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.1 2005/03/06 17:30:00 lheuer * Initial tolog import Index: DynamicAssociationPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/DynamicAssociationPredicate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DynamicAssociationPredicate.java 6 Mar 2005 21:01:07 -0000 1.2 --- DynamicAssociationPredicate.java 6 Mar 2005 21:11:33 -0000 1.3 *************** *** 28,32 **** //import org.tmapi.core.index.IndexException; //import org.tmapi.core.index.IndexManagerException; ! //import org.tmapi.index.core.AssociationTypesIndex; //import org.tmapi.index.core.AssociationRolesIndex; //import org.tmapi.core.utils.extractors.AssociationExtractor; --- 28,32 ---- //import org.tmapi.core.index.IndexException; //import org.tmapi.core.index.IndexManagerException; ! //import org.tmapi.index.core.AssociationsIndex; //import org.tmapi.index.core.AssociationRolesIndex; //import org.tmapi.core.utils.extractors.AssociationExtractor; *************** *** 150,158 **** if (m_log.isDebugEnabled()) { if (role != null) { ! m_log.debug("matchOnRolePlayer( player:" + player.getID() + ", role:" + ! ((role instanceof Topic) ? ((Topic)role).getID() : "$" + ((Variable)role).getName()) + " )"); } else { ! m_log.debug("matchOnRolePlayer( player:" + player.getID() + ", role:<unspecified>"); } } --- 150,158 ---- if (m_log.isDebugEnabled()) { if (role != null) { ! m_log.debug("matchOnRolePlayer( player:" + player.getObjectId() + ", role:" + ! ((role instanceof Topic) ? ((Topic)role).getObjectId() : "$" + ((Variable)role).getName()) + " )"); } else { ! m_log.debug("matchOnRolePlayer( player:" + player.getObjectId() + ", role:<unspecified>"); } } *************** *** 348,352 **** if (playerRoleParam.getPlayerVar() != null) { if (m_log.isDebugEnabled()) { ! m_log.debug("Binding $" + playerRoleParam.getPlayerVar().getName() + " to topic " + prp.getPlayerTopic().getID()); } localBindings.put(playerRoleParam.getPlayerVar(), prp.getPlayerTopic()); --- 348,352 ---- if (playerRoleParam.getPlayerVar() != null) { if (m_log.isDebugEnabled()) { ! m_log.debug("Binding $" + playerRoleParam.getPlayerVar().getName() + " to topic " + prp.getPlayerTopic().getObjectId()); } localBindings.put(playerRoleParam.getPlayerVar(), prp.getPlayerTopic()); *************** *** 354,358 **** if (playerRoleParam.getRoleVar() != null) { if (m_log.isDebugEnabled()) { ! m_log.debug("Binding $" + playerRoleParam.getRoleVar().getName() + " to topic " + prp.getRoleTopic().getID()); } localBindings.put(playerRoleParam.getRoleVar(), prp.getRoleTopic()); --- 354,358 ---- if (playerRoleParam.getRoleVar() != null) { if (m_log.isDebugEnabled()) { ! m_log.debug("Binding $" + playerRoleParam.getRoleVar().getName() + " to topic " + prp.getRoleTopic().getObjectId()); } localBindings.put(playerRoleParam.getRoleVar(), prp.getRoleTopic()); *************** *** 388,392 **** Object param0 = it.next(); if (param0 instanceof Topic) { ! sb.append(((Topic)param0).getID()); } else { sb.append(param0.toString()); --- 388,392 ---- Object param0 = it.next(); if (param0 instanceof Topic) { ! sb.append(((Topic)param0).getObjectId()); } else { sb.append(param0.toString()); *************** *** 452,455 **** --- 452,458 ---- /* * $Log$ + * Revision 1.3 2005/03/06 21:11:33 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.2 2005/03/06 21:01:07 lheuer * Removed getIndexManager() with getHelperObject(index.class) Index: DirectInstanceOfPredicate.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/predicates/DirectInstanceOfPredicate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DirectInstanceOfPredicate.java 6 Mar 2005 21:01:07 -0000 1.2 --- DirectInstanceOfPredicate.java 6 Mar 2005 21:11:33 -0000 1.3 *************** *** 147,151 **** */ private void checkInstance(Topic inst, Topic cls, VariableSet ret) throws TologProcessingException { ! m_log.debug("Check if " + inst.getID() + " is instance of " + cls.getID()); Iterator it = inst.getTypes().iterator(); while (it.hasNext()) { --- 147,151 ---- */ private void checkInstance(Topic inst, Topic cls, VariableSet ret) throws TologProcessingException { ! m_log.debug("Check if " + inst.getObjectId() + " is instance of " + cls.getObjectId()); Iterator it = inst.getTypes().iterator(); while (it.hasNext()) { *************** *** 213,216 **** --- 213,219 ---- /* * $Log$ + * Revision 1.3 2005/03/06 21:11:33 lheuer + * More TM4J -> TMAPI translations + * * Revision 1.2 2005/03/06 21:01:07 lheuer * Removed getIndexManager() with getHelperObject(index.class) |
