Jira-ID: CRNT-22383 Merge changes done on b_dev_6_0_x after 6.0.2.GA (6.0.2.2-r49368) through 6.0.3.GA (6.0.3.6-r50668) and beyond (6.0.x HEAD) to 7.0 (trunk) - moonglow / simulation / tate / tds (org.eclipse.stardust.modeling.project)

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53300 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

10 files changed, 219 insertions, 47 deletions

diff --git a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/Constants.java b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/Constants.java
index 767c37f..0fe9e4d 100644
--- a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/Constants.java
+++ b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/Constants.java
@@ -14,7 +14,7 @@ public final class Constants
 {
    public static final String SCOPE = "project-planning"; //$NON-NLS-1$
    public static final String EFFORT_PARAMETER = "effortParameter"; //$NON-NLS-1$
-   public static final String NOTIFIER = SCOPE + ":notifier";
+   public static final String NOTIFIER = SCOPE + ":notifier"; //$NON-NLS-1$
     
    private Constants() {}
 }
diff --git a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/Project_Messages.java b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/Project_Messages.java
new file mode 100644
index 0000000..dd19ec1
--- a/dev/null
+++ b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/Project_Messages.java
@@ -0,0 +1,65 @@
+/*******************************************************************************

+ * Copyright (c) 2011 SunGard CSA LLC and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    SunGard CSA LLC - initial API and implementation and/or initial documentation

+ *******************************************************************************/

+package org.eclipse.stardust.modeling.project;

+

+import java.text.MessageFormat;

+import java.util.MissingResourceException;

+import java.util.ResourceBundle;

+

+public class Project_Messages

+{

+	private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.project.project-messages"; //$NON-NLS-1$

+

+	private static final ResourceBundle RESOURCE_BUNDLE = (ResourceBundle

+			.getBundle(BUNDLE_NAME));

+

+	/**

+	 * 

+	 * 

+	 */

+	private Project_Messages()

+	{

+	}

+

+	/**

+	 * 

+	 * @return

+	 */

+	public static ResourceBundle getResourceBundle()

+	{

+		return RESOURCE_BUNDLE;

+	}

+

+	/**

+	 * 

+	 * @param key

+	 * @return

+	 */

+	public static String getString(String key)

+	{

+		String message = null;

+

+		try

+		{

+			message = RESOURCE_BUNDLE.getString(key);

+		} catch (MissingResourceException e)

+		{

+			return '!' + key + '!';

+		}

+

+		return message;

+	}

+

+	public static String getFormattedString(String key, Object[] arguments)

+	{

+		return MessageFormat.format(getString(key), arguments);

+	}

+}

diff --git a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortEntry.java b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortEntry.java
index 835a8e4..d2d91ef 100644
--- a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortEntry.java
+++ b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortEntry.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.stardust.modeling.project.effort;
 
-import org.eclipse.stardust.modeling.project.i18n.Messages;
+import org.eclipse.stardust.modeling.project.Project_Messages;
 
 public class EffortEntry
 {
@@ -64,6 +64,6 @@ public class EffortEntry
     
     public String getSimpleName()
     {
-       return Messages.getString(getScope().getSimpleName());
+       return Project_Messages.getString(getScope().getSimpleName());
     }
 }
diff --git a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortParameterScope.java b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortParameterScope.java
index f744a0a..87d7679 100644
--- a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortParameterScope.java
+++ b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortParameterScope.java
@@ -15,7 +15,7 @@ import java.util.Iterator;
 
 import org.eclipse.stardust.common.CompareHelper;
 import org.eclipse.stardust.model.xpdl.carnot.ApplicationType;
