Google Git
Sign in
eclipse/osbp/org.eclipse.osbp.autowireHelper/refs/heads/master^!/.
commit
b0efce6b7514fa99275579562d24da367c3672cd
[log]
author
Ralf Mollik <ramollik@compex-commerce.com>
Mon Jul 15 09:04:19 2019 +0200
committer
Ralf Mollik <ramollik@compex-commerce.com>
Mon Jul 15 09:04:19 2019 +0200
tree
6a81c06a6138563e76793cdcedac1919b4000544
parent
82240bb0c77002d8cf9b498c35561b01ac1936a0 [diff]
catch up with development

Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>

diff --git a/org.eclipse.osbp.autowireHelper/META-INF/MANIFEST.MF b/org.eclipse.osbp.autowireHelper/META-INF/MANIFEST.MF
index eee58c5..15e86e2 100644
--- a/org.eclipse.osbp.autowireHelper/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.autowireHelper/META-INF/MANIFEST.MF

@@ -11,7 +11,7 @@
  com.google.inject;bundle-version="3.0.0";resolution:=optional,
  org.eclipse.emf.common,
  org.eclipse.emf.ecore;bundle-version="2.10.2",
- org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.12.0)";resolution:=optional,
+ org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.12.0)",
  org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.12.0)";resolution:=optional,
  org.eclipse.xtend2.lib;bundle-version="2.7.3";resolution:=optional,
  org.eclipse.osbp.runtime.common;bundle-version="[0.9.0,0.10.0)",
@@ -35,7 +35,6 @@
  org.eclipse.osbp.xtext.i18n;bundle-version="0.9.0"
 Export-Package: org.eclipse.osbp.autowirehelper;version="0.9.0",
  org.eclipse.osbp.autowirehelper.utils;version="0.9.0"
-Import-Package: javax.annotation,
- org.eclipse.osbp.utils.common;version="0.9.0",
+Import-Package: org.eclipse.osbp.utils.common;version="0.9.0",
  org.eclipse.osbp.utils.functionnormalizer.api
 

diff --git a/org.eclipse.osbp.autowireHelper/src/org/eclipse/osbp/autowirehelper/AutowireHelper.xtend b/org.eclipse.osbp.autowireHelper/src/org/eclipse/osbp/autowirehelper/AutowireHelper.xtend
index 18f24c0..f1bbf8b 100644
--- a/org.eclipse.osbp.autowireHelper/src/org/eclipse/osbp/autowirehelper/AutowireHelper.xtend
+++ b/org.eclipse.osbp.autowireHelper/src/org/eclipse/osbp/autowirehelper/AutowireHelper.xtend

@@ -73,18 +73,23 @@
 import org.eclipse.osbp.ecview.semantic.uimodel.UiBeanSlot
 import org.eclipse.osbp.ecview.semantic.uimodel.UiBindingEndpointAssignment
 import org.eclipse.osbp.ecview.semantic.uimodel.UiEmbeddable
-import org.eclipse.osbp.ecview.semantic.uimodel.UiHorizontalLayout
 import org.eclipse.osbp.ecview.semantic.uimodel.UiLayout
-import org.eclipse.osbp.mobile.vaadin.ecview.model.VMVerticalComponentGroup
 import org.eclipse.osbp.mobile.vaadin.ecview.model.VaadinMobileFactory
 import org.eclipse.osbp.runtime.common.annotations.DomainDescription
 import org.eclipse.osbp.runtime.common.annotations.DomainKey
+import org.eclipse.osbp.runtime.common.annotations.EnumDefaultLiteral
+import org.eclipse.osbp.runtime.common.annotations.ExtraStyle
 import org.eclipse.osbp.runtime.common.annotations.FilterDepth
 import org.eclipse.osbp.runtime.common.annotations.OnKanbanCard
+import org.eclipse.osbp.runtime.common.annotations.TargetEnumConstraints
+import org.eclipse.osbp.runtime.common.annotations.UIGroup
 import org.eclipse.osbp.runtime.common.annotations.UniqueEntry
-import org.eclipse.osbp.runtime.common.metric.TimeLogger
+import org.eclipse.osbp.runtime.common.layouting.IPropertyConstants
 import org.eclipse.osbp.utils.functionnormalizer.api.FunctionTypingAPI
+import org.eclipse.osbp.xtext.i18n.I18NKeyGenerator
+import org.eclipse.xtext.common.types.JvmAnnotationReference
 import org.eclipse.xtext.common.types.JvmDeclaredType
+import org.eclipse.xtext.common.types.JvmField
 import org.eclipse.xtext.common.types.JvmGenericType
 import org.eclipse.xtext.common.types.JvmParameterizedTypeReference
 import org.eclipse.xtext.common.types.JvmPrimitiveType
@@ -97,12 +102,10 @@
 import org.eclipse.xtext.ui.editor.findrefs.IReferenceFinder
 import org.eclipse.xtext.util.IAcceptor
 import org.eclipse.xtext.util.concurrent.IUnitOfWork
