From 8aa97e36e79ce08852e243713f42fc1c70cad6c1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 28 Jun 2012 15:43:24 +0200 Subject: Java5 update - convert to use generics Change-Id: Ib3ce9c31036645e38ce4fe6b54b84b43bec2674a --- sfx2/qa/complex/sfx2/DocumentMetadataAccess.java | 32 +++++++++++------------- sfx2/qa/complex/sfx2/DocumentProperties.java | 4 +-- sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java | 2 +- sfx2/qa/complex/sfx2/UndoManager.java | 11 ++++---- 4 files changed, 23 insertions(+), 26 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java index 8a60f8490cb6..5b01be8cddfc 100644 --- a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java +++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java @@ -215,7 +215,7 @@ public class DocumentMetadataAccess System.out.println("Checking that new repository is initialized..."); - XURI xBaseURI = (XURI) xDocMDAccess; + XURI xBaseURI = xDocMDAccess; String baseURI = xBaseURI.getStringValue(); assertNotNull("new: baseURI", xBaseURI ); assertTrue("new: baseURI", !xBaseURI.getStringValue().equals("")); @@ -527,7 +527,7 @@ public class DocumentMetadataAccess assertTrue("xRep null", null != xRep); assertTrue("baseURI still tdoc?", !baseURI.equals(xDocMDAccess.getStringValue())); - Statement[] manifestStmts2 = getManifestStmts((XURI) xDocMDAccess); + Statement[] manifestStmts2 = getManifestStmts(xDocMDAccess); xStmtsEnum = xRep.getStatements(null, null, null); // there is no content or styles file in here, so we have just // the package stmt @@ -540,7 +540,7 @@ public class DocumentMetadataAccess assertTrue("xRep null", null != xRep); assertTrue("baseURI still tdoc?", !baseURI.equals(xDocMDAccess.getStringValue())); - Statement[] manifestStmts3 = getManifestStmts((XURI) xDocMDAccess); + Statement[] manifestStmts3 = getManifestStmts(xDocMDAccess); xStmtsEnum = xRep.getStatements(null, null, null); assertTrue("loadMetadataFromMedium (no metadata)", @@ -549,8 +549,8 @@ public class DocumentMetadataAccess xDocMDAccess.loadMetadataFromMedium(args); xRep = xRepoSupplier.getRDFRepository(); assertTrue("xRep null", null != xRep); - Statement[] manifestStmts4 = getManifestStmts((XURI) xDocMDAccess); - Statement[] metadataStmts4 = getMetadataFileStmts((XURI) xDocMDAccess, + Statement[] manifestStmts4 = getManifestStmts(xDocMDAccess); + Statement[] metadataStmts4 = getMetadataFileStmts(xDocMDAccess, fooBarPath); xStmtsEnum = xRep.getStatements(null, null, null); @@ -586,8 +586,8 @@ public class DocumentMetadataAccess XRepository xRep2 = xRS2.getRDFRepository(); assertTrue("xRep2 null", null != xRep2); - Statement[] manifestStmts5 = getManifestStmts((XURI) xDMA2); - Statement[] metadataStmts5 = getMetadataFileStmts((XURI) xDMA2, + Statement[] manifestStmts5 = getManifestStmts(xDMA2); + Statement[] metadataStmts5 = getMetadataFileStmts(xDMA2, fooBarPath); XURI xFoobar5 = URI.createNS(xContext, xDMA2.getStringValue(), fooBarPath); @@ -945,7 +945,7 @@ public class DocumentMetadataAccess static Statement[] toSeq(XEnumeration i_Enum) throws Exception { - java.util.Collection c = new java.util.ArrayList(); + java.util.Collection c = new java.util.ArrayList(); while (i_Enum.hasMoreElements()) { Statement s = (Statement) i_Enum.nextElement(); c.add(s); @@ -961,7 +961,7 @@ public class DocumentMetadataAccess static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception { - java.util.Collection c = new java.util.ArrayList(); + java.util.Collection c = new java.util.ArrayList(); while (i_Enum.hasMoreElements()) { XNode[] s = (XNode[]) i_Enum.nextElement(); c.add(s); @@ -974,12 +974,10 @@ public class DocumentMetadataAccess return ret; } - static class BindingComp implements java.util.Comparator + static class BindingComp implements java.util.Comparator { - public int compare(Object i_Left, Object i_Right) + public int compare(XNode[] left, XNode[] right) { - XNode[] left = (XNode[]) i_Left; - XNode[] right = (XNode[]) i_Right; if (left.length != right.length) { throw new RuntimeException(); @@ -996,13 +994,11 @@ public class DocumentMetadataAccess } } - static class StmtComp implements java.util.Comparator + static class StmtComp implements java.util.Comparator { - public int compare(Object i_Left, Object i_Right) + public int compare(Statement left, Statement right) { int eq; - Statement left = (Statement) i_Left; - Statement right = (Statement) i_Right; if ((eq = cmp(left.Graph, right.Graph )) != 0) return eq; if ((eq = cmp(left.Subject, right.Subject )) != 0) return eq; if ((eq = cmp(left.Predicate, right.Predicate)) != 0) return eq; @@ -1098,7 +1094,7 @@ public class DocumentMetadataAccess String[] i_Vars, XNode[][] i_Bindings) throws Exception { String[] vars = i_Result.getBindingNames(); - XEnumeration iter = (XEnumeration) i_Result; + XEnumeration iter = i_Result; XNode[][] bindings = toSeqs(iter); if (vars.length != i_Vars.length) { System.out.println("var lengths differ"); diff --git a/sfx2/qa/complex/sfx2/DocumentProperties.java b/sfx2/qa/complex/sfx2/DocumentProperties.java index 00a8cc32de51..a2392d6d9d3b 100644 --- a/sfx2/qa/complex/sfx2/DocumentProperties.java +++ b/sfx2/qa/complex/sfx2/DocumentProperties.java @@ -498,8 +498,8 @@ public class DocumentProperties && a.Negative == b.Negative; } - java.util.Collection fromArray(Object[] os) { - java.util.Collection ret = new java.util.HashSet(); + java.util.Collection fromArray(Object[] os) { + java.util.Collection ret = new java.util.HashSet(); for (int i = 0; i < os.length; ++i) { ret.add(os[i]); } diff --git a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java index f2580459b02c..96901bd783f8 100644 --- a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java +++ b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java @@ -47,7 +47,7 @@ import static org.junit.Assert.*; public class GlobalEventBroadcaster { XMultiServiceFactory m_xMSF = null; XEventBroadcaster m_xEventBroadcaster = null; - ArrayList notifyEvents = new ArrayList(); + ArrayList notifyEvents = new ArrayList(); // XTextDocument xTextDoc; XSpreadsheetDocument xSheetDoc; XEventListener m_xEventListener = new EventListenerImpl(); diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index c64cd7022e25..955ffa065f94 100644 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -1390,15 +1390,16 @@ public class UndoManager return new String[] { getCallbackComponentServiceName() }; } + @SuppressWarnings("unchecked") public void dispose() { final EventObject event = new EventObject( this ); - final ArrayList eventListenersCopy = (ArrayList)m_eventListeners.clone(); - final Iterator iter = eventListenersCopy.iterator(); + final ArrayList eventListenersCopy = (ArrayList)m_eventListeners.clone(); + final Iterator iter = eventListenersCopy.iterator(); while ( iter.hasNext() ) { - ((XEventListener)iter.next()).disposing( event ); + iter.next().disposing( event ); } } @@ -1413,7 +1414,7 @@ public class UndoManager m_eventListeners.remove( i_listener ); } - private final ArrayList m_eventListeners = new ArrayList(); + private final ArrayList m_eventListeners = new ArrayList(); }; // ----------------------------------------------------------------------------------------------------------------- @@ -1441,7 +1442,7 @@ public class UndoManager public Type[] getTypes() { - final Class interfaces[] = getClass().getInterfaces(); + final Class interfaces[] = getClass().getInterfaces(); Type types[] = new Type[ interfaces.length ]; for ( int i = 0; i < interfaces.length; ++i ) types[i] = new Type(interfaces[i]); -- cgit