GitLab

at 2018-03-30T14:44:36Z

Correction des labels sur les enums avec methods

                 <goal>parse-java-enumerations</goal>

               </goals>

               <configuration>

-                <generateHelper>true</generateHelper>

                 <enumerationSets>

                   <enumerationSet>

                     <name>label</name>

  * #L%

  */

 

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ObserveSwingApplicationContext;

 import fr.ird.observe.client.ui.ObserveMainUI;

 import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport;

  */

 package fr.ird.observe.client.ui.admin;

 

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.constants.DbMode;

 import fr.ird.observe.client.ui.util.UIHelper;

 import fr.ird.observe.client.ui.admin.config.ConfigUI;

  */

 package fr.ird.observe.client.ui.admin;

 

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ObserveRunner;

 import fr.ird.observe.client.ObserveSwingApplicationContext;

 import fr.ird.observe.client.db.ObserveSwingDataSource;

  */

 package fr.ird.observe.client.ui.admin;

 

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ObserveActionExecutor;

 import fr.ird.observe.client.ObserveRunner;

 import fr.ird.observe.client.ui.ObserveKeyStrokes;

  */

 package fr.ird.observe.client.ui.admin.resume;

 

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ui.util.UIHelper;

 import fr.ird.observe.client.ui.admin.AdminStep;

 import fr.ird.observe.client.ui.admin.AdminTabUIHandler;

   <import>

     fr.ird.observe.client.configuration.ClientConfig

     fr.ird.observe.client.constants.ReferentialSynchronizeMode

-    fr.ird.observe.client.I18nEnumHelper

+    fr.ird.observe.dto.I18nEnumHelper

     fr.ird.observe.client.ui.admin.AdminUIModel

     fr.ird.observe.client.constants.ValidationModelMode

 

  * #L%

  */

 

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.constants.ReferentialSynchronizeMode;

 import fr.ird.observe.client.db.ObserveSwingDataSource;

 import fr.ird.observe.client.ui.admin.AdminActionModel;

 <JPanel id="validateConfig">

 

   <import>

-    fr.ird.observe.client.I18nEnumHelper

+    fr.ird.observe.dto.I18nEnumHelper

     fr.ird.observe.client.ui.admin.AdminUIModel

     fr.ird.observe.client.constants.ValidationModelMode

 

 

 import com.google.common.collect.ImmutableMap;

 import com.google.common.collect.Lists;

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ObserveSwingApplicationContext;

 import fr.ird.observe.client.ui.ObserveKeyStrokes;

 import fr.ird.observe.client.ui.actions.UIActionSupport;

 import com.google.common.collect.ImmutableSet;

 import fr.ird.observe.spi.DtoModelHelper;

 import fr.ird.observe.binder.referential.ReferentialDtoReferenceBinder;

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ObserveSwingApplicationContext;

 import fr.ird.observe.client.ui.content.ContentUIModel;

 import fr.ird.observe.dto.data.seine.DcpComputedValue;

  * #L%

  */

 

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseStatus;

 import java.awt.GridLayout;

 import java.util.Objects;

 package fr.ird.observe.client.ui.content.data.seine;

 

 import fr.ird.observe.spi.DtoModelHelper;

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.db.ClientDataContext;

 import fr.ird.observe.client.db.ObserveSwingDataSource;

 import fr.ird.observe.client.db.constants.DataContextType;

 

 import com.google.common.base.Preconditions;

 import com.google.common.collect.ImmutableSet;

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ObserveSwingApplicationContext;

 import fr.ird.observe.client.constants.DbMode;

 import fr.ird.observe.client.db.ObserveSwingDataSource;

         }

     };

 

+    public String getLabel() {

+        return I18nEnumHelper.getLabel(this);

+    }

     /** Logger */

     private static final Log log = LogFactory.getLog(ObstunaAdminAction.class);

 

  */

 package fr.ird.observe.client.ui.storage;

 

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import org.nuiton.jaxx.runtime.swing.wizard.WizardStep;

 

 /**

 package fr.ird.observe.client.ui.storage;

 

 import com.google.common.base.Preconditions;

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ObserveActionExecutor;

 import fr.ird.observe.client.ObserveRunner;

 import fr.ird.observe.client.ObserveSwingApplicationContext;

  */

 package fr.ird.observe.client.ui.storage;

 

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ObserveSwingApplicationContext;

 import fr.ird.observe.client.ObserveSwingTechnicalException;

 import fr.ird.observe.client.configuration.ClientConfig;

 <StorageTabUI>

 

   <import>

