[Jsbml-svn] SF.net SVN: jsbml:[2281] branches/astnode2-merging-alternate/core/src/org/ sbml/jsbml/ASTNode.java

[<nik...@us...>]

Revision: 2281
          http://sourceforge.net/p/jsbml/code/2281
Author:   niko-rodrigue
Date:     2015-05-08 09:09:06 +0000 (Fri, 08 May 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/astnode2-merging-alternate/core/src/org/sbml/jsbml/ASTNode.java

Modified: branches/astnode2-merging-alternate/core/src/org/sbml/jsbml/ASTNode.java
===================================================================
--- branches/astnode2-merging-alternate/core/src/org/sbml/jsbml/ASTNode.java	2015-05-07 15:44:32 UTC (rev 2280)
+++ branches/astnode2-merging-alternate/core/src/org/sbml/jsbml/ASTNode.java	2015-05-08 09:09:06 UTC (rev 2281)
@@ -4384,7 +4384,9 @@
    */
   public static String astNodeToTree(ASTNode n, String tree, String indent) {
     tree = tree + indent + n.getType() + " " + 
-        (n.isInteger() ? n.getInteger() : "") + (n.isReal() ? n.getReal() : "") + "\n";
+        (n.isInteger() ? n.getInteger() : "") + (n.isReal() ? n.getReal() : "") +
+        (n.isName() ? n.getName() : "") + ", " + 
+        (n.isSetUserObjects() ? n.userObjectKeySet() : " no userObject") + "\n";
     
     for (ASTNode child : n.getChildren()) {
       tree = astNodeToTree(child, tree, indent + "  ");
@@ -4392,6 +4394,54 @@
     
     return tree;
   }
+
+  /* (non-Javadoc)
+   * @see org.sbml.jsbml.AbstractTreeNode#clearUserObjects()
+   */
+  @Override
+  public void clearUserObjects() {
+    astnode2.clearUserObjects();
+  }
+
+  /* (non-Javadoc)
+   * @see org.sbml.jsbml.AbstractTreeNode#containsUserObjectKey(java.lang.Object)
+   */
+  @Override
+  public boolean containsUserObjectKey(Object key) {
+    return astnode2.containsUserObjectKey(key);
+  }
+
+  /* (non-Javadoc)
+   * @see org.sbml.jsbml.AbstractTreeNode#getUserObject(java.lang.Object)
+   */
+  @Override
+  public Object getUserObject(Object key) {
+    return astnode2.getUserObject(key);
+  }
+
+  /* (non-Javadoc)
+   * @see org.sbml.jsbml.AbstractTreeNode#isSetUserObjects()
+   */
+  @Override
+  public boolean isSetUserObjects() {
+    return astnode2.isSetUserObjects();
+  }
+
+  /* (non-Javadoc)
+   * @see org.sbml.jsbml.AbstractTreeNode#putUserObject(java.lang.Object, java.lang.Object)
+   */
+  @Override
+  public void putUserObject(Object key, Object userObject) {
+    astnode2.putUserObject(key, userObject);
+  }
+
+  /* (non-Javadoc)
+   * @see org.sbml.jsbml.AbstractTreeNode#userObjectKeySet()
+   */
+  @Override
+  public Set<Object> userObjectKeySet() {
+    return astnode2.userObjectKeySet();
+  }
   
 
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.