[Mulgara-svn] r367 - in branches/nw-interface/src/jar: itql/java/org/mulgara itql/java/org/mulgara/itql query/java/org/mulgara/query query/java/org/mulgara/query/ast

[pag at mulgara.org]

Author: pag
Date: 2007-08-21 12:28:35 -0500 (Tue, 21 Aug 2007)
New Revision: 367

Added:
   branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/
Removed:
   branches/nw-interface/src/jar/itql/java/org/mulgara/query/
Modified:
   branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java
   branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Help.java
Log:
Moving the query AST to where it should have been in the first place.  This is needed for Query.java to compile, since the itql parser can rely on Query, but not the other way around.

Modified: branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java
===================================================================
--- branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java	2007-08-21 05:47:50 UTC (rev 366)
+++ branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java	2007-08-21 17:28:35 UTC (rev 367)
@@ -296,7 +296,7 @@
     // log the command
     if (logger.isDebugEnabled()) logger.debug("Processing help command " + node);
 
-    lastCommand = new Help(node.getCommandPrefix());
+    lastCommand = new Help(HelpPrinter.getHelp(node.getCommandPrefix()));
   }
 
 

Copied: branches/nw-interface/src/jar/query/java/org/mulgara/query/ast (from rev 366, branches/nw-interface/src/jar/itql/java/org/mulgara/query/ast)

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Help.java
===================================================================
--- branches/nw-interface/src/jar/itql/java/org/mulgara/query/ast/Help.java	2007-08-21 05:47:50 UTC (rev 366)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/ast/Help.java	2007-08-21 17:28:35 UTC (rev 367)
@@ -12,8 +12,6 @@
 
 package org.mulgara.query.ast;
 
-import org.mulgara.itql.HelpPrinter;
-import org.mulgara.itql.node.PCommandPrefix;
 
 /**
  * An AST element for the HELP command.
@@ -25,10 +23,10 @@
  */
 public class Help extends LocalAst {
 
-  private PCommandPrefix command;
+  private String helpText;
   
-  public Help(PCommandPrefix command) {
-    this.command = command;
+  public Help(String helpText) {
+    this.helpText = helpText;
   }
   
   /**
@@ -41,7 +39,7 @@
 
   public String getOutput() {
     // let the user know the help for the selected command
-    return HelpPrinter.getHelp(command);
+    return helpText;
   }
 
 }