[Edevsagetools-commit] SF.net SVN: edevsagetools: [33] trunk
Status: Beta
Brought to you by:
avdyk
Menu
▾
▴
[Edevsagetools-commit] SF.net SVN: edevsagetools: [33] trunk
|
From: <av...@us...> - 2007-03-19 12:47:23
|
Revision: 33
http://svn.sourceforge.net/edevsagetools/?rev=33&view=rev
Author: avdyk
Date: 2007-03-19 05:47:15 -0700 (Mon, 19 Mar 2007)
Log Message:
-----------
pending updates
Modified Paths:
--------------
trunk/src/site/site.xml
trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Appellation.java
trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Article.java
trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Domaine.java
trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Pays.java
trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Region.java
trunk/synchro/webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/hibernate/SynchroNettoyageDAOImpl.java
Removed Paths:
-------------
trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/SelectedList.java
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2007-02-20 18:41:23 UTC (rev 32)
+++ trunk/src/site/site.xml 2007-03-19 12:47:15 UTC (rev 33)
@@ -16,14 +16,29 @@
</links>
<menu name="SageTools">
- <item name="Accueil" href="index.html"/>
+ <item name="Home" href="index.html"/>
<!--
<item name="FAQ" href="faq.html"/>
-->
<!--
<item name="Xdoc Example" href="xdoc.html"/>
-->
+ <!--
+ <item name="News" href="http://sourceforge.net/news/?group_id=163996" />
+ <item name="Download" href="http://sourceforge.net/project/showfiles.php?group_id=163996" />
+ <item name="Tasks" href="http://sourceforge.net/pm/?group_id=163996" />
+ <item name="Browse Code From SVN" href="http://sourceforge.net/svn/?group_id=163996" />
+ <item name="Bugs" href="http://sourceforge.net/tracker/?group_id=163996&atid=829949" />
+ <item name="Feature Requests" href="http://sourceforge.net/tracker/?group_id=163996&atid=829952" />
+ <item name="Patches" href="http://sourceforge.net/tracker/?group_id=163996&atid=829951" />
+ <item name="Support Requests" href="http://sourceforge.net/tracker/?group_id=163996&atid=829950" />
+ -->
+ <item name="Project at SourceForge" href="http://www.sourceforge.net/projects/edevsagetools" />
</menu>
- ${reports}
+ <!--
+ <menu ref="modules"/>
+ -->
+ <menu ref="reports"/>
+
</body>
</project>
Modified: trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Appellation.java
===================================================================
--- trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Appellation.java 2007-02-20 18:41:23 UTC (rev 32)
+++ trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Appellation.java 2007-03-19 12:47:15 UTC (rev 33)
@@ -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()
{
@@ -91,7 +91,7 @@
* @param region
* Le region à mettre à jour.
*/
- public void setRegion(Set region)
+ public void setRegion(Set<Region> region)
{
this.region = region;
}
@@ -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/webapp/src/main/java/be/edev/sagetools/beans/Article.java
===================================================================
--- trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Article.java 2007-02-20 18:41:23 UTC (rev 32)
+++ trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Article.java 2007-03-19 12:47:15 UTC (rev 33)
@@ -72,7 +72,7 @@
private float puNet;
- private Set glossaire = new HashSet();
+ private Set<Glossaire> glossaire = new HashSet<Glossaire>();
private AnneeDebutConsommation anneeDebutConsommation;
@@ -742,7 +742,7 @@
return this.glossaire;
}
- public void setGlossaire(Set glossaire)
+ public void setGlossaire(Set<Glossaire> glossaire)
{
this.glossaire = glossaire;
}
Modified: trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Domaine.java
===================================================================
--- trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Domaine.java 2007-02-20 18:41:23 UTC (rev 32)
+++ trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Domaine.java 2007-03-19 12:47:15 UTC (rev 33)
@@ -20,9 +20,9 @@
private String photoGrande;
- private Set appellation = new HashSet();
+ private Set<Appellation> appellation = new HashSet<Appellation>();
- private Set article = new HashSet();
+ private Set<Article> article = new HashSet<Article>();
public Domaine()
{
@@ -93,7 +93,7 @@
* @param appellation
* Le appellation à mettre à jour.
*/
- public void setAppellation(Set appellation)
+ public void setAppellation(Set<Appellation> appellation)
{
this.appellation = appellation;
}
@@ -124,7 +124,7 @@
* @param article
* Le article à mettre à jour.
*/
- public void setArticle(Set article)
+ public void setArticle(Set<Article> article)
{
this.article = article;
}
Modified: trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Pays.java
===================================================================
--- trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Pays.java 2007-02-20 18:41:23 UTC (rev 32)
+++ trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Pays.java 2007-03-19 12:47:15 UTC (rev 33)
@@ -22,7 +22,7 @@
private String photoGrande;
- private Set regions = new HashSet();
+ private Set<Region> regions = new HashSet<Region>();
public Pays()
{
@@ -114,7 +114,7 @@
* @param regions
* Le regions à mettre à jour.
*/
- public void setRegions(Set regions)
+ public void setRegions(Set<Region> regions)
{
this.regions = regions;
}
Modified: trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Region.java
===================================================================
--- trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Region.java 2007-02-20 18:41:23 UTC (rev 32)
+++ trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/Region.java 2007-03-19 12:47:15 UTC (rev 33)
@@ -29,7 +29,7 @@
private String vue;
- private Set appellation = new HashSet();
+ private Set<Appellation> appellation = new HashSet<Appellation>();
public Region()
{
@@ -121,7 +121,7 @@
* @param appellation
* Le appellations à mettre à jour.
*/
- public void setAppellation(Set appellation)
+ public void setAppellation(Set<Appellation> appellation)
{
this.appellation = appellation;
}
Deleted: trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/SelectedList.java
===================================================================
--- trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/SelectedList.java 2007-02-20 18:41:23 UTC (rev 32)
+++ trunk/synchro/webapp/src/main/java/be/edev/sagetools/beans/SelectedList.java 2007-03-19 12:47:15 UTC (rev 33)
@@ -1,162 +0,0 @@
-package be.edev.sagetools.beans;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-
-import be.edev.sagetools.utils.StringComparator;
-
-/**
- * Cet objet est utilisé pour contenir la liste complète à afficher, la liste
- * des objets non sélectionnables ainsi que l'objet sélectionné.
- */
-public class SelectedList
-{
-
- private Set objects = new TreeSet(new StringComparator());
-
- private Set disabledObjects = new TreeSet(new StringComparator());
-
- private Object selectedObject = null;
-
- public SelectedList()
- {
- super();
- }
-
- public SelectedList(Comparator c)
- {
- super();
- this.objects = new TreeSet(c);
- this.disabledObjects = new TreeSet(c);
- }
-
- public boolean addDisabledObject(Object o)
- {
- return this.disabledObjects.add(o);
- }
-
- public boolean addAllDisabledObject(Collection o)
- {
- return this.disabledObjects.addAll(o);
- }
-
- public void clearDisabledObject()
- {
- this.disabledObjects.clear();
- }
-
- public boolean containsDisabledObject(Object o)
- {
- return this.disabledObjects.contains(o);
- }
-
- public boolean isDisabledObjectEmpty()
- {
- return this.disabledObjects.isEmpty();
- }
-
- public Iterator disabledObjectIterator()
- {
- return this.disabledObjects.iterator();
- }
-
- public boolean removeDisabledObject(Object o)
- {
- return this.disabledObjects.remove(o);
- }
-
- public int disabledObjectSize()
- {
- return this.disabledObjects.size();
- }
-
- public Object[] disabledObjectToArray(Object[] a)
- {
- return this.disabledObjects.toArray(a);
- }
-
- public Set getDisabledObjects()
- {
- return this.disabledObjects;
- }
-
- /**
- * @deprecated utiliser plutôt addAllDisabledObject(Collection)
- */
- public void setDisabledObjects(Set disabledObjects)
- {
- this.disabledObjects = disabledObjects;
- }
-
- public Set getObjects()
- {
- return this.objects;
- }
-
- /**
- * @deprecated utiliser plutôt addAllObject(Collection)
- */
- public void setObjects(Set objects)
- {
- this.objects = objects;
- }
-
- public boolean addObject(Object o)
- {
- return this.objects.add(o);
- }
-
- public boolean addAllObject(Collection o)
- {
- return this.objects.addAll(o);
- }
-
- public void clearObject()
- {
- this.objects.clear();
- }
-
- public boolean containsObject(Object o)
- {
- return this.objects.contains(o);
- }
-
- public boolean isObjectEmpty()
- {
- return this.objects.isEmpty();
- }
-
- public Iterator objectIterator()
- {
- return this.objects.iterator();
- }
-
- public boolean removeObject(Object o)
- {
- return this.objects.remove(o);
- }
-
- public int objectSize()
- {
- return this.objects.size();
- }
-
- public Object[] objectToArray(Object[] a)
- {
- return this.objects.toArray(a);
- }
-
- public Object getSelectedObject()
- {
- return this.selectedObject;
- }
-
- public void setSelectedObject(Object selectedObject)
- {
- this.selectedObject = selectedObject;
- }
-
-}
Modified: trunk/synchro/webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/hibernate/SynchroNettoyageDAOImpl.java
===================================================================
--- trunk/synchro/webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/hibernate/SynchroNettoyageDAOImpl.java 2007-02-20 18:41:23 UTC (rev 32)
+++ trunk/synchro/webapp/src/main/java/be/edev/sagetools/synchro/servlets/dao/hibernate/SynchroNettoyageDAOImpl.java 2007-03-19 12:47:15 UTC (rev 33)
@@ -191,7 +191,7 @@
String where = " WHERE art_id IS NULL";
String stmt = select + pk + from + table + join + pk + "=" + fk + where;
ResultSet rs = c.createStatement().executeQuery(stmt);
- ArrayList list = new ArrayList();
+ ArrayList<Number> list = new ArrayList<Number>();
this.log.info(stmt);
while (rs.next())
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
