[Tmapi-utils-commits] tmapi-utils/src/org/tmapiutils/query/tolog/parser PlayerRoleVarPair.java,1.1,1.2 ProjectionImpl.java,1.1,1.2 TologRuleInstanceImpl.java,1.1,1.2

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

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

Modified Files:
	PlayerRoleVarPair.java ProjectionImpl.java 
	TologRuleInstanceImpl.java 
Log Message:
More TM4J -> TMAPI translations

Index: ProjectionImpl.java
===================================================================
RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/parser/ProjectionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProjectionImpl.java	6 Mar 2005 17:29:06 -0000	1.1
--- ProjectionImpl.java	6 Mar 2005 21:11:32 -0000	1.2
***************
*** 152,156 ****
              Object o  = it.next();
              if (o instanceof TopicMapObject) {
!                 m.append(((TopicMapObject)o).getID());
              } else {
                  m.append(String.valueOf(o));
--- 152,156 ----
              Object o  = it.next();
              if (o instanceof TopicMapObject) {
!                 m.append(((TopicMapObject)o).getObjectId());
              } else {
                  m.append(String.valueOf(o));
***************
*** 183,186 ****
--- 183,189 ----
  /*
   * $Log$
+  * Revision 1.2  2005/03/06 21:11:32  lheuer
+  * More TM4J -> TMAPI translations
+  *
   * Revision 1.1  2005/03/06 17:29:06  lheuer
   * Initial tolog import

Index: PlayerRoleVarPair.java
===================================================================
RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/parser/PlayerRoleVarPair.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PlayerRoleVarPair.java	6 Mar 2005 17:29:06 -0000	1.1
--- PlayerRoleVarPair.java	6 Mar 2005 21:11:31 -0000	1.2
***************
*** 92,96 ****
          if (m_pVar == null) {
              if (m_pPh == null) {
!                 sb.append(m_pTopic.getID());
              } else {
                  sb.append(m_pPh.toString());
--- 92,96 ----
          if (m_pVar == null) {
              if (m_pPh == null) {
!                 sb.append(m_pTopic.getObjectId());
              } else {
                  sb.append(m_pPh.toString());
***************
*** 102,106 ****
          if (m_rTopic != null) {
              sb.append(":");
!             sb.append(m_rTopic.getID());
          } else if (m_rVar != null) {
              sb.append(":");
--- 102,106 ----
          if (m_rTopic != null) {
              sb.append(":");
!             sb.append(m_rTopic.getObjectId());
          } else if (m_rVar != null) {
              sb.append(":");
***************
*** 117,120 ****
--- 117,123 ----
  /*
   * $Log$
+  * Revision 1.2  2005/03/06 21:11:31  lheuer
+  * More TM4J -> TMAPI translations
+  *
   * Revision 1.1  2005/03/06 17:29:06  lheuer
   * Initial tolog import

Index: TologRuleInstanceImpl.java
===================================================================
RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/parser/TologRuleInstanceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TologRuleInstanceImpl.java	6 Mar 2005 17:29:07 -0000	1.1
--- TologRuleInstanceImpl.java	6 Mar 2005 21:11:32 -0000	1.2
***************
*** 276,280 ****
                  val = getParameterValue(params, v);
  				ret.addColumn(v);
! 				if (m_log.isDebugEnabled()) m_log.debug("Rule variable " + headVar.toString() + " maps to query variable " + ((val instanceof Topic) ? ((Topic)val).getID() : val.toString()));
  				m_bodyParamMap.put(headVar, v);
  			}
--- 276,280 ----
                  val = getParameterValue(params, v);
  				ret.addColumn(v);
! 				if (m_log.isDebugEnabled()) m_log.debug("Rule variable " + headVar.toString() + " maps to query variable " + ((val instanceof Topic) ? ((Topic)val).getObjectId() : val.toString()));
  				m_bodyParamMap.put(headVar, v);
  			}
***************
*** 374,378 ****
              Object o = it.next();
              if (o instanceof TopicMapObject) {
!                 buff.append(((TopicMapObject)o).getID());
              } else {
                  buff.append(o.toString());
--- 374,378 ----
              Object o = it.next();
              if (o instanceof TopicMapObject) {
!                 buff.append(((TopicMapObject)o).getObjectId());
              } else {
                  buff.append(o.toString());
***************
*** 389,392 ****
--- 389,395 ----
  /*
   * $Log$
+  * Revision 1.2  2005/03/06 21:11:32  lheuer
+  * More TM4J -> TMAPI translations
+  *
   * Revision 1.1  2005/03/06 17:29:07  lheuer
   * Initial tolog import