[Mulgara-svn] r459 - branches/nw-interface/src/jar/itql/java/org/mulgara/itql

[pag at mulgara.org]

Author: pag
Date: 2007-09-28 14:04:48 -0500 (Fri, 28 Sep 2007)
New Revision: 459

Modified:
   branches/nw-interface/src/jar/itql/java/org/mulgara/itql/ItqlInterpreter.java
   branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java
Log:
alias map accessors needed to be made public due to their appearance in the new Aliasing interface.

Modified: branches/nw-interface/src/jar/itql/java/org/mulgara/itql/ItqlInterpreter.java
===================================================================
--- branches/nw-interface/src/jar/itql/java/org/mulgara/itql/ItqlInterpreter.java	2007-09-28 19:03:29 UTC (rev 458)
+++ branches/nw-interface/src/jar/itql/java/org/mulgara/itql/ItqlInterpreter.java	2007-09-28 19:04:48 UTC (rev 459)
@@ -91,7 +91,7 @@
  * @copyright &copy;2005 <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
  * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
  */
-public class ItqlInterpreter extends DepthFirstAdapter implements SableCCInterpreter {
+public class ItqlInterpreter extends DepthFirstAdapter implements SableCCInterpreter, Aliasing {
 
   /**
    * Get line separator.
@@ -2631,7 +2631,7 @@
    *
    * @param aliasMap the alias map associated with this session
    */
-  void setAliasMap(Map aliasMap) {
+  public void setAliasMap(Map aliasMap) {
 
     this.aliasMap = aliasMap;
   }
@@ -2961,7 +2961,7 @@
    *
    * @return the alias namespace map associated with this session
    */
-  Map getAliasMap() {
+  public Map getAliasMap() {
 
     return this.aliasMap;
   }

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-09-28 19:03:29 UTC (rev 458)
+++ branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlInterpreter.java	2007-09-28 19:04:48 UTC (rev 459)
@@ -68,7 +68,7 @@
  * @copyright &copy;2007 <a href="mailto:pgearon at users.sourceforge.net">Paul Gearon</a>
  * @licence <a href="{@docRoot}/../../LICENCE.txt">Open Software License v3.0</a>
  */
-public class TqlInterpreter extends DepthFirstAdapter implements SableCCInterpreter {
+public class TqlInterpreter extends DepthFirstAdapter implements SableCCInterpreter, Aliasing {
 
   /** The logger */
   static final Logger logger = Logger.getLogger(TqlInterpreter.class.getName());
@@ -132,7 +132,7 @@
     if (aliasMap == null) throw new IllegalArgumentException("Null \"alias\" parameter");
 
     // set members
-    this.setAliasMap(aliasMap);
+    setAliasMap(aliasMap);
 
     // log the creation of this interpreter
     if (logger.isDebugEnabled()) {
@@ -959,11 +959,11 @@
 
 
   /**
-   * Sets the alias map associated with this session.
+   * Sets the alias map associated with this interpreter.
    *
-   * @param aliasMap the alias map associated with this session
+   * @param aliasMap the alias map associated with this interpreter
    */
-  void setAliasMap(Map<String,URI> aliasMap) {
+  public void setAliasMap(Map<String,URI> aliasMap) {
     this.aliasMap = aliasMap;
   }
 
@@ -973,8 +973,8 @@
    *
    * @return the alias namespace map associated with this session
    */
-  Map<String,URI> getAliasMap() {
-    return this.aliasMap;
+  public Map<String,URI> getAliasMap() {
+    return aliasMap;
   }