Jira-ID: CRNT-26284

Make sure that new i18n Properties are present in 7.1

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

32 files changed, 186 insertions, 173 deletions

diff --git a/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/testers/FeatureTester.java b/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/testers/FeatureTester.java
index c5d6fc6..2317f72 100644
--- a/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/testers/FeatureTester.java
+++ b/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/testers/FeatureTester.java
@@ -21,7 +21,7 @@ public class FeatureTester extends PropertyTester
    {
       if (value instanceof EObject && "feature".equals(property) && args.length > 0) //$NON-NLS-1$

       {
-         for (String featureId : args[0].toString().split("\\."))

+         for (String featureId : args[0].toString().split("\\.")) //$NON-NLS-1$

          {

             if (value == null)

             {

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 527f5fc..7847304 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
@@ -2073,4 +2073,10 @@ public class Diagram_Messages extends NLS {
    public static String MSG_ProviderFileNotExists;
 
    public static String LBL_AUDITTRAIL_PERSISTENCE;
+
+   public static String LBL_SUPPORTS_RELOCATION;
+
+   public static String LBL_IS_RELOCATION_TARGET;
+
+   public static String RELOCATION_TRANSITION;
 }
\ 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 a8e06b7..074751e 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
@@ -1032,4 +1032,7 @@ CRITICALITY_MULTIPLE_TARGET_EXECUTION_MEDIUM=Multiple of target execution time (
 CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH=Multiple of target execution time (High)
 LB_OPEN_REFERENCED_MODEL=Open referenced Model?
 MSG_ProviderFileNotExists=Provider File does not exists.
-LBL_AUDITTRAIL_PERSISTENCE=Audit Trail Persistence
\ No newline at end of file
+LBL_AUDITTRAIL_PERSISTENCE=Audit Trail Persistence
+LBL_SUPPORTS_RELOCATION=Supports relocation
+LBL_IS_RELOCATION_TARGET=Is relocation target
+RELOCATION_TRANSITION=Relocation Transition
\ No newline at end of file
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/actions/OpenDiagramAction.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/actions/OpenDiagramAction.java
index 6e6e405..f7b7bca 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/actions/OpenDiagramAction.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/actions/OpenDiagramAction.java
@@ -258,7 +258,7 @@ public class OpenDiagramAction extends UpdateDiagramAction
       
       if (null != x)
       {
-         throw new InternalException("");
+         throw new InternalException(""); //$NON-NLS-1$
       }
       return loader.getEditor();
       
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityApplicationPropertyPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityApplicationPropertyPage.java
index f6b0c13..fd3f33e 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityApplicationPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityApplicationPropertyPage.java
@@ -210,7 +210,7 @@ public class ActivityApplicationPropertyPage extends AbstractModelElementPropert
                                  (IExtensibleElement) application,
                                  PredefinedConstants.MODELELEMENT_VISIBILITY);
                            if (visibility == null
-                                 || visibility.getValue().equalsIgnoreCase("Public"))
+                                 || visibility.getValue().equalsIgnoreCase("Public")) //$NON-NLS-1$
                            {
                               applicationsList.add(application);
                            } 
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityGeneralPropertyPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityGeneralPropertyPage.java
index 63d1472..ebaefdb 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityGeneralPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ActivityGeneralPropertyPage.java
@@ -157,8 +157,8 @@ public class ActivityGeneralPropertyPage extends IdentifiablePropertyPage
             process.getTransition().add(relocationTransition);
          }
          relocationTransition.setId(PredefinedConstants.RELOCATION_TRANSITION_ID);
-         relocationTransition.setName("Relocation Transition");
-         relocationTransition.setCondition("TRUE");
+         relocationTransition.setName(Diagram_Messages.RELOCATION_TRANSITION);
+         relocationTransition.setCondition("TRUE"); //$NON-NLS-1$
          relocationTransition.setFrom(null);
          relocationTransition.setTo(null);
          relocationTransition.setForkOnTraversal(false);
@@ -180,14 +180,18 @@ public class ActivityGeneralPropertyPage extends IdentifiablePropertyPage
       grid.makeColumnsEqualWidth = true;
       grid.marginWidth = 0;
       grid.marginHeight = 0;
-      abortCheck = FormBuilder.createCheckBox(panel, Diagram_Messages.CHECKBOX_AllowsAbortByParticipant,
-            new GridData(SWT.LEAD, SWT.CENTER, true, false));
-      relocateSourceCheck = FormBuilder.createCheckBox(panel, "Supports relocation",
-            new GridData(SWT.LEAD, SWT.CENTER, true, false));
-      hibernateCheck = FormBuilder.createCheckBox(panel, Diagram_Messages.CHECKBOX_HibernateInitially,
-            new GridData(SWT.LEAD, SWT.CENTER, true, false));
-      relocateTargetCheck = FormBuilder.createCheckBox(panel, "Is relocation target",
-            new GridData(SWT.LEAD, SWT.CENTER, true, false));
+      abortCheck = FormBuilder.createCheckBox(panel,
+            Diagram_Messages.CHECKBOX_AllowsAbortByParticipant, new GridData(SWT.LEAD,
+                  SWT.CENTER, true, false));
+      relocateSourceCheck = FormBuilder.createCheckBox(panel,
+            Diagram_Messages.LBL_SUPPORTS_RELOCATION, new GridData(SWT.LEAD, SWT.CENTER,
+                  true, false));
+      hibernateCheck = FormBuilder.createCheckBox(panel,
+            Diagram_Messages.CHECKBOX_HibernateInitially, new GridData(SWT.LEAD,
+                  SWT.CENTER, true, false));
+      relocateTargetCheck = FormBuilder.createCheckBox(panel,
+            Diagram_Messages.LBL_IS_RELOCATION_TARGET, new GridData(SWT.LEAD, SWT.CENTER,
+                  true, false));
    }
 
 
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ProcessDefinitionTriggersPropertyPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ProcessDefinitionTriggersPropertyPage.java
index be8b36f..2c98a6b 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ProcessDefinitionTriggersPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ProcessDefinitionTriggersPropertyPage.java
@@ -20,7 +20,7 @@ public class ProcessDefinitionTriggersPropertyPage
    public void loadFieldsFromElement(IModelElementNodeSymbol symbol, IModelElement element)
    {
       super.loadFieldsFromElement(symbol, element);
-      if (getNode("_cwm_spi_trigger_") == null)
+      if (getNode("_cwm_spi_trigger_") == null) //$NON-NLS-1$
       {
          addSpiNodes((TriggerType) element);
          refreshTree();
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ProcessInterfacePropertyPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ProcessInterfacePropertyPage.java
index a7f5b48..7bd73e6 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ProcessInterfacePropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ProcessInterfacePropertyPage.java
@@ -141,7 +141,7 @@ public class ProcessInterfacePropertyPage extends AbstractModelElementPropertyPa
 

    private Button restButton;

    

-   private static final String INVOCATION_GENERATOR_ID = "org.eclipse.stardust.modeling.core.processInterfaceInvocationGenerator";

+   private static final String INVOCATION_GENERATOR_ID = "org.eclipse.stardust.modeling.core.processInterfaceInvocationGenerator"; //$NON-NLS-1$

    

    private IProcessInterfaceInvocationGenerator piInvocationGenerators[];

 

diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ReferencedModelSorter.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ReferencedModelSorter.java
index 36f8172..057503e 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ReferencedModelSorter.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/ReferencedModelSorter.java
@@ -79,8 +79,8 @@ public class ReferencedModelSorter extends ViewerSorter
       String path = AttributeUtil.getAttribute(apt, "carnot:engine:dataType").getValue(); //$NON-NLS-1$      

       if (path.startsWith("typeDeclaration:")) //$NON-NLS-1$ 

       {

-         int idx1 = path.indexOf("{");

-         int idx2 = path.indexOf("}");

+         int idx1 = path.indexOf("{"); //$NON-NLS-1$

+         int idx2 = path.indexOf("}"); //$NON-NLS-1$

          String modelID = path.substring(idx1 + 1, idx2);

          java.util.List<String> refModelsURI = ModelUtils

                .getURIsForExternalPackages(model);

diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/spi/triggerTypes/scan/ScanTriggerPropertyPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/spi/triggerTypes/scan/ScanTriggerPropertyPage.java
index d4e855d..ff92e5a 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/spi/triggerTypes/scan/ScanTriggerPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/spi/triggerTypes/scan/ScanTriggerPropertyPage.java
@@ -192,7 +192,7 @@ public class ScanTriggerPropertyPage extends AbstractModelElementPropertyPage
       participantNode = new CarnotPreferenceNode(element, getElement(), 0);

       getPreferenceManager().addToRoot(participantNode);

       triggerNode = (CarnotPreferenceNode) this

-            .getPreferenceManager().find("scan");

+            .getPreferenceManager().find("scan"); //$NON-NLS-1$

       return composite;
    }
    

@@ -226,7 +226,7 @@ public class ScanTriggerPropertyPage extends AbstractModelElementPropertyPage
    {

       this.participantNode.updatePageStatus(state);

       TreeViewer parentTreeViewer = (TreeViewer) Reflect.getFieldValue(

-            this.getContainer(), "treeViewer");

+            this.getContainer(), "treeViewer"); //$NON-NLS-1$

       parentTreeViewer.refresh(true);

    }

    

@@ -234,7 +234,7 @@ public class ScanTriggerPropertyPage extends AbstractModelElementPropertyPage
    {

       this.triggerNode.updatePageStatus(state);

       TreeViewer parentTreeViewer = (TreeViewer) Reflect.getFieldValue(

-            this.getContainer(), "treeViewer");

+            this.getContainer(), "treeViewer"); //$NON-NLS-1$

       parentTreeViewer.refresh(true);

    }

 
@@ -262,7 +262,7 @@ public class ScanTriggerPropertyPage extends AbstractModelElementPropertyPage
             }

 

          };

