This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 5df6678e228f27dc727ad4a62a2120c7d06adaae Author: Damjan Jovanovic <[email protected]> AuthorDate: Sat Oct 3 17:46:43 2026 +0200 Begin converting java.util.Vector to java.util.ArrayList. Patch by: me --- .../framework/qa/complex/api_internal/CheckAPI.java | 6 +++--- .../com/sun/star/lib/uno/helper/UnoUrl.java | 8 ++++---- .../com/sun/star/lib/uno/helper/WeakBase.java | 7 +++---- .../OOoRunner/src/main/java/mod/_sc/ScStyleObj.java | 6 +++--- .../src/main/java/org/openoffice/RunnerService.java | 4 ++-- .../OOoRunner/src/main/java/util/DesktopTools.java | 4 ++-- .../examples/java/Newsgroup/PostNewsgroup.java | 10 +++++----- .../javascript/ScriptEditorForJavaScript.java | 4 ++-- .../qa/complex/sfx2/DocumentMetadataAccess.java | 21 ++++----------------- .../unoxml/qa/complex/unoxml/RDFRepositoryTest.java | 21 ++++----------------- .../com/sun/star/wizards/text/TextFieldHandler.java | 8 ++++---- .../com/sun/star/wizards/ui/FieldSelection.java | 6 +++--- .../java/org/openoffice/xmerge/util/OfficeUtil.java | 12 ++++-------- 13 files changed, 43 insertions(+), 74 deletions(-) diff --git a/main/framework/qa/complex/api_internal/CheckAPI.java b/main/framework/qa/complex/api_internal/CheckAPI.java index 70ac32a232..113cf6096d 100644 --- a/main/framework/qa/complex/api_internal/CheckAPI.java +++ b/main/framework/qa/complex/api_internal/CheckAPI.java @@ -33,7 +33,7 @@ import com.sun.star.beans.PropertyValue; import com.sun.star.uno.UnoRuntime; import com.sun.star.beans.NamedValue; -import java.util.Vector; +import java.util.ArrayList; import java.util.StringTokenizer; @@ -104,7 +104,7 @@ public class CheckAPI { // get the parameters for the internal test String paramList = (String)param.get("ParamList"); - Vector p = new Vector(); + ArrayList p = new ArrayList(); StringTokenizer paramTokens = new StringTokenizer(paramList, " "); while(paramTokens.hasMoreTokens()) { @@ -133,7 +133,7 @@ public class CheckAPI { } else { int index=1; - p = new Vector(); + p = new ArrayList<>(); while ( param.get("job"+index) != null ) { p.add(param.get("job"+index)); index++; diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java b/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java index a88dae2835..bf14b6e4b0 100644 --- a/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java +++ b/main/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java @@ -24,7 +24,7 @@ package com.sun.star.lib.uno.helper; import java.io.UnsupportedEncodingException; import java.util.HashMap; -import java.util.Vector; +import java.util.ArrayList; /** * Object representation and parsing of Uno Urls, @@ -225,7 +225,7 @@ public class UnoUrl { private static String decodeUTF8(String s) throws com.sun.star.lang.IllegalArgumentException { - Vector v = new Vector(); + ArrayList<Integer> v = new ArrayList<>(); for (int i = 0; i < s.length(); i++) { int ch = s.charAt(i); @@ -236,13 +236,13 @@ public class UnoUrl { ch = (hb << 4) | lb; } - v.addElement(ch); + v.add(ch); } int size = v.size(); byte[] bytes = new byte[size]; for (int i = 0; i < size; i++) { - Integer anInt = (Integer) v.elementAt(i); + Integer anInt = v.get(i); bytes[i] = (byte) (anInt.intValue() & 0xFF); } diff --git a/main/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java b/main/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java index d180195470..cc470131bc 100644 --- a/main/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java +++ b/main/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java @@ -26,7 +26,7 @@ import com.sun.star.uno.XWeak; import com.sun.star.uno.XAdapter; import com.sun.star.lang.XTypeProvider; import com.sun.star.uno.Type; -import java.util.Vector; +import java.util.ArrayList; import java.util.Map; import java.util.Hashtable; @@ -77,7 +77,7 @@ public class WeakBase implements XWeak, XTypeProvider Type[] arTypes= (Type[]) _mapTypes.get( getClass()); if (arTypes == null) { - Vector vec= new Vector(); + ArrayList<Type> vec= new ArrayList<>(); Class currentClass= getClass(); do { @@ -93,8 +93,7 @@ public class WeakBase implements XWeak, XTypeProvider } while (currentClass != null); Type types[]= new Type[vec.size()]; - for( int i= 0; i < types.length; i++) - types[i]= (Type) vec.elementAt(i); + vec.toArray(types); _mapTypes.put(getClass(), types); arTypes= types; } diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java index e9a6dbc318..c95fabb6c2 100644 --- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java +++ b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_sc/ScStyleObj.java @@ -24,7 +24,7 @@ package mod._sc; import java.io.PrintWriter; -import java.util.Vector; +import java.util.ArrayList; import lib.StatusException; import lib.TestCase; @@ -252,7 +252,7 @@ public class ScStyleObj extends TestCase { public String[] getPropertyNames(XPropertySet props) { Property[] the_props = props.getPropertySetInfo().getProperties(); - Vector names = new Vector() ; + ArrayList<String> names = new ArrayList<>(); for (int i=0;i<the_props.length;i++) { boolean isWritable = @@ -261,6 +261,6 @@ public class ScStyleObj extends TestCase { names.add(the_props[i].Name); } } - return (String[]) names.toArray(new String[names.size()]) ; + return names.toArray(new String[names.size()]); } } // finish class ScStyleObj diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/RunnerService.java b/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/RunnerService.java index 7ec01010e7..771d0f3722 100644 --- a/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/RunnerService.java +++ b/main/qadevOOo/java/OOoRunner/src/main/java/org/openoffice/RunnerService.java @@ -43,7 +43,7 @@ import com.sun.star.uno.Type; import com.sun.star.registry.XRegistryKey; import com.sun.star.beans.NamedValue; -import java.util.Vector; +import java.util.ArrayList; /** * The main class, will call ClParser and CfgParser to <br> @@ -216,7 +216,7 @@ public class RunnerService implements XJob, XServiceInfo, return pVal; } - Vector v = new Vector(600); + ArrayList<String> v = new ArrayList<>(600); try { // open connection to Jar java.net.JarURLConnection con = diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/util/DesktopTools.java b/main/qadevOOo/java/OOoRunner/src/main/java/util/DesktopTools.java index 8892a3fead..8883b9b87c 100644 --- a/main/qadevOOo/java/OOoRunner/src/main/java/util/DesktopTools.java +++ b/main/qadevOOo/java/OOoRunner/src/main/java/util/DesktopTools.java @@ -46,7 +46,7 @@ import com.sun.star.util.XCloseable; import com.sun.star.util.XModifiable; import com.sun.star.view.XViewSettingsSupplier; import helper.ConfigHelper; -import java.util.Vector; +import java.util.ArrayList; import lib.StatusException; /** @@ -142,7 +142,7 @@ public class DesktopTools */ public static Object[] getAllOpenDocuments(XMultiServiceFactory xMSF) { - Vector components = new Vector(); + ArrayList<XComponent> components = new ArrayList<>(); XDesktop xDesktop = UnoRuntime.queryInterface( XDesktop.class, createDesktop(xMSF)); diff --git a/main/scripting/examples/java/Newsgroup/PostNewsgroup.java b/main/scripting/examples/java/Newsgroup/PostNewsgroup.java index f20582cafd..872f2a55d8 100644 --- a/main/scripting/examples/java/Newsgroup/PostNewsgroup.java +++ b/main/scripting/examples/java/Newsgroup/PostNewsgroup.java @@ -23,7 +23,7 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; import javax.swing.border.*; -import java.util.Vector; +import java.util.ArrayList; import com.sun.star.script.framework.runtime.XScriptContext; @@ -328,9 +328,9 @@ public class PostNewsgroup extends JFrame } else { - // Copy all newsgroups into a vector for comparison + // Copy all newsgroups into an ArrayList for comparison // Alter entries (to include host name) if duplication is found - Vector vector = new Vector( subscribedNewsgroups.length ); + ArrayList<String> vector = new ArrayList<>( subscribedNewsgroups.length ); for(int i=0; i < subscribedNewsgroups.length; i++ ) { vector.add( subscribedNewsgroups[i].getNewsgroupName() ); @@ -349,10 +349,10 @@ public class PostNewsgroup extends JFrame } } } - // Copy converted newsgroups from vector to combo box + // Copy converted newsgroups from ArrayList to combo box for(int i=0; i < subscribedNewsgroups.length; i++ ) { - newsgroupComboBox.addItem( vector.elementAt(i) ); + newsgroupComboBox.addItem( vector.get(i) ); } }// else diff --git a/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java index a75b2abb1f..4b7050835f 100644 --- a/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java +++ b/main/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java @@ -304,7 +304,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor synchronized( BEING_EDITED ) { java.util.Iterator iter = BEING_EDITED.keySet().iterator(); - java.util.Vector keysToRemove = new java.util.Vector(); + java.util.ArrayList<URL> keysToRemove = new java.util.ArrayList<>(); while ( iter.hasNext() ) { @@ -313,7 +313,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor } for ( int i=0; i<keysToRemove.size(); i++ ) { - BEING_EDITED.remove( keysToRemove.elementAt( i ) ); + BEING_EDITED.remove( keysToRemove.get( i ) ); } keysToRemove = null; } diff --git a/main/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/main/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java index 75edd18883..8a0f311b25 100644 --- a/main/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java +++ b/main/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java @@ -977,36 +977,23 @@ public class DocumentMetadataAccess static Statement[] toSeq(XEnumeration i_Enum) throws Exception { - java.util.Collection c = new java.util.Vector(); + java.util.Collection c = new java.util.ArrayList(); while (i_Enum.hasMoreElements()) { Statement s = (Statement) i_Enum.nextElement(); //System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); c.add(s); } -// return (Statement[]) c.toArray(); - // java sucks - Object[] arr = c.toArray(); - Statement[] ret = new Statement[arr.length]; - for (int i = 0; i < arr.length; ++i) { - ret[i] = (Statement) arr[i]; - } - return ret; + return c.toArray(new Statement[c.size()]); } static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception { - java.util.Collection c = new java.util.Vector(); + java.util.Collection c = new java.util.ArrayList(); while (i_Enum.hasMoreElements()) { XNode[] s = (XNode[]) i_Enum.nextElement(); c.add(s); } -// return (XNode[][]) c.toArray(); - Object[] arr = c.toArray(); - XNode[][] ret = new XNode[arr.length][]; - for (int i = 0; i < arr.length; ++i) { - ret[i] = (XNode[]) arr[i]; - } - return ret; + return c.toArray(new XNode[c.size()][]); } static class BindingComp implements java.util.Comparator diff --git a/main/unoxml/qa/complex/unoxml/RDFRepositoryTest.java b/main/unoxml/qa/complex/unoxml/RDFRepositoryTest.java index 2df8c133a6..7e26be06c2 100644 --- a/main/unoxml/qa/complex/unoxml/RDFRepositoryTest.java +++ b/main/unoxml/qa/complex/unoxml/RDFRepositoryTest.java @@ -615,36 +615,23 @@ public class RDFRepositoryTest static Statement[] toSeq(XEnumeration i_Enum) throws Exception { - java.util.Collection c = new java.util.Vector(); + java.util.Collection c = new java.util.ArrayList(); while (i_Enum.hasMoreElements()) { Statement s = (Statement) i_Enum.nextElement(); //System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); c.add(s); } -// return (Statement[]) c.toArray(); - // java sucks - Object[] arr = c.toArray(); - Statement[] ret = new Statement[arr.length]; - for (int i = 0; i < arr.length; ++i) { - ret[i] = (Statement) arr[i]; - } - return ret; + return c.toArray(new Statement[c.size()]); } static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception { - java.util.Collection c = new java.util.Vector(); + java.util.Collection c = new java.util.ArrayList(); while (i_Enum.hasMoreElements()) { XNode[] s = (XNode[]) i_Enum.nextElement(); c.add(s); } -// return (XNode[][]) c.toArray(); - Object[] arr = c.toArray(); - XNode[][] ret = new XNode[arr.length][]; - for (int i = 0; i < arr.length; ++i) { - ret[i] = (XNode[]) arr[i]; - } - return ret; + return c.toArray(new XNode[c.size()][]); } static class BindingComp implements java.util.Comparator diff --git a/main/wizards/com/sun/star/wizards/text/TextFieldHandler.java b/main/wizards/com/sun/star/wizards/text/TextFieldHandler.java index abdb5b223b..928499f1e5 100644 --- a/main/wizards/com/sun/star/wizards/text/TextFieldHandler.java +++ b/main/wizards/com/sun/star/wizards/text/TextFieldHandler.java @@ -24,7 +24,7 @@ package com.sun.star.wizards.text; import java.util.Calendar; import java.util.GregorianCalendar; -import java.util.Vector; +import java.util.ArrayList; import com.sun.star.text.XDependentTextField; import com.sun.star.text.XTextContent; @@ -148,7 +148,7 @@ public class TextFieldHandler try { XDependentTextField[] xDependentFields; - Vector xDependentVector = new Vector(); + ArrayList<XDependentTextField> xDependentVector = new ArrayList<>(); if (xTextFieldsSupplier.getTextFields().hasElements()) { XEnumeration xEnum = xTextFieldsSupplier.getTextFields().createEnumeration(); @@ -168,7 +168,7 @@ public class TextFieldHandler String sValue = AnyConverter.toString(oValue); if (sValue.equals(_aPropertyValue)) { - xDependentVector.addElement(xDependent); + xDependentVector.add(xDependent); } } } @@ -180,7 +180,7 @@ public class TextFieldHandler short ishortValue = AnyConverter.toShort(oValue); if (ishortValue == iShortParam) { - xDependentVector.addElement(xDependent); + xDependentVector.add(xDependent); } } } diff --git a/main/wizards/com/sun/star/wizards/ui/FieldSelection.java b/main/wizards/com/sun/star/wizards/ui/FieldSelection.java index ab7af1a122..9217cffa6a 100644 --- a/main/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/main/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -622,17 +622,17 @@ public class FieldSelection int MaxOriginalCount = AllFieldNames.length; // int MaxSelected = OldSelFieldItems.length; String[] SelList = xFieldsListBox.getItems(); - Vector<String> NewSourceVector = new Vector<String>(); + ArrayList<String> NewSourceVector = new ArrayList<>(); for (int i = 0; i < MaxOriginalCount; i++) { SearchString = AllFieldNames[i]; if (JavaTools.FieldInList(SelList, SearchString) != -1) { - NewSourceVector.addElement(SearchString); + NewSourceVector.add(SearchString); } else if (JavaTools.FieldInList(OldSelFieldItems, SearchString) != -1) { - NewSourceVector.addElement(SearchString); + NewSourceVector.add(SearchString); } } xFieldsListBox.removeItems((short) 0, xFieldsListBox.getItemCount()); diff --git a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/OfficeUtil.java b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/OfficeUtil.java index 5536ae79bb..eaa86ff065 100644 --- a/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/OfficeUtil.java +++ b/main/xmerge/java/xmerge/src/main/java/org/openoffice/xmerge/util/OfficeUtil.java @@ -30,7 +30,7 @@ import org.w3c.dom.Text; import org.openoffice.xmerge.converter.xml.OfficeConstants; -import java.util.Vector; +import java.util.ArrayList; /** @@ -51,7 +51,7 @@ public class OfficeUtil implements OfficeConstants { * representing the text. */ public static Node[] parseText(String text, Document parentDoc) { - Vector nodeVec = new Vector(); + ArrayList<Node> nodeVec = new ArrayList<>(); /* * Break up the text from the text run into Open @@ -85,7 +85,7 @@ public class OfficeUtil implements OfficeConstants { if (closerIndex > 0) { String beginningText = text.substring(0, closerIndex); Text textNode = parentDoc.createTextNode(beginningText); - nodeVec.addElement(textNode); + nodeVec.add(textNode); } text = text.substring(closerIndex); @@ -122,10 +122,6 @@ public class OfficeUtil implements OfficeConstants { nodeVec.add(textNode); } - // Now create and populate an array to return the nodes in. - Node nodes[] = new Node[nodeVec.size()]; - for (int i = 0; i < nodeVec.size(); i++) - nodes[i] = (Node)nodeVec.elementAt(i); - return nodes; + return nodeVec.toArray(new Node[nodeVec.size()]); } }
