r431 - trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence - Sammoa-commits

18 Aug 2012

Author: tchemit
Date: 2012-08-18 12:36:59 +0200 (Sat, 18 Aug 2012)
New Revision: 431

Url: http://forge.codelutin.com/repositories/revision/sammoa/431

Log:
was not a good idea to deprecate default constructor on entity : entity = bean = default constructor + improve some code

Modified:
   trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/CampaignImpl.java
   trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java
   trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointImpl.java
   trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObserverImpl.java
   trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RegionImpl.java
   trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMetas.java
   trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SectorImpl.java
   trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SpeciesImpl.java
   trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateImpl.java
   trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectImpl.java

Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/CampaignImpl.java
===================================================================

--- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/CampaignImpl.java	2012-08-18 08:08:55 UTC (rev 430)
+++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/CampaignImpl.java	2012-08-18 10:36:59 UTC (rev 431)
@@ -2,8 +2,8 @@
 /*
  * #%L
  * SAMMOA :: Persistence
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
  * %%
  * Copyright (C) 2012 UMS 3462, Code Lutin
  * %%
@@ -29,19 +29,15 @@
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * @deprecated Avoid using this default constructor, prefer use {@link #CampaignImpl(String, Region)}
-     */
-    @Deprecated
     public CampaignImpl() {
         // default constructor
     }
-    
+
     public CampaignImpl(String code, Region region) {
         Preconditions.checkNotNull(code);
         Preconditions.checkNotNull(region);
         this.code = code;
         this.region = region;
     }
