summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-09 10:07:39 (EST)
committerStephan Born2012-04-24 04:33:27 (EDT)
commit3f1dddca30f3ca84dbb9337f0e57ce5235b4f474 (patch)
tree1b9c1d612067607339672b19d6d2640d269d568e
parentbdda7e8d5792dd3ad5e992aed41ea43079f3565b (diff)
downloadorg.eclipse.stardust.ide-3f1dddca30f3ca84dbb9337f0e57ce5235b4f474.zip
org.eclipse.stardust.ide-3f1dddca30f3ca84dbb9337f0e57ce5235b4f474.tar.gz
org.eclipse.stardust.ide-3f1dddca30f3ca84dbb9337f0e57ce5235b4f474.tar.bz2
Jira-ID: CRNT-23200 Stardust: Rename NL Plugins to new name pattern (fixing missing externalized Strings)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53668 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.core.nl/plugin_de.properties2
-rw-r--r--modeling/org.eclipse.stardust.modeling.core.nl/plugin_en.properties2
-rw-r--r--modeling/org.eclipse.stardust.modeling.core.nl/plugin_ja.properties2
-rw-r--r--modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_de.properties16
-rw-r--r--modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_en.properties16
-rw-r--r--modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_ja.properties16
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/plugin.properties3
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/plugin.xml2
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/Diagram_Messages.java35
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/diagram-messages.properties9
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/NodeCreationFactory.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/actions/UpgradeModelAction.java14
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityControllingPropertyPage.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityCriticalityPropertyPage.java8
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityQualityControlPropertyPage.java8
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/utils/ImageFormat.java6
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizard.java73
17 files changed, 153 insertions, 63 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.core.nl/plugin_de.properties b/modeling/org.eclipse.stardust.modeling.core.nl/plugin_de.properties
index deea1c2..d40329e 100644
--- a/modeling/org.eclipse.stardust.modeling.core.nl/plugin_de.properties
+++ b/modeling/org.eclipse.stardust.modeling.core.nl/plugin_de.properties
@@ -236,3 +236,5 @@ entityBean=<Entity Bean>
# entityBean_en=Entity Bean
processInterface=<Process Interface>
# processInterface_en=Process Interface
+propPageActivityCriticality=<Activity Criticality>
+# propPageActivityCriticality_en=Activity Criticality
diff --git a/modeling/org.eclipse.stardust.modeling.core.nl/plugin_en.properties b/modeling/org.eclipse.stardust.modeling.core.nl/plugin_en.properties
index 4a720bc..78bede7 100644
--- a/modeling/org.eclipse.stardust.modeling.core.nl/plugin_en.properties
+++ b/modeling/org.eclipse.stardust.modeling.core.nl/plugin_en.properties
@@ -236,3 +236,5 @@ entityBean=Entity Bean
# entityBean_en=Entity Bean
processInterface=Process Interface
# processInterface_en=Process Interface
+propPageActivityCriticality=Activity Criticality
+# propPageActivityCriticality_en=Activity Criticality
diff --git a/modeling/org.eclipse.stardust.modeling.core.nl/plugin_ja.properties b/modeling/org.eclipse.stardust.modeling.core.nl/plugin_ja.properties
index 901bc9a..625e39a 100644
--- a/modeling/org.eclipse.stardust.modeling.core.nl/plugin_ja.properties
+++ b/modeling/org.eclipse.stardust.modeling.core.nl/plugin_ja.properties
@@ -236,3 +236,5 @@ entityBean= Entity Bean
# entityBean_en=Entity Bean
processInterface=<Process Interface>
# processInterface_en=Process Interface
+propPageActivityCriticality=<Activity Criticality>
+# propPageActivityCriticality_en=Activity Criticality
diff --git a/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_de.properties b/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_de.properties
index 185c442..b810d7c 100644
--- a/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_de.properties
+++ b/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_de.properties
@@ -2037,4 +2037,18 @@ QUALITY_CONTROL_VALIDATION_DUPLICATE=<Duplicate Entry.>
QUALITY_CONTROL_VALIDATION_EMPTY=<Entry must not be empty!>
# QUALITY_CONTROL_VALIDATION_EMPTY_en=Entry must not be empty!
QUALITY_ASSURANCE_PERFORMER_VALIDATION=<Performer must be set and should not be a Conditional Performer. >
-# QUALITY_ASSURANCE_PERFORMER_VALIDATION_en=Performer must be set and should not be a Conditional Performer.
+# QUALITY_ASSURANCE_PERFORMER_VALIDATION_en=Performer must be set and should not be a Conditional Performer.
+CRITICALITY_TARGET_EXECUTION_TIME=<Target execution time>
+# CRITICALITY_TARGET_EXECUTION_TIME_en=Target execution time
+CRITICALITY_INITIAL_CRITICALITY_LOW=<Initial criticality (Low)>
+# CRITICALITY_INITIAL_CRITICALITY_LOW_en=Initial criticality (Low)
+CRITICALITY_INITIAL_CRITICALITY_MEDIUM=<Initial criticality (Medium)>
+# CRITICALITY_INITIAL_CRITICALITY_MEDIUM_en=Initial criticality (Medium)
+CRITICALITY_INITIAL_CRITICALITY_HIGH=<Initial criticality (High)>
+# CRITICALITY_INITIAL_CRITICALITY_HIGH_en=Initial criticality (High)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_LOW=<Multiple of target execution time (Low)>
+# CRITICALITY_MULTIPLE_TARGET_EXECUTION_LOW_en=Multiple of target execution time (Low)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_MEDIUM=<Multiple of target execution time (Medium)>
+# CRITICALITY_MULTIPLE_TARGET_EXECUTION_MEDIUM_en=Multiple of target execution time (Medium)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH=<Multiple of target execution time (High)>
+# CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH_en=Multiple of target execution time (High)
diff --git a/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_en.properties b/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_en.properties
index cd2fa16..1dee026 100644
--- a/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_en.properties
+++ b/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_en.properties
@@ -2037,4 +2037,18 @@ QUALITY_CONTROL_VALIDATION_DUPLICATE=Duplicate Entry.
QUALITY_CONTROL_VALIDATION_EMPTY=Entry must not be empty!
# QUALITY_CONTROL_VALIDATION_EMPTY_en=Entry must not be empty!
QUALITY_ASSURANCE_PERFORMER_VALIDATION=Performer must be set and should not be a Conditional Performer.
-# QUALITY_ASSURANCE_PERFORMER_VALIDATION_en=Performer must be set and should not be a Conditional Performer.
+# QUALITY_ASSURANCE_PERFORMER_VALIDATION_en=Performer must be set and should not be a Conditional Performer.
+CRITICALITY_TARGET_EXECUTION_TIME=Target execution time
+# CRITICALITY_TARGET_EXECUTION_TIME_en=Target execution time
+CRITICALITY_INITIAL_CRITICALITY_LOW=Initial criticality (Low)
+# CRITICALITY_INITIAL_CRITICALITY_LOW_en=Initial criticality (Low)
+CRITICALITY_INITIAL_CRITICALITY_MEDIUM=Initial criticality (Medium)
+# CRITICALITY_INITIAL_CRITICALITY_MEDIUM_en=Initial criticality (Medium)
+CRITICALITY_INITIAL_CRITICALITY_HIGH=Initial criticality (High)
+# CRITICALITY_INITIAL_CRITICALITY_HIGH_en=Initial criticality (High)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_LOW=Multiple of target execution time (Low)
+# CRITICALITY_MULTIPLE_TARGET_EXECUTION_LOW_en=Multiple of target execution time (Low)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_MEDIUM=Multiple of target execution time (Medium)
+# CRITICALITY_MULTIPLE_TARGET_EXECUTION_MEDIUM_en=Multiple of target execution time (Medium)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH=Multiple of target execution time (High)
+# CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH_en=Multiple of target execution time (High)
diff --git a/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_ja.properties b/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_ja.properties
index 196770f..8aee822 100644
--- a/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_ja.properties
+++ b/modeling/org.eclipse.stardust.modeling.core.nl/src/org/eclipse/stardust/modeling/core/diagram-messages_ja.properties
@@ -2037,4 +2037,18 @@ QUALITY_CONTROL_VALIDATION_DUPLICATE=<Duplicate Entry.>
QUALITY_CONTROL_VALIDATION_EMPTY=<Entry must not be empty!>
# QUALITY_CONTROL_VALIDATION_EMPTY_en=Entry must not be empty!
QUALITY_ASSURANCE_PERFORMER_VALIDATION=<Performer must be set and should not be a Conditional Performer. >
-# QUALITY_ASSURANCE_PERFORMER_VALIDATION_en=Performer must be set and should not be a Conditional Performer.
+# QUALITY_ASSURANCE_PERFORMER_VALIDATION_en=Performer must be set and should not be a Conditional Performer.
+CRITICALITY_TARGET_EXECUTION_TIME=<Target execution time>
+# CRITICALITY_TARGET_EXECUTION_TIME_en=Target execution time
+CRITICALITY_INITIAL_CRITICALITY_LOW=<Initial criticality (Low)>
+# CRITICALITY_INITIAL_CRITICALITY_LOW_en=Initial criticality (Low)
+CRITICALITY_INITIAL_CRITICALITY_MEDIUM=<Initial criticality (Medium)>
+# CRITICALITY_INITIAL_CRITICALITY_MEDIUM_en=Initial criticality (Medium)
+CRITICALITY_INITIAL_CRITICALITY_HIGH=<Initial criticality (High)>
+# CRITICALITY_INITIAL_CRITICALITY_HIGH_en=Initial criticality (High)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_LOW=<Multiple of target execution time (Low)>
+# CRITICALITY_MULTIPLE_TARGET_EXECUTION_LOW_en=Multiple of target execution time (Low)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_MEDIUM=<Multiple of target execution time (Medium)>
+# CRITICALITY_MULTIPLE_TARGET_EXECUTION_MEDIUM_en=Multiple of target execution time (Medium)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH=<Multiple of target execution time (High)>
+# CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH_en=Multiple of target execution time (High)
diff --git a/modeling/org.eclipse.stardust.modeling.core/plugin.properties b/modeling/org.eclipse.stardust.modeling.core/plugin.properties
index c5ad3bd..a4e1c4b 100644
--- a/modeling/org.eclipse.stardust.modeling.core/plugin.properties
+++ b/modeling/org.eclipse.stardust.modeling.core/plugin.properties
@@ -122,4 +122,5 @@ formalParameterPropertyPage=Formal Parameter Definition
deployModel=Deploy Model
propPageExternalPackage=External Package
entityBean=Entity Bean
-processInterface=Process Interface \ No newline at end of file
+processInterface=Process Interface
+propPageActivityCriticality=Activity Criticality \ No newline at end of file
diff --git a/modeling/org.eclipse.stardust.modeling.core/plugin.xml b/modeling/org.eclipse.stardust.modeling.core/plugin.xml
index 75f4239..b6a29a5 100644
--- a/modeling/org.eclipse.stardust.modeling.core/plugin.xml
+++ b/modeling/org.eclipse.stardust.modeling.core/plugin.xml
@@ -936,7 +936,7 @@
class="org.eclipse.stardust.modeling.core.properties.ActivityCriticalityPropertyPage"
icon="icons/full/obj16/model.gif"
id="_cwm_model_variables_"
- name="Activity Criticality"
+ name="%propPageActivityCriticality"
objectClass="org.eclipse.stardust.model.xpdl.carnot.ModelType"/>
<page
category="core"
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/Diagram_Messages.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/Diagram_Messages.java
index 1ca3cc5..182a2c4 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/Diagram_Messages.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/Diagram_Messages.java
@@ -2029,16 +2029,43 @@ public class Diagram_Messages extends NLS {
public static String QUALITY_CONTROL_LABEL;
public static String QUALITY_CONTROL_CODES_LABEL;
- public static String QUALITY_CONTROL_ACTIVITY;
+
+ public static String QUALITY_CONTROL_ACTIVITY;
+
public static String QUALITY_CONTROL_PARTICIPANT;
+
public static String QUALITY_CONTROL_PROBABILITY;
+
public static String QUALITY_CONTROL_FORMULA;
- public static String QUALITY_CONTROL_PROBABILITY_VALIDATION;
- public static String QUALITY_ASSURANCE_PERFORMER_VALIDATION;
+
+ public static String QUALITY_CONTROL_PROBABILITY_VALIDATION;
+
+ public static String QUALITY_ASSURANCE_PERFORMER_VALIDATION;
+
public static String QUALITY_CONTROL_CODE;
- public static String QUALITY_CONTROL_CODE_AVAILABLE;
+
+ public static String QUALITY_CONTROL_CODE_AVAILABLE;
+
public static String QUALITY_CONTROL_DESCRIPTION;
+
public static String QUALITY_CONTROL_VALIDATION_CODE;
+
public static String QUALITY_CONTROL_VALIDATION_DUPLICATE;
+
public static String QUALITY_CONTROL_VALIDATION_EMPTY;
+
+ public static String CRITICALITY_TARGET_EXECUTION_TIME;
+
+ public static String CRITICALITY_INITIAL_CRITICALITY_LOW;
+
+ public static String CRITICALITY_INITIAL_CRITICALITY_MEDIUM;
+
+ public static String CRITICALITY_INITIAL_CRITICALITY_HIGH;
+
+ public static String CRITICALITY_MULTIPLE_TARGET_EXECUTION_LOW;
+
+ public static String CRITICALITY_MULTIPLE_TARGET_EXECUTION_MEDIUM;
+
+ public static String CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH;
+
} \ No newline at end of file
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/diagram-messages.properties b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/diagram-messages.properties
index 0009fe8..173f0c8 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/diagram-messages.properties
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/diagram-messages.properties
@@ -1022,4 +1022,11 @@ QUALITY_CONTROL_DESCRIPTION= Description
QUALITY_CONTROL_VALIDATION_CODE= Invalid Code!
QUALITY_CONTROL_VALIDATION_DUPLICATE = Duplicate Entry.
QUALITY_CONTROL_VALIDATION_EMPTY= Entry must not be empty!
-QUALITY_ASSURANCE_PERFORMER_VALIDATION=Performer must be set and should not be a Conditional Performer. \ No newline at end of file
+QUALITY_ASSURANCE_PERFORMER_VALIDATION=Performer must be set and should not be a Conditional Performer.
+CRITICALITY_TARGET_EXECUTION_TIME=Target execution time
+CRITICALITY_INITIAL_CRITICALITY_LOW=Initial criticality (Low)
+CRITICALITY_INITIAL_CRITICALITY_MEDIUM=Initial criticality (Medium)
+CRITICALITY_INITIAL_CRITICALITY_HIGH=Initial criticality (High)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_LOW=Multiple of target execution time (Low)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_MEDIUM=Multiple of target execution time (Medium)
+CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH=Multiple of target execution time (High) \ No newline at end of file
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/NodeCreationFactory.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/NodeCreationFactory.java
index efd6eaf..022697d 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/NodeCreationFactory.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/NodeCreationFactory.java
@@ -109,7 +109,7 @@ public class NodeCreationFactory
{
IdFactory id = new IdFactory(config == null ? "data" : config.getAttribute("id"), //$NON-NLS-1$ //$NON-NLS-2$
config == null ? Diagram_Messages.NodeCreationFactory_BASENAME_Data : config
- .getAttribute("name")); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
+ .getAttribute("name")); //$NON-NLS-1$
CompoundDiagramCommand command = new CompoundDiagramCommand();
if (config != null)
{
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/actions/UpgradeModelAction.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/actions/UpgradeModelAction.java
index 1c4b7b1..583e90f 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/actions/UpgradeModelAction.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/actions/UpgradeModelAction.java
@@ -148,21 +148,21 @@ public class UpgradeModelAction extends SelectionAction
for (Iterator<AttributeType> i = model.getAttribute().iterator(); i.hasNext();)
{
AttributeType attribute = i.next();
- if (attribute.getName().indexOf("project-planning") > -1)
+ if (attribute.getName().indexOf("project-planning") > -1) //$NON-NLS-1$
{
String value = attribute.getValue();
- if (value != null && value.startsWith("ag.carnot.workflow.model.carnot"))
+ if (value != null && value.startsWith("ag.carnot.workflow.model.carnot")) //$NON-NLS-1$
{
- value = value.replaceAll("ag.carnot.workflow.model.carnot",
- "org.eclipse.stardust.model.xpdl.carnot");
+ value = value.replaceAll("ag.carnot.workflow.model.carnot", //$NON-NLS-1$
+ "org.eclipse.stardust.model.xpdl.carnot"); //$NON-NLS-1$
command
.add(new SetValueCmd(attribute, CarnotWorkflowModelPackage.eINSTANCE
.getAttributeType_Value(), value));
}
- if (value != null && value.startsWith("ag.carnot.modeling.project"))
+ if (value != null && value.startsWith("ag.carnot.modeling.project")) //$NON-NLS-1$
{
- value = value.replaceAll("ag.carnot.modeling.project",
- "org.eclipse.stardust.modeling.project");
+ value = value.replaceAll("ag.carnot.modeling.project", //$NON-NLS-1$
+ "org.eclipse.stardust.modeling.project"); //$NON-NLS-1$
command
.add(new SetValueCmd(attribute, CarnotWorkflowModelPackage.eINSTANCE
.getAttributeType_Value(), value));
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityControllingPropertyPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityControllingPropertyPage.java
index 07e3488..2bf61cc 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityControllingPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityControllingPropertyPage.java
@@ -64,7 +64,7 @@ public class ActivityControllingPropertyPage extends AbstractControllingProperty
Type.Money.getId(), Diagram_Messages.MEASURE_UNIT_EUR),
new ControllingAttribute(Diagram_Messages.LB_TargetCostPerSecond, "targetCostPerSecond", //$NON-NLS-1$
Type.Money.getId(), Diagram_Messages.MEASURE_UNIT_EUR),
- new ControllingAttribute(Diagram_Messages.ActivityControllingPropertyPage_ResourcePerformanceCalculation_LB, "includeTime", //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
+ new ControllingAttribute(Diagram_Messages.ActivityControllingPropertyPage_ResourcePerformanceCalculation_LB, "includeTime", //$NON-NLS-1$
Type.Boolean.getId(), "", rpCalculationByKeys, rpCalculationByValues ) //$NON-NLS-1$
};
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityCriticalityPropertyPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityCriticalityPropertyPage.java
index 9b60cf1..32f9080 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityCriticalityPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityCriticalityPropertyPage.java
@@ -78,7 +78,7 @@ public class ActivityCriticalityPropertyPage extends AbstractModelElementPropert
private void loadFormula(IModelElement element)
{
String formula = AttributeUtil.getAttributeValue((IExtensibleElement) element,
- "ipp:criticalityFormula");
+ "ipp:criticalityFormula"); //$NON-NLS-1$
this.refreshDocument();
if (formula != null)
{
@@ -96,8 +96,8 @@ public class ActivityCriticalityPropertyPage extends AbstractModelElementPropert
model);
if (variableContext != null && !variableContext.isCriticalityFormulaChanged())
{
- AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:criticalityFormula",
- "String", formula);
+ AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:criticalityFormula", //$NON-NLS-1$
+ "String", formula); //$NON-NLS-1$
variableContext.setCriticalityFormulaChanged(false);
} else {
loadFormula(element);
@@ -128,7 +128,7 @@ public class ActivityCriticalityPropertyPage extends AbstractModelElementPropert
project = ModelUtils.getProjectFromEObject(getModelElement());
- criticalityFormula = FormBuilder.createLabel(composite, "Formula", 2);
+ criticalityFormula = FormBuilder.createLabel(composite, "Formula", 2); //$NON-NLS-1$
EditorUtils.deleteFileStructure(project, model);
try
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityQualityControlPropertyPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityQualityControlPropertyPage.java
index 34c29c8..397923d 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityQualityControlPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityQualityControlPropertyPage.java
@@ -204,9 +204,9 @@ public class ActivityQualityControlPropertyPage extends AbstractModelElementProp
// disable
classCombo.setEnabled(false);
performerViewer.setSelection(new StructuredSelection(createRoleType));
- createLabeledText.getText().setText("");
+ createLabeledText.getText().setText(""); //$NON-NLS-1$
createLabeledText.getText().setEnabled(false);
- transitionConditionEditor.getAdaptedSourceViewer().getTextWidget().setText("");
+ transitionConditionEditor.getAdaptedSourceViewer().getTextWidget().setText(""); //$NON-NLS-1$
sourceViewerComposite.setVisible(true);
sourceViewerComposite.setEnabled(false);
composite.setVisible(false);
@@ -222,14 +222,14 @@ public class ActivityQualityControlPropertyPage extends AbstractModelElementProp
{
classCombo.setEnabled(true);
createLabeledText.getText().setEnabled(true);
- transitionConditionEditor.getAdaptedSourceViewer().getTextWidget().setText("true");
+ transitionConditionEditor.getAdaptedSourceViewer().getTextWidget().setText("true"); //$NON-NLS-1$
sourceViewerComposite.setVisible(true);
sourceViewerComposite.setEnabled(true);
composite.setVisible(true);
if(preselect)
{
- createLabeledText.getText().setText("100");
+ createLabeledText.getText().setText("100"); //$NON-NLS-1$
ActivityType activity = (ActivityType) getModelElement();
ModelType model = ModelUtils.findContainingModel(activity);
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/utils/ImageFormat.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/utils/ImageFormat.java
index 28c6ad3..5e63aad 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/utils/ImageFormat.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/utils/ImageFormat.java
@@ -12,10 +12,10 @@ package org.eclipse.stardust.modeling.core.utils;
public class ImageFormat
{
- public static final java.lang.String PNG = "png";
+ public static final java.lang.String PNG = "png"; //$NON-NLS-1$
- public static final java.lang.String JPEG = "jpeg";
+ public static final java.lang.String JPEG = "jpeg"; //$NON-NLS-1$
- public static final java.lang.String GIF = "gif";
+ public static final java.lang.String GIF = "gif"; //$NON-NLS-1$
}
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizard.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizard.java
index c9b9280..3a9cc7d 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizard.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizard.java
@@ -391,61 +391,68 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard
context.initializeVariables(model);
// TDefault
- ModelVariable modelVariable = new ModelVariable("${TDefault}", "86400", "Target execution time");
+ ModelVariable modelVariable = new ModelVariable("${TDefault}", "86400", //$NON-NLS-1$ //$NON-NLS-2$
+ Diagram_Messages.CRITICALITY_TARGET_EXECUTION_TIME);
context.createAttributeSet(modelVariable, 0);
// CLow
- modelVariable = new ModelVariable("${CLow}", "0", "Initial criticality (Low)");
+ modelVariable = new ModelVariable("${CLow}", "0", //$NON-NLS-1$ //$NON-NLS-2$
+ Diagram_Messages.CRITICALITY_INITIAL_CRITICALITY_LOW);
context.createAttributeSet(modelVariable, 1);
// CMed
- modelVariable = new ModelVariable("${CMed}", "0.33", "Initial criticality (Medium)");
+ modelVariable = new ModelVariable("${CMed}", "0.33", //$NON-NLS-1$ //$NON-NLS-2$
+ Diagram_Messages.CRITICALITY_INITIAL_CRITICALITY_MEDIUM);
context.createAttributeSet(modelVariable, 2);
// CHigh
- modelVariable = new ModelVariable("${CHigh}", "0.66", "Initial criticality (High)");
+ modelVariable = new ModelVariable("${CHigh}", "0.66", //$NON-NLS-1$ //$NON-NLS-2$
+ Diagram_Messages.CRITICALITY_INITIAL_CRITICALITY_HIGH);
context.createAttributeSet(modelVariable, 3);
// MLow
- modelVariable = new ModelVariable("${MLow}", "10", "Multiple of target execution time (Low)");
+ modelVariable = new ModelVariable("${MLow}", "10", //$NON-NLS-1$ //$NON-NLS-2$
+ Diagram_Messages.CRITICALITY_MULTIPLE_TARGET_EXECUTION_LOW);
context.createAttributeSet(modelVariable, 4);
// MMed
- modelVariable = new ModelVariable("${MMed}", "10", "Multiple of target execution time (Medium)");
+ modelVariable = new ModelVariable("${MMed}", "10", //$NON-NLS-1$ //$NON-NLS-2$
+ Diagram_Messages.CRITICALITY_MULTIPLE_TARGET_EXECUTION_MEDIUM);
context.createAttributeSet(modelVariable, 5);
// MHigh
- modelVariable = new ModelVariable("${MHigh}", "10", "Multiple of target execution time (High)");
+ modelVariable = new ModelVariable("${MHigh}", "10", //$NON-NLS-1$ //$NON-NLS-2$
+ Diagram_Messages.CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH);
context.createAttributeSet(modelVariable, 6);
//Default criticality formula
String formula =
- "if(activityInstance.getActivity().getTargetExecutionTime() == 0)\n" +
- "{\n" +
- " T = ${TDefault};\n" +
- "}\n" +
- "else\n" +
- "{\n" +
- " T = activityInstance.getActivity().getTargetExecutionTime();\n" +
- "}\n" +
- "if(PROCESS_PRIORITY == -1)\n" +
- "{\n"+
- " Cp = ${CLow};\n" +
- " Mp = ${MLow};\n" +
- "}\n" +
- "if(PROCESS_PRIORITY == 0)\n" +
- "{\n" +
- " Cp = ${CMed};\n" +
- " Mp = ${MMed};\n" +
- "}\n" +
- "if(PROCESS_PRIORITY == 1)\n" +
- "{\n" +
- " Cp = ${CHigh};\n" +
- " Mp = ${MHigh};\n" +
- "}\n" +
- "t = activityInstance.getAge() / 1000;\n\n" +
- "Cp + (1- Cp) * t/(Mp * T);\n";
- AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:criticalityFormula", "String", formula);
+ "if(activityInstance.getActivity().getTargetExecutionTime() == 0)\n" + //$NON-NLS-1$
+ "{\n" + //$NON-NLS-1$
+ " T = ${TDefault};\n" + //$NON-NLS-1$
+ "}\n" + //$NON-NLS-1$
+ "else\n" + //$NON-NLS-1$
+ "{\n" + //$NON-NLS-1$
+ " T = activityInstance.getActivity().getTargetExecutionTime();\n" + //$NON-NLS-1$
+ "}\n" + //$NON-NLS-1$
+ "if(PROCESS_PRIORITY == -1)\n" + //$NON-NLS-1$
+ "{\n"+ //$NON-NLS-1$
+ " Cp = ${CLow};\n" + //$NON-NLS-1$
+ " Mp = ${MLow};\n" + //$NON-NLS-1$
+ "}\n" + //$NON-NLS-1$
+ "if(PROCESS_PRIORITY == 0)\n" + //$NON-NLS-1$
+ "{\n" + //$NON-NLS-1$
+ " Cp = ${CMed};\n" + //$NON-NLS-1$
+ " Mp = ${MMed};\n" + //$NON-NLS-1$
+ "}\n" + //$NON-NLS-1$
+ "if(PROCESS_PRIORITY == 1)\n" + //$NON-NLS-1$
+ "{\n" + //$NON-NLS-1$
+ " Cp = ${CHigh};\n" + //$NON-NLS-1$
+ " Mp = ${MHigh};\n" + //$NON-NLS-1$
+ "}\n" + //$NON-NLS-1$
+ "t = activityInstance.getAge() / 1000;\n\n" + //$NON-NLS-1$
+ "Cp + (1- Cp) * t/(Mp * T);\n"; //$NON-NLS-1$
+ AttributeUtil.setAttribute((IExtensibleElement) model, "ipp:criticalityFormula", "String", formula); //$NON-NLS-1$ //$NON-NLS-2$
}
private void createAttribute(DataType data, String name, String type, String value)