Java5 update - convert collections classes to use generics

Change-Id: Ia2e92ea7c5da3ef6e7235b724a82d28d0e562541

5 files changed, 34 insertions, 36 deletions

diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
index 0e5e016fab54..18afc19732eb 100644
--- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
+++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
@@ -31,7 +31,7 @@ public class GroupFieldHandler extends FieldSelection
 {
 
     private IReportDocument CurReportDocument;
-    private ArrayList GroupFieldVector = new ArrayList();
+    private ArrayList<String> GroupFieldVector = new ArrayList<String>();
     private QueryMetaData CurDBMetaData;
     private WizardDialog oWizardDialog;
     private static final short MAXSELFIELDS = 4;
@@ -76,8 +76,8 @@ public class GroupFieldHandler extends FieldSelection
     {
         try
         {
-            ArrayList NormalFieldsVector = new ArrayList();
-            ArrayList SelFieldsVector = new ArrayList();
+            ArrayList<String> NormalFieldsVector = new ArrayList<String>();
+            ArrayList<String> SelFieldsVector = new ArrayList<String>();
             String[] sFieldNames = CurDBMetaData.getFieldNames();
             for (int i = 0; i < sFieldNames.length; i++)
             {
diff --git a/wizards/com/sun/star/wizards/report/IReportDocument.java b/wizards/com/sun/star/wizards/report/IReportDocument.java
index 1e8d2b8b8b94..1ef0e9300847 100644
--- a/wizards/com/sun/star/wizards/report/IReportDocument.java
+++ b/wizards/com/sun/star/wizards/report/IReportDocument.java
@@ -119,7 +119,7 @@ public interface IReportDocument
      * @param iSelCount
      * @return
      */
-    public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList GroupFieldVector, ArrayList ReportPath, int iSelCount);
+    public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount);
 
     public void refreshGroupFields(String[] _sNewNames);
     // public boolean isGroupField(String _FieldName);
@@ -129,7 +129,7 @@ public interface IReportDocument
      * @param CurGroupTitle
      * @param GroupFieldVector
      */
-    public void liveupdate_removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, java.util.ArrayList GroupFieldVector);
+    public void liveupdate_removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, java.util.ArrayList<String> GroupFieldVector);
 
     /**
      * set the list how to group
@@ -152,7 +152,7 @@ public interface IReportDocument
 
     public int getDefaultPageOrientation();
 
-    public ArrayList getReportPath();
+    public ArrayList<String> getReportPath();
 
     public String getLayoutPath();
 
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 78140cb52d9f..b65d67e0a405 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -47,7 +47,7 @@ import com.sun.star.wizards.document.FormHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implements Comparator
+class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implements Comparator<FieldColumn>
 {
 
     private static final String ISLANDSCAPE = "IsLandscape";
@@ -61,7 +61,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
     private int PageWidth;
     private Rectangle PosSize;
     // private String ReportFolderName;
-    public ArrayList DBColumnsVector;
+    public ArrayList<DBColumn> DBColumnsVector;
     private RecordTable CurRecordTable;
     private String sMsgTableNotExisting;
     private String sMsgCommonReportError;
@@ -108,7 +108,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
         oTextStyleHandler = new TextStyleHandler(xMSFDoc, xTextDocument);
         oViewHandler = new ViewHandler(xMSFDoc, xTextDocument);
         oTextFieldHandler = new TextFieldHandler(xMSFDoc, xTextDocument);
-        DBColumnsVector = new java.util.ArrayList();
+        DBColumnsVector = new java.util.ArrayList<DBColumn>();
         oNumberFormatter = oTextTableHandler.getNumberFormatter();
         // CurDBMetaData = new RecordParser(xMSF); //, CharLocale, oNumberFormatter);
         CurDBMetaData = _aRecordParser;
@@ -348,7 +348,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
         int nSize = DBColumnsVector.size();
         for (int i = 0; i < nSize; i++)
         {
-            DBColumn CurDBColumn = (DBColumn) DBColumnsVector.get(i);
+            DBColumn CurDBColumn = DBColumnsVector.get(i);
             String sFieldName = CurDBColumn.CurDBField.getFieldName();
             if (!sFieldName.equals(_sNewNames[i]))
             {
@@ -368,7 +368,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
         int FieldCount = CurDBMetaData.getFieldNames().length;
         for (int i = GroupCount; i < FieldCount; i++)
         {
-            ((DBColumn) DBColumnsVector.get(i)).insertColumnData(oTextFieldHandler, this.bIsCurLandscape);
+            DBColumnsVector.get(i).insertColumnData(oTextFieldHandler, this.bIsCurLandscape);
         }
     }
 
@@ -382,7 +382,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
         for (int i = 0; i < GroupFieldCount; i++)
         {
             TableName = TBLGROUPSECTION + Integer.toString(i + 1);
-            OldDBColumn = (DBColumn) DBColumnsVector.get(i);
+            OldDBColumn = DBColumnsVector.get(i);
             CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, SelGroupNames[i], i, TableName, OldDBColumn);
             CurDBColumn.formatValueCell();
             DBColumnsVector.set(i, CurDBColumn);
@@ -415,7 +415,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
         int RecordCount = CurDBMetaData.getRecordFieldNames().length;
         for (int i = GroupCount; i < RecordCount; i++)
         {
-            ((DBColumn) DBColumnsVector.get(i)).insertColumnData(oTextFieldHandler, this.bIsCurLandscape);
+            DBColumnsVector.get(i).insertColumnData(oTextFieldHandler, this.bIsCurLandscape);
         }
     }
 
@@ -465,7 +465,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
         }
     }
 
-    public boolean addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList GroupFieldVector, ArrayList ReportPath, int iSelCount)
+    public boolean addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount)
     {
         DBColumn CurDBColumn = null;
         int GroupCount = GroupFieldVector.size();
@@ -494,7 +494,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
         return (CurDBColumn != null);
     }
 
-    public void removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, java.util.ArrayList GroupFieldVector)
+    public void removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, java.util.ArrayList<String> GroupFieldVector)
     {
         removeGroupNamesofRecordTable(NewSelGroupNames.length + 1);
         FieldColumn CurFieldColumn = CurDBMetaData.getFieldColumnByTitle(CurGroupTitle);
@@ -596,10 +596,8 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
         }
     }
 
-    public int compare(Object _oObject1, Object _oObject2)
+    public int compare(FieldColumn oFieldColumn1, FieldColumn oFieldColumn2)
     {
-        FieldColumn oFieldColumn1 = (FieldColumn) _oObject1;
-        FieldColumn oFieldColumn2 = (FieldColumn) _oObject2;
         DBColumn oDBColumn1 = getDBColumnByName(oFieldColumn1.getFieldName());
         DBColumn oDBColumn2 = getDBColumnByName(oFieldColumn2.getFieldName());
         if (oDBColumn1.ValColumn < oDBColumn2.ValColumn)
@@ -620,7 +618,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
     {
         for (int i = 0; i < DBColumnsVector.size(); i++)
         {
-            DBColumn oDBColumn = (DBColumn) DBColumnsVector.get(i);
+            DBColumn oDBColumn = DBColumnsVector.get(i);
             if (oDBColumn.CurDBField.getFieldName().equals(_FieldName))
             {
                 return oDBColumn;
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index e3dc075dfbf8..c47561f394fa 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -109,7 +109,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
     {
         getDoc().oTextSectionHandler.removeAllTextSections();
         getDoc().oTextTableHandler.removeAllTextTables();
-        getDoc().DBColumnsVector = new ArrayList();
+        getDoc().DBColumnsVector = new ArrayList<DBColumn>();
     }
 
     protected ReportTextImplementation( XMultiServiceFactory i_serviceFactory )
@@ -351,7 +351,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
             int ColIndex;
             boolean breset;
             Object oTable;
-            ArrayList DataVector = new ArrayList();
+            ArrayList<Object[]> DataVector = new ArrayList<Object[]>();
             DBColumn CurDBColumn;
             Object CurGroupValue;
             String CurGroupTableName;
@@ -381,7 +381,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
                     xGroupBaseTables[ColIndex] = UnoRuntime.queryInterface( XTextTable.class, oTable );
                     CurGroupValue = getRecordParser().getGroupColumnValue(ColIndex);
                     OldGroupFieldValues[ColIndex] = CurGroupValue;
-                    CurDBColumn = (DBColumn) getDoc().DBColumnsVector.get(ColIndex);
+                    CurDBColumn = getDoc().DBColumnsVector.get(ColIndex);
                     addLinkedTextSection(xTextCursor, ReportTextDocument.GROUPSECTION + Integer.toString(ColIndex + 1), CurDBColumn, CurGroupValue); //COPYOF!!!!
                 }
                 if (getRecordParser().getcurrentRecordData(DataVector))
@@ -399,7 +399,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
                             {
                                 breset = true;
                                 insertDataToRecordTable(xTextCursor, DataVector, RecordFieldCount);
-                                CurDBColumn = (DBColumn) getDoc().DBColumnsVector.get(ColIndex);
+                                CurDBColumn = getDoc().DBColumnsVector.get(ColIndex);
                                 addLinkedTextSection(xTextCursor, ReportTextDocument.COPYOFGROUPSECTION + Integer.toString(ColIndex + 1), CurDBColumn, CurGroupValue);
                                 OldGroupFieldValues[ColIndex] = CurGroupValue;
                                 breset = !(ColIndex == GroupFieldCount - 1);
@@ -420,7 +420,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
             {
                 for (ColIndex = 0; ColIndex < GroupFieldCount; ColIndex++)
                 {
-                    CurDBColumn = (DBColumn) getDoc().DBColumnsVector.get(ColIndex);
+                    CurDBColumn = getDoc().DBColumnsVector.get(ColIndex);
                     Object oValue = PropertyNames.EMPTY_STRING;
                     addLinkedTextSection(xTextCursor, ReportTextDocument.COPYOFGROUPSECTION + Integer.toString(ColIndex + 1), CurDBColumn, oValue);
                 }
@@ -450,7 +450,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
         getDoc().removeLayoutTextTables();
     }
 
-    private void insertDataToRecordTable(XTextCursor xTextCursor, ArrayList DataVector, int FieldCount)
+    private void insertDataToRecordTable(XTextCursor xTextCursor, ArrayList<Object[]> DataVector, int FieldCount)
     {
         int DataLength = DataVector.size();
         if ((FieldCount > 0) && (DataLength > 0))
@@ -491,7 +491,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
         int iCount = getDoc().DBColumnsVector.size();
         for (int i = 0; i < iCount; i++)
         {
-            CurDBColumn = (DBColumn) getDoc().DBColumnsVector.get(i);
+            CurDBColumn = getDoc().DBColumnsVector.get(i);
             xNameCellCursor = ReportTextDocument.createTextCursor(CurDBColumn.xNameCell);
             xNameCellCursor.gotoStart(false);
             FieldContent = getDoc().oTextFieldHandler.getUserFieldContent(xNameCellCursor);
@@ -526,7 +526,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
         }
     }
 
-    public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList GroupFieldVector, ArrayList ReportPath, int iSelCount)
+    public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount)
     {
         return getDoc().addGroupNametoDocument(GroupNames, CurGroupTitle, GroupFieldVector, ReportPath, iSelCount);
     }
@@ -540,7 +540,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
     // {
     //    return getDoc().isGroupField(_FieldName);
     // }
-    public void liveupdate_removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, ArrayList GroupFieldVector)
+    public void liveupdate_removeGroupName(String[] NewSelGroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector)
     {
         getDoc().removeGroupName(NewSelGroupNames, CurGroupTitle, GroupFieldVector);
     }
@@ -647,9 +647,9 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
     }
 
 // TODO: we have to change to String List!!!!
-    private ArrayList m_aReportPath = null;
+    private ArrayList<String> m_aReportPath = null;
 
-    public ArrayList getReportPath()
+    public ArrayList<String> getReportPath()
     {
         if (m_aReportPath == null)
         {
@@ -670,10 +670,10 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
 
     public String getContentPath()
     {
-        ArrayList aReportPath = getReportPath();
+        ArrayList<String> aReportPath = getReportPath();
         for (int i = 0; i < aReportPath.size(); i++)
         {
-            String sPath = (String) aReportPath.get(i);
+            String sPath = aReportPath.get(i);
             sPath += "/cnt-default.ott";
             if (FileAccess.isPathValid(getMSF(), sPath))
             {
@@ -685,10 +685,10 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
 
     public String getLayoutPath()
     {
-        ArrayList aReportPath = getReportPath();
+        ArrayList<String> aReportPath = getReportPath();
         for (int i = 0; i < aReportPath.size(); i++)
         {
-            String sPath = (String) aReportPath.get(i);
+            String sPath = aReportPath.get(i);
             sPath += "/stl-default.ott";
             if (FileAccess.isPathValid(getMSF(), sPath))
             {
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index ec00faef9a4b..af717356403f 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -141,7 +141,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener,
 
             case SOTITLEPAGE:
                 String[] aFieldNames = m_reportDocument.getRecordParser().getFieldNames();
-                Map aFieldTitleSet = m_reportDocument.getRecordParser().getFieldTitleSet();
+                Map<String, String> aFieldTitleSet = m_reportDocument.getRecordParser().getFieldTitleSet();
                 CurTitlesComponent.initialize(aFieldNames, aFieldTitleSet);
                 break;
 
@@ -451,7 +451,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener,
                     URL[] aURLs = new URL[1];
                     aURLs[0] = aLocationURI.toURL();
                     URLClassLoader aClassLoader = new URLClassLoader(aURLs, this.getClass().getClassLoader());
-                    Class a = aClassLoader.loadClass("com.sun.star.wizards.reportbuilder.ReportBuilderImplementation");
+                    Class<?> a = aClassLoader.loadClass("com.sun.star.wizards.reportbuilder.ReportBuilderImplementation");
                     Method aMethod = a.getMethod("create", new Class[]
                             {
                                 XMultiServiceFactory.class