Merge remote-tracking branch 'origin/release-7.2.0' into 7.2.x

bundles/plugins/org.bonitasoft.studio-models/process.history

@@ -9928,5 +9928,8 @@
     <changes xsi:type="history:MigrationChange" migration="org.bonitasoft.studio.migration.custom.migration.connector.UpdateGroovyConnectorVersionTo102"/>
     <changes xsi:type="history:MigrationChange" migration="org.bonitasoft.studio.migration.custom.migration.connector.UpdateTransactionalGroovyConnectorVersionTo101"/>
   </releases>
+  <releases date="2016-01-25T10:43:27.494+0100" label="7.2.0-002">
+    <changes xsi:type="history:MigrationChange" migration="org.bonitasoft.studio.migration.custom.migration.connector.UpdateDocumentConverterTo102"/>
+  </releases>
   <releases/>
 </history:History>

bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/ModelVersion.java

@@ -20,7 +20,7 @@ package org.bonitasoft.studio.common;
 public class ModelVersion {
 
     public static final String VERSION_6_0_0_ALPHA = "6.0.0-Alpha";
-    public static final String CURRENT_VERSION = "7.2.0-001";
+    public static final String CURRENT_VERSION = "7.2.0-002";
 
     public static boolean sameVersion(final String version) {
         return CURRENT_VERSION.equals(version);

bundles/plugins/org.bonitasoft.studio.contract/messages.properties

@@ -65,7 +65,7 @@ contractInputDescriptionTooltip=Used in the automatically generated forms as use
 errorTitle=Error
 contractFromDataCreationErrorMessage=An error occurred while generating the contract from a data.
 contractGenerationTitle=Contract generation
-contractOperationGenerationMsg=The contract inputs have been specified.\n\nOperations to set the values of the business variable attributes with the contract inputs values will be generated.They can be viewed in the Operations pane.\nIf operations have already been generated for these attributes, they will not be replaced. The new operations are added to the list.\n\nContract inputs and operations can be edited manually.\nHowever, there is no refactoring (for example, updating the attribute name or a multiple property in a business object or contract element will break the operation).
+contractOperationGenerationMsg=The contract inputs have been specified.\n\nOperations to set the values of the business variable attributes with the contract inputs values will be generated.They can be viewed in the Operations pane.\nIf operations have already been generated for these attributes, they will not be replaced. The new operations are added to the list.\n\nThe Contract inputs and operations can be edited manually.\nHowever, there is no refactoring (for example, updating the attribute name or a multiple property in a business object or contract element will break the operation).
 doNotShowMeAgain=Do not show me this dialog again
 notAllAttributesGeneratedTitle=Incomplete initialization of the business variable
 notAllAttributesGeneratedTaskTitle=Incomplete update of the business variable

bundles/plugins/org.bonitasoft.studio.diagram.custom/src/org/bonitasoft/studio/diagram/custom/decorator/LoopSubprocessTaskDecorator.java

@@ -80,7 +80,7 @@ public class LoopSubprocessTaskDecorator extends AbstractBonitaDecorator {
         if(view != null){
             final int height = ((Size)view.getLayoutConstraint()).getHeight() ;
             if(height != 0){
-                delta = - (height / 25) ;
+                delta = -(height / 10);
                 if(delta > -1 ){
                     delta = -1 ;
                 }

bundles/plugins/org.bonitasoft.studio.diagram.custom/src/org/bonitasoft/studio/diagram/custom/decorator/MultiInstanceSubprocessDecorator.java

@@ -57,24 +57,6 @@ public abstract class MultiInstanceSubprocessDecorator extends AbstractBonitaDec
     @Override
     protected abstract DecoratorSVGFigure getImageDecorator();
 
-    //    @Override
-    //    public void refresh() {
-    //        final IGraphicalEditPart node = (IGraphicalEditPart) ActivityDecoratorProvider.getDecoratorTargetNode(getDecoratorTarget());
-    //
-    //        //BUGFIX : NullPointerException if Root is null
-    //        if(node != null && node.getRoot() != null ){
-    //            final Activity activity= (Activity) node.getAdapter(Activity.class);
-    //            if (activity != null) {
-    //                if (activity.getMultiInstantiation() != null){
-    //                    DiagramEventBroker.getInstance(node.getEditingDomain()).addNotificationListener(activity,ProcessPackage.eINSTANCE.getActivity_IsMultiInstance(),notificationListener);
-    //                    DiagramEventBroker.getInstance(node.getEditingDomain()).addNotificationListener(activity.getMultiInstantiation(),ProcessPackage.eINSTANCE.getMultiInstantiation_Sequential(),notificationListener);
-    //                }else{
-    //                    DiagramEventBroker.getInstance(node.getEditingDomain()).removeNotificationListener(activity,ProcessPackage.eINSTANCE.getActivity_IsMultiInstance(),notificationListener);
-    //                }
-    //            }
-    //        }
-    //        super.refresh();
-    //    }
 
     @Override
     protected Direction getDirection() {
@@ -93,7 +75,7 @@ public abstract class MultiInstanceSubprocessDecorator extends AbstractBonitaDec
         if(view != null){
             final int height = ((Size)view.getLayoutConstraint()).getHeight() ;
             if(height != 0){
-                delta = - (height / 25) ;
+                delta = -(height / 10);
                 if(delta > -1 ){
                     delta = -1 ;
                 }

bundles/plugins/org.bonitasoft.studio.migration/src/org/bonitasoft/studio/migration/custom/migration/connector/UpdateDocumentConverterTo102.java

+/**
+ * Copyright (C) 2015 Bonitasoft S.A.
+ * Bonitasoft, 32 rue Gustave Eiffel - 38000 Grenoble
+ * 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 2.0 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/>.
+ */
+package org.bonitasoft.studio.migration.custom.migration.connector;
+
+import java.util.Objects;
+
+/**
+ * @author Romain Bioteau
+ */
+public class UpdateDocumentConverterTo102 extends UpdateConnectorVersionMigration {
+
+    private static final String DOCUEMENT_CONVERTER_DEF_ID = "document-converter";
+
+    @Override
+    protected String getNewDefinitionVersion() {
+        return "1.0.2";
+    }
+
+    @Override
+    protected String getOldDefinitionVersion() {
+        return "1.0.1";
+    }
+
+    @Override
+    protected boolean shouldUpdateVersion(final String defId) {
+        return Objects.equals(defId, DOCUEMENT_CONVERTER_DEF_ID);
+    }
+}