summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-01 06:49:33 (EST)
committer Stephan Born2012-04-24 04:30:02 (EDT)
commit14cd0a169c2bfc141bb976ecd6516af72e8d3db5 (patch)
tree71f0cd5eea539f74ce2a7a27e4fd06db42e343f5
parent6e26766920634293dd85db1309680f21df9eda44 (diff)
downloadorg.eclipse.stardust.ide-14cd0a169c2bfc141bb976ecd6516af72e8d3db5.zip
org.eclipse.stardust.ide-14cd0a169c2bfc141bb976ecd6516af72e8d3db5.tar.gz
org.eclipse.stardust.ide-14cd0a169c2bfc141bb976ecd6516af72e8d3db5.tar.bz2
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.modelexport)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53295 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelexport/src-32dependency/org/eclipse/stardust/modeling/modelexport/ui/DeployModelDialogSwt.java16
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/DeployCarnotModelWizard.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportCarnotModelWizard.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportCarnotModelWizardPage.java30
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/Export_Messages.java (renamed from modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportMessages.java)171
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ModelInfo.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/SelectCarnotModelWizardPage.java14
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/Internal_Export_Messages.java (renamed from modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/Internal_ExportMessages.java)76
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/internal-export-messages.properties8
-rw-r--r--modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/internal_export_messages.properties33
10 files changed, 146 insertions, 208 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.modelexport/src-32dependency/org/eclipse/stardust/modeling/modelexport/ui/DeployModelDialogSwt.java b/modeling/org.eclipse.stardust.modeling.modelexport/src-32dependency/org/eclipse/stardust/modeling/modelexport/ui/DeployModelDialogSwt.java
index bfa02e6..d6b53fb 100644
--- a/modeling/org.eclipse.stardust.modeling.modelexport/src-32dependency/org/eclipse/stardust/modeling/modelexport/ui/DeployModelDialogSwt.java
+++ b/modeling/org.eclipse.stardust.modeling.modelexport/src-32dependency/org/eclipse/stardust/modeling/modelexport/ui/DeployModelDialogSwt.java
@@ -123,11 +123,11 @@ public class DeployModelDialogSwt extends Dialog
((GridLayout) panel.getLayout()).numColumns = 3;
- FormBuilder.createLabel(panel, Internal_ExportMessages.getString("LB_Action")); //$NON-NLS-1$
+ FormBuilder.createLabel(panel, Internal_Export_Messages.getString("LB_Action")); //$NON-NLS-1$
this.overwriteButton = FormBuilder.createRadioButton(panel,
- Internal_ExportMessages.getString("LB_Overwrite")); //$NON-NLS-1$
+ Internal_Export_Messages.getString("LB_Overwrite")); //$NON-NLS-1$
this.deployButton = FormBuilder.createRadioButton(panel,
- Internal_ExportMessages.getString("LB_DeployVersion")); //$NON-NLS-1$
+ Internal_Export_Messages.getString("LB_DeployVersion")); //$NON-NLS-1$
overwriteButton.addSelectionListener(new SelectionAdapter()
{
@@ -163,14 +163,14 @@ public class DeployModelDialogSwt extends Dialog
{
super.configureShell(shell);
- shell.setText(Internal_ExportMessages.getString("DIALOG_Model"));
+ shell.setText(Internal_Export_Messages.getString("DIALOG_Model")); //$NON-NLS-1$
}
public void validateSettings() throws ValidationException
{
if (overwriteButton.getSelection() && overwriteView.getSelectedModelOID() == -1)
{
- throw new ValidationException(Internal_ExportMessages.getString("MSG_NoModelToOverwrite"), false); //$NON-NLS-1$
+ throw new ValidationException(Internal_Export_Messages.getString("MSG_NoModelToOverwrite"), false); //$NON-NLS-1$
}
}
@@ -214,7 +214,7 @@ public class DeployModelDialogSwt extends Dialog
private void overwrite()
{
- String modelFile = "";
+ String modelFile = ""; //$NON-NLS-1$
String modelXml = XmlUtils.getXMLString(modelFile);
@@ -245,14 +245,14 @@ public class DeployModelDialogSwt extends Dialog
private boolean ignoreWarnings(List warnings)
{
ValidationException e = new ValidationException(
- Internal_ExportMessages.getString("MSG_ContinueDeploying"), warnings, true); //$NON-NLS-1$
+ Internal_Export_Messages.getString("MSG_ContinueDeploying"), warnings, true); //$NON-NLS-1$
return false; // TODO ValidationExceptionDialog.showDialog(this, e, false);
}
private void showErrors(List errors)
{
ValidationException e = new ValidationException(
- Internal_ExportMessages.getString("MSG_NoErrors"), errors, false); //$NON-NLS-1$
+ Internal_Export_Messages.getString("MSG_NoErrors"), errors, false); //$NON-NLS-1$
// TODO ValidationExceptionDialog.showDialog(this, e);
}
diff --git a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/DeployCarnotModelWizard.java b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/DeployCarnotModelWizard.java
index 987fc10..94a4b13 100644
--- a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/DeployCarnotModelWizard.java
+++ b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/DeployCarnotModelWizard.java
@@ -38,7 +38,7 @@ public class DeployCarnotModelWizard extends Wizard implements IExportWizard
section = workbenchSettings.addNewSection(WIZARD_NAME);
}
setDialogSettings(section);
- setWindowTitle(ExportMessages.TITLE_DeployModelWiz);
+ setWindowTitle(Export_Messages.TITLE_DeployModelWiz);
}
public boolean performFinish()
diff --git a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportCarnotModelWizard.java b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportCarnotModelWizard.java
index a420b73..d511b0a 100644
--- a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportCarnotModelWizard.java
+++ b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportCarnotModelWizard.java
@@ -29,7 +29,7 @@ public class ExportCarnotModelWizard extends Wizard implements IExportWizard
public ExportCarnotModelWizard()
{
super();
- setWindowTitle(ExportMessages.DESC_ExportModel);
+ setWindowTitle(Export_Messages.DESC_ExportModel);
}
public boolean performFinish()
diff --git a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportCarnotModelWizardPage.java b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportCarnotModelWizardPage.java
index 8597e2b..92cca0e 100644
--- a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportCarnotModelWizardPage.java
+++ b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportCarnotModelWizardPage.java
@@ -56,8 +56,8 @@ import org.eclipse.ui.model.WorkbenchPartLabelProvider;
public class ExportCarnotModelWizardPage extends WizardExportResourcesPage
{
- private static final String DIRECTORY_LABEL = ExportMessages.LB_ToDir;
- private static final String CONTAINER_BROWSE_BUTTON_LABEL = ExportMessages.Btn_Browse;
+ private static final String DIRECTORY_LABEL = Export_Messages.LB_ToDir;
+ private static final String CONTAINER_BROWSE_BUTTON_LABEL = Export_Messages.Btn_Browse;
private Composite parent;
private Text fileNameField;
@@ -74,12 +74,12 @@ public class ExportCarnotModelWizardPage extends WizardExportResourcesPage
for (Iterator<?> _iterator = getSelectedResources().iterator(); _iterator.hasNext();)
{
IResource resource = (IResource) _iterator.next();
- String modelName = "";
+ String modelName = ""; //$NON-NLS-1$
try
{
modelName = resource.getName().substring(0,
- resource.getName().lastIndexOf("."));
+ resource.getName().lastIndexOf(".")); //$NON-NLS-1$
}
catch (Throwable t)
{
@@ -99,8 +99,8 @@ public class ExportCarnotModelWizardPage extends WizardExportResourcesPage
//WorkflowModelEditor editor = (WorkflowModelEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
//Shell shell = editor.getSite().getShell();
// skip file, when user does not want to overwrite file
- String message = ExportMessages.ExportCarnotModelWizardPage_OverwriteQuestionString + pathBuf.toString() + "?"; //$NON-NLS-2$
- boolean answer = MessageDialog.openQuestion(null, ExportMessages.ExportCarnotModelWizardPage_OverwriteQuestionTitle, message);
+ String message = Export_Messages.ExportCarnotModelWizardPage_OverwriteQuestionString + pathBuf.toString() + "?"; //$NON-NLS-1$
+ boolean answer = MessageDialog.openQuestion(null, Export_Messages.ExportCarnotModelWizardPage_OverwriteQuestionTitle, message);
if (!answer)
{
continue;
@@ -147,9 +147,9 @@ public class ExportCarnotModelWizardPage extends WizardExportResourcesPage
ListSelectionDialog modelsToSaveDialog = new ListSelectionDialog(getShell(),
new AdaptableList(saveEditors), new WorkbenchContentProvider(),
new WorkbenchPartLabelProvider(),
- ExportMessages.MSG_SaveModelsBeforeExporting);
+ Export_Messages.MSG_SaveModelsBeforeExporting);
modelsToSaveDialog.setInitialSelections(saveEditors.toArray());
- modelsToSaveDialog.setTitle(ExportMessages.TITLE_SaveModels);
+ modelsToSaveDialog.setTitle(Export_Messages.TITLE_SaveModels);
int result = modelsToSaveDialog.open();
if (result == IDialogConstants.OK_ID)
{
@@ -227,8 +227,8 @@ public class ExportCarnotModelWizardPage extends WizardExportResourcesPage
}
});
- setTitle(ExportMessages.LB_Select);
- setDescription(ExportMessages.DESC_ModelsToExport); // TODO
+ setTitle(Export_Messages.LB_Select);
+ setDescription(Export_Messages.DESC_ModelsToExport); // TODO
setControl(containerGroup);
@@ -273,18 +273,18 @@ public class ExportCarnotModelWizardPage extends WizardExportResourcesPage
{
if (StringUtils.isEmpty(fileNameField.getText()))
{
- setErrorMessage(ExportMessages.MSG_NoDirectory);
+ setErrorMessage(Export_Messages.MSG_NoDirectory);
return false;
}
File targetFile = new File(fileNameField.getText());
if (!targetFile.exists())
{
- setErrorMessage(ExportMessages.MSG_DirectoryDoesNotExist);
+ setErrorMessage(Export_Messages.MSG_DirectoryDoesNotExist);
return false;
}
if (getSelectedResources().isEmpty())
{
- setErrorMessage(ExportMessages.MSG_NoModelSelected);
+ setErrorMessage(Export_Messages.MSG_NoModelSelected);
return false;
}
@@ -292,10 +292,10 @@ public class ExportCarnotModelWizardPage extends WizardExportResourcesPage
.hasNext();)
{
IResource resource = (IResource) _iterator.next();
- if (!("cwm".equals(resource.getFileExtension()) || ("xpdl").equals(resource
+ if (!("cwm".equals(resource.getFileExtension()) || ("xpdl").equals(resource //$NON-NLS-1$ //$NON-NLS-2$
.getFileExtension())))
{
- setErrorMessage(ExportMessages.MSG_InvalidResource);
+ setErrorMessage(Export_Messages.MSG_InvalidResource);
return false;
}
}
diff --git a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportMessages.java b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/Export_Messages.java
index 7462db4..50ee459 100644
--- a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ExportMessages.java
+++ b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/Export_Messages.java
@@ -1,105 +1,68 @@
-/*******************************************************************************
- * 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.modelexport;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ExportMessages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.modelexport.export_messages"; //$NON-NLS-1$
-
- private ExportMessages()
- {}
-
- static
- {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, ExportMessages.class);
- }
-
- public static String ExportCarnotModelWizardPage_OverwriteQuestionString;
-
- public static String ExportCarnotModelWizardPage_OverwriteQuestionTitle;
-
- public static String LB_CarnotHome;
-
- public static String LB_CarnotWorkspace;
-
- public static String BTN_Browse;
-
- public static String LB_Select;
-
- public static String DESC_DeployModelEnvironment;
-
- public static String LB_ToDir;
-
- public static String Btn_Browse;
-
- public static String DESC_ModelsToExport;
-
- public static String TITLE_DeployModelWiz;
-
- public static String STR_Unspecified;
-
- public static String STR_ValidFrom;
-
- public static String STR_ValidTo;
-
- public static String LB_Options;
-
- public static String BTN_DeployVersion;
-
- public static String BTN_Overwrite;
-
- public static String BTN_OverwriteActiveModel;
-
- public static String BTN_IgnoreWarn;
-
- public static String BTN_InitDisabled;
-
- public static String BTN_Deselect;
-
- public static String TITLE_Select;
-
- public static String DESC_DeployedModels;
-
- public static String DESC_ExportModel;
-
- public static String DESC_ModelToOverwrite;
-
- public static String DESC_PredecessorModel;
-
- public static String LB_DeployedModels;
-
- public static String LB_ActiveModel;
-
- public static String LB_ModelName;
-
- public static String LB_ModelId;
-
- public static String LB_ModelOID;
-
- public static String LB_ValidFrom;
-
- public static String LB_ValidTo;
-
- public static String MSG_SaveModelsBeforeExporting;
-
- public static String TITLE_SaveModels;
-
- public static String MSG_NoDirectory;
-
- public static String MSG_DirectoryDoesNotExist;
-
- public static String MSG_NoModelSelected;
-
- public static String MSG_InvalidResource;
+/*******************************************************************************
+ * 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.modelexport;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Export_Messages extends NLS
+{
+ private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.modelexport.export-messages"; //$NON-NLS-1$
+
+ private Export_Messages()
+ {}
+
+ static
+ {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Export_Messages.class);
+ }
+
+ public static String ExportCarnotModelWizardPage_OverwriteQuestionString;
+
+ public static String ExportCarnotModelWizardPage_OverwriteQuestionTitle;
+
+ public static String BTN_Browse;
+
+ public static String LB_Select;
+
+ public static String DESC_DeployModelEnvironment;
+
+ public static String LB_ToDir;
+
+ public static String Btn_Browse;
+
+ public static String DESC_ModelsToExport;
+
+ public static String TITLE_DeployModelWiz;
+
+ public static String STR_Unspecified;
+
+ public static String DESC_ExportModel;
+
+ public static String MSG_SaveModelsBeforeExporting;
+
+ public static String TITLE_SaveModels;
+
+ public static String MSG_NoDirectory;
+
+ public static String MSG_DirectoryDoesNotExist;
+
+ public static String MSG_NoModelSelected;
+
+ public static String MSG_InvalidResource;
+
+ public static String LB_ADVANCED;
+
+ public static String BTN_CUSTOM_CARNOT_HOME;
+
+ public static String BTN_CUSTOM_CARNOT_WORKSPACE;
+
} \ No newline at end of file
diff --git a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ModelInfo.java b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ModelInfo.java
index 3763b33..3088964 100644
--- a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ModelInfo.java
+++ b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ModelInfo.java
@@ -26,7 +26,7 @@ public class ModelInfo
private long oid;
private Date validFrom;
private Date validTo;
- private static final String UNSPECIFIED = ExportMessages.STR_Unspecified;
+ private static final String UNSPECIFIED = Export_Messages.STR_Unspecified;
private boolean active;
public void setName(String name)
diff --git a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/SelectCarnotModelWizardPage.java b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/SelectCarnotModelWizardPage.java
index 4190840..d19ccd5 100644
--- a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/SelectCarnotModelWizardPage.java
+++ b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/SelectCarnotModelWizardPage.java
@@ -43,7 +43,7 @@ public class SelectCarnotModelWizardPage extends WizardExportResourcesPage
// private static final String DIRECTORY_LABEL = ExportMessages.LB_CarnotWorkspace;
- private static final String CONTAINER_BROWSE_BUTTON_LABEL = ExportMessages.BTN_Browse;
+ private static final String CONTAINER_BROWSE_BUTTON_LABEL = Export_Messages.BTN_Browse;
private ExpandableComposite sctAdvanced;
@@ -108,12 +108,12 @@ public class SelectCarnotModelWizardPage extends WizardExportResourcesPage
sctAdvanced.setLayout(layout);
sctAdvanced.setLayoutData(FormBuilder.createDefaultMultiLineWidgetGridData());
- sctAdvanced.setText("Advanced");
+ sctAdvanced.setText(Export_Messages.LB_ADVANCED);
Composite containerGroup = FormBuilder.createComposite(sctAdvanced, 3);
sctAdvanced.setClient(containerGroup);
- this.chkWithCarnotHome = FormBuilder.createCheckBox(containerGroup, "Custom CARNOT HOME");
+ this.chkWithCarnotHome = FormBuilder.createCheckBox(containerGroup, Export_Messages.BTN_CUSTOM_CARNOT_HOME);
this.txtCarnotHome = FormBuilder.createText(containerGroup);
FormBuilder.applyDefaultTextControlWidth(txtCarnotHome);
this.btnBrowseCarnotHome = FormBuilder.createButton(containerGroup, CONTAINER_BROWSE_BUTTON_LABEL,
@@ -124,7 +124,7 @@ public class SelectCarnotModelWizardPage extends WizardExportResourcesPage
browseForFile(txtCarnotHome);
}
});
- this.chkWithCarnotWork = FormBuilder.createCheckBox(containerGroup, "Custom CARNOT Workspace");
+ this.chkWithCarnotWork = FormBuilder.createCheckBox(containerGroup, Export_Messages.BTN_CUSTOM_CARNOT_WORKSPACE);
this.txtCarnotWork = FormBuilder.createText(containerGroup);
// data.widthHint = SIZING_TEXT_FIELD_WIDTH;
FormBuilder.applyDefaultTextControlWidth(txtCarnotWork);
@@ -172,8 +172,8 @@ public class SelectCarnotModelWizardPage extends WizardExportResourcesPage
}
});*/
- setTitle(ExportMessages.LB_Select);
- setDescription(ExportMessages.DESC_DeployModelEnvironment);
+ setTitle(Export_Messages.LB_Select);
+ setDescription(Export_Messages.DESC_DeployModelEnvironment);
setImageDescriptor(ExportPlugin.getImageDescriptor("icons/full/wizbean/export_wiz.zip")); //$NON-NLS-1$
@@ -291,7 +291,7 @@ public class SelectCarnotModelWizardPage extends WizardExportResourcesPage
if ( !chkWithLocation.getSelection())
{
- txtLocation.setText("");
+ txtLocation.setText(""); //$NON-NLS-1$
}
}
diff --git a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/Internal_ExportMessages.java b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/Internal_Export_Messages.java
index 962af19..0470539 100644
--- a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/Internal_ExportMessages.java
+++ b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/Internal_Export_Messages.java
@@ -1,38 +1,38 @@
-/*******************************************************************************
- * 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.modelexport.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Internal_ExportMessages
-{
- private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.modelexport.ui.internal_export_messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Internal_ExportMessages()
- {}
-
- public static String getString(String key)
- {
- // TODO Auto-generated method stub
- try
- {
- return RESOURCE_BUNDLE.getString(key);
- }
- catch (MissingResourceException e)
- {
- return '!' + key + '!';
- }
- }
-}
+/*******************************************************************************
+ * 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.modelexport.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Internal_Export_Messages
+{
+ private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.modelexport.ui.internal-export-messages"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
+ .getBundle(BUNDLE_NAME);
+
+ private Internal_Export_Messages()
+ {}
+
+ public static String getString(String key)
+ {
+ // TODO Auto-generated method stub
+ try
+ {
+ return RESOURCE_BUNDLE.getString(key);
+ }
+ catch (MissingResourceException e)
+ {
+ return '!' + key + '!';
+ }
+ }
+}
diff --git a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/internal-export-messages.properties b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/internal-export-messages.properties
new file mode 100644
index 0000000..f904dae
--- /dev/null
+++ b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/internal-export-messages.properties
@@ -0,0 +1,8 @@
+LB_DeployVersion=Deploy version
+LB_Overwrite=Overwrite
+LB_Action=Action:
+DIALOG_Model=Deploy Model
+MSG_NoModelToOverwrite=No model to overwrite selected.
+MSG_ContinueDeploying=Warnings issued. Continue deploying ?
+MSG_NoErrors=There were errors during deployment.
+
diff --git a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/internal_export_messages.properties b/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/internal_export_messages.properties
deleted file mode 100644
index 52cf469..0000000
--- a/modeling/org.eclipse.stardust.modeling.modelexport/src/org/eclipse/stardust/modeling/modelexport/ui/internal_export_messages.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-###############################################################################
-# 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_FileNotFound=File not found: '
-MSG_LoadingModel=Loading model ...
-MSG_ModelDeployed=Model was deployed.
-MSG_ModelNotDeployed=Model was not deployed.
-MSG_LoginFailed=Login Failed:
-LB_DeployVersion=Deploy version
-LB_Overwrite=Overwrite
-LB_Action=Action:
-DIALOG_Model=Deploy Model
-MSG_DeploymentErrors=There were errors during deployment.
-MSG_DeploymentNotPossible=Deployment is not possible. Daemons are running.
-MSG_DeployModel=Deploying model from file
-MSG_NoModelToOverwrite=No model to overwrite selected.
-MSG_NoModelSpecified=No model file was specified.
-MSG_InconsistentVersion=You are going to deploy an inconsistent model version\nto a production environment.\n\n
-MSG_ContinueDeploying=Warnings issued. Continue deploying ?
-MSG_NoErrors=There were errors during deployment.
-MSG_NotImpl=Not implemented.
-MSG_Starting=Starting ...
-MSG_Continue=Continue?
-ERR_FileNotFound=File not found: '
-MSG_ModelVersionDeployment=Model Version Deployment
-TITLE_Warning=Warning