Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorytanguy2009-12-15 08:58:03 +0000
committerytanguy2009-12-15 08:58:03 +0000
commit0ce22bb27d3dcffb88f1390e1b2a246fc675e4ad (patch)
tree5474c9e64f69f3b73f71bca3d09f8b8bc54157ef /plugins/sysml/org.eclipse.papyrus.sysml.edit
parent71ace81a477aa2bb9c467b280bbe6b6b72d249e5 (diff)
downloadorg.eclipse.papyrus-0ce22bb27d3dcffb88f1390e1b2a246fc675e4ad.tar.gz
org.eclipse.papyrus-0ce22bb27d3dcffb88f1390e1b2a246fc675e4ad.tar.xz
org.eclipse.papyrus-0ce22bb27d3dcffb88f1390e1b2a246fc675e4ad.zip
ASSIGNED - bug 297746: Typo in SysML profile: extension ParameterOptionnal should be ParameterOptional
https://bugs.eclipse.org/bugs/show_bug.cgi?id=297746
Diffstat (limited to 'plugins/sysml/org.eclipse.papyrus.sysml.edit')
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optional.gif (renamed from plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optionnal.gif)bin129 -> 129 bytes
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties2
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java21
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java (renamed from plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionnalItemProvider.java)48
4 files changed, 40 insertions, 31 deletions
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optionnal.gif b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optional.gif
index 7b7c428c715..7b7c428c715 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optionnal.gif
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/icons/full/obj16/Optional.gif
Binary files differ
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties b/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
index 38f0f14418b..a75d3437257 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/plugin.properties
@@ -136,3 +136,5 @@ _UI_Unknown_feature = Unspecified
_UI_FlowDirection_in_literal = in
_UI_FlowDirection_out_literal = out
_UI_FlowDirection_inout_literal = inout
+_UI_Optional_type = Optional
+_UI_Optional_base_Parameter_feature = Base Parameter
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
index 14a9d6df046..d14d9b21a4f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ActivitiesItemProviderAdapterFactory.java
@@ -83,27 +83,28 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
}
/**
- * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Optionnal} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.sysml.activities.Optional} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
*/
- protected OptionnalItemProvider optionnalItemProvider;
+ protected OptionalItemProvider optionalItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Optionnal}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
+ * This creates an adapter for a {@link org.eclipse.papyrus.sysml.activities.Optional}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
*/
@Override
- public Adapter createOptionnalAdapter() {
- if(optionnalItemProvider == null) {
- optionnalItemProvider = new OptionnalItemProvider(this);
+ public Adapter createOptionalAdapter() {
+ if(optionalItemProvider == null) {
+ optionalItemProvider = new OptionalItemProvider(this);
}
- return optionnalItemProvider;
+ return optionalItemProvider;
}
/**
@@ -376,8 +377,8 @@ public class ActivitiesItemProviderAdapterFactory extends ActivitiesAdapterFacto
* @generated
*/
public void dispose() {
- if(optionnalItemProvider != null)
- optionnalItemProvider.dispose();
+ if(optionalItemProvider != null)
+ optionalItemProvider.dispose();
if(rateItemProvider != null)
rateItemProvider.dispose();
if(probabilityItemProvider != null)
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionnalItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java
index 5c69870ed65..402d795c15a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionnalItemProvider.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java
@@ -13,6 +13,7 @@
*****************************************************************************/
package org.eclipse.papyrus.sysml.activities.provider;
+
import java.util.Collection;
import java.util.List;
@@ -31,28 +32,29 @@ import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Optionnal} object. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Optional} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
*/
-public class OptionnalItemProvider extends ResourceEObjectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class OptionalItemProvider extends ResourceEObjectItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
*/
- public OptionnalItemProvider(AdapterFactory adapterFactory) {
+ public OptionalItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
/**
* This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -68,41 +70,44 @@ public class OptionnalItemProvider extends ResourceEObjectItemProvider implement
/**
* This adds a property descriptor for the Base Parameter feature.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
*/
protected void addBase_ParameterPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Optionnal_base_Parameter_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Optionnal_base_Parameter_feature", "_UI_Optionnal_type"), ActivitiesPackage.Literals.OPTIONNAL__BASE_PARAMETER, true, false, true, null, null, null));
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Optional_base_Parameter_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Optional_base_Parameter_feature", "_UI_Optional_type"), ActivitiesPackage.Literals.OPTIONAL__BASE_PARAMETER, true, false, true, null, null, null));
}
/**
- * This returns Optionnal.gif.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * This returns Optional.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
*/
@Override
public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Optionnal"));
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/Optional"));
}
/**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
*/
@Override
public String getText(Object object) {
- return getString("_UI_Optionnal_type");
+ return getString("_UI_Optional_type");
}
/**
* This handles model notifications by calling {@link #updateChildren} to update any cached
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -115,7 +120,8 @@ public class OptionnalItemProvider extends ResourceEObjectItemProvider implement
/**
* This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
* that can be created under this object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
*/
@@ -126,8 +132,8 @@ public class OptionnalItemProvider extends ResourceEObjectItemProvider implement
/**
* Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc --> <!--
- * end-user-doc -->
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
*
* @generated
*/

Back to the top