-import org.eclipse.osbp.runtime.common.layouting.IPropertyConstants
-import org.eclipse.xtext.common.types.JvmField
-import org.eclipse.osbp.runtime.common.annotations.TargetEnumConstraints
-import org.eclipse.osbp.runtime.common.annotations.UIGroup
-import org.eclipse.osbp.runtime.common.annotations.ExtraStyle
-import org.eclipse.osbp.xtext.i18n.I18NKeyGenerator
+import org.eclipse.xtext.common.types.JvmStringAnnotationValue
+import org.eclipse.xtext.common.types.JvmAnnotationValue
+import org.eclipse.xtext.common.types.JvmEnumAnnotationValue
+import org.eclipse.xtext.common.types.JvmOperation
 
 @SuppressWarnings("restriction")
 class AutowireHelper implements IAutowireDelegate {
@@ -818,6 +821,21 @@
 		if (info.readonly) {
 			suspect.tags += ILayoutingStrategy.TAG__READONLY
 		}
+		
+		
+		val JvmAnnotationReference annRef = (type as JvmDeclaredType).annotations.findFirst[it.annotation.qualifiedName.equals(EnumDefaultLiteral.canonicalName)]
+		if(annRef !== null && annRef.values !== null) {
+//			val annValue = annRef.values.findFirst[
+//				it.valueName.equals("literalName")
+//			] as JvmStringAnnotationValue
+// 			if(annValue !== null) {
+			if(!annRef.values.empty) {
+				val defaultLiteralName = annRef.values.get(0) as JvmStringAnnotationValue 
+				if(defaultLiteralName !== null) {
+					suspect.properties.put("defaultLiteralName", defaultLiteralName.values.get(0));
+				}
+			}
+		}		
 		suspect
 	}
 

diff --git a/org.eclipse.osbp.autowireHelper/xtend-gen/org/eclipse/osbp/autowirehelper/AutowireHelper.java b/org.eclipse.osbp.autowireHelper/xtend-gen/org/eclipse/osbp/autowirehelper/AutowireHelper.java
index 788ce62..9706d7f 100644
--- a/org.eclipse.osbp.autowireHelper/xtend-gen/org/eclipse/osbp/autowirehelper/AutowireHelper.java
+++ b/org.eclipse.osbp.autowireHelper/xtend-gen/org/eclipse/osbp/autowirehelper/AutowireHelper.java

@@ -92,6 +92,7 @@
 import org.eclipse.osbp.mobile.vaadin.ecview.model.VaadinMobileFactory;
 import org.eclipse.osbp.runtime.common.annotations.DomainDescription;
 import org.eclipse.osbp.runtime.common.annotations.DomainKey;
+import org.eclipse.osbp.runtime.common.annotations.EnumDefaultLiteral;
 import org.eclipse.osbp.runtime.common.annotations.ExtraStyle;
 import org.eclipse.osbp.runtime.common.annotations.FilterDepth;
 import org.eclipse.osbp.runtime.common.annotations.OnKanbanCard;
@@ -103,11 +104,13 @@
 import org.eclipse.osbp.xtext.i18n.I18NKeyGenerator;
 import org.eclipse.xtend2.lib.StringConcatenation;
 import org.eclipse.xtext.common.types.JvmAnnotationReference;
+import org.eclipse.xtext.common.types.JvmAnnotationValue;
 import org.eclipse.xtext.common.types.JvmDeclaredType;
 import org.eclipse.xtext.common.types.JvmField;
 import org.eclipse.xtext.common.types.JvmGenericType;
 import org.eclipse.xtext.common.types.JvmParameterizedTypeReference;
 import org.eclipse.xtext.common.types.JvmPrimitiveType;
+import org.eclipse.xtext.common.types.JvmStringAnnotationValue;
 import org.eclipse.xtext.common.types.JvmType;
 import org.eclipse.xtext.common.types.JvmTypeReference;
 import org.eclipse.xtext.common.types.JvmVoid;
@@ -1175,6 +1178,21 @@
         EList<String> _tags_1 = suspect.getTags();
         _tags_1.add(ILayoutingStrategy.TAG__READONLY);
       }
+      final Function1<JvmAnnotationReference, Boolean> _function = (JvmAnnotationReference it) -> {
+        return Boolean.valueOf(it.getAnnotation().getQualifiedName().equals(EnumDefaultLiteral.class.getCanonicalName()));
+      };
+      final JvmAnnotationReference annRef = IterableExtensions.<JvmAnnotationReference>findFirst(((JvmDeclaredType) type).getAnnotations(), _function);
+      if (((annRef != null) && (annRef.getValues() != null))) {
+        boolean _isEmpty = annRef.getValues().isEmpty();
+        boolean _not = (!_isEmpty);
+        if (_not) {
+          JvmAnnotationValue _get = annRef.getValues().get(0);
+          final JvmStringAnnotationValue defaultLiteralName = ((JvmStringAnnotationValue) _get);
+          if ((defaultLiteralName != null)) {
+            suspect.getProperties().put("defaultLiteralName", defaultLiteralName.getValues().get(0));
+          }
+        }
+      }
       _xblockexpression = suspect;
     }
     return _xblockexpression;