db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r426893 - in /db/derby/code/trunk/java/tools/org/apache/derby: impl/tools/ij/Main.java tools/ij.java
Date Sun, 30 Jul 2006 15:16:07 GMT
Author: djd
Date: Sun Jul 30 08:16:07 2006
New Revision: 426893

URL: http://svn.apache.org/viewvc?rev=426893&view=rev
Log:
DERBY-1609 (partial) Have ij.runScript use utilMain directly, rather than Main,
to avoid one additional object.

Modified:
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java
    db/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java?rev=426893&r1=426892&r2=426893&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/Main.java Sun Jul 30 08:16:07
2006
@@ -203,12 +203,6 @@
 		LocalizedInput[] inA = { in } ;
 		utilInstance.go(inA, out,connAttributeDefaults);
 	}
-	
-	public void goScript(Connection conn,
-			LocalizedInput in)
-{
-	utilInstance.goScript(conn, in);
-}	
 
 	/**
 	 * create an ij tool waiting to be given input and output streams.

Modified: db/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java?rev=426893&r1=426892&r2=426893&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java Sun Jul 30 08:16:07 2006
@@ -26,6 +26,7 @@
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 
 import org.apache.derby.impl.tools.ij.Main;
+import org.apache.derby.impl.tools.ij.utilMain;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -100,18 +101,19 @@
 	  Main ijE;
 	  if (JVMInfo.JDK_ID == JVMInfo.J2SE_13)
 	  {
-		  ijE = new Main(lo);
+		  ijE = new Main(false);
 	  }
 	  else
 	  {
-		  ijE = new org.apache.derby.impl.tools.ij.Main14(lo);
+		  ijE = new org.apache.derby.impl.tools.ij.Main14(false);
 	  }	  
 	  
 	  LocalizedInput li = LocalizedResource.getInstance().
 	            getNewEncodedInput(sqlIn, inputEncoding);
 	  
-	  
-	  ijE.goScript(conn, li);
+	  utilMain um = ijE.getutilMain(1, lo);
+
+	  um.goScript(conn, li);
 	  
 	  return -1;
   }



Mime
View raw message