[Edevsagetools-commit] SF.net SVN: edevsagetools: [4] trunk

[<av...@us...>]

Revision: 4
          http://svn.sourceforge.net/edevsagetools/?rev=4&view=rev
Author:   avdyk
Date:     2006-12-31 04:39:33 -0800 (Sun, 31 Dec 2006)

Log Message:
-----------
generify

Modified Paths:
--------------
    trunk/pom.xml
    trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java
    trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java
    trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java

Property Changed:
----------------
    trunk/
    trunk/synchro-client/
    trunk/synchro-core/
    trunk/synchro-webapp/


Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   + target
build


Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2006-12-29 16:12:46 UTC (rev 3)
+++ trunk/pom.xml	2006-12-31 12:39:33 UTC (rev 4)
@@ -11,6 +11,17 @@
     <module>synchro-client</module>
     <module>synchro-webapp</module>
   </modules>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>


Property changes on: trunk/synchro-client
___________________________________________________________________
Name: svn:ignore
   + target
build



Property changes on: trunk/synchro-core
___________________________________________________________________
Name: svn:ignore
   + target
build


Modified: trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java
===================================================================
--- trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java	2006-12-29 16:12:46 UTC (rev 3)
+++ trunk/synchro-core/src/main/java/be/edev/sagetools/beans/Appellation.java	2006-12-31 12:39:33 UTC (rev 4)
@@ -18,9 +18,9 @@
 
   private String photo;
 
-  private Set region = new HashSet();
+  private Set<Region> region = new HashSet<Region>();
 
-  private Set domaine = new HashSet();
+  private Set<Domaine> domaine = new HashSet<Domaine>();
 
   public Appellation()
   {
@@ -80,7 +80,7 @@
    * 
    * @return retourne la valeur de region.
    */
-  public Set getRegion()
+  public Set<Region> getRegion()
   {
     return this.region;
   }
@@ -91,7 +91,7 @@
    * @param region
    *          Le region à mettre à jour.
    */
-  public void setRegion(Set region)
+  public void setRegion(Set<Region> region)
   {
     this.region = region;
   }
@@ -111,7 +111,7 @@
    * 
    * @return retourne la valeur de domaine.
    */
-  public Set getDomaine()
+  public Set<Domaine> getDomaine()
   {
     return this.domaine;
   }
@@ -122,7 +122,7 @@
    * @param domaine
    *          Le domaine à mettre à jour.
    */
-  public void setDomaine(Set domaine)
+  public void setDomaine(Set<Domaine> domaine)
   {
     this.domaine = domaine;
   }

Modified: trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java
===================================================================
--- trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java	2006-12-29 16:12:46 UTC (rev 3)
+++ trunk/synchro-core/src/main/java/be/edev/sagetools/beans/SelectedList.java	2006-12-31 12:39:33 UTC (rev 4)
@@ -15,9 +15,9 @@
 public class SelectedList
 {
 
-  private Set objects = new TreeSet(new StringComparator());
+  private Set<Object> objects = new TreeSet<Object>(new StringComparator<Object>());
 
-  private Set disabledObjects = new TreeSet(new StringComparator());
+  private Set<Object> disabledObjects = new TreeSet<Object>(new StringComparator<Object>());
 
   private Object selectedObject = null;
 
@@ -26,11 +26,11 @@
     super();
   }
 
-  public SelectedList(Comparator c)
+  public SelectedList(Comparator<Object> c)
   {
     super();
-    this.objects = new TreeSet(c);
-    this.disabledObjects = new TreeSet(c);
+    this.objects = new TreeSet<Object>(c);
+    this.disabledObjects = new TreeSet<Object>(c);
   }
 
   public boolean addDisabledObject(Object o)
@@ -38,7 +38,7 @@
     return this.disabledObjects.add(o);
   }
 
-  public boolean addAllDisabledObject(Collection o)
+  public boolean addAllDisabledObject(Collection<Object> o)
   {
     return this.disabledObjects.addAll(o);
   }
@@ -86,12 +86,12 @@
   /**
    * @deprecated utiliser plutôt addAllDisabledObject(Collection)
    */
-  public void setDisabledObjects(Set disabledObjects)
+  public void setDisabledObjects(Set<Object> disabledObjects)
   {
     this.disabledObjects = disabledObjects;
   }
 
-  public Set getObjects()
+  public Set<Object> getObjects()
   {
     return this.objects;
   }
@@ -99,7 +99,7 @@
   /**
    * @deprecated utiliser plutôt addAllObject(Collection)
    */
-  public void setObjects(Set objects)
+  public void setObjects(Set<Object> objects)
   {
     this.objects = objects;
   }
@@ -109,7 +109,7 @@
     return this.objects.add(o);
   }
 
-  public boolean addAllObject(Collection o)
+  public boolean addAllObject(Collection<Object> o)
   {
     return this.objects.addAll(o);
   }
@@ -129,7 +129,7 @@
     return this.objects.isEmpty();
   }
 
-  public Iterator objectIterator()
+  public Iterator<Object> objectIterator()
   {
     return this.objects.iterator();
   }

Modified: trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java
===================================================================
--- trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java	2006-12-29 16:12:46 UTC (rev 3)
+++ trunk/synchro-core/src/main/java/be/edev/sagetools/utils/StringComparator.java	2006-12-31 12:39:33 UTC (rev 4)
@@ -2,7 +2,7 @@
 
 import java.util.Comparator;
 
-public class StringComparator implements Comparator
+public class StringComparator<T> implements Comparator<T>
 {
 
   private boolean asc = true;
@@ -18,7 +18,7 @@
     this.asc = asc;
   }
 
-  public int compare(Object o1, Object o2)
+  public int compare(T o1, T o2)
   {
     int value = 0;
     if (asc)


Property changes on: trunk/synchro-webapp
___________________________________________________________________
Name: svn:ignore
   + target
build



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.