r1017 - trunk/eugene/src/main/java/org/nuiton/eugene - Eugene-commits

28 Nov 2010

Author: tchemit
Date: 2010-11-29 00:55:31 +0100 (Mon, 29 Nov 2010)
New Revision: 1017

Url: http://nuiton.org/repositories/revision/eugene/1017

Log:
let init moethod be public (for tests) + optimize imports

Modified:
   trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java
   trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java
   trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java

Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java
===================================================================

--- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java	2010-11-28 23:49:23 UTC (rev 1016)
+++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java	2010-11-28 23:55:31 UTC (rev 1017)
@@ -29,6 +29,8 @@
 import org.nuiton.eugene.models.object.ObjectModelAttribute;
 import org.nuiton.eugene.models.object.ObjectModelClassifier;
 
+import static org.nuiton.eugene.ModelPropertiesUtil.StereotypeDefinition;
+
 /**
  * Defines all stereotypes managed by Eugene.
  * <p/>
@@ -46,7 +48,7 @@
      * @see JavaBeanTransformer
      * @see JavaGeneratorUtil#hasBeanStereotype(ObjectModelClassifier)
      */
-    @ModelPropertiesUtil.StereotypeDefinition(target = ObjectModelClassifier.class)
+    @StereotypeDefinition(target = ObjectModelClassifier.class)
     String STEREOTYPE_BEAN = "bean";
 
     /**
@@ -54,6 +56,6 @@
      *
      * @see GeneratorUtil#hasIndexedStereotype(ObjectModelAttribute)
      */
-    @ModelPropertiesUtil.StereotypeDefinition(target = ObjectModelAttribute.class)
+    @StereotypeDefinition(target = ObjectModelAttribute.class)
     String STEREOTYPE_INDEXED = "indexed";
 }

Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java
===================================================================
--- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java	2010-11-28 23:49:23 UTC (rev 1016)
+++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java	2010-11-28 23:55:31 UTC (rev 1017)
@@ -31,6 +31,7 @@
 import org.nuiton.eugene.models.object.ObjectModelElement;
 import org.nuiton.eugene.models.object.ObjectModelReader;
 
+import static org.nuiton.eugene.ModelPropertiesUtil.TagValueDefinition;
 /**
  * Defines all tag values managed by Eugene.
  * <p/>
@@ -53,7 +54,7 @@
      * @see ObjectModelReader#loadModelTagValue(ObjectModel, String, String)
      * @since 2.3
      */
-    @ModelPropertiesUtil.TagValueDefinition(target = {ObjectModel.class})
+    @TagValueDefinition(target = {ObjectModel.class})
     String TAG_VERSION = "version";
 
     /**
@@ -65,7 +66,7 @@
      * @see JavaGeneratorUtil#getConstantPrefixTagValue(ObjectModel, ObjectModelClassifier)
      * @since 2.3
      */
-    @ModelPropertiesUtil.TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class})
+    @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class})
     String TAG_CONSTANT_PREFIX = "constantPrefix";
 
     /**
@@ -77,7 +78,7 @@
      * @see JavaGeneratorUtil#getNoPCSTagValue(ObjectModel, ObjectModelClassifier)
      * @since 2.3
      */
-    @ModelPropertiesUtil.TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class})
+    @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class})
     String TAG_NO_PCS = "noPCS";
 
     /**
@@ -88,6 +89,6 @@
      * @see JavaGeneratorUtil#getI18nPrefixTagValue(ObjectModelElement, ObjectModel)
      * @since 2.3
      */
-    @ModelPropertiesUtil.TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class})
+    @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class})
     String TAG_I18N_PREFIX = "i18n";
 }

Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java
===================================================================
--- trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java	2010-11-28 23:49:23 UTC (rev 1016)
+++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java	2010-11-28 23:55:31 UTC (rev 1017)
@@ -70,7 +70,7 @@
     public static class EugeneModelPropertiesProvider extends ModelPropertiesProvider {
 
         @Override
-        protected void init() throws IllegalAccessException {
+        public void init() throws IllegalAccessException {
             scanStereotypeClass(EugeneStereoTypes.class);
             scanTagValueClass(EugeneTagValues.class);
         }
@@ -92,7 +92,7 @@
         }
 
         @Override
-        protected void init() throws Exception {
+        public void init() throws Exception {
             ServiceLoader<ModelPropertiesProvider> loader;
             loader = ServiceLoader.load(ModelPropertiesProvider.class,
                                         this.loader);
@@ -181,7 +181,7 @@
             tagValueStore = new TreeMap<String, TagValueDefinition>();
         }
 
-        protected abstract void init() throws Exception;
+        public abstract void init() throws Exception;
 
         protected void scanStereotypeClass(Class<?> holder) throws IllegalAccessException {
             if (log.isInfoEnabled()) {

    

r1017 - trunk/eugene/src/main/java/org/nuiton/eugene

tchemit＠users.nuiton.org

tags

participants (1)