-         Reflect.setFieldValue(wBndMgr, "vBndMgr", pm);

+         Reflect.setFieldValue(wBndMgr, "vBndMgr", pm); //$NON-NLS-1$

          return wBndMgr;

       }

       return super.getWidgetBindingManager();

diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationContentProvider.java b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationContentProvider.java
index f3ec558..92f98e6 100644
--- a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationContentProvider.java
+++ b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationContentProvider.java
@@ -96,7 +96,7 @@ public class AnnotationContentProvider implements ITreeContentProvider
          for (int i = 0; i < configs.length; i++)
          {
             String name = configs[i].getName();
-            if ("category".equals(name))
+            if ("category".equals(name)) //$NON-NLS-1$
             {
                elements.add(new CategoryAnnotation(this, decl, configs[i]));
             }
@@ -127,7 +127,7 @@ public class AnnotationContentProvider implements ITreeContentProvider
       for (int i = 0; i < children.size(); i++)
       {
          ElementAnnotation annotation = (ElementAnnotation) children.get(i);
-         if ("storage".equals(annotation.getConfigurationAttribute("name"))) //$NON-NLS-1$
+         if ("storage".equals(annotation.getConfigurationAttribute("name"))) //$NON-NLS-1$ //$NON-NLS-2$
          {
             return annotation;
          }
@@ -142,9 +142,9 @@ public class AnnotationContentProvider implements ITreeContentProvider
       for (int i = 0; i < configs.length; i++)
       {
          String name = configs[i].getName();
-         if ("category".equals(name))
+         if ("category".equals(name)) //$NON-NLS-1$
          {
-            if (IPP_CATEGORY_ID.equals(configs[i].getAttribute("id")))
+            if (IPP_CATEGORY_ID.equals(configs[i].getAttribute("id"))) //$NON-NLS-1$
             {
                return new CategoryAnnotation(this, decl, configs[i]);
             }
diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/Column.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/Column.java
index 872110a..dde9191 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/Column.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/Column.java
@@ -82,38 +82,38 @@ public class Column extends MetadataPropertyHolder
    {

       StringBuffer buffer = new StringBuffer();

 

-      buffer.append("<COLUMN");

+      buffer.append("<COLUMN"); //$NON-NLS-1$

 

-      buffer.append(" id=\"");

-      buffer.append("12");

-      buffer.append("\"");

-      buffer.append(" type=\"");

-      buffer.append("" + getType());

-      buffer.append("\"");

+      buffer.append(" id=\""); //$NON-NLS-1$

+      buffer.append("12"); //$NON-NLS-1$

+      buffer.append("\""); //$NON-NLS-1$

+      buffer.append(" type=\""); //$NON-NLS-1$

+      buffer.append("" + getType()); //$NON-NLS-1$

+      buffer.append("\""); //$NON-NLS-1$

 

       if (getLabel() != null)

       {

-         buffer.append(" label=\"");

+         buffer.append(" label=\""); //$NON-NLS-1$

          buffer.append(getLabel());

-         buffer.append("\"");

+         buffer.append("\""); //$NON-NLS-1$

       }

 

-      buffer.append(" mandatory=\"");

-      buffer.append("" + getMandatory());

-      buffer.append("\"");

-      buffer.append(" readonly=\"");

-      buffer.append("" + getReadonly());

-      buffer.append("\"");

+      buffer.append(" mandatory=\""); //$NON-NLS-1$

+      buffer.append("" + getMandatory()); //$NON-NLS-1$

+      buffer.append("\""); //$NON-NLS-1$

+      buffer.append(" readonly=\""); //$NON-NLS-1$

+      buffer.append("" + getReadonly()); //$NON-NLS-1$

+      buffer.append("\""); //$NON-NLS-1$

 

       if (getToolTip() != null)

       {

-         buffer.append(" tooltip=\"");

+         buffer.append(" tooltip=\""); //$NON-NLS-1$

          buffer.append(getToolTip());

-         buffer.append("\"");

+         buffer.append("\""); //$NON-NLS-1$

       }

 

-      buffer.append(">\n");

-      buffer.append("</COLUMN>\n");

+      buffer.append(">\n"); //$NON-NLS-1$

+      buffer.append("</COLUMN>\n"); //$NON-NLS-1$

 

       return buffer.toString();

    }

@@ -127,11 +127,11 @@ public class Column extends MetadataPropertyHolder
       {

          try

          {

-            icon = new ImageIcon(Data.class.getResource("images/column.gif"));

+            icon = new ImageIcon(Data.class.getResource("images/column.gif")); //$NON-NLS-1$

          }

          catch (Exception x)

          {

-            throw new PublicException("Cannnot load resource \"images/column.gif\"");

+            throw new PublicException("Cannnot load resource \"images/column.gif\""); //$NON-NLS-1$

          }

       }

 

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateDataDialog.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateDataDialog.java
index f91d17a..765267d 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateDataDialog.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateDataDialog.java
@@ -56,16 +56,16 @@ public class CreateDataDialog extends AbstractDialog
 

       LabeledComponentsPanel components = new LabeledComponentsPanel();

 

-      components.add(idEntry = new TextEntry(10), "ID:", 'i');

+      components.add(idEntry = new TextEntry(10), "ID:", 'i'); //$NON-NLS-1$

       idEntry.setMandatory(true);

-      components.add(new JComboBox(new String[]{"Integer", "Money"}), "ID:", 'i');

-      components.add(labelEntry = new TextEntry(20), "Label:", 'l');

-      components.add(new JComponent[]{mandatoryBox = new JCheckBox("Mandatory"), readonlyBox = new JCheckBox("Readonly")},

-            new String[]{"", ""}, new int[]{'m', 'r'});

-      components.add(defaultEntry = new TextEntry(30), "Default Value: ", 'd');

+      components.add(new JComboBox(new String[]{"Integer", "Money"}), "ID:", 'i'); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+      components.add(labelEntry = new TextEntry(20), "Label:", 'l'); //$NON-NLS-1$

+      components.add(new JComponent[]{mandatoryBox = new JCheckBox("Mandatory"), readonlyBox = new JCheckBox("Readonly")}, //$NON-NLS-1$ //$NON-NLS-2$

+            new String[]{"", ""}, new int[]{'m', 'r'}); //$NON-NLS-1$ //$NON-NLS-2$

+      components.add(defaultEntry = new TextEntry(30), "Default Value: ", 'd'); //$NON-NLS-1$

       components.add(new JComponent[]{lengthEntry = new ShortEntry(), rowEntry = new ByteEntry(), columnEntry = new ByteEntry()},

-            new String[]{"Length:", "Row:", "Column:"}, new int[]{'l', 'r', 'c'});

-      components.add(toolTipEntry = new TextEntry(20), "Tooltip Text: ", 't');

+            new String[]{"Length:", "Row:", "Column:"}, new int[]{'l', 'r', 'c'}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+      components.add(toolTipEntry = new TextEntry(20), "Tooltip Text: ", 't'); //$NON-NLS-1$

       components.pack();

 

       panel.add(components);

@@ -141,7 +141,7 @@ public class CreateDataDialog extends AbstractDialog
 

       singleton.setData(data);

 

-      return showDialog("Modify Data", singleton, editor);

+      return showDialog("Modify Data", singleton, editor); //$NON-NLS-1$

    }

 

    /**

@@ -166,6 +166,6 @@ public class CreateDataDialog extends AbstractDialog
 

       singleton.dataGroup = dataGroup;

 

-      return showDialog("Create Data", singleton, editor);

+      return showDialog("Create Data", singleton, editor); //$NON-NLS-1$

    }

 }

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateOrModifyColumnDialog.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateOrModifyColumnDialog.java
index 50dd4db..7e58b35 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateOrModifyColumnDialog.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateOrModifyColumnDialog.java
@@ -55,16 +55,16 @@ public class CreateOrModifyColumnDialog extends AbstractDialog
 

       LabeledComponentsPanel components = new LabeledComponentsPanel();

 

-      components.add(idEntry = new TextEntry(10), "ID:", 'i');

+      components.add(idEntry = new TextEntry(10), "ID:", 'i'); //$NON-NLS-1$

       idEntry.setMandatory(true);

-      components.add(new JComboBox(new String[]{"Integer", "Money"}), "ID:", 'i');

-      components.add(labelEntry = new TextEntry(20), "Label:", 'l');

-      components.add(new JComponent[]{mandatoryBox = new JCheckBox("Mandatory"), readonlyBox = new JCheckBox("Readonly")},

-            new String[]{"", ""}, new int[]{'m', 'r'});

-      components.add(defaultEntry = new TextEntry(30), "Default Value: ", 'd');

+      components.add(new JComboBox(new String[]{"Integer", "Money"}), "ID:", 'i'); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+      components.add(labelEntry = new TextEntry(20), "Label:", 'l'); //$NON-NLS-1$

+      components.add(new JComponent[]{mandatoryBox = new JCheckBox("Mandatory"), readonlyBox = new JCheckBox("Readonly")}, //$NON-NLS-1$ //$NON-NLS-2$

+            new String[]{"", ""}, new int[]{'m', 'r'}); //$NON-NLS-1$ //$NON-NLS-2$

+      components.add(defaultEntry = new TextEntry(30), "Default Value: ", 'd'); //$NON-NLS-1$

       components.add(new JComponent[]{lengthEntry = new ShortEntry(), rowEntry = new ByteEntry(), columnEntry = new ByteEntry()},

-            new String[]{"Length:", "Row:", "Column:"}, new int[]{'l', 'r', 'c'});

-      components.add(toolTipEntry = new TextEntry(20), "Tooltip Text: ", 't');

+            new String[]{"Length:", "Row:", "Column:"}, new int[]{'l', 'r', 'c'}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+      components.add(toolTipEntry = new TextEntry(20), "Tooltip Text: ", 't'); //$NON-NLS-1$

       components.pack();

 

       panel.add(components);

@@ -103,7 +103,7 @@ public class CreateOrModifyColumnDialog extends AbstractDialog
          singleton = new CreateOrModifyColumnDialog(parent);

       }

 

-      return showDialog("Modify Column", singleton, editor);

+      return showDialog("Modify Column", singleton, editor); //$NON-NLS-1$

    }

 

    /**

@@ -128,6 +128,6 @@ public class CreateOrModifyColumnDialog extends AbstractDialog
 

       singleton.table = table;

 

-      return showDialog("Create Column", singleton, editor);

+      return showDialog("Create Column", singleton, editor); //$NON-NLS-1$

    }

 }

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateOrModifyTableDataDialog.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateOrModifyTableDataDialog.java
index 6586f4c..e625c0b 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateOrModifyTableDataDialog.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateOrModifyTableDataDialog.java
@@ -56,14 +56,14 @@ public class CreateOrModifyTableDataDialog extends AbstractDialog
 

       LabeledComponentsPanel components = new LabeledComponentsPanel();

 

-      components.add(idEntry = new TextEntry(10), "ID:", 'i');

+      components.add(idEntry = new TextEntry(10), "ID:", 'i'); //$NON-NLS-1$

       idEntry.setMandatory(true);

-      components.add(labelEntry = new TextEntry(20), "Label:", 'l');

-      components.add(new JComponent[]{mandatoryBox = new JCheckBox("Mandatory"), readonlyBox = new JCheckBox("Readonly")},

-            new String[]{"", ""}, new int[]{'m', 'r'});

+      components.add(labelEntry = new TextEntry(20), "Label:", 'l'); //$NON-NLS-1$

+      components.add(new JComponent[]{mandatoryBox = new JCheckBox("Mandatory"), readonlyBox = new JCheckBox("Readonly")}, //$NON-NLS-1$ //$NON-NLS-2$

+            new String[]{"", ""}, new int[]{'m', 'r'}); //$NON-NLS-1$ //$NON-NLS-2$

       components.add(new JComponent[]{rowEntry = new ByteEntry(), columnEntry = new ByteEntry()},

-            new String[]{"Row:", "Column:"}, new int[]{'r', 'c'});

-      components.add(toolTipEntry = new TextEntry(20), "Tooltip Text: ", 't');

+            new String[]{"Row:", "Column:"}, new int[]{'r', 'c'}); //$NON-NLS-1$ //$NON-NLS-2$

+      components.add(toolTipEntry = new TextEntry(20), "Tooltip Text: ", 't'); //$NON-NLS-1$

       components.pack();

 

       panel.add(components);

@@ -111,7 +111,7 @@ public class CreateOrModifyTableDataDialog extends AbstractDialog
 

       singleton.dataGroup = dataGroup;

 

-      return showDialog("Create Data", singleton, editor);

+      return showDialog("Create Data", singleton, editor); //$NON-NLS-1$

    }

 

    /**

@@ -134,6 +134,6 @@ public class CreateOrModifyTableDataDialog extends AbstractDialog
          singleton = new CreateOrModifyTableDataDialog(parent);

       }

 

-      return showDialog("Modify Table Data", singleton, editor);

+      return showDialog("Modify Table Data", singleton, editor); //$NON-NLS-1$

    }

 }

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateSubGroupDialog.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateSubGroupDialog.java
index 8a5cc88..0cc2822 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateSubGroupDialog.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/CreateSubGroupDialog.java
@@ -56,12 +56,12 @@ public class CreateSubGroupDialog extends AbstractDialog
 

       LabeledComponentsPanel components = new LabeledComponentsPanel();

 

-      components.add(idEntry = new TextEntry(10), "ID:", 'i');

+      components.add(idEntry = new TextEntry(10), "ID:", 'i'); //$NON-NLS-1$

       idEntry.setMandatory(true);

-      components.add(labelEntry = new TextEntry(20), "Label:", 'l');

-      components.add(typeEntry = new TextEntry(20), "Type:", 't');

+      components.add(labelEntry = new TextEntry(20), "Label:", 'l'); //$NON-NLS-1$

+      components.add(typeEntry = new TextEntry(20), "Type:", 't'); //$NON-NLS-1$

       components.add(new JComponent[]{rowEntry = new ByteEntry(), columnEntry = new ByteEntry()},

-            new String[]{"Row:", "Column:"}, new int[]{'r', 'c'});

+            new String[]{"Row:", "Column:"}, new int[]{'r', 'c'}); //$NON-NLS-1$ //$NON-NLS-2$

       components.pack();

 

       panel.add(components);

@@ -137,7 +137,7 @@ public class CreateSubGroupDialog extends AbstractDialog
       singleton.createSubgroup = false;

       singleton.setData(dataGroup);

 

-      return showDialog("Modify Data Group", singleton, editor);

+      return showDialog("Modify Data Group", singleton, editor); //$NON-NLS-1$

    }

 

    /**

@@ -165,6 +165,6 @@ public class CreateSubGroupDialog extends AbstractDialog
       singleton.createSubgroup = true;

       singleton.dataGroup = dataGroup;

 

-      return showDialog("Create Subgroup", singleton, editor);

+      return showDialog("Create Subgroup", singleton, editor); //$NON-NLS-1$

    }

 }

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/Data.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/Data.java
index ff3d940..4e0596a 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/Data.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/Data.java
@@ -197,11 +197,11 @@ public class Data extends MetadataPropertyHolder
       {

          try

          {

-            icon = new ImageIcon(Data.class.getResource("images/data.gif"));

+            icon = new ImageIcon(Data.class.getResource("images/data.gif")); //$NON-NLS-1$

          }

          catch (Exception x)

          {

-            throw new PublicException("Cannnot load resource \"images/data.gif\"");

+            throw new PublicException("Cannnot load resource \"images/data.gif\""); //$NON-NLS-1$

          }

       }

 

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/DataGroup.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/DataGroup.java
index 473c26b..90f0c67 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/DataGroup.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/DataGroup.java
@@ -209,11 +209,11 @@ public class DataGroup extends MetadataPropertyHolder
       {

          try

          {

-            icon = new ImageIcon(Data.class.getResource("images/data_group.gif"));

+            icon = new ImageIcon(Data.class.getResource("images/data_group.gif")); //$NON-NLS-1$

          }

          catch (Exception x)

          {

-            throw new PublicException("Cannnot load resource \"images/data_group.gif\"");

+            throw new PublicException("Cannnot load resource \"images/data_group.gif\""); //$NON-NLS-1$

          }

       }

 

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/DefaultInterpreter.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/DefaultInterpreter.java
index dfc2f02..0afaa9b 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/DefaultInterpreter.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/DefaultInterpreter.java
@@ -111,8 +111,8 @@ public class DefaultInterpreter extends Interpreter
          _processedData.add(data.getID());

          if (data instanceof TableData)

          {

-            table = new GenericTable(Data.class, new String[]{"Label", "Label", "Label"},

-                  new String[]{"Column1", "Column2", "Column3"});

+            table = new GenericTable(Data.class, new String[]{"Label", "Label", "Label"}, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+                  new String[]{"Column1", "Column2", "Column3"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

             table.setMaximumSize(new Dimension(table.getMaximumSize().width, 100));

             table.setPreferredSize(new Dimension(100, 100));

          }

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataEditor.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataEditor.java
index 62a9149..7925942 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataEditor.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataEditor.java
@@ -24,8 +24,8 @@ import org.eclipse.stardust.engine.core.compatibility.gui.GenericTree;
 public class MetadataEditor extends AbstractDialog

 {

    private static Class[] treeClasses = new Class[]{DataGroup.class, TableData.class, Data.class, Column.class};

-   private static String[][] treeAssociations = new String[][]{{"SubGroups", "Data"}, {"Columns"}, null, null};

-   private static String[] treeNames = new String[]{"Label", "Label", "Label", "Label"};

+   private static String[][] treeAssociations = new String[][]{{"SubGroups", "Data"}, {"Columns"}, null, null}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+   private static String[] treeNames = new String[]{"Label", "Label", "Label", "Label"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

 

    private static MetadataEditor instance;

 

@@ -141,7 +141,7 @@ public class MetadataEditor extends AbstractDialog
       viewPanel = new JPanel();

 

       viewPanel.setLayout(new BoxLayout(viewPanel, BoxLayout.Y_AXIS));

-      viewPanel.setBorder(new TitledBorder(new EtchedBorder(), "Activity Dialog"));

+      viewPanel.setBorder(new TitledBorder(new EtchedBorder(), "Activity Dialog")); //$NON-NLS-1$

 

       panel.add(viewPanel);

       panel.add(Box.createHorizontalStrut(10));

@@ -152,10 +152,10 @@ public class MetadataEditor extends AbstractDialog
       tree.setPopupMenu(getDataPopupMenu(), Data.class);

       tree.setPopupMenu(getTableDataPopupMenu(), TableData.class);

       tree.setPopupMenu(getColumnPopupMenu(), Column.class);

-      tree.setIconMethod("getIcon", DataGroup.class);

-      tree.setIconMethod("getIcon", Data.class);

-      tree.setIconMethod("getIcon", TableData.class);

-      tree.setIconMethod("getIcon", Column.class);

+      tree.setIconMethod("getIcon", DataGroup.class); //$NON-NLS-1$

+      tree.setIconMethod("getIcon", Data.class); //$NON-NLS-1$

+      tree.setIconMethod("getIcon", TableData.class); //$NON-NLS-1$

+      tree.setIconMethod("getIcon", Column.class); //$NON-NLS-1$

       tree.setLoadIncrement(100000);

       tree.setDragAndDropEnabled(true);

 

@@ -178,7 +178,7 @@ public class MetadataEditor extends AbstractDialog
    {

       JPopupMenu popupMenu = new JPopupMenu();

 

-      columnPropertiesItem = new JMenuItem("Properties...");

+      columnPropertiesItem = new JMenuItem("Properties..."); //$NON-NLS-1$

 

       columnPropertiesItem.addActionListener(this);

       columnPropertiesItem.setMnemonic('e');

@@ -192,20 +192,20 @@ public class MetadataEditor extends AbstractDialog
    {

       JPopupMenu popupMenu = new JPopupMenu();

 

-      dataGroupPropertiesItem = new JMenuItem("Properties...");

+      dataGroupPropertiesItem = new JMenuItem("Properties..."); //$NON-NLS-1$

 

       dataGroupPropertiesItem.addActionListener(this);

       dataGroupPropertiesItem.setMnemonic('e');

       popupMenu.add(dataGroupPropertiesItem);

       popupMenu.addSeparator();

 

-      addDataItem = new JMenuItem("Add Data...");

+      addDataItem = new JMenuItem("Add Data..."); //$NON-NLS-1$

 

       addDataItem.addActionListener(this);

       addDataItem.setMnemonic('e');

       popupMenu.add(addDataItem);

 

-      addSubGroupItem = new JMenuItem("Add Subgroup...");

+      addSubGroupItem = new JMenuItem("Add Subgroup..."); //$NON-NLS-1$

 

       addSubGroupItem.addActionListener(this);

       addSubGroupItem.setMnemonic('e');

@@ -220,7 +220,7 @@ public class MetadataEditor extends AbstractDialog
    {

       JPopupMenu popupMenu = new JPopupMenu();

 

-      dataPropertiesItem = new JMenuItem("Properties...");

+      dataPropertiesItem = new JMenuItem("Properties..."); //$NON-NLS-1$

 

       dataPropertiesItem.addActionListener(this);

       dataPropertiesItem.setMnemonic('e');

@@ -234,7 +234,7 @@ public class MetadataEditor extends AbstractDialog
    {

       JPopupMenu popupMenu = new JPopupMenu();

 

-      tableDataPropertiesItem = new JMenuItem("Properties...");

+      tableDataPropertiesItem = new JMenuItem("Properties..."); //$NON-NLS-1$

 

       tableDataPropertiesItem.addActionListener(this);

       tableDataPropertiesItem.setMnemonic('p');

@@ -274,6 +274,6 @@ public class MetadataEditor extends AbstractDialog
       }

 

       instance.setData(topGroup);

-      return showDialog("Manual Activity Dialog Editor", instance, dialog);

+      return showDialog("Manual Activity Dialog Editor", instance, dialog); //$NON-NLS-1$

    }

 }

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataParser.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataParser.java
index 8c90cb4..606a881 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataParser.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataParser.java
@@ -131,11 +131,11 @@ public class MetadataParser extends HandlerBase
       }

       catch (ParserConfigurationException e)

       {

-         throw new InternalException("Invalid JAXP setup.", e);

+         throw new InternalException("Invalid JAXP setup.", e); //$NON-NLS-1$

       }

       catch (SAXException e)

       {

-         throw new InternalException("SAX error.", e);

+         throw new InternalException("SAX error.", e); //$NON-NLS-1$

       }

    }

 

@@ -164,29 +164,29 @@ public class MetadataParser extends HandlerBase
       String tooltip = null;

       Hashtable properties = null;

 

-      if (tag.compareTo("DATA_GROUP") == 0)

+      if (tag.compareTo("DATA_GROUP") == 0) //$NON-NLS-1$

       {

-         trace.debug( "Processing data group ...");

+         trace.debug( "Processing data group ..."); //$NON-NLS-1$

 

          for (i = 0; i < atts.getLength(); i++)

          {

-            if (atts.getName(i).compareTo("id") == 0)

+            if (atts.getName(i).compareTo("id") == 0) //$NON-NLS-1$

             {

                id = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("label") == 0)

+            else if (atts.getName(i).compareTo("label") == 0) //$NON-NLS-1$

             {

                label = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("type") == 0)

+            else if (atts.getName(i).compareTo("type") == 0) //$NON-NLS-1$

             {

                type = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("row") == 0)

+            else if (atts.getName(i).compareTo("row") == 0) //$NON-NLS-1$

             {

                rowString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("column") == 0)

+            else if (atts.getName(i).compareTo("column") == 0) //$NON-NLS-1$

             {

                columnString = atts.getValue(i);

             }

@@ -201,7 +201,7 @@ public class MetadataParser extends HandlerBase
 

                properties.put(atts.getName(i), atts.getName(i));

 

-               trace.debug( "Property " + atts.getName(i) + " set to " + atts.getValue(i));

+               trace.debug( "Property " + atts.getName(i) + " set to " + atts.getValue(i)); //$NON-NLS-1$ //$NON-NLS-2$

             }

          }

 

@@ -210,7 +210,7 @@ public class MetadataParser extends HandlerBase
             row = Byte.parseByte(rowString);

             column = Byte.parseByte(columnString);

 

-            trace.debug( "R/C: " + row + " " + column);

+            trace.debug( "R/C: " + row + " " + column); //$NON-NLS-1$ //$NON-NLS-2$

          }

          catch (NumberFormatException x)

          {

@@ -238,49 +238,49 @@ public class MetadataParser extends HandlerBase
 

          return;

       }

-      else if (tag.compareTo("DATA") == 0)

+      else if (tag.compareTo("DATA") == 0) //$NON-NLS-1$

       {

-         trace.debug( "Processing data definition ...");

+         trace.debug( "Processing data definition ..."); //$NON-NLS-1$

 

          for (i = 0; i < atts.getLength(); i++)

          {

-            if (atts.getName(i).compareTo("id") == 0)

+            if (atts.getName(i).compareTo("id") == 0) //$NON-NLS-1$

             {

                id = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("label") == 0)

+            else if (atts.getName(i).compareTo("label") == 0) //$NON-NLS-1$

             {

                label = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("type") == 0)

+            else if (atts.getName(i).compareTo("type") == 0) //$NON-NLS-1$

             {

                type = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("mandatory") == 0)

+            else if (atts.getName(i).compareTo("mandatory") == 0) //$NON-NLS-1$

             {

                mandatoryString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("readonly") == 0)

+            else if (atts.getName(i).compareTo("readonly") == 0) //$NON-NLS-1$

             {

                readonlyString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("length") == 0)

+            else if (atts.getName(i).compareTo("length") == 0) //$NON-NLS-1$

             {

                lengthString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("default") == 0)

+            else if (atts.getName(i).compareTo("default") == 0) //$NON-NLS-1$

             {

                defaultValue = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("row") == 0)

+            else if (atts.getName(i).compareTo("row") == 0) //$NON-NLS-1$

             {

                rowString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("column") == 0)

+            else if (atts.getName(i).compareTo("column") == 0) //$NON-NLS-1$

             {

                columnString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("tooltip") == 0)

+            else if (atts.getName(i).compareTo("tooltip") == 0) //$NON-NLS-1$

             {

                tooltip = atts.getValue(i);

             }

@@ -310,7 +310,7 @@ public class MetadataParser extends HandlerBase
 

          data.setID(id);

 

-         if (label.equals("null"))

+         if (label.equals("null")) //$NON-NLS-1$

          {

             label = null;

          }

@@ -319,7 +319,7 @@ public class MetadataParser extends HandlerBase
          data.setRow(row);

          data.setColumn(column);

 

-         if (readonlyString.equals("true"))

+         if (readonlyString.equals("true")) //$NON-NLS-1$

          {

             data.setReadonly(true);

          }

@@ -328,7 +328,7 @@ public class MetadataParser extends HandlerBase
             data.setReadonly(false);

          }

 

-         if (mandatoryString.equals("true"))

+         if (mandatoryString.equals("true")) //$NON-NLS-1$

          {

             data.setMandatory(true);

          }

@@ -341,33 +341,33 @@ public class MetadataParser extends HandlerBase
 

          return;

       }

-      else if (tag.compareTo("TABLE_DATA") == 0)

+      else if (tag.compareTo("TABLE_DATA") == 0) //$NON-NLS-1$

       {

-         trace.debug( "Processing table data ...");

+         trace.debug( "Processing table data ..."); //$NON-NLS-1$

 

          for (i = 0; i < atts.getLength(); i++)

          {

-            if (atts.getName(i).compareTo("id") == 0)

+            if (atts.getName(i).compareTo("id") == 0) //$NON-NLS-1$

             {

                id = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("label") == 0)

+            else if (atts.getName(i).compareTo("label") == 0) //$NON-NLS-1$

             {

                label = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("readonly") == 0)

+            else if (atts.getName(i).compareTo("readonly") == 0) //$NON-NLS-1$

             {

                readonlyString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("row") == 0)

+            else if (atts.getName(i).compareTo("row") == 0) //$NON-NLS-1$

             {

                rowString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("column") == 0)

+            else if (atts.getName(i).compareTo("column") == 0) //$NON-NLS-1$

             {

                columnString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("tooltip") == 0)

+            else if (atts.getName(i).compareTo("tooltip") == 0) //$NON-NLS-1$

             {

                tooltip = atts.getValue(i);

             }

@@ -390,45 +390,45 @@ public class MetadataParser extends HandlerBase
 

          return;

       }

-      else if (tag.compareTo("COLUMN") == 0)

+      else if (tag.compareTo("COLUMN") == 0) //$NON-NLS-1$

       {

-         trace.debug( "Processing column ...");

+         trace.debug( "Processing column ..."); //$NON-NLS-1$

 

          for (i = 0; i < atts.getLength(); i++)

          {

-            if (atts.getName(i).compareTo("id") == 0)

+            if (atts.getName(i).compareTo("id") == 0) //$NON-NLS-1$

             {

                id = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("label") == 0)

+            else if (atts.getName(i).compareTo("label") == 0) //$NON-NLS-1$

             {

                label = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("type") == 0)

+            else if (atts.getName(i).compareTo("type") == 0) //$NON-NLS-1$

             {

                type = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("mandatory") == 0)

+            else if (atts.getName(i).compareTo("mandatory") == 0) //$NON-NLS-1$

             {

                mandatoryString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("readonly") == 0)

+            else if (atts.getName(i).compareTo("readonly") == 0) //$NON-NLS-1$

             {

                readonlyString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("length") == 0)

+            else if (atts.getName(i).compareTo("length") == 0) //$NON-NLS-1$

             {

                lengthString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("row") == 0)

+            else if (atts.getName(i).compareTo("row") == 0) //$NON-NLS-1$

             {

                rowString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("column") == 0)

+            else if (atts.getName(i).compareTo("column") == 0) //$NON-NLS-1$

             {

                columnString = atts.getValue(i);

             }

-            else if (atts.getName(i).compareTo("tooltip") == 0)

+            else if (atts.getName(i).compareTo("tooltip") == 0) //$NON-NLS-1$

             {

                tooltip = atts.getValue(i);

             }

@@ -447,7 +447,7 @@ public class MetadataParser extends HandlerBase
 

          if (currentTable == null)

          {

-            throw new SAXException("No current table defined.");

+            throw new SAXException("No current table defined."); //$NON-NLS-1$

          }

 

          Column tableColumn = currentTable.createColumn(Integer.TYPE, label, true, true);

@@ -465,11 +465,11 @@ public class MetadataParser extends HandlerBase
     */

    public void endElement(String tag) throws SAXException

    {

-      if (tag.compareTo("DATA_GROUP") == 0)

+      if (tag.compareTo("DATA_GROUP") == 0) //$NON-NLS-1$

       {

          dataGroupStack.pop();

       }

-      else if (tag.compareTo("TABLE") == 0)

+      else if (tag.compareTo("TABLE") == 0) //$NON-NLS-1$

       {

          currentTable = null;

       }

@@ -488,8 +488,8 @@ public class MetadataParser extends HandlerBase
     */

    public void warning(SAXParseException e) throws SAXException

    {

-      System.err.println("Warning at (file " + e.getSystemId() + ", line " +

-            e.getLineNumber() + ", char " + e.getColumnNumber() + "): " + e.getMessage());

+      System.err.println("Warning at (file " + e.getSystemId() + ", line " + //$NON-NLS-1$ //$NON-NLS-2$

+            e.getLineNumber() + ", char " + e.getColumnNumber() + "): " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$

    }

 

    /**

@@ -497,8 +497,8 @@ public class MetadataParser extends HandlerBase
     */

    public void error(SAXParseException e) throws SAXException

    {

-      throw new SAXException("Error at (file " + e.getSystemId() + ", line " +

-            e.getLineNumber() + ", char " + e.getColumnNumber() + "): " + e.getMessage());

+      throw new SAXException("Error at (file " + e.getSystemId() + ", line " + //$NON-NLS-1$ //$NON-NLS-2$

+            e.getLineNumber() + ", char " + e.getColumnNumber() + "): " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$

    }

 

    /**

@@ -506,8 +506,8 @@ public class MetadataParser extends HandlerBase
     */

    public void fatalError(SAXParseException e) throws SAXException

    {

-      throw new SAXException("Fatal Error at (file " + e.getSystemId() +

-            ", line " + e.getLineNumber() + ", char " + e.getColumnNumber() + "): " + e.getMessage());

+      throw new SAXException("Fatal Error at (file " + e.getSystemId() + //$NON-NLS-1$

+            ", line " + e.getLineNumber() + ", char " + e.getColumnNumber() + "): " + e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    }

 

    /**

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataPropertyHolder.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataPropertyHolder.java
index 8527145..3f8e811 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataPropertyHolder.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/MetadataPropertyHolder.java
@@ -130,7 +130,7 @@ public abstract class MetadataPropertyHolder implements Serializable
    {

       String string = (String) properties.get(id);

 

-      if (string == null || string.compareTo("false") == 0)

+      if (string == null || string.compareTo("false") == 0) //$NON-NLS-1$

       {

          return false;

       }

diff --git a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/TableData.java b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/TableData.java
index 1c6c4fa..2ff2a1a 100644
--- a/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/TableData.java
+++ b/modeling/org.eclipse.stardust.modeling.debug/src/org/eclipse/stardust/modeling/debug/interpreter/TableData.java
@@ -78,11 +78,11 @@ public class TableData extends Data
       {

          try

          {

-            icon = new ImageIcon(Data.class.getResource("images/table.gif"));

+            icon = new ImageIcon(Data.class.getResource("images/table.gif")); //$NON-NLS-1$

          }

          catch (Exception x)

          {

-            throw new PublicException("Cannnot load resource \"images/table.gif\"");

+            throw new PublicException("Cannnot load resource \"images/table.gif\""); //$NON-NLS-1$

          }

       }

 

diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployUtil.java b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployUtil.java
index 3707122..7c5158e 100644
--- a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployUtil.java
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/DeployUtil.java
@@ -81,7 +81,7 @@ public class DeployUtil
                {

                   String fileName = resource.getLocation().toOSString();

                   String encodedFileName = new String(Base64.encode(fileName.getBytes(XpdlUtils.UTF8_ENCODING)));

-                  addArgument(programAttributes, "filename64", encodedFileName, false, separator);            

+                  addArgument(programAttributes, "filename64", encodedFileName, false, separator);             //$NON-NLS-1$

                   separator = true;

                }

                catch (UnsupportedEncodingException e)

diff --git a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/ModelDeploymentTool.java b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/ModelDeploymentTool.java
index 82f02f1..7e6de0f 100644
--- a/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/ModelDeploymentTool.java
+++ b/modeling/org.eclipse.stardust.modeling.deploy/src/org/eclipse/stardust/modeling/deploy/ModelDeploymentTool.java
@@ -256,7 +256,7 @@ public class ModelDeploymentTool
          {

             int dialogResult = JOptionPane.showConfirmDialog(null,

                /*Internal_ExportMessages.getString("MSG_InconsistentVersion")*/ //$NON-NLS-1$

-                  inconsistencies.get(0).getMessage() + " "

+                  inconsistencies.get(0).getMessage() + " " //$NON-NLS-1$

                   + Deploy_Messages.getString("MSG_Continue"), //$NON-NLS-1$

                   Deploy_Messages.getString("MSG_ModelVersionDeployment"), //$NON-NLS-1$

                JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);

diff --git a/modeling/org.eclipse.stardust.modeling.repository.file/src/org/eclipse/stardust/modeling/repository/file/FileConnectionHandler.java b/modeling/org.eclipse.stardust.modeling.repository.file/src/org/eclipse/stardust/modeling/repository/file/FileConnectionHandler.java
index 1106436..0bdc5a0 100644
--- a/modeling/org.eclipse.stardust.modeling.repository.file/src/org/eclipse/stardust/modeling/repository/file/FileConnectionHandler.java
+++ b/modeling/org.eclipse.stardust.modeling.repository.file/src/org/eclipse/stardust/modeling/repository/file/FileConnectionHandler.java
@@ -50,7 +50,7 @@ public class FileConnectionHandler implements ConnectionHandler
    private Connection connection;
    
    private static final List<String> PARTICIPANTS = Arrays.asList(new String[] {
-         "role", "organization", "conditionalPerformer"
+         "role", "organization", "conditionalPerformer" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    });
    
    private EObjectDescriptor modelDescriptor;
@@ -243,7 +243,7 @@ public class FileConnectionHandler implements ConnectionHandler
       {
          return true;
       }
-      if ("participants".equals(categoryUri.lastSegment()) && uri.segmentCount() > categoryUri.segmentCount())
+      if ("participants".equals(categoryUri.lastSegment()) && uri.segmentCount() > categoryUri.segmentCount()) //$NON-NLS-1$
       {
          return PARTICIPANTS.contains(uri.segment(categoryUri.segmentCount() - 1));
       }
diff --git a/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/MessageTransformationController.java b/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/MessageTransformationController.java
index 34a42b9..f30bad1 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/MessageTransformationController.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/MessageTransformationController.java
@@ -342,7 +342,7 @@ public class MessageTransformationController {
 	       if (messageType instanceof StructAccessPointType) {
 	          realfieldPath = realfieldPath.substring(realfieldPath.indexOf("/") + 1, realfieldPath.length());  //$NON-NLS-1$
 	          isContained = ((StructAccessPointType)messageType).getXPathMap().containsXPath(realfieldPath);
-	          String firstSegment = fieldPath.substring(0, fieldPath.indexOf("/"));
+	          String firstSegment = fieldPath.substring(0, fieldPath.indexOf("/")); //$NON-NLS-1$
 	          isContained = isContained &&  (firstSegment.equalsIgnoreCase(messageType.getId()));
 	           //It may be possible that this is an Attribute type - check this
 	           if (!isContained) {	                   
diff --git a/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/widgets/TypesLabelProvider.java b/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/widgets/TypesLabelProvider.java
index 5de8e71..07fc333 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/widgets/TypesLabelProvider.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/widgets/TypesLabelProvider.java
@@ -37,7 +37,7 @@ public class TypesLabelProvider extends LabelProvider
       {
          ModelType parent = ModelUtils.findContainingModel((TypeDeclarationType) element);
          String name = ((TypeDeclarationType) element).getName();
-         return parent == model ? name : parent.getName() + " / " + name;
+         return parent == model ? name : parent.getName() + " / " + name; //$NON-NLS-1$
       }
       return element.getClass().getName();
    }
diff --git a/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/validation/MessageSerializationApplicationValidator.java b/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/validation/MessageSerializationApplicationValidator.java
index fa252af..901bf47 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/validation/MessageSerializationApplicationValidator.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/validation/MessageSerializationApplicationValidator.java
@@ -55,7 +55,7 @@ public class MessageSerializationApplicationValidator implements IModelElementVa
       else
       {
          ModelType model = ModelUtils.findContainingModel(element);
-         int ix = declaredTypeId.indexOf(":{");

+         int ix = declaredTypeId.indexOf(":{"); //$NON-NLS-1$

          if (ix > 0 && declaredTypeId.substring(0, ix).equals(XpdlPackage.eINSTANCE.getTypeDeclarationsType_TypeDeclaration().getName()))

          {

             ExternalPackages packages = model.getExternalPackages();

diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataMappingValidator.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataMappingValidator.java
index b5c8ea6..772fb9a 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataMappingValidator.java
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataMappingValidator.java
@@ -158,7 +158,7 @@ public class DataMappingValidator implements IModelElementValidator
             }
             
             IXPathMap xPathMap = StructuredTypeUtils.getXPathMap(dataMapping.getData());
-            if (dataPath.indexOf("[") > -1)
+            if (dataPath.indexOf("[") > -1) //$NON-NLS-1$
             {
                checkNestedPath(dataPath, xPathMap);
             }
@@ -176,12 +176,12 @@ public class DataMappingValidator implements IModelElementValidator
 
    private void checkNestedPath(String dataPath, IXPathMap xPathMap)
    {
-      String[] pathSegs = dataPath.split("/");
-      String path = "";
+      String[] pathSegs = dataPath.split("/"); //$NON-NLS-1$
+      String path = ""; //$NON-NLS-1$
       for (int i = 0; i < pathSegs.length; i++)
       {
          path = path + pathSegs[i];
-         path = path.replaceAll("\\[[^\\]]*\\]|\\..*/", "");
+         path = path.replaceAll("\\[[^\\]]*\\]|\\..*/", ""); //$NON-NLS-1$ //$NON-NLS-2$
          if (!xPathMap.containsXPath(path))
          {
             throw new ValidationException(
@@ -189,7 +189,7 @@ public class DataMappingValidator implements IModelElementValidator
          }
          else
          {
-            if (pathSegs[i].indexOf("[") > -1)
+            if (pathSegs[i].indexOf("[") > -1) //$NON-NLS-1$
             {
                TypedXPath xPath = xPathMap.getXPath(path);
                if (!xPath.isList())
@@ -200,7 +200,7 @@ public class DataMappingValidator implements IModelElementValidator
             }
             if (i < pathSegs.length)
             {
-               path = path + "/";
+               path = path + "/"; //$NON-NLS-1$
             }
          }
       }
diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DefaultProcessDefinitionValidator.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DefaultProcessDefinitionValidator.java
index fb4dc22..368f50f 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DefaultProcessDefinitionValidator.java
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DefaultProcessDefinitionValidator.java
@@ -126,7 +126,7 @@ public class DefaultProcessDefinitionValidator implements IModelElementValidator
 
          // validate auditTrailPersistence setting
          AttributeType auditTrailPersistenceAttribute = AttributeUtil.getAttribute(
-               (IExtensibleElement) element, "carnot:engine:auditTrailPersistence");
+               (IExtensibleElement) element, "carnot:engine:auditTrailPersistence"); //$NON-NLS-1$
 
          if (auditTrailPersistenceAttribute != null)
          {
diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/spi/triggerTypes/ManualTriggerValidator.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/spi/triggerTypes/ManualTriggerValidator.java
index c7831e4..f2456dd 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/spi/triggerTypes/ManualTriggerValidator.java
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/spi/triggerTypes/ManualTriggerValidator.java
@@ -47,7 +47,7 @@ public class ManualTriggerValidator implements IModelElementValidator
          if (metaType != null)
          {
             typeId = metaType.getId();
-            if (typeId != null && typeId.equals("scan"))
+            if (typeId != null && typeId.equals("scan")) //$NON-NLS-1$
             {
                if (((TriggerType) element).getAccessPoint().isEmpty())
                {