Tag: cws_src680_dba25 User: oj Date: 05/03/02 02:14:40 Modified: /dba/dbaccess/qa/complex/dbaccess/ RowSet.java, makefile.mk
Log: #i43849# rowset events File Changes: Directory: /dba/dbaccess/qa/complex/dbaccess/ ============================================= File [changed]: RowSet.java Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/RowSet.java?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +37 -26 --------------------- --- RowSet.java 2 Mar 2005 09:41:40 -0000 1.1.2.1 +++ RowSet.java 2 Mar 2005 10:14:36 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: RowSet.java,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2005/03/02 09:41:40 $ + * last change: $Author: oj $ $Date: 2005/03/02 10:14:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -135,7 +135,7 @@ String str = File.createTempFile("testdb",".odb").getCanonicalPath(); str = str.replaceAll(" ","%20"); str = "file:///" +str; - tempFileName = str.replace("\\","/"); + tempFileName = str.replace('\\','/'); //tempFileName = java.net.URI.create(str).getPath(); }catch(java.io.IOException e){ @@ -366,27 +366,27 @@ moves[RowSetEventListener.IS_ROW_COUNT_FINAL] = true; moves[RowSetEventListener.ROW_COUNT] = true; - testCursorMove(resSet,cResSet.getMethod("afterLast"),pRow,moves); + testCursorMove(resSet,cResSet.getMethod("afterLast",null),pRow,moves,null); moves[RowSetEventListener.IS_ROW_COUNT_FINAL] = false; moves[RowSetEventListener.ROW_COUNT] = false; - testCursorMove(resSet,cResSet.getMethod("next"),pRow,moves); - testCursorMove(resSet,cResSet.getMethod("next"),pRow,moves); - testCursorMove(resSet,cResSet.getMethod("next"),pRow,moves); - testCursorMove(resSet,cResSet.getMethod("last"),pRow,moves); - testCursorMove(resSet,cResSet.getMethod("next"),pRow,moves); - testCursorMove(resSet,cResSet.getMethod("first"),pRow,moves); - testCursorMove(resSet,cResSet.getMethod("previous"),pRow,moves); - testCursorMove(resSet,cResSet.getMethod("next"),pRow,moves); + testCursorMove(resSet,cResSet.getMethod("next",null),pRow,moves,null); + testCursorMove(resSet,cResSet.getMethod("next",null),pRow,moves,null); + testCursorMove(resSet,cResSet.getMethod("next",null),pRow,moves,null); + testCursorMove(resSet,cResSet.getMethod("last",null),pRow,moves,null); + testCursorMove(resSet,cResSet.getMethod("next",null),pRow,moves,null); + testCursorMove(resSet,cResSet.getMethod("first",null),pRow,moves,null); + testCursorMove(resSet,cResSet.getMethod("previous",null),pRow,moves,null); + testCursorMove(resSet,cResSet.getMethod("next",null),pRow,moves,null); moves[RowSetEventListener.IS_MODIFIED] = true; XRowUpdate updRow = (XRowUpdate)UnoRuntime.queryInterface(XRowUpdate.class,resSet); updRow.updateString(2,"Test21"); - testCursorMove(resSet,cResSet.getMethod("next"),pRow,moves); + testCursorMove(resSet,cResSet.getMethod("next",null),pRow,moves,null); moves[RowSetEventListener.IS_MODIFIED] = false; Class cupd = java.lang.Class.forName("com.sun.star.sdbc.XResultSetUpdate"); XResultSetUpdate upd = (XResultSetUpdate)UnoRuntime.queryInterface(XResultSetUpdate.class,resSet); - testCursorMove(upd,cupd.getMethod("moveToInsertRow"),pRow,moves); + testCursorMove(upd,cupd.getMethod("moveToInsertRow",null),pRow,moves,null); updRow.updateInt(1, MAX_TABLE_ROWS + 2); updRow.updateString(2, "HHHH"); @@ -398,30 +398,30 @@ moves[RowSetEventListener.APPROVE_ROW_CHANGE] = true; moves[RowSetEventListener.ROW_CHANGED] = true; - testCursorMove(upd,cupd.getMethod("insertRow"),pRow,moves); + testCursorMove(upd,cupd.getMethod("insertRow",null),pRow,moves,null); moves[RowSetEventListener.IS_NEW] = false; moves[RowSetEventListener.ROW_COUNT] = false; resSet.first(); updRow.updateInt(1, MAX_TABLE_ROWS + 3); updRow.updateString(2, "__"); - testCursorMove(upd,cupd.getMethod("updateRow"),pRow,moves); + testCursorMove(upd,cupd.getMethod("updateRow",null),pRow,moves,null); moves[RowSetEventListener.IS_NEW] = true; moves[RowSetEventListener.ROW_COUNT] = true; resSet.first(); - testCursorMove(upd,cupd.getMethod("deleteRow"),pRow,moves); + testCursorMove(upd,cupd.getMethod("deleteRow",null),pRow,moves,null); moves[RowSetEventListener.IS_NEW] = false; moves[RowSetEventListener.COLUMN_VALUE] = true; moves[RowSetEventListener.ROW_COUNT] = false; resSet.first(); updRow.updateString(2,"Test21"); - testCursorMove(resSet,cResSet.getMethod("refreshRow"),pRow,moves); + testCursorMove(resSet,cResSet.getMethod("refreshRow",null),pRow,moves,null); resSet.first(); updRow.updateString(2,"Test21"); - testCursorMove(upd,cupd.getMethod("cancelRowUpdates"),pRow,moves); + testCursorMove(upd,cupd.getMethod("cancelRowUpdates",null),pRow,moves,null); for( int i = 0; i < moves.length; ++i) moves[i] = false; @@ -434,9 +434,19 @@ resSet.first(); Object bookmark = loc.getBookmark(); resSet.next(); - testCursorMove(loc,cloc.getMethod("moveToBookmark",Object.class),pRow,moves,bookmark); - - testCursorMove(loc,cloc.getMethod("moveRelativeToBookmark",Object.class,int.class),pRow,moves,bookmark,1); + Object temp[] = new Object[1]; + temp[0] = bookmark; + Class ctemp[] = new Class[1]; + ctemp[0] = Object.class; + testCursorMove(loc,cloc.getMethod("moveToBookmark",ctemp),pRow,moves,temp); + + Object temp2[] = new Object[2]; + temp2[0] = bookmark; + temp2[1] = new Integer(1); + Class ctemp2[] = new Class[2]; + ctemp2[0] = Object.class; + ctemp2[1] = int.class; + testCursorMove(loc,cloc.getMethod("moveRelativeToBookmark",ctemp2),pRow,moves,temp2); for( int i = 0; i < moves.length; ++i) moves[i] = false; @@ -444,6 +454,7 @@ moves[RowSetEventListener.ROW_CHANGED] = true; moves[RowSetEventListener.ROW_COUNT] = true; Class cdelRows = java.lang.Class.forName("com.sun.star.sdbcx.XDeleteRows"); + ctemp[0] = Object[].class; XDeleteRows delRows = (XDeleteRows)UnoRuntime.queryInterface(XDeleteRows.class,resSet); Object bookmarks[] = new Object[5]; resSet.first(); @@ -451,9 +462,9 @@ resSet.next(); bookmarks[i] = loc.getBookmark(); } - Object temp[] = new Object[1]; + temp[0] = bookmarks; - testCursorMove(delRows,cdelRows.getMethod("deleteRows",Object[].class),pRow,moves,temp); + testCursorMove(delRows,cdelRows.getMethod("deleteRows",ctemp),pRow,moves,temp); // now destroy the RowSet XComponent xComp = (XComponent)UnoRuntime.queryInterface(XComponent.class,resSet); @@ -463,7 +474,7 @@ ,java.lang.reflect.Method _method , RowSetEventListener _evt , boolean _must[] - , Object... args) throws java.lang.Exception { + , Object args[]) throws java.lang.Exception { _evt.clearCalling(); _method.invoke(res,args); File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/qa/complex/dbaccess/makefile.mk?r1=1.3&r2=1.3.106.1 Delta lines: +5 -5 ------------------- --- makefile.mk 23 Jul 2004 14:34:02 -0000 1.3 +++ makefile.mk 2 Mar 2005 10:14:37 -0000 1.3.106.1 @@ -3,9 +3,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.106.1 $ # -# last change: $Date: 2004/07/23 14:34:02 $ +# last change: $Date: 2005/03/02 10:14:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -73,7 +73,7 @@ #----- compile .java files ----------------------------------------- JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar -JAVAFILES = $(shell $(FIND) .$/*.java) +JAVAFILES = SingleSelectQueryComposer.java RowSetEventListener.java RowSet.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) #----- make a jar from compiled files ------------------------------ @@ -96,5 +96,5 @@ run: - java -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar org.openoffice.Runner -TestBase java_complex -o complex.dbaccess.$(TARGET) + java -cp $(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar org.openoffice.Runner -TestBase java_complex -sce dbaccess.sce --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
