[certi-cvs] jcerti/src/hla rti/jlc/RtiFactoryFactory.java r...

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    jcerti
Changes by:     Eric NOULARD <erk>      14/05/15 08:48:06

Modified files:
        src/hla/rti/jlc: RtiFactoryFactory.java 
        src/hla/rti1516/jlc: RtiFactoryFactory.java 

Log message:
        Avoid using raw type.
        Generics are there since 2004 (Java 5) it's time to rely on them.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/jcerti/src/hla/rti/jlc/RtiFactoryFactory.java?cvsroot=certi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/jcerti/src/hla/rti1516/jlc/RtiFactoryFactory.java?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: rti/jlc/RtiFactoryFactory.java
===================================================================
RCS file: /sources/certi/jcerti/src/hla/rti/jlc/RtiFactoryFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- rti/jlc/RtiFactoryFactory.java      13 May 2014 11:28:34 -0000      1.3
+++ rti/jlc/RtiFactoryFactory.java      15 May 2014 08:48:06 -0000      1.4
@@ -64,7 +64,7 @@
       return getRtiFactory("certi.rti.jlc.CertiRtiFactory");
    }
 
-   public static Map getAvailableRtis() throws RTIinternalError
+   public static Map<String, String> getAvailableRtis() throws RTIinternalError
    {
       String userHomeDir = System.getProperty("user.home");
       File propertiesFile = new File(userHomeDir, "RTI-list.properties");
@@ -82,7 +82,7 @@
          throw new RTIinternalError("Error reading Link Compatibility settings 
file");
       }
 
-      Map map = new HashMap();
+      Map<String, String> map = new HashMap<String, String>();
       int index = 1;
       while (true) {
          String rtiName = properties.getProperty(index + ".name");

Index: rti1516/jlc/RtiFactoryFactory.java
===================================================================
RCS file: /sources/certi/jcerti/src/hla/rti1516/jlc/RtiFactoryFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- rti1516/jlc/RtiFactoryFactory.java  13 May 2014 10:31:59 -0000      1.1
+++ rti1516/jlc/RtiFactoryFactory.java  15 May 2014 08:48:06 -0000      1.2
@@ -65,10 +65,10 @@
       }
 
       // Provide a reasonable default if no setting found
-      return getRtiFactory("com.rtibusters.rti.BustersRtiFactory");
+      return getRtiFactory("certi.rti.jlc.CertiRtiFactory");
    }
 
-   public static Map getAvailableRtis() throws RTIinternalError
+   public static Map<String, String> getAvailableRtis() throws RTIinternalError
    {
       String userHomeDir = System.getProperty("user.home");
       File propertiesFile = new File(userHomeDir, SETTINGS_FILE);
@@ -86,7 +86,7 @@
          throw new RTIinternalError("Error reading Link Compatibility settings 
file");
       }
 
-      Map map = new HashMap();
+      Map<String, String> map = new HashMap<String, String>();
       int index = 1;
       while (true) {
          String rtiName = properties.getProperty(index + ".name");