raised dep versions

Guite · Sep 20, 2018 · f41a143 · f41a143
1 parent ac9e625
commit f41a143
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 53 deletions.
diff --git a/bundles/org.zikula.modulestudio.generator/META-INF/MANIFEST.MF b/bundles/org.zikula.modulestudio.generator/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@ Bundle-SymbolicName: org.zikula.modulestudio.generator; singleton:=true
 Bundle-Version: 1.3.2.qualifier
 Require-Bundle: de.guite.modulestudio.mostdsl;bundle-version="1.3.2",
  org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.core.runtime;bundle-version="3.14.0",
+ org.eclipse.core.runtime;bundle-version="3.15.0",
  org.eclipse.emf.mwe2.launch;bundle-version="2.9.1",
- org.eclipse.xtend.core;bundle-version="2.14.0",
- org.eclipse.xtend.standalone;bundle-version="2.14.0";resolution:=optional,
- org.eclipse.xtext;bundle-version="2.14.0",
- org.objectweb.asm;bundle-version="6.1.1"
+ org.eclipse.xtend.core;bundle-version="2.15.0",
+ org.eclipse.xtend.standalone;bundle-version="2.15.0";resolution:=optional,
+ org.eclipse.xtext;bundle-version="2.15.0",
+ org.objectweb.asm;bundle-version="6.2.1"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Export-Package: org.zikula.modulestudio.generator.application,

diff --git a/...rc/org/zikula/modulestudio/generator/cartridges/zclassic/controller/ControllerLayer.xtend b/...rc/org/zikula/modulestudio/generator/cartridges/zclassic/controller/ControllerLayer.xtend
@@ -15,7 +15,6 @@ import org.zikula.modulestudio.generator.cartridges.zclassic.controller.addition
 import org.zikula.modulestudio.generator.cartridges.zclassic.controller.additions.Routing
 import org.zikula.modulestudio.generator.cartridges.zclassic.controller.additions.Scribite
 import org.zikula.modulestudio.generator.cartridges.zclassic.controller.formtype.QuickNavigationType
-import org.zikula.modulestudio.generator.extensions.CollectionUtils
 import org.zikula.modulestudio.generator.extensions.ControllerExtensions
 import org.zikula.modulestudio.generator.extensions.FormattingExtensions
 import org.zikula.modulestudio.generator.extensions.ModelBehaviourExtensions