-import org.eclipse.stardust.modeling.project.i18n.Messages;
+import org.eclipse.stardust.modeling.project.Project_Messages;
 
 public final class EffortParameterScope extends NamedItemList implements NamedItem
 {
@@ -47,11 +47,11 @@ public final class EffortParameterScope extends NamedItemList implements NamedIt
    {
       // TODO keep in sync with the declarations
       ApplicationType app = (ApplicationType) target;
-      if ("Interactive".equals(filter))
+      if ("Interactive".equals(filter)) //$NON-NLS-1$
       {
          return app.isInteractive();
       }
-      if ("Service".equals(filter))
+      if ("Service".equals(filter)) //$NON-NLS-1$
       {
          return !app.isInteractive();
       }
@@ -70,7 +70,7 @@ public final class EffortParameterScope extends NamedItemList implements NamedIt
 
    public String getDisplayName()
    {
-      return Messages.getString(getName());
+      return Project_Messages.getString(getName());
    }
 
    public String toString()
diff --git a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortParameters.java b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortParameters.java
index 083d919..54b5828 100644
--- a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortParameters.java
+++ b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortParameters.java
@@ -362,11 +362,11 @@ public class EffortParameters extends EffortNotifier
             EffortParameter parameter = scope.getParameter(name);
             IAttributeCategory category = planningCat
                   .createAttributeCategory(Constants.EFFORT_PARAMETER + "[" + n++ + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-            setAttribute(category, "scope", scope.getScopeClass().getName());
-            setAttribute(category, "filter", scope.getFilter());
-            setAttribute(category, "type", parameter.getClass().getName());
-            setAttribute(category, "name", name);
-            setAttribute(category, "initializers", parameter.getInitializers());
+            setAttribute(category, "scope", scope.getScopeClass().getName()); //$NON-NLS-1$
+            setAttribute(category, "filter", scope.getFilter()); //$NON-NLS-1$
+            setAttribute(category, "type", parameter.getClass().getName()); //$NON-NLS-1$
+            setAttribute(category, "name", name); //$NON-NLS-1$
+            setAttribute(category, "initializers", parameter.getInitializers()); //$NON-NLS-1$
          }
       }
       // remove change notifier if set
@@ -481,7 +481,7 @@ public class EffortParameters extends EffortNotifier
       if (!loading)
       {
          modified = true;
-         AttributeUtil.setAttribute(model, Constants.NOTIFIER, "dummy");
+         AttributeUtil.setAttribute(model, Constants.NOTIFIER, "dummy"); //$NON-NLS-1$
       }
    }
 
diff --git a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortPerUnit.java b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortPerUnit.java
index 99be068..3caf080 100644
--- a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortPerUnit.java
+++ b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/EffortPerUnit.java
@@ -12,17 +12,17 @@ package org.eclipse.stardust.modeling.project.effort;
 
 import java.util.StringTokenizer;
 
