Andreas Mülder 14 лет назад
Родитель
Сommit
addcb4ca22
22 измененных файлов с 37 добавлено и 24 удалено
  1. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_ActiveStateReferenceExpression.gif
  2. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_AssignmentExpression.gif
  3. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_BitwiseAndExpression.gif
  4. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_BitwiseOrExpression.gif
  5. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_BitwiseXorExpression.gif
  6. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_ConditionalExpression.gif
  7. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_EventRaisingExpression.gif
  8. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_EventValueReferenceExpression.gif
  9. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_Expression.gif
  10. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_LogicalAndExpression.gif
  11. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_LogicalNotExpression.gif
  12. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_LogicalOrExpression.gif
  13. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_LogicalRelationExpression.gif
  14. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_NumericalAddSubtractExpression.gif
  15. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_NumericalMultiplyDivideExpression.gif
  16. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_NumericalUnaryExpression.gif
  17. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_PrimitiveValueExpression.gif
  18. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_ShiftExpression.gif
  19. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_TypedElementReferenceExpression.gif
  20. BIN
      plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateOperationDefinition_params_Parameter.gif
  21. 5 0
      plugins/org.yakindu.sct.model.stext.edit/plugin.properties
  22. 32 24
      plugins/org.yakindu.sct.model.stext.edit/src/org/yakindu/sct/model/stext/stext/provider/OperationDefinitionItemProvider.java

BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_ActiveStateReferenceExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_AssignmentExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_BitwiseAndExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_BitwiseOrExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_BitwiseXorExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_ConditionalExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_EventRaisingExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_EventValueReferenceExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_Expression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_LogicalAndExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_LogicalNotExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_LogicalOrExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_LogicalRelationExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_NumericalAddSubtractExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_NumericalMultiplyDivideExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_NumericalUnaryExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_PrimitiveValueExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_ShiftExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateExpression_child_TypedElementReferenceExpression.gif


BIN
plugins/org.yakindu.sct.model.stext.edit/icons/full/ctool16/CreateOperationDefinition_params_Parameter.gif


+ 5 - 0
plugins/org.yakindu.sct.model.stext.edit/plugin.properties

@@ -212,3 +212,8 @@ _UI_FeatureCall_feature_feature = Feature
 _UI_FeatureCall_operationCall_feature = Operation Call
 _UI_FeatureCall_args_feature = Args
 _UI_TypedElementReferenceExpression_reference_feature = Reference
+_UI_OperationDefinition_params_feature = Params
+_UI_Expression_feature_feature = Feature
+_UI_Expression_child_feature = Child
+_UI_Expression_children_feature = Children
+_UI_Expression_features_feature = Features

+ 32 - 24
plugins/org.yakindu.sct.model.stext.edit/src/org/yakindu/sct/model/stext/stext/provider/OperationDefinitionItemProvider.java

@@ -74,7 +74,6 @@ public class OperationDefinitionItemProvider
       super.getPropertyDescriptors(object);
 
       addTypePropertyDescriptor(object);
-      addParamTypesPropertyDescriptor(object);
     }
     return itemPropertyDescriptors;
   }
@@ -102,29 +101,6 @@ public class OperationDefinitionItemProvider
          null));
   }
 
-  /**
-   * This adds a property descriptor for the Param Types feature.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected void addParamTypesPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add
-      (createItemPropertyDescriptor
-        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-         getResourceLocator(),
-         getString("_UI_OperationDefinition_paramTypes_feature"),
-         getString("_UI_PropertyDescriptor_description", "_UI_OperationDefinition_paramTypes_feature", "_UI_OperationDefinition_type"),
-         StextPackage.Literals.OPERATION_DEFINITION__PARAM_TYPES,
-         true,
-         false,
-         true,
-         null,
-         null,
-         null));
-  }
-
   /**
    * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
    * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
@@ -140,6 +116,7 @@ public class OperationDefinitionItemProvider
     {
       super.getChildrenFeatures(object);
       childrenFeatures.add(TypesPackage.Literals.OPERATION__PARAMETERS);
+      childrenFeatures.add(StextPackage.Literals.OPERATION_DEFINITION__PARAMS);
     }
     return childrenFeatures;
   }
@@ -200,6 +177,7 @@ public class OperationDefinitionItemProvider
     switch (notification.getFeatureID(OperationDefinition.class))
     {
       case StextPackage.OPERATION_DEFINITION__PARAMETERS:
+      case StextPackage.OPERATION_DEFINITION__PARAMS:
         fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
         return;
     }
@@ -222,6 +200,36 @@ public class OperationDefinitionItemProvider
       (createChildParameter
         (TypesPackage.Literals.OPERATION__PARAMETERS,
          TypesFactory.eINSTANCE.createParameter()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.OPERATION_DEFINITION__PARAMS,
+         TypesFactory.eINSTANCE.createParameter()));
+  }
+
+  /**
+   * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection)
+  {
+    Object childFeature = feature;
+    Object childObject = child;
+
+    boolean qualify =
+      childFeature == TypesPackage.Literals.OPERATION__PARAMETERS ||
+      childFeature == StextPackage.Literals.OPERATION_DEFINITION__PARAMS;
+
+    if (qualify)
+    {
+      return getString
+        ("_UI_CreateChild_text2",
+         new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+    }
+    return super.getCreateChildText(owner, feature, child, selection);
   }
 
   /**