-    fr.ird.observe.client.I18nEnumHelper

+    fr.ird.observe.dto.I18nEnumHelper

     fr.ird.observe.client.ObserveSwingApplicationContext

     fr.ird.observe.client.configuration.ClientConfig

     fr.ird.observe.client.ui.util.UIHelper

  * #L%

  */

 

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ObserveSwingApplicationContext;

 import fr.ird.observe.client.ObserveTextGenerator;

 import fr.ird.observe.client.constants.CreationMode;

 <StorageTabUI>

 

   <import>

-    fr.ird.observe.client.I18nEnumHelper

+    fr.ird.observe.dto.I18nEnumHelper

     fr.ird.observe.client.constants.CreationMode

     fr.ird.observe.client.ui.storage.StorageStep

 

 <StorageTabUI>

 

   <import>

-    fr.ird.observe.client.I18nEnumHelper

+    fr.ird.observe.dto.I18nEnumHelper

     fr.ird.observe.client.constants.ConnexionStatus

     fr.ird.observe.client.ui.actions.storage.SaveCurrentRemoteConfigurationUIAction

     fr.ird.observe.client.ui.actions.storage.SaveCurrentServerConfigurationUIAction

         implements='org.nuiton.jaxx.runtime.swing.wizard.WizardStepUI&lt;StorageStep, StorageUIModel&gt;'>

 

   <import>

-    fr.ird.observe.client.I18nEnumHelper

+    fr.ird.observe.dto.I18nEnumHelper

     fr.ird.observe.client.ui.util.UIHelper

     fr.ird.observe.client.ui.storage.StorageStep

     fr.ird.observe.client.ui.storage.StorageUIModel

 import com.vividsolutions.jts.geom.LineString;

 import com.vividsolutions.jts.geom.Point;

 import com.vividsolutions.jts.geom.Polygon;

-import fr.ird.observe.client.I18nEnumHelper;

+import fr.ird.observe.dto.I18nEnumHelper;

 import fr.ird.observe.client.ObserveSwingTechnicalException;

 import fr.ird.observe.dto.data.TripMapPoint;

 import fr.ird.observe.dto.data.TripMapPointType;

                 <goal>parse-java-enumerations</goal>

               </goals>

               <configuration>

-                <generateHelper>true</generateHelper>

                 <enumerationSets>

                   <enumerationSet>

                     <name>label</name>

+package fr.ird.observe.dto;

+

+/*-

+ * #%L

+ * ObServe :: Dto

+ * %%

+ * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io

+ * %%

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as

+ * published by the Free Software Foundation, either version 3 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public

+ * License along with this program.  If not, see

+ * <http://www.gnu.org/licenses/gpl-3.0.html>.

+ * #L%

+ */

+

+import java.util.Locale;

+

+import static org.nuiton.i18n.I18n.l;

+import static org.nuiton.i18n.I18n.t;

+

+public class I18nEnumHelper {

+

+    public static <E extends Enum<E>> String getLabel(E e) {

+        return t(getLabelKey(e));

+    }

+

+    public static <E extends Enum<E>> String getLabel(Locale locale, E e) {

+        return l(locale, getLabelKey(e));

+    }

+

+    public static <E extends Enum<E>> String getDescription(E e) {

+        return t(getDescriptionKey(e));

+    }

+

+    public static <E extends Enum<E>> String getDescription(Locale locale, E e) {

+        return l(locale, getDescriptionKey(e));

+    }

+

+    private static <E extends Enum<E>> String getLabelKey(E e) {

+        return "observe.constant." + getClassSimpleName(e) + "." + e.name();

+    }

+

+    private static <E extends Enum<E>> String getDescriptionKey(E e) {

+        return "observe.constant." + getClassSimpleName(e) + "." + e.name() + ".description";

+    }

+

+    private static <E extends Enum<E>> String getClassSimpleName(E e) {

+        String result = e.getClass().getSimpleName();

+        if (result.isEmpty()) {

+            result = e.getClass().getEnclosingClass().getSimpleName();

+        }

+        return result;

+    }

+

+}

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

25 changed files:

Changes: