svn commit: r586478 - in /ofbiz/trunk/framework/service/src/org/ofbiz/service: ModelService.java engine/GenericEngineFactory.java engine/StandardJavaEngine.java jms/JmsListenerFactory.java rmi/RmiServiceContainer.java

[doogie-3]

Author: doogie
Date: Fri Oct 19 07:26:16 2007
New Revision: 586478

URL: http://svn.apache.org/viewvc?rev=586478&view=rev
Log:
loadClass calls now have generics markup.

Modified:
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java?rev=586478&r1=586477&r2=586478&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java Fri Oct 19 07:26:16 2007
@@ -609,7 +609,7 @@
 
     public static boolean typeValidate(ModelParam.ModelParamValidator vali, Object testValue) throws GeneralException {
         // find the validator class
-        Class validatorClass = null;
+        Class<?> validatorClass = null;
         try {
             validatorClass = ObjectType.loadClass(vali.getClassName());
         } catch (ClassNotFoundException e) {

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java?rev=586478&r1=586477&r2=586478&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/GenericEngineFactory.java Fri Oct 19 07:26:16 2007
@@ -72,7 +72,7 @@
                 if (engine == null) {
                     try {
                         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-                        Class c = loader.loadClass(className);
+                        Class<?> c = loader.loadClass(className);
                         Constructor cn = c.getConstructor(ServiceDispatcher.class);
                         engine = (GenericEngine) cn.newInstance(dispatcher);
                     } catch (Exception e) {

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java?rev=586478&r1=586477&r2=586478&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java Fri Oct 19 07:26:16 2007
@@ -90,7 +90,7 @@
         }
 
         try {
-            Class c = cl.loadClass(this.getLocation(modelService));
+            Class<?> c = cl.loadClass(this.getLocation(modelService));
             Method m = c.getMethod(modelService.invoke, DispatchContext.class, Map.class);
             result = m.invoke(null, dctx, context);
         } catch (ClassNotFoundException cnfe) {

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java?rev=586478&r1=586477&r2=586478&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java Fri Oct 19 07:26:16 2007
@@ -143,7 +143,7 @@
                     ClassLoader cl = this.getClass().getClassLoader();
 
                     try {
-                        Class c = cl.loadClass(className);
+                        Class<?> c = cl.loadClass(className);
                         Constructor cn = c.getConstructor(ServiceDispatcher.class, String.class, String.class, String.class, String.class, String.class);
 
                         listener = (GenericMessageListener) cn.newInstance(dispatcher, serverName, jndiName, queueName, userName, password);

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java?rev=586478&r1=586477&r2=586478&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/rmi/RmiServiceContainer.java Fri Oct 19 07:26:16 2007
@@ -95,7 +95,7 @@
         // load the factories
         if (clientProp != null && clientProp.value != null && clientProp.value.length() > 0) {
             try {
-                Class c = loader.loadClass(clientProp.value);
+                Class<?> c = loader.loadClass(clientProp.value);
                 csf = (RMIClientSocketFactory) c.newInstance();
             } catch (Exception e) {
                 throw new ContainerException(e);
@@ -103,7 +103,7 @@
         }
         if (serverProp != null && serverProp.value != null && serverProp.value.length() > 0) {
             try {
-                Class c = loader.loadClass(serverProp.value);
+                Class<?> c = loader.loadClass(serverProp.value);
                 ssf = (RMIServerSocketFactory) c.newInstance();
             } catch (Exception e) {
                 throw new ContainerException(e);