Jira-ID: CRNT-23200 Stardust: Rename NL Plugins to new name pattern (fixing missing externalized Strings)

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

23 files changed, 104 insertions, 58 deletions

diff --git a/modeling/org.eclipse.stardust.modeling.templates.basic/src/org/eclipse/stardust/modeling/templates/basic/factories/GenericPatternsFactory.java b/modeling/org.eclipse.stardust.modeling.templates.basic/src/org/eclipse/stardust/modeling/templates/basic/factories/GenericPatternsFactory.java
index bc96dce..df8393e 100644
--- a/modeling/org.eclipse.stardust.modeling.templates.basic/src/org/eclipse/stardust/modeling/templates/basic/factories/GenericPatternsFactory.java
+++ b/modeling/org.eclipse.stardust.modeling.templates.basic/src/org/eclipse/stardust/modeling/templates/basic/factories/GenericPatternsFactory.java
@@ -57,7 +57,7 @@ public class GenericPatternsFactory implements ITemplateFactory
       childFactories = new ITemplateFactory[2];
       childFactories[0] = new BasicControlFlowPatterns(); 
       parameters = new HashMap();
-      parameters.put("xpdl", "/org/eclipse/stardust/modeling/templates/basic/resources/dynamicspawn.cwmt");      
+      parameters.put("xpdl", "/org/eclipse/stardust/modeling/templates/basic/resources/dynamicspawn.cwmt");       //$NON-NLS-1$ //$NON-NLS-2$

       ITemplateFactory factory = new DynamicSpawnTemplateFactory();
       factory.initialize(parameters);
       childFactories[1] = factory;
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/WatchExpressionDelegate.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/WatchExpressionDelegate.java
index f38526b..6d46b28 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/WatchExpressionDelegate.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/WatchExpressionDelegate.java
@@ -139,22 +139,22 @@ public class WatchExpressionDelegate implements IWatchExpressionDelegate
                IVariable variable = null;
                if (null == rawResult)
                {
-                  variable = new NullElementVariable(frame, "xyz");
+                  variable = new NullElementVariable(frame, "xyz"); //$NON-NLS-1$
                }
                else if (rawResult instanceof StructuredDataMapAccessor)
                {
-                  variable = new StructuredDataMapVariable(frame, null, "xyz",
+                  variable = new StructuredDataMapVariable(frame, null, "xyz", //$NON-NLS-1$
                         (StructuredDataMapAccessor) rawResult);
                }
                else if (rawResult instanceof StructuredDataListAccessor)
                {
-                  variable = new StructuredDataListVariable(frame, null, "xyz",
+                  variable = new StructuredDataListVariable(frame, null, "xyz", //$NON-NLS-1$
                         (StructuredDataListAccessor) rawResult);
                }
                else if (JsValue.isValidJsValue(rawResult))
                {
                   final boolean isPrimitive = rawResult.getClass().isPrimitive();
-                  variable = new JsVariable(frame, null, "xyz", rawResult, isPrimitive);
+                  variable = new JsVariable(frame, null, "xyz", rawResult, isPrimitive); //$NON-NLS-1$
                }
    
                if (null != variable)
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/debugger/RhinoDebugFrame.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/debugger/RhinoDebugFrame.java
index 1f6ac82..a8325e9 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/debugger/RhinoDebugFrame.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/debugger/RhinoDebugFrame.java
@@ -284,7 +284,7 @@ public class RhinoDebugFrame implements DebugFrame
          if(debugTarget.getSteppingManager().requestedTermination())
          {
             context.setDebugger(null, null);
-            throw new DebuggerTerminatedException("Debugger terminated.");
+            throw new DebuggerTerminatedException("Debugger terminated."); //$NON-NLS-1$
          }
       }
    }
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/DebugModelPresentation.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/DebugModelPresentation.java
index 2100a07..fc09946 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/DebugModelPresentation.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/DebugModelPresentation.java
@@ -39,7 +39,7 @@ public class DebugModelPresentation implements IDebugModelPresentation
       if (element instanceof MessageTransformationMappingBreakpoint)
       {
          MessageTransformationMappingBreakpoint breakpoint = (MessageTransformationMappingBreakpoint) element;
-         return "FieldPath: " + breakpoint.getFieldPath();
+         return "FieldPath: " + breakpoint.getFieldPath(); //$NON-NLS-1$
       }
       
       return null;
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsDebugTarget.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsDebugTarget.java
index 8f1645e..3796069 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsDebugTarget.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsDebugTarget.java
@@ -169,7 +169,7 @@ public class JsDebugTarget extends JsDebugElement
 
    public String getName() throws DebugException
    {
-      return "Infinity Message Transformation";
+      return "Infinity Message Transformation"; //$NON-NLS-1$
    }
 
    public boolean supportsBreakpoint(IBreakpoint breakpoint)
