donaldp 01/11/19 02:59:09
Modified: apps/db/src/java/org/apache/avalon/db/actions/impl
AbstractAction.java
apps/db/src/java/org/apache/avalon/db/basic/data
BasicTable.java
apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql
BasicLXSQLCreateIndexHandler.java
apps/db/src/java/org/apache/avalon/db/basic/parser
BasicLXSQLParser.xinfo
apps/db/src/java/org/apache/avalon/db/bcel/parser
BCELLXSQLParser.java
apps/db/src/java/org/apache/avalon/db/test TestGUI.java
Log:
Zap the evil ^M and ^I 's ;)
Revision Changes Path
1.7 +41 -41
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/impl/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/actions/impl/AbstractAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractAction.java 2001/11/13 14:16:23 1.6
+++ AbstractAction.java 2001/11/19 10:59:09 1.7
@@ -1,41 +1,41 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
- */
-package org.apache.avalon.db.actions.impl;
-
-import org.apache.avalon.db.services.DatabasePersistor;
-import org.apache.avalon.db.actions.ActionException;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
-
-public class AbstractAction extends AbstractLogEnabled {
-
- protected DatabasePersistor mDatabasePersistor;
-
- public void setDatabasePersistor(DatabasePersistor databasePersistor) {
- mDatabasePersistor = databasePersistor;
- }
-
-
- /* TODO not needed ? - PH
- protected Class getJavaType(String sqlType) throws ActionException {
-
- System.out.println("Type=(" + sqlType + ")");
-
- if (sqlType.equals("varchar")) {
- return String.class;
- } else if (sqlType.equals("char")) {
- return String.class;
- }
-
- throw new ActionException("Type " + sqlType + " not supported yet");
- }
- */
-
-
-}
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
+ */
+package org.apache.avalon.db.actions.impl;
+
+import org.apache.avalon.db.services.DatabasePersistor;
+import org.apache.avalon.db.actions.ActionException;
+
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+
+public class AbstractAction extends AbstractLogEnabled {
+
+ protected DatabasePersistor mDatabasePersistor;
+
+ public void setDatabasePersistor(DatabasePersistor databasePersistor) {
+ mDatabasePersistor = databasePersistor;
+ }
+
+
+ /* TODO not needed ? - PH
+ protected Class getJavaType(String sqlType) throws ActionException {
+
+ System.out.println("Type=(" + sqlType + ")");
+
+ if (sqlType.equals("varchar")) {
+ return String.class;
+ } else if (sqlType.equals("char")) {
+ return String.class;
+ }
+
+ throw new ActionException("Type " + sqlType + " not supported yet");
+ }
+ */
+
+
+}
1.9 +51 -51
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data/BasicTable.java
Index: BasicTable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/data/BasicTable.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BasicTable.java 2001/11/14 17:05:32 1.8
+++ BasicTable.java 2001/11/19 10:59:09 1.9
@@ -1,51 +1,51 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
- */
-package org.apache.avalon.db.basic.data;
-
-import org.apache.avalon.db.data.impl.AbstractTable;
-import org.apache.avalon.db.data.Column;
-
-public class BasicTable extends AbstractTable {
-
-
- public BasicTable(String name, Column[] columns) {
- super(name, columns);
- }
-
- public int getColumnIndex(String columnName) {
- for (int x = 0; x < mColumns.length; x++) {
- if (mColumns[x].getColumnName().equals(columnName)) {
- return x;
- }
- }
- throw new RuntimeException("Column " + columnName + " not found");
- }
-
-
- public Column getColumn(String columnName) {
- return this.getColumn(columnName, true);
- }
- public Column getColumn(String columnName, boolean throwExcpt) {
- Column col = null;
-
- for (int x = 0; x < mColumns.length; x++) {
- if (mColumns[x].getColumnName().equals(columnName)) {
- col = mColumns[x];
- }
- }
- if(col != null) {
- return col;
- } else {
- if (throwExcpt) {
- throw new RuntimeException("Column " + columnName + " not
found");
- } else {
- return null;
- }
- }
- }
-}
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
+ */
+package org.apache.avalon.db.basic.data;
+
+import org.apache.avalon.db.data.impl.AbstractTable;
+import org.apache.avalon.db.data.Column;
+
+public class BasicTable extends AbstractTable {
+
+
+ public BasicTable(String name, Column[] columns) {
+ super(name, columns);
+ }
+
+ public int getColumnIndex(String columnName) {
+ for (int x = 0; x < mColumns.length; x++) {
+ if (mColumns[x].getColumnName().equals(columnName)) {
+ return x;
+ }
+ }
+ throw new RuntimeException("Column " + columnName + " not found");
+ }
+
+
+ public Column getColumn(String columnName) {
+ return this.getColumn(columnName, true);
+ }
+ public Column getColumn(String columnName, boolean throwExcpt) {
+ Column col = null;
+
+ for (int x = 0; x < mColumns.length; x++) {
+ if (mColumns[x].getColumnName().equals(columnName)) {
+ col = mColumns[x];
+ }
+ }
+ if(col != null) {
+ return col;
+ } else {
+ if (throwExcpt) {
+ throw new RuntimeException("Column " + columnName + " not
found");
+ } else {
+ return null;
+ }
+ }
+ }
+}
1.6 +1 -3
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLCreateIndexHandler.java
Index: BasicLXSQLCreateIndexHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/BasicLXSQLCreateIndexHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasicLXSQLCreateIndexHandler.java 2001/11/19 09:03:02 1.5
+++ BasicLXSQLCreateIndexHandler.java 2001/11/19 10:59:09 1.6
@@ -8,8 +8,6 @@
*/
package org.apache.avalon.db.basic.handlers.lxsql;
-
-
import org.apache.avalon.db.basic.parser.BasicLXSQLParser;
import org.apache.avalon.db.basic.actions.BasicCreateIndex;
import org.apache.avalon.db.services.DatabasePersistor;
@@ -30,7 +28,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class BasicLXSQLCreateIndexHandler extends BasicLXSQLHandler {
1.2 +22 -22
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicLXSQLParser.xinfo
Index: BasicLXSQLParser.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/parser/BasicLXSQLParser.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicLXSQLParser.xinfo 2001/11/07 13:51:26 1.1
+++ BasicLXSQLParser.xinfo 2001/11/19 10:59:09 1.2
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
-
-<blockinfo>
-
- <!-- section to describe block -->
- <block>
- <version>1.0</version>
- </block>
-
- <!-- services that are offered by this block -->
- <services>
- <service name="org.apache.avalon.db.services.SQLParser" version="1.0" />
- </services>
- <dependencies>
- <dependency>
- <service
name="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory"
version="1.0"/>
- </dependency>
- <dependency>
- <service name="org.apache.avalon.db.services.DatabasePersistor"
version="1.0"/>
- </dependency>
- </dependencies>
-</blockinfo>
+<?xml version="1.0"?>
+
+<blockinfo>
+
+ <!-- section to describe block -->
+ <block>
+ <version>1.0</version>
+ </block>
+
+ <!-- services that are offered by this block -->
+ <services>
+ <service name="org.apache.avalon.db.services.SQLParser" version="1.0" />
+ </services>
+ <dependencies>
+ <dependency>
+ <service
name="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory"
version="1.0"/>
+ </dependency>
+ <dependency>
+ <service name="org.apache.avalon.db.services.DatabasePersistor"
version="1.0"/>
+ </dependency>
+ </dependencies>
+</blockinfo>
1.7 +71 -71
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELLXSQLParser.java
Index: BCELLXSQLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/bcel/parser/BCELLXSQLParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BCELLXSQLParser.java 2001/11/15 14:29:57 1.6
+++ BCELLXSQLParser.java 2001/11/19 10:59:09 1.7
@@ -1,71 +1,71 @@
-
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
- */
-package org.apache.avalon.db.bcel.parser;
-
-import org.apache.avalon.db.server.AbstractLXSQLParser;
-import org.apache.avalon.db.server.AbstractRequestHandler;
-import org.apache.avalon.db.bcel.actions.BCELSelect;
-import org.apache.avalon.db.bcel.actions.AbstractBCELAction;
-import org.apache.avalon.db.bcel.actions.BCELCreateTable;
-import org.apache.avalon.db.bcel.actions.BCELInsert;
-import org.apache.avalon.db.bcel.data.BCELTable;
-import org.apache.avalon.db.actions.Select;
-import org.apache.avalon.db.actions.ActionException;
-import org.apache.avalon.db.actions.CreateTable;
-import org.apache.avalon.db.actions.InsertRows;
-import org.apache.avalon.db.actions.CreateView;
-import org.apache.avalon.db.actions.DeleteRows;
-import org.apache.avalon.db.actions.Action;
-import org.apache.avalon.db.transport.SelectRequest;
-import org.apache.avalon.db.transport.CreateTableRequest;
-import org.apache.avalon.db.transport.InsertRowsRequest;
-import org.apache.avalon.db.transport.CreateViewRequest;
-import org.apache.avalon.db.transport.DeleteRowsRequest;
-import org.apache.avalon.db.data.Column;
-import org.apache.avalon.db.data.impl.AbstractColumn;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.bcel.generic.InstructionFactory;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.Constants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-
-import java.util.Vector;
-
-
-/**
- * Class BCELSQLParser
- *
- *
- * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.14 $
- */
-public class BCELLXSQLParser extends AbstractLXSQLParser {
-
- protected BCELHelper bcelHelper = new BCELHelper();
-
- public void compose(ComponentManager componentManager) throws
ComponentException {
- super.compose(componentManager);
- bcelHelper.setDatabasePersistor(mDatabasePersistor);
- }
-
- public AbstractRequestHandler[] getRequestHandlers() {
- //TODO
- return new AbstractRequestHandler[0];
- }
-
- public void initializeAction(Action action) throws ActionException {
- //TODO
- }
-}
+
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
+ */
+package org.apache.avalon.db.bcel.parser;
+
+import org.apache.avalon.db.server.AbstractLXSQLParser;
+import org.apache.avalon.db.server.AbstractRequestHandler;
+import org.apache.avalon.db.bcel.actions.BCELSelect;
+import org.apache.avalon.db.bcel.actions.AbstractBCELAction;
+import org.apache.avalon.db.bcel.actions.BCELCreateTable;
+import org.apache.avalon.db.bcel.actions.BCELInsert;
+import org.apache.avalon.db.bcel.data.BCELTable;
+import org.apache.avalon.db.actions.Select;
+import org.apache.avalon.db.actions.ActionException;
+import org.apache.avalon.db.actions.CreateTable;
+import org.apache.avalon.db.actions.InsertRows;
+import org.apache.avalon.db.actions.CreateView;
+import org.apache.avalon.db.actions.DeleteRows;
+import org.apache.avalon.db.actions.Action;
+import org.apache.avalon.db.transport.SelectRequest;
+import org.apache.avalon.db.transport.CreateTableRequest;
+import org.apache.avalon.db.transport.InsertRowsRequest;
+import org.apache.avalon.db.transport.CreateViewRequest;
+import org.apache.avalon.db.transport.DeleteRowsRequest;
+import org.apache.avalon.db.data.Column;
+import org.apache.avalon.db.data.impl.AbstractColumn;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.bcel.generic.InstructionFactory;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.Type;
+import org.apache.bcel.Constants;
+import org.w3c.dom.Element;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
+
+import java.util.Vector;
+
+
+/**
+ * Class BCELSQLParser
+ *
+ *
+ * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
+ * @version $Revision: 1.14 $
+ */
+public class BCELLXSQLParser extends AbstractLXSQLParser {
+
+ protected BCELHelper bcelHelper = new BCELHelper();
+
+ public void compose(ComponentManager componentManager) throws
ComponentException {
+ super.compose(componentManager);
+ bcelHelper.setDatabasePersistor(mDatabasePersistor);
+ }
+
+ public AbstractRequestHandler[] getRequestHandlers() {
+ //TODO
+ return new AbstractRequestHandler[0];
+ }
+
+ public void initializeAction(Action action) throws ActionException {
+ //TODO
+ }
+}
1.6 +1 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/test/TestGUI.java
Index: TestGUI.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/test/TestGUI.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestGUI.java 2001/11/09 23:32:04 1.5
+++ TestGUI.java 2001/11/19 10:59:09 1.6
@@ -212,7 +212,7 @@
private void handleException(Throwable exception) {
System.out.println("--------- UNCAUGHT EXCEPTION ---------");
- exception.printStackTrace(System.out);
+ exception.printStackTrace(System.out);
outputArea.setText("--------- UNCAUGHT EXCEPTION ---------" + "\n"
+ exception
+ "\n" + exception.getMessage());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
