[Mulgara-svn] r1554 - trunk/src/jar/querylang/java/org/mulgara/itql

[pag at mulgara.org]

Author: pag
Date: 2009-02-25 11:03:16 -0800 (Wed, 25 Feb 2009)
New Revision: 1554

Modified:
   trunk/src/jar/querylang/java/org/mulgara/itql/ItqlSession.java
Log:
Fixed warnings by adding generics and suppressing the warnings on the necessary use of deprecated interfaces

Modified: trunk/src/jar/querylang/java/org/mulgara/itql/ItqlSession.java
===================================================================
--- trunk/src/jar/querylang/java/org/mulgara/itql/ItqlSession.java	2009-02-25 19:01:49 UTC (rev 1553)
+++ trunk/src/jar/querylang/java/org/mulgara/itql/ItqlSession.java	2009-02-25 19:03:16 UTC (rev 1554)
@@ -40,12 +40,6 @@
 import org.apache.log4j.xml.DOMConfigurator;
 
 // Automatically generated packages (SableCC)
-import org.mulgara.itql.analysis.DepthFirstAdapter;
-import org.mulgara.itql.lexer.Lexer;
-import org.mulgara.itql.lexer.LexerException;
-import org.mulgara.itql.node.*;
-import org.mulgara.itql.parser.Parser;
-import org.mulgara.itql.parser.ParserException;
 import org.mulgara.query.Answer;
 import org.mulgara.query.QueryException;
 import org.mulgara.query.TuplesException;
@@ -127,12 +121,12 @@
   /**
    * The messages from the previous queries.
    */
-  private List messages = new ArrayList();
+  private List<String> messages = new ArrayList<String>();
 
   /**
    * The answers from the previous queries.
    */
-  private List answers = new ArrayList();
+  private List<Answer> answers = new ArrayList<Answer>();
 
   /**
    * The file name (URL) of the script to execute if -s is given.
@@ -327,8 +321,7 @@
    *
    * @return the message from the execution of the last command.
    */
-  public List getLastMessages() {
-
+  public List<String> getLastMessages() {
     return messages;
   }
 
@@ -336,8 +329,7 @@
    * Returns a list of Answers from the execution of the last command or series
    * of commands.  Failures will have null answers in place.
    */
-  public List getLastAnswers() {
-
+  public List<Answer> getLastAnswers() {
     return answers;
   }
 
@@ -347,7 +339,6 @@
    * @return the script to run.
    */
   public String getScript() {
-
     return script;
   }
 
@@ -473,6 +464,7 @@
    * Closes the session associated with this interpreter. Subclasses that
    * override this method <strong>must</strong> call <code>super.close()</code>.
    */
+  @SuppressWarnings("deprecation")
   private void close() {
 
     // Close the session, if any