@@ -271,7 +271,7 @@ public class JsDebugTarget extends JsDebugElement
          throws DebugException
    {
       throw new DebugException(new Status(IStatus.ERROR,
-            PredefinedConstants.ID_KNITWARE_DEBUG_MODEL, "Feature not supported."));
+            PredefinedConstants.ID_KNITWARE_DEBUG_MODEL, "Feature not supported.")); //$NON-NLS-1$
    }
    
    // Breakpoint management
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsStackFrame.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsStackFrame.java
index f8f9a9f..599cb11 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsStackFrame.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsStackFrame.java
@@ -106,10 +106,10 @@ public class JsStackFrame extends JsDebugElement implements IStackFrame
       String name = debugFrame.getDebuggableScript().getFunctionName();
       if (StringUtils.isEmpty(name))
       {
-         name = "Script entry";
+         name = "Script entry"; //$NON-NLS-1$
       }
 
-      name = name + " [line: " + getLineNumber() + "]";
+      name = name + " [line: " + getLineNumber() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
 
       return name;
    }
@@ -244,7 +244,7 @@ public class JsStackFrame extends JsDebugElement implements IStackFrame
    
       if (debugFrame.getThisObj() != null)
       {
-         vars.add(new JsVariable(this, null, "this", debugFrame.getThisObj()));
+         vars.add(new JsVariable(this, null, "this", debugFrame.getThisObj())); //$NON-NLS-1$
       }
    
       Scriptable scope = debugFrame.getScope();
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsThread.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsThread.java
index 93f3107..46f01dd 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsThread.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsThread.java
@@ -130,16 +130,16 @@ public class JsThread extends JsDebugElement implements IThread
 
    public String getName() throws DebugException
    {
-      String message = "Thread";
+      String message = "Thread"; //$NON-NLS-1$
       
       if(CommonConstants.NO_THROWABLE != suspendedByThrowable)
       {
-         message += " (suspended by exception)";
+         message += " (suspended by exception)"; //$NON-NLS-1$
       }
       
       if(isStepping())
       {
-         message += " (Stepping)";
+         message += " (Stepping)"; //$NON-NLS-1$
       }
       
       return message; 
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsValue.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsValue.java
index eb4354c..446b6b9 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsValue.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsValue.java
@@ -68,7 +68,7 @@ public class JsValue extends JsDebugElement implements IValue
 
    public String getValueString() throws DebugException
    {
-      return null == rawValue ? "" :rawValue.toString(); // TODO
+      return null == rawValue ? "" :rawValue.toString(); // TODO //$NON-NLS-1$
    }
 
    public boolean isAllocated() throws DebugException
@@ -143,8 +143,8 @@ public class JsValue extends JsDebugElement implements IValue
 
             if (isValidJsValue(aobj))
             {
-               children.add(new JsVariable(variable.getFrame(), variable, "["
-                     + children.size() + "]", aobj, primitive));
+               children.add(new JsVariable(variable.getFrame(), variable, "[" //$NON-NLS-1$
+                     + children.size() + "]", aobj, primitive)); //$NON-NLS-1$
             }
          }
       }
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsVariable.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsVariable.java
index 3d22fc3..3f95238 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsVariable.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/JsVariable.java
@@ -51,7 +51,7 @@ public class JsVariable extends AbstractVariable
 
    public String getReferenceTypeName() throws DebugException
    {
-      return StringUtils.isEmpty(typeName) ? "<no type available>" : typeName;
+      return StringUtils.isEmpty(typeName) ? "<no type available>" : typeName; //$NON-NLS-1$
    }
 
    public void setReferenceTypeName(String typeName) throws DebugException
