vendor update

Guite · Jun 7, 2024 · d530230 · d530230
1 parent 13d0875
commit d530230
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/bundles/org.zikula.modulestudio.generator/META-INF/MANIFEST.MF b/bundles/org.zikula.modulestudio.generator/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Require-Bundle: de.guite.modulestudio.mostdsl;bundle-version="1.5.0",
  org.eclipse.core.runtime;bundle-version="3.31.0",
  org.eclipse.emf.mwe2.launch;bundle-version="2.17.0",
  org.eclipse.emf.mwe.utils;bundle-version="1.11.0",
- org.eclipse.xtend.core;bundle-version="2.34.0",
- org.eclipse.xtend.standalone;bundle-version="2.34.0";resolution:=optional,
- org.eclipse.xtext;bundle-version="2.34.0",
+ org.eclipse.xtend.core;bundle-version="2.35.0",
+ org.eclipse.xtend.standalone;bundle-version="2.35.0";resolution:=optional,
+ org.eclipse.xtext;bundle-version="2.35.0",
  org.objectweb.asm;bundle-version="9.6.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy

diff --git a/...dulestudio.generator/src/org/zikula/modulestudio/generator/application/ImageCreator.xtend b/...dulestudio.generator/src/org/zikula/modulestudio/generator/application/ImageCreator.xtend
@@ -112,7 +112,7 @@ class ImageCreator {
         if (capitals.size > 1) {
             // If the application name contains more than one capital use the first and the last one of it
             // Example: VD for VerySimpleDownloads
-            initialsText = capitals.head + '' + capitals.last //$NON-NLS-1$
+            initialsText = capitals.head + '' + capitals.lastOrNull //$NON-NLS-1$
         } else {
             // Otherwise use the first capital of the vendor and the capital of the application name
             // Example: GN for Guite / News

diff --git a/...io.generator/src/org/zikula/modulestudio/generator/application/MostFileSystemHelper.xtend b/...io.generator/src/org/zikula/modulestudio/generator/application/MostFileSystemHelper.xtend
@@ -17,7 +17,7 @@ class MostFileSystemHelper {
 
         var finalPath = filePath
         var filePathParts = filePath.split('\\.') //$NON-NLS-1$
-        val fileExtension = filePathParts.last
+        val fileExtension = filePathParts.lastOrNull
 
         if (shouldBeMarked(filePath)) {
             filePathParts = Arrays.copyOf(filePathParts, filePathParts.length - 1)
@@ -41,7 +41,7 @@ class MostFileSystemHelper {
      */
     def getPathToBaseClass(Application it, String concretePath) {
         var basePathSegments = concretePath.split('/') //$NON-NLS-1$
-        var baseFileName = basePathSegments.last
+        var baseFileName = basePathSegments.lastOrNull
         basePathSegments = Arrays.copyOf(basePathSegments, basePathSegments.length - 1)
 
         var basePathPartsChangeable = newArrayList(basePathSegments)

diff --git a/...tor/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/FormHandler.xtend b/...tor/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/FormHandler.xtend
@@ -405,7 +405,11 @@ class FormHandler {
             }
 
             «IF !getAllEntities.filter[hasEditAction && hasSluggableFields && slugUnique && needsSlugHandler].empty»
-                if (null !== $entity->getSlug() && in_array($this->objectType, ['«getAllEntities.filter[hasEditAction && hasSluggableFields && slugUnique && needsSlugHandler].map[name.formatForCode].join('\', \'')»'], true)) {
+                if (
+                    in_array($this->objectType, ['«getAllEntities.filter[hasEditAction && hasSluggableFields && slugUnique && needsSlugHandler].map[name.formatForCode].join('\', \'')»'], true)
+                    && method_exists($entity, 'getSlug')
+                    && null !== $entity->getSlug()
+                ) {
                     $slugParts = explode('/', $entity->getSlug());
                     $entity->setSlug(end($slugParts));
                 }

diff --git a/.../src/org/zikula/modulestudio/generator/cartridges/symfony/models/entity/Association.xtend b/.../src/org/zikula/modulestudio/generator/cartridges/symfony/models/entity/Association.xtend
@@ -361,7 +361,7 @@ class Association {
             if (orderByField.contains(':')) {
                 val criteriaParts = orderByField.split(':')
                 fieldName = criteriaParts.head
-                sorting = criteriaParts.last
+                sorting = criteriaParts.lastOrNull
             }
             criteria.add('"' + fieldName + '" = "' + sorting.toUpperCase + '"')
         }

diff --git a/...enerator/src/org/zikula/modulestudio/generator/cartridges/symfony/smallstuff/Recipe.xtend b/...enerator/src/org/zikula/modulestudio/generator/cartridges/symfony/smallstuff/Recipe.xtend
@@ -3,15 +3,13 @@ package org.zikula.modulestudio.generator.cartridges.symfony.smallstuff
 import de.guite.modulestudio.metamodel.Application
 import org.zikula.modulestudio.generator.application.IMostFileSystemAccess
 import org.zikula.modulestudio.generator.extensions.FormattingExtensions
-import org.zikula.modulestudio.generator.extensions.ModelBehaviourExtensions
 import org.zikula.modulestudio.generator.extensions.ModelExtensions
 import org.zikula.modulestudio.generator.extensions.NamingExtensions
 import org.zikula.modulestudio.generator.extensions.Utils
 
 class Recipe {
 
     extension FormattingExtensions = new FormattingExtensions
-    extension ModelBehaviourExtensions = new ModelBehaviourExtensions
     extension ModelExtensions = new ModelExtensions
     extension NamingExtensions = new NamingExtensions
     extension Utils = new Utils

diff --git a/tests/org.zikula.modulestudio.generator.tests/META-INF/MANIFEST.MF b/tests/org.zikula.modulestudio.generator.tests/META-INF/MANIFEST.MF
@@ -12,11 +12,11 @@ Require-Bundle: com.google.guava;bundle-version="33.0.0",
  de.guite.modulestudio.mostdsl;bundle-version="1.5.0",
  de.guite.modulestudio.mostdsl.ui;bundle-version="1.5.0",
  org.eclipse.xpect.xtext.lib;bundle-version="0.3.0",
- org.eclipse.xtend.lib;bundle-version="2.34.0",
- org.eclipse.xtend.lib.macro;bundle-version="2.34.0",
- org.eclipse.xtext.testing;bundle-version="2.34.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.34.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.34.0",
+ org.eclipse.xtend.lib;bundle-version="2.35.0",
+ org.eclipse.xtend.lib.macro;bundle-version="2.35.0",
+ org.eclipse.xtext.testing;bundle-version="2.35.0",
+ org.eclipse.xtext.ui.shared;bundle-version="2.35.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.35.0",
  org.hamcrest.core;bundle-version="2.2.0",
  org.junit;bundle-version="4.13.2",
  org.objectweb.asm;bundle-version="9.6.0",