Java5 update, Convert ArrayList and Vector code to use generics

Change-Id: I6cf6fa8e55005ffdc1d173aeee1e374efbb214fd

5 files changed, 15 insertions, 15 deletions

diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java
index 7127cd8043a8..99c26e7c9f40 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java
@@ -65,5 +65,5 @@ public interface IOnewayLink
      *          Note: Atomic types (e.g. int, long) will be transported as objects
      *          too (Integer, Long)!
      */
-    public abstract void execOneway( int nRequest, Vector lParams );
+    public abstract void execOneway( int nRequest, Vector<?> lParams );
 }
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
index 66ab24d41512..42d01cf1e679 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
@@ -161,7 +161,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
      * @param lParams
      *          the vector with all packed parameters of the original request
      */
-    public void execOneway(/*IN*/ int nRequest,/*IN*/ Vector lParams )
+    public void execOneway(/*IN*/ int nRequest,/*IN*/ Vector<?> lParams )
     {
         synchronized(this)
         {
@@ -338,7 +338,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
             xFrame          = m_xFrame;
         }
 
-        com.sun.star.frame.XDispatchProviderInterception xRegistration = (com.sun.star.frame.XDispatchProviderInterception)UnoRuntime.queryInterface(
+        com.sun.star.frame.XDispatchProviderInterception xRegistration = UnoRuntime.queryInterface(
             com.sun.star.frame.XDispatchProviderInterception.class,
             xFrame);
 
@@ -650,7 +650,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
 
         if (bIsRegistered)
         {
-            com.sun.star.frame.XDispatchProviderInterception xRegistration = (com.sun.star.frame.XDispatchProviderInterception)UnoRuntime.queryInterface(
+            com.sun.star.frame.XDispatchProviderInterception xRegistration = UnoRuntime.queryInterface(
                 com.sun.star.frame.XDispatchProviderInterception.class,
                 xFrame);
 
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
index 132ee897e2be..c549c4883a73 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
@@ -77,7 +77,7 @@ class OnewayExecutor extends Thread
      */
     private IOnewayLink m_rLink     ;
     private int         m_nRequest  ;
-    private Vector      m_lParams   ;
+    private Vector<?>      m_lParams   ;
 
     // _______________________________
 
@@ -103,7 +103,7 @@ class OnewayExecutor extends Thread
      */
     public OnewayExecutor( IOnewayLink rLink    ,
                            int         nRequest ,
-                           Vector      lParams  )
+                           Vector<?>      lParams  )
     {
         m_rLink    = rLink   ;
         m_nRequest = nRequest;
@@ -148,7 +148,7 @@ class OnewayExecutor extends Thread
     {
         if (bEncode)
         {
-            lParams[0] = new Vector(1);
+            lParams[0] = new Vector<Object>(1);
             lParams[0].add( (Object)(aAction[0]) );
         }
         else
@@ -166,7 +166,7 @@ class OnewayExecutor extends Thread
     {
         if (bEncode)
         {
-            lParams[0] = new Vector(1);
+            lParams[0] = new Vector<Object>(1);
             lParams[0].add( (Object)aStatus[0] );
         }
         else
@@ -185,7 +185,7 @@ class OnewayExecutor extends Thread
     {
         if (bEncode)
         {
-            lParams[0] = new Vector(2);
+            lParams[0] = new Vector<Object>(2);
             lParams[0].add( (Object)xListener[0] );
             lParams[0].add( (Object)aURL[0]      );
         }
@@ -208,7 +208,7 @@ class OnewayExecutor extends Thread
         {
             int nLength = lArgs.length+1;
             int nPos    = 0;
-            lParams[0] = new Vector(nLength);
+            lParams[0] = new Vector<Object>(nLength);
 
             lParams[0].add( (Object)aURL[0] );
             --nLength;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
index 5bb20d3fe149..ac5d429ba08a 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
@@ -166,7 +166,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener,
      * @param lParams
      *          the vector with all packed parameters of the original request
      */
-    public void execOneway(/*IN*/  int nRequest,/*IN*/  Vector lParams )
+    public void execOneway(/*IN*/  int nRequest,/*IN*/  Vector<?> lParams )
     {
         synchronized(this)
         {
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java
index 451593f9a634..fb3e675820ae 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java
@@ -75,8 +75,8 @@ public class ViewContainer extends Thread
      */
     private ViewContainer()
     {
-        mlViews          = new Vector();
-        mlListener       = new Vector();
+        mlViews          = new Vector<Object>();
+        mlListener       = new Vector<IShutdownListener>();
         mbShutdownActive = false       ;
         Runtime.getRuntime().addShutdownHook(this);
     }
@@ -259,7 +259,7 @@ public class ViewContainer extends Thread
      */
     public  static boolean       mbInplace   = false ;
     private static ViewContainer maSingleton = null  ;
-    private        Vector        mlViews             ;
-    private        Vector        mlListener          ;
+    private        Vector<Object>        mlViews             ;
+    private        Vector<IShutdownListener>        mlListener          ;
     private        boolean       mbShutdownActive    ;
 }