@@ -25,7 +24,6 @@ import org.zikula.modulestudio.generator.extensions.Utils
 
 class ControllerLayer {
 
-    extension CollectionUtils = new CollectionUtils
     extension ControllerExtensions = new ControllerExtensions
     extension FormattingExtensions = new FormattingExtensions
     extension ModelExtensions = new ModelExtensions
@@ -167,8 +165,8 @@ class ControllerLayer {
         class «name.formatForCodeCapital»Controller extends Abstract«name.formatForCodeCapital»Controller
         {
             «IF hasSluggableFields»«/* put display method at the end to avoid conflict between delete/edit and display for slugs */»
-                «FOR action : getAllEntityActions.exclude(DisplayAction)»
-                    «adminAndUserImpl(action as Action, false)»
+                «FOR action : getAllEntityActions.reject(DisplayAction)»
+                    «adminAndUserImpl(action, false)»
                 «ENDFOR»
                 «IF loggable»
                     «new LoggableUndelete().generate(it, false)»

diff --git a/...org/zikula/modulestudio/generator/cartridges/zclassic/view/formcomponents/Relations.xtend b/...org/zikula/modulestudio/generator/cartridges/zclassic/view/formcomponents/Relations.xtend
@@ -43,7 +43,7 @@ class Relations {
     /**
      * This method creates the templates to be included into the edit forms.
      */
-    def generateInclusionTemplate(Entity it) '''
+    def CharSequence generateInclusionTemplate(Entity it) '''
         «FOR relation : getEditableJoinRelations(true)»«relation.generate(false, false, false)»«ENDFOR»
         «FOR relation : getEditableJoinRelations(false)»«relation.generate(false, false, true)»«ENDFOR»
     '''

diff --git a/...lestudio.generator/src/org/zikula/modulestudio/generator/extensions/CollectionUtils.xtend b/...lestudio.generator/src/org/zikula/modulestudio/generator/extensions/CollectionUtils.xtend
diff --git a/...lestudio.generator/src/org/zikula/modulestudio/generator/extensions/ModelExtensions.xtend b/...lestudio.generator/src/org/zikula/modulestudio/generator/extensions/ModelExtensions.xtend
@@ -34,14 +34,12 @@ import de.guite.modulestudio.metamodel.UploadField
 import de.guite.modulestudio.metamodel.UploadNamingScheme
 import de.guite.modulestudio.metamodel.UrlField
 import de.guite.modulestudio.metamodel.UserField
-import java.util.List
 
 /**
  * This class contains model related extension methods.
  */
 class ModelExtensions {
 
-    extension CollectionUtils = new CollectionUtils
     extension FormattingExtensions = new FormattingExtensions
     extension ModelInheritanceExtensions = new ModelInheritanceExtensions
     extension Utils = new Utils
@@ -351,8 +349,7 @@ class ModelExtensions {
      * Returns a list of all fields which should be displayed on the view page.
      */
     def getFieldsForViewPage(Entity it) {
-        var fields = getDisplayFields.filter[f|f.isVisibleOnViewPage].exclude(ArrayField).exclude(ObjectField)
-        fields.toList as List<DerivedField>
+        getDisplayFields.filter[f|f.isVisibleOnViewPage].reject(ArrayField).reject(ObjectField).toList
     }
 
     /**
@@ -382,8 +379,7 @@ class ModelExtensions {
      * Returns a list of all fields which may be used for sorting.
      */
     def getSortingFields(DataObject it) {
-        var fields = getDisplayFields.filter[f|f.isSortField].exclude(UserField).exclude(ArrayField).exclude(ObjectField)
-        fields.toList as List<Field>
+        getDisplayFields.filter[f|f.isSortField].reject(UserField).reject(ArrayField).reject(ObjectField).toList
     }
 
     /**
@@ -397,7 +393,7 @@ class ModelExtensions {
         if (it instanceof Entity && (it as Entity).identifierStrategy != EntityIdentifierStrategy.NONE) {
             fields = fields.filter[!primaryKey]
         }
-        var filteredFields = fields.filter[!isVersionField].exclude(ObjectField)
+        var filteredFields = fields.filter[!isVersionField].reject(ObjectField)
         val joinFieldNames = newArrayList
         for (relation : incoming.filter(JoinRelationship).filter[targetField != 'id']) {
             joinFieldNames += relation.targetField
@@ -408,7 +404,7 @@ class ModelExtensions {
 
         filteredFields = filteredFields.filter(DerivedField).filter[!joinFieldNames.contains(name)]
 
-        filteredFields.toList as List<DerivedField>
+        filteredFields.toList
     }
 
     /**
@@ -427,8 +423,7 @@ class ModelExtensions {
      * At the moment instances of UploadField are excluded.
      */
     def getFieldsForExampleData(DataObject it) {
-        val exampleFields = getDerivedFields.filter[!primaryKey].exclude(UploadField)
-        exampleFields.toList as List<DerivedField>
+        getDerivedFields.filter[!primaryKey].reject(UploadField).toList
     }
 
     /**

diff --git a/features/org.zikula.modulestudio.generator.feature/feature.xml b/features/org.zikula.modulestudio.generator.feature/feature.xml
@@ -31,10 +31,10 @@
       <import plugin="de.guite.modulestudio.mostdsl" version="1.3.2" match="greaterOrEqual"/>
       <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.mwe2.launch" version="2.9.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtend.core" version="2.14.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext" version="2.14.0" match="greaterOrEqual"/>
-      <import plugin="org.objectweb.asm" version="6.1.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.14.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.15.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtend.core" version="2.15.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext" version="2.15.0" match="greaterOrEqual"/>
+      <import plugin="org.objectweb.asm" version="6.2.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/tests/org.zikula.modulestudio.generator.tests/META-INF/MANIFEST.MF b/tests/org.zikula.modulestudio.generator.tests/META-INF/MANIFEST.MF
@@ -11,14 +11,14 @@ Require-Bundle: com.google.guava;bundle-version="21.0.0",
  com.google.inject;bundle-version="3.0.0",
  de.guite.modulestudio.mostdsl;bundle-version="1.3.2",
  de.guite.modulestudio.mostdsl.ui;bundle-version="1.3.2",
- org.eclipse.xtend.lib;bundle-version="2.14.0",
- org.eclipse.xtext.generator;bundle-version="2.14.0",
- org.eclipse.xtext.testing;bundle-version="2.14.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.14.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
+ org.eclipse.xtend.lib;bundle-version="2.15.0",
+ org.eclipse.xtext.generator;bundle-version="2.15.0",
+ org.eclipse.xtext.testing;bundle-version="2.15.0",
+ org.eclipse.xtext.ui.shared;bundle-version="2.15.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.15.0",
  org.hamcrest.core;bundle-version="1.3.0",
  org.junit;bundle-version="4.12.0",
- org.objectweb.asm;bundle-version="6.1.1",
+ org.objectweb.asm;bundle-version="6.2.1",
  org.xpect.xtext.lib;bundle-version="0.2.0",
  org.zikula.modulestudio.generator;bundle-version="1.3.2"
 Export-Package: org.zikula.modulestudio.generator.tests;x-internal=true