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

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

20 files changed, 361 insertions, 355 deletions

diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/.settings/org.eclipse.core.resources.prefs b/modeling/org.eclipse.stardust.modeling.modelimport/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 0e05023..0000000
--- a/modeling/org.eclipse.stardust.modeling.modelimport/.settings/org.eclipse.core.resources.prefs
+++ b/dev/null
@@ -1,3 +0,0 @@
-#Mon Nov 14 12:02:25 CET 2011
-eclipse.preferences.version=1
-encoding//src/org/eclipse/stardust/modeling/modelimport/import_messages.properties=8859_1
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/FileSystemStore.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/FileSystemStore.java
index a571342..8711059 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/FileSystemStore.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/FileSystemStore.java
@@ -121,7 +121,7 @@ public class FileSystemStore
    {
       if (findRootModel(id) != null)
       {
-         throw new IOException(ImportMessages.MSG_RootModelWithId + id + "'."); //$NON-NLS-1$
+         throw new IOException(Import_Messages.MSG_RootModelWithId + id + "'."); //$NON-NLS-1$
       }
       else
       {
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportCarnotModelRepositoryWizard.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportCarnotModelRepositoryWizard.java
index b66cb76..3097d86 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportCarnotModelRepositoryWizard.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportCarnotModelRepositoryWizard.java
@@ -23,7 +23,7 @@ public class ImportCarnotModelRepositoryWizard extends Wizard
 
    private ImportRepositoryWizardPage page;
    private IWorkbench workbench;
-   private static final String WIZARD_NAME = ImportMessages.NAME_ImportWiz;
+   private static final String WIZARD_NAME = Import_Messages.NAME_ImportWiz;
 
    public ImportCarnotModelRepositoryWizard()
    {
@@ -45,7 +45,7 @@ public class ImportCarnotModelRepositoryWizard extends Wizard
    {
       this.workbench = workbench;
       this.selection = selection;
-      this.setWindowTitle(ImportMessages.TITLE_ImportWiz);
+      this.setWindowTitle(Import_Messages.TITLE_ImportWiz);
    }
 
    public void addPages()
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizard.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizard.java
index c1077d2..d78f173 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizard.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizard.java
@@ -37,8 +37,8 @@ public class ImportModelWizard extends Wizard implements IImportWizard
 
    public ImportModelWizard()
    {
-      setWindowTitle(ImportMessages.DESC_ImportFile);
-      String WIZARD_NAME = ImportMessages.NAME_ImportCarnotProcessModelWiz;
+      setWindowTitle(Import_Messages.DESC_ImportFile);
+      String WIZARD_NAME = Import_Messages.NAME_ImportCarnotProcessModelWiz;
 
       ImportPlugin plugin = ImportPlugin.getDefault();
       IDialogSettings workbenchSettings = plugin.getDialogSettings();
@@ -69,7 +69,7 @@ public class ImportModelWizard extends Wizard implements IImportWizard
 
    public void addPages()
    {
-      importModelWizardPage = new ImportModelWizardPage(ImportMessages.NAME_CarnotWorkflowImportPage,
+      importModelWizardPage = new ImportModelWizardPage(Import_Messages.NAME_CarnotWorkflowImportPage,
             selection);
       addPage(importModelWizardPage);
    }
@@ -81,7 +81,7 @@ public class ImportModelWizard extends Wizard implements IImportWizard
 
    public void openEditor(IProgressMonitor monitor, final IFile file, final boolean reopen)
    {
-      monitor.setTaskName(ImportMessages.TASK_OpenFile);
+      monitor.setTaskName(Import_Messages.TASK_OpenFile);
       getShell().getDisplay().asyncExec(new Runnable()
       {
          public void run()
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizardPage.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizardPage.java
index 0eb6ce5..18af3cb 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizardPage.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportModelWizardPage.java
@@ -223,8 +223,8 @@ public class ImportModelWizardPage extends WizardResourceImportPage
       }
 
       setPageComplete(false);
-      setTitle(ImportMessages.LB_Select); // TODO
-      setDescription(ImportMessages.DESC_ImportFile); // TODO
+      setTitle(Import_Messages.LB_Select); // TODO
+      setDescription(Import_Messages.DESC_ImportFile); // TODO
       setImageDescriptor(WorkbenchImages
             .getImageDescriptor(IWorkbenchGraphicConstants.IMG_WIZBAN_IMPORT_WIZ));
 
@@ -313,7 +313,7 @@ public class ImportModelWizardPage extends WizardResourceImportPage
       }
 
       Label modelTypsComboLabel = new Label(composite, SWT.NONE);
-      modelTypsComboLabel.setText(ImportMessages.LB_Types); // TODO
+      modelTypsComboLabel.setText(Import_Messages.LB_Types); // TODO
 
       modelTypsCombo = new Combo(composite, SWT.READ_ONLY);
 
@@ -399,7 +399,7 @@ public class ImportModelWizardPage extends WizardResourceImportPage
       {
          if (checkFileExists())
          {
-            setMessage(ImportMessages.ImportModelWizardPage_WarningIdAlreadyExists, 2);
+            setMessage(Import_Messages.ImportModelWizardPage_WarningIdAlreadyExists, 2);
          }
          else
          {
@@ -491,7 +491,7 @@ public class ImportModelWizardPage extends WizardResourceImportPage
       catch (InvocationTargetException e)
       {
          Throwable realException = e.getTargetException();
-         MessageDialog.openError(getShell(), ImportMessages.MSG_Err, realException
+         MessageDialog.openError(getShell(), Import_Messages.MSG_Err, realException
                .getMessage());
       }
       return result[0];
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportRepositoryWizardPage.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportRepositoryWizardPage.java
index cc403fc..56f8b6f 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportRepositoryWizardPage.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportRepositoryWizardPage.java
@@ -91,15 +91,15 @@ public class ImportRepositoryWizardPage extends WizardResourceImportPage
 
    private final static String STORE_CREATE_CONTAINER_STRUCTURE_ID = "ImportRepositoryWizardPage.STORE_CREATE_CONTAINER_STRUCTURE_ID";//$NON-NLS-1$
 
-   private static final String SELECT_ALL_TITLE = ImportMessages.STR_SelectAll;
+   private static final String SELECT_ALL_TITLE = Import_Messages.STR_SelectAll;
 
-   private static final String DESELECT_ALL_TITLE = ImportMessages.STR_DeselectAll;
+   private static final String DESELECT_ALL_TITLE = Import_Messages.STR_DeselectAll;
 
-   private static final String SELECT_SOURCE_TITLE = ImportMessages.STR_ImportFromRepository;
+   private static final String SELECT_SOURCE_TITLE = Import_Messages.STR_ImportFromRepository;
 
-   private static final String SELECT_SOURCE_MESSAGE = ImportMessages.MSG_SelectImportDir;
+   private static final String SELECT_SOURCE_MESSAGE = Import_Messages.MSG_SelectImportDir;
 
-   protected static final String SOURCE_EMPTY_MESSAGE = ImportMessages.MSG_SrcNotEmpty;
+   protected static final String SOURCE_EMPTY_MESSAGE = Import_Messages.MSG_SrcNotEmpty;
 
    protected ImportRepositoryWizardPage(String name, IWorkbench aWorkbench,
                                         IStructuredSelection selection)
@@ -204,12 +204,12 @@ public class ImportRepositoryWizardPage extends WizardResourceImportPage
       // overwrite... checkbox
       overwriteExistingResourcesCheckbox = new Button(optionsGroup, SWT.CHECK);
       overwriteExistingResourcesCheckbox.setFont(optionsGroup.getFont());
-      overwriteExistingResourcesCheckbox.setText(ImportMessages.BTN_OverwriteModels);
+      overwriteExistingResourcesCheckbox.setText(Import_Messages.BTN_OverwriteModels);
 
       // create containers radio
       createContainerStructureButton = new Button(optionsGroup, SWT.CHECK);
       createContainerStructureButton.setFont(optionsGroup.getFont());
-      createContainerStructureButton.setText(ImportMessages.BTN_CreateDirStructure);
+      createContainerStructureButton.setText(Import_Messages.BTN_CreateDirStructure);
       createContainerStructureButton.setSelection(false);
 
       // create selection only radio
@@ -298,7 +298,7 @@ public class ImportRepositoryWizardPage extends WizardResourceImportPage
 
       // source browse button
       sourceBrowseButton = new Button(sourceContainerGroup, SWT.PUSH);
-      sourceBrowseButton.setText(ImportMessages.BTN_Browse);
+      sourceBrowseButton.setText(Import_Messages.BTN_Browse);
       sourceBrowseButton.addListener(SWT.Selection, this);
       sourceBrowseButton.setLayoutData(new GridData(
          GridData.HORIZONTAL_ALIGN_FILL));
@@ -412,7 +412,7 @@ public class ImportRepositoryWizardPage extends WizardResourceImportPage
       if (new File(getSourceDirectoryName()).isDirectory())
          return true;
 
-      displayErrorDialog(ImportMessages.MSG_InvalidSrc);
+      displayErrorDialog(Import_Messages.MSG_InvalidSrc);
       sourceNameField.setFocus();
       return false;
    }
@@ -442,7 +442,7 @@ public class ImportRepositoryWizardPage extends WizardResourceImportPage
       if (!status.isOK())
       {
          ErrorDialog
-            .openError(getContainer().getShell(), ImportMessages.MSG_ImportProblems,
+            .openError(getContainer().getShell(), Import_Messages.MSG_ImportProblems,
                null, // no special message
                status);
          return false;
@@ -476,8 +476,8 @@ public class ImportRepositoryWizardPage extends WizardResourceImportPage
          return importResources(fileSystemObjects);
 
       MessageDialog.openInformation(getContainer().getShell(),
-         ImportMessages.TITLE_Info,
-         ImportMessages.MSG_NoFilesSelected);
+         Import_Messages.TITLE_Info,
+         Import_Messages.MSG_NoFilesSelected);
 
       return false;
    }
@@ -584,7 +584,7 @@ public class ImportRepositoryWizardPage extends WizardResourceImportPage
     */
    protected String getSourceLabel()
    {
-      return ImportMessages.LB_FromDir;
+      return Import_Messages.LB_FromDir;
    }
 
    /**
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportMessages.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/Import_Messages.java
index e68ea4b..b8da251 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ImportMessages.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/Import_Messages.java
@@ -1,175 +1,180 @@
-/*******************************************************************************
- * Copyright (c) 2011 SunGard CSA LLC and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    SunGard CSA LLC - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.stardust.modeling.modelimport;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ImportMessages extends NLS
-{
-   private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.modelimport.import_messages"; //$NON-NLS-1$
-
-   private ImportMessages()
-   {}
-
-   static
-   {
-      // initialize resource bundle
-      NLS.initializeMessages(BUNDLE_NAME, ImportMessages.class);
-   }
-
-   public static String DifferencesViewer_additionFilterText;
-
-   public static String DifferencesViewer_additionFilterTooltip;
-
-   public static String DifferencesViewer_allFilterActionText;
-
-   public static String DifferencesViewer_allFilterActionTooltip;
-
-   public static String DifferencesViewer_changedFilterText;
-
-   public static String DifferencesViewer_changedFilterToolTip;
-
-   public static String DifferencesViewer_deletionFilterText;
-
-   public static String DifferencesViewer_deletionFilterTooltip;
-
-   public static String DifferencesViewer_Title;
-
-   public static String ImportModelWizardPage_WarningIdAlreadyExists;
-
-   public static String MergeEditorInput_CheckingDuplicateOidsTaskName;
-
-   public static String MergeEditorInput_ComparingTaskName;
-
-   public static String MergeEditorInput_ERROR_MESSAGE_CONTINUE;
-
-   public static String MergeEditorInput_ERROR_MESSAGE_HEADLINE;
-
-   public static String MergeEditorInput_ERROR_MESSAGE_NEWOIDS;
-
-   public static String MergeEditorInput_ERROR_MESSAGE_TITLE;
-
-   public static String MergeEditorInput_LoadingTaskName;
-
-   public static String MergeEditorInput_OpenCompareViewerTaskName;
-
-   public static String MergeEditorInput_OpenEditorJobName;
-
-   public static String MergeModelElementsWizardPage_Comment;
-
-   public static String MergeModelElementsWizardPage_InfoDialogText;
-
-   public static String MergeModelElementsWizardPage_InfoDialogTitle;
-
-   public static String MergeModelElementsWizardPage_ERROR_DIALOG_TITLE;
-
-   public static String MergeModelElementsWizardPage_Title;
-
-   public static String MergeUtil_DUPLICATE_OIDS_SOURCE;
-
-   public static String MergeUtil_DUPLICATE_OIDS_TARGET;
-
-   public static String MergeUtil_MISSING_OIDS_SOURCE;
-
-   public static String MergeUtil_MISSING_OIDS_TARGET;
-
-   public static String MSG_InvalidSel;
-
-   public static String MSG_SelectModel;
-
-   public static String LB_ElementsImport;
-
-   public static String MSG_OpenFile;
-
-   public static String LB_IncludeDiagram;
-
-   public static String LB_PrototypeMode;
-
-   public static String LB_ProductionMode;
-
-   public static String NAME_ImportWiz;
-
-   public static String TITLE_ImportWiz;
-
-   public static String LB_Select;
-
-   public static String DESC_ImportFile;
-
-   public static String LB_Types;
-
-   public static String MSG_Err;
-
-   public static String DESC_CarnotFileImport;
-
-   public static String LB_ModelTypes;
-
-   public static String NAME_ImportCarnotProcessModelWiz;
-
-   public static String NAME_CarnotWorkflowImportPage;
-
-   public static String TASK_OpenFile;
-
-   public static String MSG_RootModelWithId;
-
-   public static String STR_SelectAll;
-
-   public static String STR_DeselectAll;
-
-   public static String STR_ImportFromRepository;
-
-   public static String MSG_SelectImportDir;
-
-   public static String MSG_SrcNotEmpty;
-
-   public static String BTN_OverwriteModels;
-
-   public static String BTN_CreateDirStructure;
-
-   public static String MSG_InvalidSrc;
-
-   public static String MSG_ImportProblems;
-
-   public static String TITLE_Info;
-
-   public static String MSG_NoFilesSelected;
-
-   public static String LB_FromDir;
-
-   public static String LB_FromXML;
-
-   public static String STR_XmlFiles;
-
-   public static String STR_XpdlFiles;
-
-   public static String STR_ModFiles;
-
-   public static String STR_AnyFile;
-
-   public static String BTN_Browse;
-
-   public static String LB_TargetFile;
-
-   public static String MSG_CouldNotCreateActivityGraphForProcess;
-
-   public static String MSG_CouldNotCreateActivityGraph;
-
-   public static String MSG_CreateTransitions;
-
-   public static String MSG_CouldNotCreateFromInputStream;
-
-   public static String MSG_CannotCreateDocFromNull;
-
-   public static String MSG_ErrRetrievingChild;
-
-   public static String TITLE_ModelElementImport;
-
-   public static String MSG_IdenticalModels;
-}
+/*******************************************************************************

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

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

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

+ * which accompanies this distribution, and is available at

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

+ *

+ * Contributors:

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

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

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

+

+import org.eclipse.osgi.util.NLS;

+

+public class Import_Messages extends NLS

+{

+   private static final String BUNDLE_NAME = "ag.carnot.workflow.modelimport.import-messages"; //$NON-NLS-1$

+

+   public static  String MSG_LOCK_MODEL_REQUIRED;

+

+   public static  String MSG_IMPORT_MODEL_ELEMENTS;

+

+   private Import_Messages()

+   {}

+

+   static

+   {

+      // initialize resource bundle

+      NLS.initializeMessages(BUNDLE_NAME, Import_Messages.class);

+   }

+

+   public static String DifferencesViewer_additionFilterText;

+

+   public static String DifferencesViewer_additionFilterTooltip;

+

+   public static String DifferencesViewer_allFilterActionText;

+

+   public static String DifferencesViewer_allFilterActionTooltip;

+

+   public static String DifferencesViewer_changedFilterText;

+

+   public static String DifferencesViewer_changedFilterToolTip;

+

+   public static String DifferencesViewer_deletionFilterText;

+

+   public static String DifferencesViewer_deletionFilterTooltip;

+

+   public static String DifferencesViewer_Title;

+

+   public static String ImportModelWizardPage_WarningIdAlreadyExists;

+

+   public static String MergeEditorInput_CheckingDuplicateOidsTaskName;

+

+   public static String MergeEditorInput_ComparingTaskName;

+

+   public static String MergeEditorInput_ERROR_MESSAGE_CONTINUE;

+

+   public static String MergeEditorInput_ERROR_MESSAGE_HEADLINE;

+

+   public static String MergeEditorInput_ERROR_MESSAGE_NEWOIDS;

+

+   public static String MergeEditorInput_ERROR_MESSAGE_TITLE;

+

+   public static String MergeEditorInput_LoadingTaskName;

+

+   public static String MergeEditorInput_OpenCompareViewerTaskName;

+

+   public static String MergeEditorInput_OpenEditorJobName;

+

+   public static String MergeModelElementsWizardPage_Comment;

+

+   public static String MergeModelElementsWizardPage_InfoDialogText;

+

+   public static String MergeModelElementsWizardPage_InfoDialogTitle;

+

+   public static String MergeModelElementsWizardPage_ERROR_DIALOG_TITLE;

+

+   public static String MergeModelElementsWizardPage_Title;

+

+   public static String MergeUtil_DUPLICATE_OIDS_SOURCE;

+

+   public static String MergeUtil_DUPLICATE_OIDS_TARGET;

+

+   public static String MergeUtil_MISSING_OIDS_SOURCE;

+

+   public static String MergeUtil_MISSING_OIDS_TARGET;

+

+   public static String MSG_InvalidSel;

+

+   public static String MSG_SelectModel;

+

+   public static String LB_ElementsImport;

+

+   public static String LB_IncludeDiagram;

+

+   public static String LB_PrototypeMode;

+

+   public static String LB_ProductionMode;

+

+   public static String NAME_ImportWiz;

+

+   public static String TITLE_ImportWiz;

+

+   public static String LB_Select;

+

+   public static String DESC_ImportFile;

+

+   public static String LB_Types;

+

+   public static String MSG_Err;

+

+   public static String DESC_CarnotFileImport;

+

+   public static String LB_ModelTypes;

+

+   public static String NAME_ImportCarnotProcessModelWiz;

+

+   public static String NAME_CarnotWorkflowImportPage;

+

+   public static String TASK_OpenFile;

+

+   public static String MSG_RootModelWithId;

+

+   public static String STR_SelectAll;

+

+   public static String STR_DeselectAll;

+

+   public static String STR_ImportFromRepository;

+

+   public static String MSG_SelectImportDir;

+

+   public static String MSG_SrcNotEmpty;

+

+   public static String BTN_OverwriteModels;

+

+   public static String BTN_CreateDirStructure;

+

+   public static String MSG_InvalidSrc;

+

+   public static String MSG_ImportProblems;

+

+   public static String TITLE_Info;

+

+   public static String MSG_NoFilesSelected;

+

+   public static String LB_FromDir;

+

+   public static String LB_FromXML;

+

+   public static String STR_XmlFiles;

+

+   public static String STR_XpdlFiles;

+

+   public static String STR_ModFiles;

+

+   public static String STR_AnyFile;

+

+   public static String BTN_Browse;

+

+   public static String CarnotAuditTrailSourceGroupProvider_1;

+

+   public static String CarnotAuditTrailSourceGroupProvider_2;

+

+   public static String CarnotAuditTrailSourceGroupProvider_3;

+

+   public static String LB_TargetFile;

+

+   public static String MSG_CouldNotCreateActivityGraphForProcess;

+

+   public static String MSG_CouldNotCreateActivityGraph;

+

+   public static String MSG_CreateTransitions;

+

+   public static String MSG_CouldNotCreateFromInputStream;

+

+   public static String MSG_CannotCreateDocFromNull;

+

+   public static String MSG_ErrRetrievingChild;

+

+}

diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ThirdPartySourceGroupProvider.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ThirdPartySourceGroupProvider.java
index 69e7823..5bd45e8 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ThirdPartySourceGroupProvider.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/ThirdPartySourceGroupProvider.java
@@ -53,12 +53,12 @@ public class ThirdPartySourceGroupProvider
          data.horizontalSpan = 3;
          withDiagramLabel.setLayoutData(data);
       }
-      withDiagramLabel.setText(ImportMessages.LB_IncludeDiagram); // TODO
+      withDiagramLabel.setText(Import_Messages.LB_IncludeDiagram); // TODO
 
       prototypeModeButton = new Button(addtionalOptionsComposite, SWT.RADIO);
       prototypeModeButton.setEnabled(enabled);
       Label prototypeModeLabel = new Label(addtionalOptionsComposite, SWT.NONE);
-      prototypeModeLabel.setText(ImportMessages.LB_PrototypeMode); // TODO
+      prototypeModeLabel.setText(Import_Messages.LB_PrototypeMode); // TODO
       if (enabled)
       {
          prototypeModeButton.setSelection(true);
@@ -67,7 +67,7 @@ public class ThirdPartySourceGroupProvider
       productionModeButton = new Button(addtionalOptionsComposite, SWT.RADIO);
       productionModeButton.setEnabled(enabled);
       Label productionModeLabel = new Label(addtionalOptionsComposite, SWT.NONE);
-      productionModeLabel.setText(ImportMessages.LB_ProductionMode); // TODO
+      productionModeLabel.setText(Import_Messages.LB_ProductionMode); // TODO
 
       return addtionalOptionsComposite;
    }
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/carnot/CarnotXmlSourceGroupProvider.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/carnot/CarnotXmlSourceGroupProvider.java
index 25ff945..2adb300 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/carnot/CarnotXmlSourceGroupProvider.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/carnot/CarnotXmlSourceGroupProvider.java
@@ -21,7 +21,7 @@ import org.eclipse.stardust.engine.core.model.xpdl.XpdlUtils;
 import org.eclipse.stardust.model.xpdl.carnot.util.CarnotWorkflowModelResourceFactoryImpl;
 import org.eclipse.stardust.modeling.modelimport.IImportModelWizardPage;
 import org.eclipse.stardust.modeling.modelimport.ISourceGroupProvider;
-import org.eclipse.stardust.modeling.modelimport.ImportMessages;
+import org.eclipse.stardust.modeling.modelimport.Import_Messages;
 import org.eclipse.stardust.modeling.modelimport.ThirdPartySourceGroupProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -46,9 +46,9 @@ public class CarnotXmlSourceGroupProvider extends ThirdPartySourceGroupProvider
 
    private static final int SIZING_TEXT_LABEL_WIDTH = 55;
 
-   private static final String XML_SOURCE_FILE_LABEL = ImportMessages.LB_FromXML;
+   private static final String XML_SOURCE_FILE_LABEL = Import_Messages.LB_FromXML;
 
-   private static final String CONTAINER_BROWSE_BUTTON_LABEL = ImportMessages.BTN_Browse;
+   private static final String CONTAINER_BROWSE_BUTTON_LABEL = Import_Messages.BTN_Browse;
 
    private IImportModelWizardPage wizardPage;
 
@@ -141,8 +141,8 @@ public class CarnotXmlSourceGroupProvider extends ThirdPartySourceGroupProvider
       FileDialog dialog = new FileDialog(parent.getShell(), SWT.OPEN);
       dialog.setFilterExtensions(new String[] {"*.xpdl", "*.xml", "*.mod", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
       dialog.setFilterNames(new String[] {
-            ImportMessages.STR_XpdlFiles, ImportMessages.STR_XmlFiles,
-            ImportMessages.STR_ModFiles, ImportMessages.STR_AnyFile});
+            Import_Messages.STR_XpdlFiles, Import_Messages.STR_XmlFiles,
+            Import_Messages.STR_ModFiles, Import_Messages.STR_AnyFile});
       String filename = dialog.open();
       if (filename != null)
       {
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/carnot/audittrail/CarnotAuditTrailSourceGroupProvider.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/carnot/audittrail/CarnotAuditTrailSourceGroupProvider.java
index ed1de71..c724cb2 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/carnot/audittrail/CarnotAuditTrailSourceGroupProvider.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/carnot/audittrail/CarnotAuditTrailSourceGroupProvider.java
@@ -43,9 +43,9 @@ import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder;
 import org.eclipse.stardust.modeling.common.ui.jface.utils.LabeledText;
 import org.eclipse.stardust.modeling.modelimport.IImportModelWizardPage;
 import org.eclipse.stardust.modeling.modelimport.ISourceGroupProvider;
-import org.eclipse.stardust.modeling.modelimport.ImportMessages;
 import org.eclipse.stardust.modeling.modelimport.ImportModelWizardPage;
 import org.eclipse.stardust.modeling.modelimport.ImportPlugin;
+import org.eclipse.stardust.modeling.modelimport.Import_Messages;
 import org.eclipse.stardust.modeling.modelimport.ThirdPartySourceGroupProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -73,7 +73,7 @@ public class CarnotAuditTrailSourceGroupProvider extends ThirdPartySourceGroupPr
    public static final String ATTR_CARNOT_USER = ImportPlugin.PLUGIN_ID
          + ".deployment.User"; //$NON-NLS-1$
 
-   private static final String CONTAINER_BROWSE_BUTTON_LABEL = ImportMessages.BTN_Browse;
+   private static final String CONTAINER_BROWSE_BUTTON_LABEL = Import_Messages.BTN_Browse;
 
    private IImportModelWizardPage wizardPage;
 
@@ -130,7 +130,7 @@ public class CarnotAuditTrailSourceGroupProvider extends ThirdPartySourceGroupPr
       if (wizardPage instanceof ImportModelWizardPage)
       {
          this.txtTargetFileName = FormBuilder.createLabeledText(containerGroup,
-               ImportMessages.LB_TargetFile);
+               Import_Messages.LB_TargetFile);
          ((GridData) txtTargetFileName.getText().getLayoutData()).horizontalSpan = 2;
          txtTargetFileName.getText().addModifyListener(txtModifyListener);
       }
@@ -159,7 +159,7 @@ public class CarnotAuditTrailSourceGroupProvider extends ThirdPartySourceGroupPr
 
          if (!chkWithLocation.getSelection())
          {
-            txtLocation.setText("");
+            txtLocation.setText(""); //$NON-NLS-1$
          }
       }
       setComplete(true);
@@ -391,13 +391,13 @@ public class CarnotAuditTrailSourceGroupProvider extends ThirdPartySourceGroupPr
       expComp.setLayout(layout);
       expComp.setLayoutData(FormBuilder.createDefaultMultiLineWidgetGridData());
 
-      expComp.setText("Advanced");
+      expComp.setText(Import_Messages.CarnotAuditTrailSourceGroupProvider_1);
 
       Composite containerGroup = FormBuilder.createComposite(expComp, 3);
       expComp.setClient(containerGroup);
 
       this.chkWithCarnotHome = FormBuilder.createCheckBox(containerGroup,
-            "Custom CARNOT HOME");
+            Import_Messages.CarnotAuditTrailSourceGroupProvider_2);
       this.txtCarnotHome = FormBuilder.createText(containerGroup);
       FormBuilder.applyDefaultTextControlWidth(txtCarnotHome);
       this.btnBrowseCarnotHome = FormBuilder.createButton(containerGroup,
@@ -409,7 +409,7 @@ public class CarnotAuditTrailSourceGroupProvider extends ThirdPartySourceGroupPr
                }
             });
       this.chkWithCarnotWork = FormBuilder.createCheckBox(containerGroup,
-            "Custom CARNOT Workspace");
+            Import_Messages.CarnotAuditTrailSourceGroupProvider_3);
       this.txtCarnotWork = FormBuilder.createText(containerGroup);
 
       FormBuilder.applyDefaultTextControlWidth(txtCarnotWork);
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/convert/Converter.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/convert/Converter.java
index b6a989c..43e7ac9 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/convert/Converter.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/convert/Converter.java
@@ -52,7 +52,7 @@ import org.eclipse.stardust.engine.core.model.gui.PerformsConnection;
 import org.eclipse.stardust.engine.core.model.gui.RoleSymbol;
 import org.eclipse.stardust.engine.core.model.gui.TransitionConnection;
 import org.eclipse.stardust.engine.core.model.utils.ModelElementList;
-import org.eclipse.stardust.modeling.modelimport.ImportMessages;
+import org.eclipse.stardust.modeling.modelimport.Import_Messages;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 
@@ -122,11 +122,11 @@ public abstract class Converter
          catch (Exception e)
          {
             trace.warn(
-                  ImportMessages.MSG_CouldNotCreateActivityGraphForProcess
+                  Import_Messages.MSG_CouldNotCreateActivityGraphForProcess
                         + processDefinition.getName()
                         + "(" + processDefinition.getId() + ")", e); //$NON-NLS-1$ //$NON-NLS-2$
             ConvertWarningException warning = new ConvertWarningException(
-                  ImportMessages.MSG_CouldNotCreateActivityGraph + e.getMessage());
+                  Import_Messages.MSG_CouldNotCreateActivityGraph + e.getMessage());
             warning.setProcessDefinition(processDefinition);
             converterWarnings.addLast(warning);
          }
@@ -210,7 +210,7 @@ public abstract class Converter
          }
          catch (Throwable e)
          {
-            System.out.println(ImportMessages.MSG_CreateTransitions
+            System.out.println(Import_Messages.MSG_CreateTransitions
                   + startActivity.getName() + "-> " + nextActivity.getName() + ": " + e); //$NON-NLS-1$ //$NON-NLS-2$
          }
       }
@@ -398,7 +398,7 @@ public abstract class Converter
       Document document;
 
       org.eclipse.stardust.common.Assert.isNotNull(inputStream, MessageFormat.format(
-            ImportMessages.MSG_CannotCreateDocFromNull, null));
+            Import_Messages.MSG_CannotCreateDocFromNull, null));
 
       try
       {
@@ -407,7 +407,7 @@ public abstract class Converter
       }
       catch (Exception e)
       {
-         throw new ApplicationException(ImportMessages.MSG_CouldNotCreateFromInputStream,
+         throw new ApplicationException(Import_Messages.MSG_CouldNotCreateFromInputStream,
                e);
       }
 
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/convert/XMLUtil.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/convert/XMLUtil.java
index 02fdd34..b322a7d 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/convert/XMLUtil.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/convert/XMLUtil.java
@@ -16,7 +16,7 @@ import java.util.List;
 import org.eclipse.stardust.common.CollectionUtils;
 import org.eclipse.stardust.common.log.LogManager;
 import org.eclipse.stardust.common.log.Logger;
-import org.eclipse.stardust.modeling.modelimport.ImportMessages;
+import org.eclipse.stardust.modeling.modelimport.Import_Messages;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -50,7 +50,7 @@ public class XMLUtil
       }
       catch (Exception e)
       {
-         trace.warn(MessageFormat.format(ImportMessages.MSG_ErrRetrievingChild,
+         trace.warn(MessageFormat.format(Import_Messages.MSG_ErrRetrievingChild,
                new Object[] {name, parent}), e);
       }
 
@@ -76,7 +76,7 @@ public class XMLUtil
       }
       catch (Exception e)
       {
-         trace.warn(MessageFormat.format(ImportMessages.MSG_ErrRetrievingChild,
+         trace.warn(MessageFormat.format(Import_Messages.MSG_ErrRetrievingChild,
                new Object[] {name, parent}), e);
       }
 
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ConnectionsComparator.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ConnectionsComparator.java
index 75fb87d..c4eea5b 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ConnectionsComparator.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ConnectionsComparator.java
@@ -55,7 +55,7 @@ public class ConnectionsComparator extends StructureComparator
 
    String computeUniqueIdentifier()
    {
-      return "ConnectionManager";
+      return "ConnectionManager"; //$NON-NLS-1$

    }
 
    @Override
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/DifferencesViewer.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/DifferencesViewer.java
index ec5da12..21c05aa 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/DifferencesViewer.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/DifferencesViewer.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.stardust.common.CollectionUtils;
 import org.eclipse.stardust.modeling.core.DiagramPlugin;
-import org.eclipse.stardust.modeling.modelimport.ImportMessages;
+import org.eclipse.stardust.modeling.modelimport.Import_Messages;
 import org.eclipse.swt.widgets.Composite;
 
 public final class DifferencesViewer extends StructureDiffViewer
@@ -50,7 +50,7 @@ public final class DifferencesViewer extends StructureDiffViewer
 
       public String getName()
       {
-         return ImportMessages.DifferencesViewer_Title;
+         return Import_Messages.DifferencesViewer_Title;
       }
 
       public IStructureComparator getStructure(Object input)
@@ -250,8 +250,8 @@ public final class DifferencesViewer extends StructureDiffViewer
             DifferencesViewer.this.refresh();
          }
       };
-      allFilterAction.setText(ImportMessages.DifferencesViewer_allFilterActionText);
-      allFilterAction.setToolTipText(ImportMessages.DifferencesViewer_allFilterActionTooltip);
+      allFilterAction.setText(Import_Messages.DifferencesViewer_allFilterActionText);
+      allFilterAction.setToolTipText(Import_Messages.DifferencesViewer_allFilterActionTooltip);
       allFilterAction.setImageDescriptor(DiagramPlugin
             .getImageDescriptor(ICONS_FULL_OBJ16_PATH
                   + "all_changes.gif")); //$NON-NLS-1$
@@ -269,8 +269,8 @@ public final class DifferencesViewer extends StructureDiffViewer
             DifferencesViewer.this.refresh();
          }
       };
-      additionFilterAction.setText(ImportMessages.DifferencesViewer_additionFilterText);
-      additionFilterAction.setToolTipText(ImportMessages.DifferencesViewer_additionFilterTooltip);
+      additionFilterAction.setText(Import_Messages.DifferencesViewer_additionFilterText);
+      additionFilterAction.setToolTipText(Import_Messages.DifferencesViewer_additionFilterTooltip);
       additionFilterAction.setImageDescriptor(DiagramPlugin
             .getImageDescriptor(ICONS_FULL_OBJ16_PATH
                   + "additive_changes.gif")); //$NON-NLS-1$
@@ -287,8 +287,8 @@ public final class DifferencesViewer extends StructureDiffViewer
          }
       };
 
-      deletionFilterAction.setText(ImportMessages.DifferencesViewer_deletionFilterText);
-      deletionFilterAction.setToolTipText(ImportMessages.DifferencesViewer_deletionFilterTooltip);
+      deletionFilterAction.setText(Import_Messages.DifferencesViewer_deletionFilterText);
+      deletionFilterAction.setToolTipText(Import_Messages.DifferencesViewer_deletionFilterTooltip);
       deletionFilterAction.setImageDescriptor(DiagramPlugin
             .getImageDescriptor(ICONS_FULL_OBJ16_PATH
                   + "subtractive_changes.gif")); //$NON-NLS-1$
@@ -304,8 +304,8 @@ public final class DifferencesViewer extends StructureDiffViewer
          }
       };
 
-      changeFilterAction.setText(ImportMessages.DifferencesViewer_changedFilterText);
-      changeFilterAction.setToolTipText(ImportMessages.DifferencesViewer_changedFilterToolTip);
+      changeFilterAction.setText(Import_Messages.DifferencesViewer_changedFilterText);
+      changeFilterAction.setToolTipText(Import_Messages.DifferencesViewer_changedFilterToolTip);
       changeFilterAction.setImageDescriptor(DiagramPlugin
             .getImageDescriptor(ICONS_FULL_OBJ16_PATH
                   + "update_changes.gif")); //$NON-NLS-1$
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizard.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizard.java
index 009470b..9337fb6 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizard.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizard.java
@@ -29,8 +29,8 @@ import org.eclipse.stardust.model.xpdl.carnot.util.WorkflowModelManager;
 import org.eclipse.stardust.modeling.core.editors.WorkflowModelEditor;
 import org.eclipse.stardust.modeling.core.modelserver.ModelServer;
 import org.eclipse.stardust.modeling.modelimport.IImportModelWizardPage;
-import org.eclipse.stardust.modeling.modelimport.ImportMessages;
 import org.eclipse.stardust.modeling.modelimport.ImportPlugin;
+import org.eclipse.stardust.modeling.modelimport.Import_Messages;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IImportWizard;
 import org.eclipse.ui.IWorkbench;
@@ -44,7 +44,7 @@ public class ImportModelElementsWizard extends Wizard implements IImportWizard
    public ImportModelElementsWizard()
    {
       super();
-      setWindowTitle(ImportMessages.DESC_CarnotFileImport);
+      setWindowTitle(Import_Messages.DESC_CarnotFileImport);
    }
 
    private ImportModelElementsWizardPage importModelElementsWizardPage;
@@ -79,10 +79,12 @@ public class ImportModelElementsWizard extends Wizard implements IImportWizard
                ModelServer modelServer = wme.getModelServer();
                if(modelServer.isModelShared())
                {
-                  if(!modelServer.isLockedAll())
+                  if (!modelServer.isLockedAll())
                   {
-                     MessageDialog.openInformation(getShell(), "Import Model Elements",
-                     "This operation requires the whole model to be locked.\nYou must lock the whole Model to proceed!");
+                     MessageDialog.openInformation(getShell(),
+                           Import_Messages.MSG_IMPORT_MODEL_ELEMENTS,
+                           Import_Messages.MSG_LOCK_MODEL_REQUIRED);
+
                      proceed = false;
                   }
                }
@@ -115,13 +117,13 @@ public class ImportModelElementsWizard extends Wizard implements IImportWizard
       
          if (selectedResources.isEmpty())
          {
-            MessageDialog.openInformation(getShell(), ImportMessages.MSG_InvalidSel,
-                  ImportMessages.MSG_SelectModel);
+            MessageDialog.openInformation(getShell(), Import_Messages.MSG_InvalidSel,
+                  Import_Messages.MSG_SelectModel);
          }
          else
          {
             importModelElementsWizardPage = new ImportModelElementsWizardPage(
-                  ImportMessages.LB_ElementsImport, selection);
+                  Import_Messages.LB_ElementsImport, selection);
             mergeModelElementsWizardPage = new MergeModelElementsWizardPage("merge",  //$NON-NLS-1$
                   importModelElementsWizardPage);
    
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizardPage.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizardPage.java
index dbc0f1c..d14805d 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizardPage.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/ImportModelElementsWizardPage.java
@@ -37,8 +37,8 @@ import org.eclipse.stardust.model.xpdl.carnot.util.CarnotWorkflowModelResourceFa
 import org.eclipse.stardust.model.xpdl.carnot.util.WorkflowModelManager;
 import org.eclipse.stardust.modeling.modelimport.IImportModelWizardPage;
 import org.eclipse.stardust.modeling.modelimport.ISourceGroupProvider;
-import org.eclipse.stardust.modeling.modelimport.ImportMessages;
 import org.eclipse.stardust.modeling.modelimport.ImportPlugin;
+import org.eclipse.stardust.modeling.modelimport.Import_Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.events.SelectionEvent;
@@ -216,7 +216,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
             }
          }
       }
-      return new Path("");
+      return new Path(""); //$NON-NLS-1$
    }
 
    protected void createSourceGroup(Composite parent)
@@ -245,8 +245,8 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
       }
 
       setPageComplete(false);
-      setTitle(ImportMessages.LB_Select); // TODO
-      setDescription(ImportMessages.DESC_CarnotFileImport);
+      setTitle(Import_Messages.LB_Select); // TODO
+      setDescription(Import_Messages.DESC_CarnotFileImport);
       // TODO: replace with CARNOT EXP specific image
       setImageDescriptor(WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_WIZBAN_IMPORT_WIZ));
    }
@@ -307,7 +307,7 @@ public class ImportModelElementsWizardPage extends WizardDataTransferPage
       }
 
       Label modelTypsComboLabel = new Label(composite, SWT.NONE);
-      modelTypsComboLabel.setText(ImportMessages.LB_ModelTypes); // TODO
+      modelTypsComboLabel.setText(Import_Messages.LB_ModelTypes); // TODO
 
       modelTypsCombo = new Combo(composite, SWT.READ_ONLY);
 
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeEditorInput.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeEditorInput.java
index f62aabc..adb4713 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeEditorInput.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeEditorInput.java
@@ -36,8 +36,8 @@ import org.eclipse.stardust.model.xpdl.carnot.ModelType;
 import org.eclipse.stardust.model.xpdl.carnot.util.WorkflowModelManager;
 import org.eclipse.stardust.modeling.core.editors.WorkflowModelEditor;
 import org.eclipse.stardust.modeling.modelimport.IImportModelWizardPage;
-import org.eclipse.stardust.modeling.modelimport.ImportMessages;
 import org.eclipse.stardust.modeling.modelimport.ImportPlugin;
+import org.eclipse.stardust.modeling.modelimport.Import_Messages;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IEditorReference;
@@ -76,7 +76,7 @@ public class MergeEditorInput extends CompareEditorInput
       {
          return null;
       }
-      monitor.beginTask(ImportMessages.MergeEditorInput_OpenCompareViewerTaskName, 4);
+      monitor.beginTask(Import_Messages.MergeEditorInput_OpenCompareViewerTaskName, 4);
 
       load(monitor, source, sourceName);
       if (monitor.isCanceled())
@@ -111,7 +111,7 @@ public class MergeEditorInput extends CompareEditorInput
          }
       }.schedule();
 
-      monitor.subTask(ImportMessages.MergeEditorInput_CheckingDuplicateOidsTaskName);
+      monitor.subTask(Import_Messages.MergeEditorInput_CheckingDuplicateOidsTaskName);
       returnCode = MergeUtil.initialize(sourceRoot.getModel(), targetRoot.getModel(), this);
       if (returnCode == true)
       {
@@ -125,7 +125,7 @@ public class MergeEditorInput extends CompareEditorInput
       monitor.worked(1);
       
       // nodeTwo is local
-      monitor.subTask(ImportMessages.MergeEditorInput_ComparingTaskName);
+      monitor.subTask(Import_Messages.MergeEditorInput_ComparingTaskName);
       Differencer differencer = new Differencer();
       Object input = differencer.findDifferences(false, null, null,
             null, nodeOne, nodeTwo);
@@ -152,7 +152,7 @@ public class MergeEditorInput extends CompareEditorInput
    public static void load(IProgressMonitor monitor, WorkflowModelManager resource, String name)
       throws InvocationTargetException
    {
-      monitor.subTask(MessageFormat.format(ImportMessages.MergeEditorInput_LoadingTaskName,
+      monitor.subTask(MessageFormat.format(Import_Messages.MergeEditorInput_LoadingTaskName,
             new Object[] {name}));
       try
       {
@@ -225,7 +225,7 @@ public class MergeEditorInput extends CompareEditorInput
             }
          }
 
-         new WorkbenchJob(ImportMessages.MergeEditorInput_OpenEditorJobName)
+         new WorkbenchJob(Import_Messages.MergeEditorInput_OpenEditorJobName)
          {
             public IStatus runInUIThread(IProgressMonitor monitor)
             {
@@ -278,14 +278,14 @@ public class MergeEditorInput extends CompareEditorInput
          public void run()
          {
             StringBuffer message = new StringBuffer();
-            message.append(ImportMessages.MergeEditorInput_ERROR_MESSAGE_HEADLINE);
+            message.append(Import_Messages.MergeEditorInput_ERROR_MESSAGE_HEADLINE);
             for (int i = 0; i < errors.length; i++)
             {
                message.append("\n  - ").append(errors[i]).append(';'); //$NON-NLS-1$
             }
-            message.append(ImportMessages.MergeEditorInput_ERROR_MESSAGE_NEWOIDS);
-            message.append(ImportMessages.MergeEditorInput_ERROR_MESSAGE_CONTINUE);
-            result[0] = MessageDialog.openQuestion(((WizardPage) page).getShell(), ImportMessages.MergeEditorInput_ERROR_MESSAGE_TITLE, message.toString());
+            message.append(Import_Messages.MergeEditorInput_ERROR_MESSAGE_NEWOIDS);
+            message.append(Import_Messages.MergeEditorInput_ERROR_MESSAGE_CONTINUE);
+            result[0] = MessageDialog.openQuestion(((WizardPage) page).getShell(), Import_Messages.MergeEditorInput_ERROR_MESSAGE_TITLE, message.toString());
          }
       });
       return result[0];
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeModelElementsWizardPage.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeModelElementsWizardPage.java
index e118be6..332c633 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeModelElementsWizardPage.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeModelElementsWizardPage.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder;
 import org.eclipse.stardust.modeling.core.editors.WorkflowModelEditor;
 import org.eclipse.stardust.modeling.modelimport.IImportModelWizardPage;
-import org.eclipse.stardust.modeling.modelimport.ImportMessages;
+import org.eclipse.stardust.modeling.modelimport.Import_Messages;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -45,8 +45,8 @@ public class MergeModelElementsWizardPage extends WizardPage
    protected MergeModelElementsWizardPage(String pageName, ImportModelElementsWizardPage sourcePage)
    {
       super(pageName);
-      setTitle(ImportMessages.MergeModelElementsWizardPage_Title); // TODO
-      setDescription(ImportMessages.MergeModelElementsWizardPage_Comment);
+      setTitle(Import_Messages.MergeModelElementsWizardPage_Title); // TODO
+      setDescription(Import_Messages.MergeModelElementsWizardPage_Comment);
       // TODO: replace with CARNOT EXP specific image
       ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
       setImageDescriptor(sharedImages.getImageDescriptor(IMG_WIZBAN_IMPORT_WIZ));
@@ -73,7 +73,7 @@ public class MergeModelElementsWizardPage extends WizardPage
       }
       catch (CoreException e)
       {
-         ErrorDialog.openError(getShell(), ImportMessages.MergeModelElementsWizardPage_ERROR_DIALOG_TITLE, e.getMessage(), e.getStatus());
+         ErrorDialog.openError(getShell(), Import_Messages.MergeModelElementsWizardPage_ERROR_DIALOG_TITLE, e.getMessage(), e.getStatus());
          result = false;
       }
       return result;
@@ -160,7 +160,7 @@ public class MergeModelElementsWizardPage extends WizardPage
       {
          WorkflowModelEditor editor = (WorkflowModelEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
          Shell shell = editor.getSite().getShell();
-         MessageDialog.openInformation(shell, ImportMessages.MergeModelElementsWizardPage_InfoDialogTitle, ImportMessages.MergeModelElementsWizardPage_InfoDialogText);            
+         MessageDialog.openInformation(shell, Import_Messages.MergeModelElementsWizardPage_InfoDialogTitle, Import_Messages.MergeModelElementsWizardPage_InfoDialogText);            
       }
       return canFlip;
    }
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeUtil.java b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeUtil.java
index 180ff91..c01e5a9 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeUtil.java
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/elements/MergeUtil.java
@@ -29,7 +29,7 @@ import org.eclipse.stardust.model.xpdl.carnot.ModelType;
 import org.eclipse.stardust.model.xpdl.carnot.OrganizationType;
 import org.eclipse.stardust.model.xpdl.carnot.ParticipantType;
 import org.eclipse.stardust.modeling.core.modelserver.ModelServerUtils;
-import org.eclipse.stardust.modeling.modelimport.ImportMessages;
+import org.eclipse.stardust.modeling.modelimport.Import_Messages;
 import org.eclipse.xsd.XSDSchema;
 
 
@@ -224,11 +224,11 @@ public class MergeUtil
       }
       if ((result & DUPLICATE_OID) != 0)
       {
-         errors.add(ImportMessages.MergeUtil_DUPLICATE_OIDS_TARGET);            
+         errors.add(Import_Messages.MergeUtil_DUPLICATE_OIDS_TARGET);            
       }
       if ((result & MISSING_OID) != 0)
       {
-         errors.add(ImportMessages.MergeUtil_MISSING_OIDS_TARGET);
+         errors.add(Import_Messages.MergeUtil_MISSING_OIDS_TARGET);
       }
       
       // collect new oids and fix duplicates
@@ -245,11 +245,11 @@ public class MergeUtil
       }
       if ((result & DUPLICATE_OID) != 0)
       {
-         errors.add(ImportMessages.MergeUtil_DUPLICATE_OIDS_SOURCE);            
+         errors.add(Import_Messages.MergeUtil_DUPLICATE_OIDS_SOURCE);            
       }
       if ((result & MISSING_OID) != 0)
       {
-         errors.add(ImportMessages.MergeUtil_MISSING_OIDS_SOURCE);
+         errors.add(Import_Messages.MergeUtil_MISSING_OIDS_SOURCE);
       }
       
       // an Error occured
diff --git a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/import_messages.properties b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/import-messages.properties
index c59f970..fe47e64 100644
--- a/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/import_messages.properties
+++ b/modeling/org.eclipse.stardust.modeling.modelimport/src/org/eclipse/stardust/modeling/modelimport/import-messages.properties
@@ -1,84 +1,86 @@
-###############################################################################
-# Copyright (c) 2011 SunGard CSA LLC and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    SunGard CSA LLC - initial API and implementation and/or initial documentation
-###############################################################################
-MSG_InvalidSel=Invalid selection
-MSG_InvalidSrc=Invalid source.
-MSG_SelectModel=Please select a Infinity Model File.
-MSG_SelectImportDir=Select a directory to import from.
-MSG_SrcNotEmpty=Source must not be empty.
-LB_ElementsImport=WorkflowModelElementsImport
-LB_IncludeDiagram=Includes Diagrams
-LB_PrototypeMode=Prototype Mode
-LB_ProductionMode=Production Mode
-MSG_OpenFile=Opening file for editing...
-NAME_ImportWiz=CarnotRepositoryImportWizard
-TITLE_ImportWiz=Import Infinity Model Repository
-TITLE_Info=Information
-LB_Select=Select ...
-LB_FromDir=From directory:
-LB_FromXML=From File:
-DESC_ImportFile=Model file to import.
-LB_Types=Model Types
-MSG_Err=Error
-DESC_CarnotFileImport= Infinity Model file to import.
-LB_ModelTypes=Model Types
-LB_TargetFile=Target File name:
-NAME_ImportCarnotProcessModelWiz=ImportCarnotProcessModelWizard
-NAME_CarnotWorkflowImportPage=CarnotWorkflowImport
-TASK_OpenFile=Opening file for editing...
-MSG_RootModelWithId=There is already a root model with id '
-STR_SelectAll=Select All
-STR_XmlFiles=XML Files (*.xml)
-STR_XpdlFiles=XPDL Files (*.xpdl)
-STR_ModFiles=Mod Files (*.mod)
-STR_AnyFile=Any File (*.*)
-STR_DeselectAll=Deselect All
-STR_ImportFromRepository=Import from Infinity Repository
-BTN_OverwriteModels=Overwrite existing models
-BTN_CreateDirStructure=Create complete directory structure
-BTN_Browse=Browse...
-MSG_ImportProblems=Import Problems
-MSG_NoFilesSelected=No Model files selected
-MSG_IdenticalModels=The models are identical.
-MSG_CreateTransitions=Creating transitions 
-MSG_ErrRetrievingChild=Error retrieving child {0} from parent: {1}.
-MSG_CouldNotCreateActivityGraphForProcess=Could not create activity graph for process 
-MSG_CouldNotCreateActivityGraph=Could not create activity graph. 
-MSG_CouldNotCreateFromInputStream=Could not create document from InputStream
-MSG_CannotCreateDocFromNull=Cannot create Document from NULL InputStream.
-TITLE_ModelElementImport=Model Element Import
-DifferencesViewer_Title= Infinity Model Differences
-DifferencesViewer_allFilterActionText=Show All Differences
-DifferencesViewer_additionFilterText=Show Additional Elements
-DifferencesViewer_additionFilterTooltip=Show All Additional Elements
-DifferencesViewer_deletionFilterText=Show Missing Elements
-DifferencesViewer_deletionFilterTooltip=Show All Missing Elements
-DifferencesViewer_changedFilterText=Show Changed Elements
-DifferencesViewer_changedFilterToolTip=Show All Changed Elements
-MergeModelElementsWizardPage_Title=Merge
-MergeEditorInput_ComparingTaskName=Scanning for differences...
-MergeEditorInput_LoadingTaskName=Loading {0}
-MergeUtil_DUPLICATE_OIDS_TARGET=duplicate OIDs in target model
-MergeUtil_MISSING_OIDS_TARGET=model elements without OID in target model
-MergeUtil_DUPLICATE_OIDS_SOURCE=duplicate OIDs in source model
-MergeUtil_MISSING_OIDS_SOURCE=model elements without OID in source model
-MergeEditorInput_OpenEditorJobName=Open editor
-MergeEditorInput_ERROR_MESSAGE_TITLE=Warning
-MergeModelElementsWizardPage_Comment=Select element in the difference tree and press merge button.
-MergeModelElementsWizardPage_InfoDialogTitle=Info
-MergeModelElementsWizardPage_InfoDialogText=Nothing to merge.
-MergeModelElementsWizardPage_ERROR_DIALOG_TITLE=Save Error
-MergeEditorInput_OpenCompareViewerTaskName=Comparing resources
-MergeEditorInput_ERROR_MESSAGE_HEADLINE=Critical errors found during preparation:\n
-MergeEditorInput_ERROR_MESSAGE_NEWOIDS=\n\nNew OIDs will be automatically assigned to problematic model elements.
-MergeEditorInput_ERROR_MESSAGE_CONTINUE=\n\nDo you want to continue ?
-MergeEditorInput_CheckingDuplicateOidsTaskName=Checking for duplicate oids...
-DifferencesViewer_allFilterActionTooltip=Show All Differences
-ImportModelWizardPage_WarningIdAlreadyExists=Model with the same Id already exists.\nWhen you continue the existing model will be overwritten.
+###############################################################################

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

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

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

+# which accompanies this distribution, and is available at

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

+#

+# Contributors:

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

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

+MSG_InvalidSel=Invalid selection

+MSG_InvalidSrc=Invalid source.

+MSG_SelectModel=Please select a Infinity Model File.

+MSG_SelectImportDir=Select a directory to import from.

+MSG_SrcNotEmpty=Source must not be empty.

+LB_ElementsImport=WorkflowModelElementsImport

+LB_IncludeDiagram=Includes Diagrams

+LB_PrototypeMode=Prototype Mode

+LB_ProductionMode=Production Mode

+NAME_ImportWiz=CarnotRepositoryImportWizard

+TITLE_ImportWiz=Import Infinity Model Repository

+TITLE_Info=Information

+LB_Select=Select ...

+LB_FromDir=From directory:

+LB_FromXML=From File:

+DESC_ImportFile=Model file to import.

+LB_Types=Model Types

+MSG_Err=Error

+DESC_CarnotFileImport= Infinity Model file to import.

+LB_ModelTypes=Model Types

+LB_TargetFile=Target File name:

+NAME_ImportCarnotProcessModelWiz=ImportCarnotProcessModelWizard

+NAME_CarnotWorkflowImportPage=CarnotWorkflowImport

+TASK_OpenFile=Opening file for editing...

+MSG_RootModelWithId=There is already a root model with id '

+STR_SelectAll=Select All

+STR_XmlFiles=XML Files (*.xml)

+STR_XpdlFiles=XPDL Files (*.xpdl)

+STR_ModFiles=Mod Files (*.mod)

+STR_AnyFile=Any File (*.*)

+STR_DeselectAll=Deselect All

+STR_ImportFromRepository=Import from Infinity Repository

+BTN_OverwriteModels=Overwrite existing models

+BTN_CreateDirStructure=Create complete directory structure

+BTN_Browse=Browse...

+CarnotAuditTrailSourceGroupProvider_1=Advanced

+CarnotAuditTrailSourceGroupProvider_2=Custom CARNOT HOME

+CarnotAuditTrailSourceGroupProvider_3=Custom CARNOT Workspace

+MSG_ImportProblems=Import Problems

+MSG_NoFilesSelected=No Model files selected

+MSG_CreateTransitions=Creating transitions 

+MSG_ErrRetrievingChild=Error retrieving child {0} from parent: {1}.

+MSG_CouldNotCreateActivityGraphForProcess=Could not create activity graph for process 

+MSG_CouldNotCreateActivityGraph=Could not create activity graph. 

+MSG_CouldNotCreateFromInputStream=Could not create document from InputStream

+MSG_CannotCreateDocFromNull=Cannot create Document from NULL InputStream.

+DifferencesViewer_Title= Infinity Model Differences

+DifferencesViewer_allFilterActionText=Show All Differences

+DifferencesViewer_additionFilterText=Show Additional Elements

+DifferencesViewer_additionFilterTooltip=Show All Additional Elements

+DifferencesViewer_deletionFilterText=Show Missing Elements

+DifferencesViewer_deletionFilterTooltip=Show All Missing Elements

+DifferencesViewer_changedFilterText=Show Changed Elements

+DifferencesViewer_changedFilterToolTip=Show All Changed Elements

+MergeModelElementsWizardPage_Title=Merge

+MergeEditorInput_ComparingTaskName=Scanning for differences...

+MergeEditorInput_LoadingTaskName=Loading {0}

+MergeUtil_DUPLICATE_OIDS_TARGET=duplicate OIDs in target model

+MergeUtil_MISSING_OIDS_TARGET=model elements without OID in target model

+MergeUtil_DUPLICATE_OIDS_SOURCE=duplicate OIDs in source model

+MergeUtil_MISSING_OIDS_SOURCE=model elements without OID in source model

+MergeEditorInput_OpenEditorJobName=Open editor

+MergeEditorInput_ERROR_MESSAGE_TITLE=Warning

+MergeModelElementsWizardPage_Comment=Select element in the difference tree and press merge button.

+MergeModelElementsWizardPage_InfoDialogTitle=Info

+MergeModelElementsWizardPage_InfoDialogText=Nothing to merge.

+MergeModelElementsWizardPage_ERROR_DIALOG_TITLE=Save Error

+MergeEditorInput_OpenCompareViewerTaskName=Comparing resources

+MergeEditorInput_ERROR_MESSAGE_HEADLINE=Critical errors found during preparation:\n

+MergeEditorInput_ERROR_MESSAGE_NEWOIDS=\n\nNew OIDs will be automatically assigned to problematic model elements.

+MergeEditorInput_ERROR_MESSAGE_CONTINUE=\n\nDo you want to continue ?

+MergeEditorInput_CheckingDuplicateOidsTaskName=Checking for duplicate oids...

+DifferencesViewer_allFilterActionTooltip=Show All Differences

+ImportModelWizardPage_WarningIdAlreadyExists=Model with the same Id already exists.\nWhen you continue the existing model will be overwritten.

+MSG_LOCK_MODEL_REQUIRED=Import Model Elements

+MSG_IMPORT_MODEL_ELEMENTS=This operation requires the whole model to be locked.\nYou must lock the whole Model to proceed!  
\ No newline at end of file