-import org.eclipse.stardust.modeling.project.i18n.Messages;
+import org.eclipse.stardust.modeling.project.Project_Messages;
 
 
 public class EffortPerUnit extends EffortNotifier
 {
     public static final String[] DEFAULT_LABELS = {
-       Messages.getString("EffortPerUnit.DefineColumnLabel"), //$NON-NLS-1$
-       Messages.getString("EffortPerUnit.DesignColumnLabel"), //$NON-NLS-1$
-       Messages.getString("EffortPerUnit.ImplementationColumnLabel"), //$NON-NLS-1$
-       Messages.getString("EffortPerUnit.ValidationColumnLabel"), //$NON-NLS-1$
-       Messages.getString("EffortPerUnit.RolloutColumnLabel") //$NON-NLS-1$
+       Project_Messages.getString("EffortPerUnit.DefineColumnLabel"), //$NON-NLS-1$
+       Project_Messages.getString("EffortPerUnit.DesignColumnLabel"), //$NON-NLS-1$
+       Project_Messages.getString("EffortPerUnit.ImplementationColumnLabel"), //$NON-NLS-1$
+       Project_Messages.getString("EffortPerUnit.ValidationColumnLabel"), //$NON-NLS-1$
+       Project_Messages.getString("EffortPerUnit.RolloutColumnLabel") //$NON-NLS-1$
     };
     
     private double[] values;
diff --git a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/NamedItem.java b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/NamedItem.java
index 80cd247..119d0ab 100644
--- a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/NamedItem.java
+++ b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/NamedItem.java
@@ -12,7 +12,7 @@ package org.eclipse.stardust.modeling.project.effort;
 
 public interface NamedItem
 {
-   final String NAME_PROPERTY = "name";
+   final String NAME_PROPERTY = "name"; //$NON-NLS-1$

    
    String getName();
    
diff --git a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/NamedItemList.java b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/NamedItemList.java
index 53c180d..1a04973 100644
--- a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/NamedItemList.java
+++ b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/effort/NamedItemList.java
@@ -18,8 +18,8 @@ import org.eclipse.stardust.common.CompareHelper;
 
 public abstract class NamedItemList extends EffortNotifier
 {
-   public static final String ADD_PROPERTY = "items.add";
-   public static final String REMOVE_PROPERTY = "items.remove";
+   public static final String ADD_PROPERTY = "items.add"; //$NON-NLS-1$

+   public static final String REMOVE_PROPERTY = "items.remove"; //$NON-NLS-1$

    
    private List<NamedItem> items = CollectionUtils.newList();
    
diff --git a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/project-messages.properties b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/project-messages.properties
new file mode 100644
index 0000000..371db6f
--- a/dev/null
+++ b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/project-messages.properties
@@ -0,0 +1,107 @@
+###############################################################################

+# Copyright (c) 2011 SunGard CSA LLC and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#    SunGard CSA LLC - initial API and implementation and/or initial documentation

+###############################################################################

+# PropertyPages labels

+PropertyPage.ParameterColumnLabel=Parameter

+PropertyPage.ScopeColumnLabel=Scope

+PropertyPage.ObjectColumnLabel=Object

+PropertyPage.DriverColumnLabel=Driver

+PropertyPage.ValueColumnLabel=Value

+PropertyPage.ParametersTabLabel=Effort Parameters

+PropertyPage.EffortTabLabel=Effort

+PropertyPage.CalculateEffortButtonLabel=Calculate Effort

+PropertyPage.CostDriversTabLabel=Effort Drivers

+PropertyPage.NewKeyActionLabel=New Key

+PropertyPage.EffortKeyBaseName=Key 

+PropertyPage.NewByKeyParameterActionLabel=New "By Key" Driver

+PropertyPage.NewByQuantityParameterActionLabel=New "By Quantity" Driver

+PropertyPage.ByKeyParameterBaseName=By Key Parameter 

+PropertyPage.ByValueParameterBaseName=By Value Parameter 

+PropertyPage.DeleteParameterActionLabel=Delete Parameter

+PropertyPage.DeleteKeyActionLabel=Delete Key

+EffortPerUnit.DefineColumnLabel=Define

+EffortPerUnit.DesignColumnLabel=Design

+EffortPerUnit.ImplementationColumnLabel=Implementation

+EffortPerUnit.ValidationColumnLabel=Validation

+EffortPerUnit.RolloutColumnLabel=Rollout

+

+# Parameters and Keys labels

+EffortParameters.WeblogicKey=BEA WebLogic

+EffortParameters.WebSphereKey=IBM WebSphere

+EffortParameters.NetWeaverKey=SAP NetWeaver

+EffortParameters.DBMSParameter=DBMS

+EffortParameters.OracleKey=Oracle

+EffortParameters.SqlServerKey=SQL Server

+EffortParameters.DotNetKey=.NET

+EffortParameters.OtherPortalKey=Other

+EffortParameters.WellDefinedKey=Well-defined

+EffortParameters.ComplexKey=Complex

+EffortParameters.MediumKey=Medium

+EffortParameters.SimpleKey=Simple

+EffortParameters.LinkToDBMSKey=Link to existing DBMS

+EffortParameters.LinkToOtherKey=Link to other data

+EffortParameters.ApplicationServerParameter=Application Server

+EffortParameters.DirectoryServiceParameter=Directory Service

+EffortParameters.PortalTechnologyParameter=Portal Technology

+EffortParameters.HighComplexityRefinementKey=High-complexity Subprocess Refinement

+EffortParameters.LowComplexityRefinementKey=Low-complexity Subprocess Refinement

+EffortParameters.TransitionTypeParameter=Transition Type

+EffortParameters.ExpressionOnProcessDataKey=Expression on Process Data

+EffortParameters.ComplexOrAuxillaryLogicKey=Complex/Auxiliary logic required

+EffortParameters.DataTechnologyParameter=Data Technology

+EffortParameters.DataDevelopmentParameter=Data Development

+EffortParameters.ImplementationParameter=Implementation

+EffortParameters.RoleComplexityParameter=Role Complexity

+EffortParameters.ActiveDirectoryKey=Active Directory

+EffortParameters.NewDevelopmentKey=New Development

+EffortParameters.ComplexityParameter=Complexity

+EffortParameters.TechnologyParameter=Technology

+EffortParameters.JBossKey=JBOSS

+EffortParameters.MySqlKey=MySQL

+EffortParameters.LDAPKey=LDAP

+EffortParameters.SWTKey=SWT

+EffortParameters.SwingKey=Swing

+EffortParameters.JSFKey=JSF

+EffortParameters.JSPKey=JSP

+EffortParameters.HighComplexityReportsParameter=Number of High-Complexity Reports

+EffortParameters.MediumComplexityReportsParameter=Number of Medium-Complexity Reports

+EffortParameters.LowComplexityReportsParameter=Number of Low-Complexity Reports

+EffortParameters.RemainingModelingComplexityParameter=Remaining Modeling Complexity

+EffortParameters.SubprocessRefinementParameter=Subprocess Refinement Required

+EffortParameters.NoRefinementKey=No Refinement Required

+EffortParameters.MediumComplexityRefinementKey=Medium-complexity Subprocess Refinement

+EffortParameters.TransitionComplexityParameter=Transition Complexity

+EffortParameters.HighKey=High

+EffortParameters.LowKey=Low

+EffortParameters.ToDoKey=ToDo

+EffortParameters.NewDataModelKey=New data model

+EffortParameters.QualityAvailableDocumentationParameter=Quality available documentation

+EffortParameters.PerformerComplexityParameter=Performer Complexity

+EffortParameters.OrganizationComplexityParameter=Organization Complexity

+ModelProjectPlanningAspectPropertyPage.CostDriverExcelColumnLabel=Cost Driver

+ModelProjectPlanningAspectPropertyPage.ValueExcelColumnLabel=Value

+ModelProjectPlanningAspectPropertyPage.ExcelEffortLabel=Effort and Cost Contributions

+ModelProjectPlanningAspectPropertyPage.TotalEffortExcelLabel=Total Effort

+ModelProjectPlanningAspectPropertyPage.ExcelTitle=Project Effort and Cost Planning

+ModelProjectPlanningAspectPropertyPage.NegativeValuesErrorMessage=Negative values are not allowed.

+ModelProjectPlanningAspectPropertyPage.ErrorDialogTitle=Validation error

+ModelProjectPlanningAspectPropertyPage.ErrorDialogText=Invalid number of hours

+

+#Scopes

+ActivityType=ActivityType

+ProcessDefinitionType=ProcessDefinitionType

+TransitionType=TransitionType

+DataType=DataType

+RoleType=RoleType

+OrganizationType=OrganizationType

+ConditionalPerformerType=ConditionalPerformerType

+Interactive=Interactive

+Service=Service

+ModelType=ModelType

diff --git a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/propertypages/ModelProjectPlanningAspectPropertyPage.java b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/propertypages/ModelProjectPlanningAspectPropertyPage.java
index 98e1071..9227cba 100644
--- a/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/propertypages/ModelProjectPlanningAspectPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.project/src/org/eclipse/stardust/modeling/project/propertypages/ModelProjectPlanningAspectPropertyPage.java
@@ -50,6 +50,7 @@ import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder;
 import org.eclipse.stardust.modeling.core.Verifier;
 import org.eclipse.stardust.modeling.core.VerifierFactory;
 import org.eclipse.stardust.modeling.project.ProjectPlanningAspectPlugin;
+import org.eclipse.stardust.modeling.project.Project_Messages;
 import org.eclipse.stardust.modeling.project.effort.EffortByKeyParameter;
 import org.eclipse.stardust.modeling.project.effort.EffortByQuantityParameter;
 import org.eclipse.stardust.modeling.project.effort.EffortCalculator;
@@ -61,7 +62,6 @@ import org.eclipse.stardust.modeling.project.effort.EffortParameter;
 import org.eclipse.stardust.modeling.project.effort.EffortParameterScope;
 import org.eclipse.stardust.modeling.project.effort.EffortParameters;
 import org.eclipse.stardust.modeling.project.effort.EffortPerUnit;
-import org.eclipse.stardust.modeling.project.i18n.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DragSourceAdapter;
@@ -113,12 +113,12 @@ public class ModelProjectPlanningAspectPropertyPage
    private static final String TR = "tr"; //$NON-NLS-1$
    private static final String H1 = "h1"; //$NON-NLS-1$
 
-   private static final String PARAMETER_LABEL = Messages.getString("PropertyPage.ParameterColumnLabel"); //$NON-NLS-1$
+   private static final String PARAMETER_LABEL = Project_Messages.getString("PropertyPage.ParameterColumnLabel"); //$NON-NLS-1$
    private static final String[] EFFORT_LABELS = {
-      Messages.getString("PropertyPage.ScopeColumnLabel"), //$NON-NLS-1$
-      Messages.getString("PropertyPage.ObjectColumnLabel"), //$NON-NLS-1$
-      Messages.getString("PropertyPage.DriverColumnLabel"), //$NON-NLS-1$
-      Messages.getString("PropertyPage.ValueColumnLabel")}; //$NON-NLS-1$
+      Project_Messages.getString("PropertyPage.ScopeColumnLabel"), //$NON-NLS-1$
+      Project_Messages.getString("PropertyPage.ObjectColumnLabel"), //$NON-NLS-1$
+      Project_Messages.getString("PropertyPage.DriverColumnLabel"), //$NON-NLS-1$
+      Project_Messages.getString("PropertyPage.ValueColumnLabel")}; //$NON-NLS-1$
    private static final Verifier verifier = VerifierFactory.doubleVerifier;
 
    private String dragData;
@@ -165,7 +165,7 @@ public class ModelProjectPlanningAspectPropertyPage
    private void createParametersTab(TabFolder tabFolder)
    {
       TabItem parametersTabItem = new TabItem(tabFolder, SWT.NONE);
-      parametersTabItem.setText(Messages.getString("PropertyPage.ParametersTabLabel")); //$NON-NLS-1$
+      parametersTabItem.setText(Project_Messages.getString("PropertyPage.ParametersTabLabel")); //$NON-NLS-1$
       parametersTabItem.setControl(createParameterComposite(tabFolder));
    }
 
@@ -174,10 +174,10 @@ public class ModelProjectPlanningAspectPropertyPage
       Composite composite = FormBuilder.createComposite(tabFolder, 1);
       TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
 
-      tabItem.setText(Messages.getString("PropertyPage.EffortTabLabel")); //$NON-NLS-1$
+      tabItem.setText(Project_Messages.getString("PropertyPage.EffortTabLabel")); //$NON-NLS-1$
       tabItem.setControl(composite);
 
-      FormBuilder.createButton(composite, Messages.getString("PropertyPage.CalculateEffortButtonLabel"),	new SelectionListener() //$NON-NLS-1$
+      FormBuilder.createButton(composite, Project_Messages.getString("PropertyPage.CalculateEffortButtonLabel"),	new SelectionListener() //$NON-NLS-1$
       {
          public void widgetDefaultSelected(SelectionEvent e)
          {
@@ -227,7 +227,7 @@ public class ModelProjectPlanningAspectPropertyPage
       Composite composite = FormBuilder.createComposite(tabFolder, 1);
       TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
 
-      tabItem.setText(Messages.getString("PropertyPage.CostDriversTabLabel")); //$NON-NLS-1$
+      tabItem.setText(Project_Messages.getString("PropertyPage.CostDriversTabLabel")); //$NON-NLS-1$
       tabItem.setControl(composite);
 
       Tree tree = FormBuilder.createTree(composite,
@@ -352,8 +352,8 @@ public class ModelProjectPlanningAspectPropertyPage
 
       List<String> rows = CollectionUtils.newList();
       String[] columns = new String[2 + EffortPerUnit.DEFAULT_LABELS.length];
-      columns[0] = column(bold(Messages.getString("ModelProjectPlanningAspectPropertyPage.CostDriverExcelColumnLabel"))); //$NON-NLS-1$
-      columns[1] = column(bold(Messages.getString("ModelProjectPlanningAspectPropertyPage.ValueExcelColumnLabel"))); //$NON-NLS-1$
+      columns[0] = column(bold(Project_Messages.getString("ModelProjectPlanningAspectPropertyPage.CostDriverExcelColumnLabel"))); //$NON-NLS-1$
+      columns[1] = column(bold(Project_Messages.getString("ModelProjectPlanningAspectPropertyPage.ValueExcelColumnLabel"))); //$NON-NLS-1$
       for (int i = 0; i < EffortPerUnit.DEFAULT_LABELS.length; i++)
       {
          columns[2 + i] = column(bold(EffortPerUnit.DEFAULT_LABELS[i]));
@@ -377,7 +377,7 @@ public class ModelProjectPlanningAspectPropertyPage
          {
             int colspan = 2 + EffortPerUnit.DEFAULT_LABELS.length;
             String label2 = effortEntry.getName();
-            String label = Messages.getString("ModelProjectPlanningAspectPropertyPage.ExcelEffortLabel") + //$NON-NLS-1$
+            String label = Project_Messages.getString("ModelProjectPlanningAspectPropertyPage.ExcelEffortLabel") + //$NON-NLS-1$
             BLANK + effortEntry.getSimpleName() +
             BLANK + quote(DOUBLE_QUOTE, label2);
             rows.add(row(new String[] {column(colspan, bold(label))}));
@@ -395,14 +395,14 @@ public class ModelProjectPlanningAspectPropertyPage
       }
 
       columns = new String[1 + EffortPerUnit.DEFAULT_LABELS.length];
-      columns[0] = column(2, bold(Messages.getString("ModelProjectPlanningAspectPropertyPage.TotalEffortExcelLabel"))); //$NON-NLS-1$
+      columns[0] = column(2, bold(Project_Messages.getString("ModelProjectPlanningAspectPropertyPage.TotalEffortExcelLabel"))); //$NON-NLS-1$
       for (int i = 0, len = effort.length; i < len; i++)
       {
          columns[1 + i] = column(effort[i], true);
       }
       rows.add(row(columns));
 
-      dragData = title(Messages.getString("ModelProjectPlanningAspectPropertyPage.ExcelTitle")) + table(1, rows); //$NON-NLS-1$
+      dragData = title(Project_Messages.getString("ModelProjectPlanningAspectPropertyPage.ExcelTitle")) + table(1, rows); //$NON-NLS-1$
 
       effortTableViewer.setInput(items);
    }
@@ -548,7 +548,7 @@ public class ModelProjectPlanningAspectPropertyPage
       public CreateEffortKeyAction(TreeViewer treeViewer)
       {
          this.treeViewer = treeViewer;
-         setText(Messages.getString("PropertyPage.NewKeyActionLabel")); //$NON-NLS-1$
+         setText(Project_Messages.getString("PropertyPage.NewKeyActionLabel")); //$NON-NLS-1$
       }
 
       public boolean isEnabled()
@@ -571,7 +571,7 @@ public class ModelProjectPlanningAspectPropertyPage
 
       private void createEffortKey(EffortByKeyParameter parameter)
       {
-         String baseName = Messages.getString("PropertyPage.EffortKeyBaseName"); //$NON-NLS-1$
+         String baseName = Project_Messages.getString("PropertyPage.EffortKeyBaseName"); //$NON-NLS-1$
          int start = parameter.keyCount();
          while (parameter.getKey(baseName + start) != null)
          {
@@ -596,8 +596,8 @@ public class ModelProjectPlanningAspectPropertyPage
       private static final int BY_VALUE_PARAMETER_TYPE = 1;
 
       private static final String[] LABELS = {
-         Messages.getString("PropertyPage.NewByKeyParameterActionLabel"), //$NON-NLS-1$
-         Messages.getString("PropertyPage.NewByQuantityParameterActionLabel") //$NON-NLS-1$
+         Project_Messages.getString("PropertyPage.NewByKeyParameterActionLabel"), //$NON-NLS-1$
+         Project_Messages.getString("PropertyPage.NewByQuantityParameterActionLabel") //$NON-NLS-1$
       };
 
       private TreeViewer treeViewer;
@@ -640,7 +640,7 @@ public class ModelProjectPlanningAspectPropertyPage
       {
          // TODO: label generation algorithm may create duplicate labels
          EffortByKeyParameter parameter = new EffortByKeyParameter(scope,
-               createParameterName(Messages.getString("PropertyPage.ByKeyParameterBaseName"), scope), //$NON-NLS-1$ 
+               createParameterName(Project_Messages.getString("PropertyPage.ByKeyParameterBaseName"), scope), //$NON-NLS-1$ 
                new String[] {}, new double[] {});
          scope.addParameter(parameter);
          treeViewer.refresh(scope);
@@ -649,7 +649,7 @@ public class ModelProjectPlanningAspectPropertyPage
       private void createByValueParameter(EffortParameterScope scope)
       {
          EffortByQuantityParameter parameter = new EffortByQuantityParameter(scope,
-               createParameterName(Messages.getString("PropertyPage.ByValueParameterBaseName"), scope), 1.0); //$NON-NLS-1$ 
+               createParameterName(Project_Messages.getString("PropertyPage.ByValueParameterBaseName"), scope), 1.0); //$NON-NLS-1$ 
          scope.addParameter(parameter);
          treeViewer.refresh(scope);
       }
@@ -677,8 +677,8 @@ public class ModelProjectPlanningAspectPropertyPage
       private static final int EFFORT_KEY_TYPE = 1;
 
       private static final String[] LABELS = {
-         Messages.getString("PropertyPage.DeleteParameterActionLabel"), //$NON-NLS-1$
-         Messages.getString("PropertyPage.DeleteKeyActionLabel") //$NON-NLS-1$
+         Project_Messages.getString("PropertyPage.DeleteParameterActionLabel"), //$NON-NLS-1$
+         Project_Messages.getString("PropertyPage.DeleteKeyActionLabel") //$NON-NLS-1$
       };
 
       private TreeViewer treeViewer;
@@ -849,7 +849,7 @@ public class ModelProjectPlanningAspectPropertyPage
                   double newValue = Double.parseDouble(verifier.getInternalValue((String) value));
                   if (newValue < 0)
                   {
-                     throw new NumberFormatException(Messages.getString("ModelProjectPlanningAspectPropertyPage.NegativeValuesErrorMessage")); //$NON-NLS-1$
+                     throw new NumberFormatException(Project_Messages.getString("ModelProjectPlanningAspectPropertyPage.NegativeValuesErrorMessage")); //$NON-NLS-1$
                   }
                   else
                   {
@@ -861,7 +861,7 @@ public class ModelProjectPlanningAspectPropertyPage
                   IStatus status = new Status(IStatus.ERROR,
                         ProjectPlanningAspectPlugin.getDefault().getBundle().getSymbolicName(),
                         IStatus.ERROR, nfe.getMessage(), nfe);
-                  ErrorDialog.openError(getShell(), Messages.getString("ModelProjectPlanningAspectPropertyPage.ErrorDialogTitle"), Messages.getString("ModelProjectPlanningAspectPropertyPage.ErrorDialogText"), status); //$NON-NLS-1$ //$NON-NLS-2$
+                  ErrorDialog.openError(getShell(), Project_Messages.getString("ModelProjectPlanningAspectPropertyPage.ErrorDialogTitle"), Project_Messages.getString("ModelProjectPlanningAspectPropertyPage.ErrorDialogText"), status); //$NON-NLS-1$ //$NON-NLS-2$
                }
             }
          }