@@ -67,11 +67,11 @@ public class JsVariable extends AbstractVariable
       while (null != parent)
       {
          // prepend parent-name followed by "."
-         buffer.insert(0, ".").insert(0, parent.getQualifiedName());
+         buffer.insert(0, ".").insert(0, parent.getQualifiedName()); //$NON-NLS-1$
          parent = parent.getParent();
       }
 
-      buffer.append(" = ").append(expression);
+      buffer.append(" = ").append(expression); //$NON-NLS-1$
 
       if (verifyValue(buffer.toString()))
       {
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/NullElementValue.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/NullElementValue.java
index 496eac3..21a025b 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/NullElementValue.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/NullElementValue.java
@@ -26,12 +26,12 @@ public class NullElementValue extends JsDebugElement implements IValue
 
    public String getReferenceTypeName() throws DebugException
    {
-      return "<null>";
+      return "<null>"; //$NON-NLS-1$
    }
 
    public String getValueString() throws DebugException
    {
-      return "<null>";
+      return "<null>"; //$NON-NLS-1$
    }
 
    public IVariable[] getVariables() throws DebugException
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/NullElementVariable.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/NullElementVariable.java
index 4d34349..dcb5e3e 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/NullElementVariable.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/NullElementVariable.java
@@ -38,7 +38,7 @@ public class NullElementVariable extends JsDebugElement implements IVariable
 
    public String getReferenceTypeName() throws DebugException
    {
-      return "<null>";
+      return "<null>"; //$NON-NLS-1$
    }
 
    public IValue getValue() throws DebugException
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataListValue.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataListValue.java
index a2727f2..6aad8d5 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataListValue.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataListValue.java
@@ -52,7 +52,7 @@ public class StructuredDataListValue extends JsDebugElement implements IValue
          {
             Object rawValue = accessor.get(idx, null);
 
-            final String name = "[" + idx + "]";
+            final String name = "[" + idx + "]"; //$NON-NLS-1$ //$NON-NLS-2$
             if (null == rawValue)
             {
                variables.add(new NullElementVariable(variable.getStackFrame(), name));
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataListVariable.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataListVariable.java
index 2cbb540..4fce21b 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataListVariable.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataListVariable.java
@@ -79,8 +79,8 @@ public class StructuredDataListVariable extends AbstractVariable
 
    public String getReferenceTypeName() throws DebugException
    {
-      return accessor == null ? "null" : getTypedXPath().getXsdTypeName() + "[" + size
-            + "]";
+      return accessor == null ? "null" : getTypedXPath().getXsdTypeName() + "[" + size //$NON-NLS-1$ //$NON-NLS-2$
+            + "]"; //$NON-NLS-1$
    }
 
    public IValue getValue() throws DebugException
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataPrimitiveVariable.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataPrimitiveVariable.java
index 17310ec..48a7d64 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataPrimitiveVariable.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/model/StructuredDataPrimitiveVariable.java
@@ -82,7 +82,7 @@ public class StructuredDataPrimitiveVariable extends AbstractVariable
       {
          // name may contain characters which are not allowed in JS identifiers, e.g -.
          // must be access "name indexed".
-         buffer.append("[\"").append(name).append("\"]");
+         buffer.append("[\"").append(name).append("\"]"); //$NON-NLS-1$ //$NON-NLS-2$
       }
       else
       {
@@ -93,13 +93,13 @@ public class StructuredDataPrimitiveVariable extends AbstractVariable
       {
          if ( !(parent instanceof StructuredDataMapVariable) && !(parent instanceof StructuredDataListVariable))
          {
-            buffer.insert(0, ".");
+            buffer.insert(0, "."); //$NON-NLS-1$
          }
          buffer.insert(0, parent.getQualifiedName());
          parent = parent.getParent();
       }
       
-      buffer.append(" = ").append(expression);
+      buffer.append(" = ").append(expression); //$NON-NLS-1$
       
       //buffer = new StringBuffer(expression);
 
diff --git a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/views/TransformationMappingDebugView.java b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/views/TransformationMappingDebugView.java
index 3fff10d..520ca06 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/views/TransformationMappingDebugView.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation.debug/src/org/eclipse/stardust/modeling/transformation/debug/views/TransformationMappingDebugView.java
@@ -95,7 +95,7 @@ import org.eclipse.ui.texteditor.ITextEditor;
 
 public class TransformationMappingDebugView extends ViewPart
 {
-   public static final String VIEW_ID = "org.eclipse.stardust.modeling.transformation.debug.views.TransformationMappingDebugView";
+   public static final String VIEW_ID = "org.eclipse.stardust.modeling.transformation.debug.views.TransformationMappingDebugView"; //$NON-NLS-1$
 
    private final MessageTransformationApplicationControlsManager controlsManager;
    private Composite parent;
@@ -130,7 +130,7 @@ public class TransformationMappingDebugView extends ViewPart
 
       public Object[] getElements(Object parent)
       {
-         return new String[] { "One", "Two", "Three" };
+         return new String[] { "One", "Two", "Three" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
       }
    }
 
@@ -185,7 +185,7 @@ public class TransformationMappingDebugView extends ViewPart
       if (null == modelElement)
       {
          Text text = FormBuilder.createText(baseComposite);
-         text.setText("Works only in message transformation debug context.");
+         text.setText("Works only in message transformation debug context."); //$NON-NLS-1$
       }
       else
       {
@@ -268,7 +268,7 @@ public class TransformationMappingDebugView extends ViewPart
    {
       // This counter should be incremented on each iter.next() call which succeeds.
       int usedFieldPathSegmentCounter = 0;
-      Iterator iter = StringUtils.split(fieldPath, "/");
+      Iterator iter = StringUtils.split(fieldPath, "/"); //$NON-NLS-1$
       // if no path at all -> return
       if ( !iter.hasNext())
       {
@@ -376,7 +376,7 @@ public class TransformationMappingDebugView extends ViewPart
 
    private void hookContextMenu()
    {
-      MenuManager menuMgr = new MenuManager("#PopupMenu");
+      MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
       menuMgr.setRemoveAllWhenShown(true);
       menuMgr.addMenuListener(new IMenuListener()
       {
@@ -424,11 +424,11 @@ public class TransformationMappingDebugView extends ViewPart
       {
          public void run()
          {
-            showMessage("Action 1 executed");
+            showMessage("Action 1 executed"); //$NON-NLS-1$
          }
       };
-      action1.setText("Action 1");
-      action1.setToolTipText("Action 1 tooltip");
+      action1.setText("Action 1"); //$NON-NLS-1$
+      action1.setToolTipText("Action 1 tooltip"); //$NON-NLS-1$
       action1.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages()
             .getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
 
@@ -436,11 +436,11 @@ public class TransformationMappingDebugView extends ViewPart
       {
          public void run()
          {
-            showMessage("Action 2 executed");
+            showMessage("Action 2 executed"); //$NON-NLS-1$
          }
       };
-      action2.setText("Action 2");
-      action2.setToolTipText("Action 2 tooltip");
+      action2.setText("Action 2"); //$NON-NLS-1$
+      action2.setToolTipText("Action 2 tooltip"); //$NON-NLS-1$
       action2.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages()
             .getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
       doubleClickAction = new Action()
@@ -449,7 +449,7 @@ public class TransformationMappingDebugView extends ViewPart
          {
             ISelection selection = viewer.getSelection();
             Object obj = ((IStructuredSelection) selection).getFirstElement();
-            showMessage("Double-click detected on " + obj.toString());
+            showMessage("Double-click detected on " + obj.toString()); //$NON-NLS-1$
          }
       };
    }
@@ -467,7 +467,7 @@ public class TransformationMappingDebugView extends ViewPart
 
    private void showMessage(String message)
    {
-      MessageDialog.openInformation(viewer.getControl().getShell(), "Sample View",
+      MessageDialog.openInformation(viewer.getControl().getShell(), "Sample View", //$NON-NLS-1$
             message);
    }
    
diff --git a/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/MessageTransformationApplicationControlsManager.java b/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/MessageTransformationApplicationControlsManager.java
index 2685eb9..a4626f1 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/MessageTransformationApplicationControlsManager.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/MessageTransformationApplicationControlsManager.java
@@ -1399,7 +1399,7 @@ public class MessageTransformationApplicationControlsManager
             {
             case SWT.MouseDown:
                Event e = new Event();
-               e.item = (TreeItem) label.getData("_TABLEITEM");
+               e.item = (TreeItem) label.getData("_TABLEITEM"); //$NON-NLS-1$
                // Assuming table is single select, set the selection as if
                // the mouse down event went through to the table
                targetMessageTreeViewer.getTree().setSelection(
diff --git a/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/widgets/MessagingJavaCodeScanner.java b/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/widgets/MessagingJavaCodeScanner.java
index 2b8832f..e65a1ef 100644
--- a/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/widgets/MessagingJavaCodeScanner.java
+++ b/modeling/org.eclipse.stardust.modeling.transformation/src/org/eclipse/stardust/modeling/transformation/messaging/modeling/application/transformation/widgets/MessagingJavaCodeScanner.java
@@ -270,12 +270,12 @@ public class MessagingJavaCodeScanner extends AbstractJavaScanner
    static String[] fgKeywords = {"abstract", //$NON-NLS-1$
          "break", //$NON-NLS-1$
          "case", "catch", "class", "const", "continue", //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
-         "default", "delete", "debugger", "do", //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-1$
+         "default", "delete", "debugger", "do", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ 
          "else", "export", "extends", //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
          "final", "finally", "for", "function",//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-2$ //$NON-NLS-1$
          "goto", //$NON-NLS-1$
          "if", "implements", "in", "instanceof", "interface", //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
-         "new", //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$
+         "new", //$NON-NLS-1$
          "package", "private", "protected", "public", //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
          "static", "super", "switch", "synchronized", //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
          "this", "throw", "throws", "transient", "try", "typeof", //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
diff --git a/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_de.properties b/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_de.properties
index 8b94b08..3f3e284 100644
--- a/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_de.properties
+++ b/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_de.properties
@@ -424,3 +424,13 @@ WR_MD_HAS_AN_OLDER_VERSION=<Model has an older version.>
 # WR_MD_HAS_AN_OLDER_VERSION_en=Model has an older version.

 MSG_REMOVED_TRANSFORMATION=<Removed transformation: {0}, result: {1}>

 # MSG_REMOVED_TRANSFORMATION_en=Removed transformation: {0}, result: {1}

+MSG_KEY_DESCRIPTOR_PRIMITIVE_STRUCTURED=<Key descriptors must be either primitive or structured types.>

+# MSG_KEY_DESCRIPTOR_PRIMITIVE_STRUCTURED_en=Key descriptors must be either primitive or structured types.

+MSG_KEY_DESCRIPTOR_PRIMITIVE=<Structured key descriptors must have primitive type.>

+# MSG_KEY_DESCRIPTOR_PRIMITIVE_en=Structured key descriptors must have primitive type.

+MSG_KEY_DESCRIPTOR_INDEXED_PERSISTENT=<Structured key descriptors must be indexed and persistent.>

+# MSG_KEY_DESCRIPTOR_INDEXED_PERSISTENT_en=Structured key descriptors must be indexed and persistent.

+MSG_KEY_DESCRIPTOR_NO_SCHEMA=<No schema found for structured key descriptor.>

+# MSG_KEY_DESCRIPTOR_NO_SCHEMA_en=No schema found for structured key descriptor.

+MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR=<DataPath marked as key descriptor but it's not a descriptor.>

+# MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR_en=DataPath marked as key descriptor but it's not a descriptor.

diff --git a/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_en.properties b/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_en.properties
index 4a6a5ae..9a2a92a 100644
--- a/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_en.properties
+++ b/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_en.properties
@@ -424,3 +424,13 @@ WR_MD_HAS_AN_OLDER_VERSION=<Model has an older version.>
 # WR_MD_HAS_AN_OLDER_VERSION_en=Model has an older version.

 MSG_REMOVED_TRANSFORMATION=Removed transformation: {0}, result: {1}

 # MSG_REMOVED_TRANSFORMATION_en=Removed transformation: {0}, result: {1}

+MSG_KEY_DESCRIPTOR_PRIMITIVE_STRUCTURED=Key descriptors must be either primitive or structured types.

+# MSG_KEY_DESCRIPTOR_PRIMITIVE_STRUCTURED_en=Key descriptors must be either primitive or structured types.

+MSG_KEY_DESCRIPTOR_PRIMITIVE=Structured key descriptors must have primitive type.

+# MSG_KEY_DESCRIPTOR_PRIMITIVE_en=Structured key descriptors must have primitive type.

+MSG_KEY_DESCRIPTOR_INDEXED_PERSISTENT=Structured key descriptors must be indexed and persistent.

+# MSG_KEY_DESCRIPTOR_INDEXED_PERSISTENT_en=Structured key descriptors must be indexed and persistent.

+MSG_KEY_DESCRIPTOR_NO_SCHEMA=No schema found for structured key descriptor.

+# MSG_KEY_DESCRIPTOR_NO_SCHEMA_en=No schema found for structured key descriptor.

+MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR=DataPath marked as key descriptor but it's not a descriptor.

+# MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR_en=DataPath marked as key descriptor but it's not a descriptor.

diff --git a/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_ja.properties b/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_ja.properties
index bbfdd7b..132cc47 100644
--- a/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_ja.properties
+++ b/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_ja.properties
@@ -424,3 +424,13 @@ WR_MD_HAS_AN_OLDER_VERSION= \u30E2\u30C7\u30EB\u306B\u53E4\u3044\u30D0\u30FC\u30
 # WR_MD_HAS_AN_OLDER_VERSION_en=Model has an older version.

 MSG_REMOVED_TRANSFORMATION=<Removed transformation: {0}, result: {1}>

 # MSG_REMOVED_TRANSFORMATION_en=Removed transformation: {0}, result: {1}

+MSG_KEY_DESCRIPTOR_PRIMITIVE_STRUCTURED=<Key descriptors must be either primitive or structured types.>

+# MSG_KEY_DESCRIPTOR_PRIMITIVE_STRUCTURED_en=Key descriptors must be either primitive or structured types.

+MSG_KEY_DESCRIPTOR_PRIMITIVE=<Structured key descriptors must have primitive type.>

+# MSG_KEY_DESCRIPTOR_PRIMITIVE_en=Structured key descriptors must have primitive type.

+MSG_KEY_DESCRIPTOR_INDEXED_PERSISTENT=<Structured key descriptors must be indexed and persistent.>

+# MSG_KEY_DESCRIPTOR_INDEXED_PERSISTENT_en=Structured key descriptors must be indexed and persistent.

+MSG_KEY_DESCRIPTOR_NO_SCHEMA=<No schema found for structured key descriptor.>

+# MSG_KEY_DESCRIPTOR_NO_SCHEMA_en=No schema found for structured key descriptor.

+MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR=<DataPath marked as key descriptor but it's not a descriptor.>

+# MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR_en=DataPath marked as key descriptor but it's not a descriptor.

diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/Validation_Messages.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/Validation_Messages.java
index e3e7ead..2b0481c 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/Validation_Messages.java
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/Validation_Messages.java
@@ -427,17 +427,28 @@ public static String Validation_MSG_JNDIPathNotSpecified;
    
    public static String ERR_Invalid_TeamLeadConnection;
 
-public static String EXC_NOT_IMPLEMENTED;
+   public static String EXC_NOT_IMPLEMENTED;
 
-public static String WR_IS_A_RESERVED_IDENTIFIER;
+   public static String WR_IS_A_RESERVED_IDENTIFIER;
 
    public static String WR_MAPPING_INCONSISTENT_DATA_MAPPING_ID;
    
    public static String MSG_REMOVED_TRANSFORMATION;
 
-public static String WR_MAPPING_NO_IN_DATA_MAPPING_SPECIFIED;
+   public static String WR_MAPPING_NO_IN_DATA_MAPPING_SPECIFIED;
 
-public static String WR_MAPPING_NO_IN_DATA_MAPPING_WITH_ID_STELLE_NULL_FOUND;
+   public static String WR_MAPPING_NO_IN_DATA_MAPPING_WITH_ID_STELLE_NULL_FOUND;
 
-public static String WR_MD_HAS_AN_OLDER_VERSION;
+   public static String WR_MD_HAS_AN_OLDER_VERSION;
+   
+   public static String MSG_KEY_DESCRIPTOR_PRIMITIVE_STRUCTURED;
+   
+   public static String MSG_KEY_DESCRIPTOR_PRIMITIVE;
+   
+   public static String MSG_KEY_DESCRIPTOR_INDEXED_PERSISTENT;
+   
+   public static String MSG_KEY_DESCRIPTOR_NO_SCHEMA;
+   
+   public static String MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR;
+   
 }
\ No newline at end of file
diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataPathValidator.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataPathValidator.java
index 1ef3284..87690ab 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataPathValidator.java
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataPathValidator.java
@@ -118,13 +118,13 @@ public class DataPathValidator implements IModelElementValidator
                   if (!PredefinedConstants.STRUCTURED_DATA.equals(dataTypeId))
                   {
                      result.add(Issue.error(dataPath,
-                           "Key descriptors must be either primitive or structured types.",
+                           Validation_Messages.MSG_KEY_DESCRIPTOR_PRIMITIVE_STRUCTURED,
                            ValidationService.PKG_CWM.getDataPathType_Key()));
                   }
                   else if (accessPath == null || accessPath.length() == 0)
                   {
                      result.add(Issue.error(dataPath,
-                           "Structured key descriptors must have primitive type.",
+                           Validation_Messages.MSG_KEY_DESCRIPTOR_PRIMITIVE,
                            ValidationService.PKG_CWM.getDataPathType_Key()));
                   }
                   else try
@@ -133,7 +133,7 @@ public class DataPathValidator implements IModelElementValidator
                      if (StructuredDataXPathUtils.returnSinglePrimitiveType(accessPath, xPathMap) == BigData.NULL)
                      {
                         result.add(Issue.error(dataPath,
-                              "Structured key descriptors must have primitive type.",
+                              Validation_Messages.MSG_KEY_DESCRIPTOR_PRIMITIVE,
                               ValidationService.PKG_CWM.getDataPathType_Key()));
                      }
                      else
@@ -142,7 +142,7 @@ public class DataPathValidator implements IModelElementValidator
                         if (!xPathAnnotations.isIndexed() || !xPathAnnotations.isPersistent())
                         {
                            result.add(Issue.error(dataPath,
-                                 "Structured key descriptors must be indexed and persistent.",
+                                 Validation_Messages.MSG_KEY_DESCRIPTOR_INDEXED_PERSISTENT,
                                  ValidationService.PKG_CWM.getDataPathType_Key()));
                         }
                      }
@@ -150,7 +150,7 @@ public class DataPathValidator implements IModelElementValidator
                   catch (Exception ex)
                   {
                      result.add(Issue.error(dataPath,
-                           "No schema found for structured key descriptor.",
+                           Validation_Messages.MSG_KEY_DESCRIPTOR_NO_SCHEMA,
                            ValidationService.PKG_CWM.getDataPathType_Key()));
                   }
                }
@@ -158,7 +158,7 @@ public class DataPathValidator implements IModelElementValidator
             else
             {
                result.add(Issue.warning(dataPath,
-                     "DataPath marked as key descriptor but it's not a descriptor.",
+                     Validation_Messages.MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR,
                      ValidationService.PKG_CWM.getDataPathType_Key()));
             }
          }
diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/validation-messages.properties b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/validation-messages.properties
index c638151..12d8769 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/validation-messages.properties
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/validation-messages.properties
@@ -215,4 +215,9 @@ WR_MAPPING_INCONSISTENT_DATA_MAPPING_ID=Inconsistent data mapping ID.
 WR_MAPPING_NO_IN_DATA_MAPPING_SPECIFIED=No IN data mapping specified.
 WR_MAPPING_NO_IN_DATA_MAPPING_WITH_ID_STELLE_NULL_FOUND=No IN data mapping with id {0} found.
 WR_MD_HAS_AN_OLDER_VERSION=Model has an older version.
-MSG_REMOVED_TRANSFORMATION=Removed transformation: {0}, result: {1}
\ No newline at end of file
+MSG_REMOVED_TRANSFORMATION=Removed transformation: {0}, result: {1}
+MSG_KEY_DESCRIPTOR_PRIMITIVE_STRUCTURED=Key descriptors must be either primitive or structured types.
+MSG_KEY_DESCRIPTOR_PRIMITIVE=Structured key descriptors must have primitive type.
+MSG_KEY_DESCRIPTOR_INDEXED_PERSISTENT=Structured key descriptors must be indexed and persistent.
+MSG_KEY_DESCRIPTOR_NO_SCHEMA=No schema found for structured key descriptor.
+MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR=DataPath marked as key descriptor but it's not a descriptor.
\ No newline at end of file