-    
+
 } //CampaignImpl

Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java
===================================================================
--- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java	2012-08-18 08:08:55 UTC (rev 430)
+++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightImpl.java	2012-08-18 10:36:59 UTC (rev 431)
@@ -52,12 +52,14 @@
 
     @Override
     public TransectFlight getTransectFlightByTransect(Transect transect) {
+        TransectFlight result = null;
         for (TransectFlight element : getTransectFlight()) {
             if (transect.equals(element.getTransect())) {
-                return element;
+                result = element;
+                break;
             }
         }
-        return null;
+        return result;
     }
 
     @Override

Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointImpl.java
===================================================================
--- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointImpl.java	2012-08-18 08:08:55 UTC (rev 430)
+++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointImpl.java	2012-08-18 10:36:59 UTC (rev 431)
@@ -36,6 +36,7 @@
     private static final long serialVersionUID = 1L;
 
     public GeoPointImpl() {
+        // default constructor
     }
 
     public GeoPointImpl(double latitude, double longitude) {

Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObserverImpl.java
===================================================================
--- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObserverImpl.java	2012-08-18 08:08:55 UTC (rev 430)
+++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObserverImpl.java	2012-08-18 10:36:59 UTC (rev 431)
@@ -2,8 +2,8 @@
 /*
  * #%L
  * SAMMOA :: Persistence
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
  * %%
  * Copyright (C) 2012 UMS 3462, Code Lutin
  * %%
@@ -28,15 +28,11 @@
 public class ObserverImpl extends ObserverAbstract {
 
     private static final long serialVersionUID = 1L;
-    
-    /**
-     * @deprecated Avoid using this default constructor, prefer use {@link #ObserverImpl(String, Campaign)}
-     */
-    @Deprecated
+
     public ObserverImpl() {
         // default constructor
     }
-    
+
     public ObserverImpl(String initials, Campaign campaign) {
         Preconditions.checkNotNull(initials);
         Preconditions.checkNotNull(campaign);

Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RegionImpl.java
===================================================================
--- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RegionImpl.java	2012-08-18 08:08:55 UTC (rev 430)
+++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RegionImpl.java	2012-08-18 10:36:59 UTC (rev 431)
@@ -2,8 +2,8 @@
 /*
  * #%L
  * SAMMOA :: Persistence
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
  * %%
  * Copyright (C) 2012 UMS 3462, Code Lutin
  * %%
@@ -29,10 +29,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * @deprecated Avoid using this default constructor, prefer use {@link #RegionImpl(String)}
-     */
-    @Deprecated
     public RegionImpl() {
         // default constructor
     }

Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMetas.java
===================================================================
--- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMetas.java	2012-08-18 08:08:55 UTC (rev 430)
+++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMetas.java	2012-08-18 10:36:59 UTC (rev 431)
@@ -21,9 +21,10 @@
             new SammoaEntityEnum[0];
 
     public static DbMeta<SammoaEntityEnum> newDbMetas() {
-        return DbMeta.newDbMeta(SammoaEntityEnum.values(),
-                                EMPTY_ENTITY_TYPE_ARRAY,
-                                new SammoaTopiaEntityEnumProvider());
+        return DbMeta.newDbMeta(new SammoaTopiaEntityEnumProvider(),
+                                SammoaEntityEnum.values(),
+                                EMPTY_ENTITY_TYPE_ARRAY
+        );
     }
 
     /**
@@ -97,9 +98,7 @@
         List<MetaFilenameAware<SammoaEntityEnum>> associations = Lists.newArrayList();
 
         Metadatas.addEntries(dbMeta, null, associations, getDataTypes());
-
-        Multimap<SammoaEntityEnum, MetaFilenameAware<SammoaEntityEnum>> associationsBySource = Metadatas.split(associations);
-        return associationsBySource;
+        return Metadatas.split(associations);
     }
 
     /**

Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SectorImpl.java
===================================================================
--- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SectorImpl.java	2012-08-18 08:08:55 UTC (rev 430)
+++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SectorImpl.java	2012-08-18 10:36:59 UTC (rev 431)
@@ -2,8 +2,8 @@
 /*
  * #%L
  * SAMMOA :: Persistence
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
  * %%
  * Copyright (C) 2012 UMS 3462, Code Lutin
  * %%
@@ -29,10 +29,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * @deprecated Avoid using this default constructor, prefer use {@link #SectorImpl(int, Campaign)}
-     */
-    @Deprecated
     public SectorImpl() {
         // default constructor
     }

Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SpeciesImpl.java
===================================================================
--- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SpeciesImpl.java	2012-08-18 08:08:55 UTC (rev 430)
+++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SpeciesImpl.java	2012-08-18 10:36:59 UTC (rev 431)
@@ -2,8 +2,8 @@
 /*
  * #%L
  * SAMMOA :: Persistence
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
  * %%
  * Copyright (C) 2012 UMS 3462, Code Lutin
  * %%
@@ -29,10 +29,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * @deprecated Avoid using this default constructor, prefer use {@link #SpeciesImpl(String, Region)}
-     */
-    @Deprecated
     public SpeciesImpl() {
         // default constructor
     }

Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateImpl.java
===================================================================
--- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateImpl.java	2012-08-18 08:08:55 UTC (rev 430)
+++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateImpl.java	2012-08-18 10:36:59 UTC (rev 431)
@@ -2,8 +2,8 @@
 /*
  * #%L
  * SAMMOA :: Persistence
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
  * %%
  * Copyright (C) 2012 UMS 3462, Code Lutin
  * %%
@@ -29,10 +29,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * @deprecated Avoid using this default constructor, prefer use {@link #StrateImpl(StrateType, Sector)}
-     */
-    @Deprecated
     public StrateImpl() {
         // default constructor
     }

Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectImpl.java
===================================================================
--- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectImpl.java	2012-08-18 08:08:55 UTC (rev 430)
+++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectImpl.java	2012-08-18 10:36:59 UTC (rev 431)
@@ -2,8 +2,8 @@
 /*
  * #%L
  * SAMMOA :: Persistence
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
  * %%
  * Copyright (C) 2012 UMS 3462, Code Lutin
  * %%
@@ -29,10 +29,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * @deprecated Avoid using this default constructor, prefer use {@link #TransectImpl(String, Strate)}
-     */
-    @Deprecated
     public TransectImpl() {
         // default constructor
     }

    

r431 - trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence

tchemit＠users.forge.codelutin.com

tags

participants (1)