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.model.i18n)

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

9 files changed, 73 insertions, 83 deletions

diff --git a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/I18NBundlesValidator.java b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/I18NBundlesValidator.java
index 204f708..ab4bb74 100644
--- a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/I18NBundlesValidator.java
+++ b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/I18NBundlesValidator.java
@@ -56,7 +56,7 @@ public class I18NBundlesValidator implements IModelElementValidator, IModelValid
                            missing = CollectionUtils.newList();
                         }
                         missing.add(Issue.warning(element, MessageFormat.format(
-                              Messages.I18NBundlesValidator_MISSING_VALUE,
+                              I18N_Messages.I18NBundlesValidator_MISSING_VALUE,
                               propertyName, getLocale(locale)),
                               propertyName + SEPARATOR + locale));
                      }
diff --git a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/Messages.java b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/I18N_Messages.java
index 9a95eaa..05b93cc 100644
--- a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/Messages.java
+++ b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/I18N_Messages.java
@@ -1,47 +1,47 @@
-/*******************************************************************************
- * 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.model.i18n;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS
-{
-   private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.model.i18n.messages"; //$NON-NLS-1$
-
-   public static String I18NBundlesModelPropertyPage_DeleteButtonLabel;
-
-   public static String I18NBundlesModelPropertyPage_DeleteConfirmationDialogTitle;
-
-   public static String I18NBundlesModelPropertyPage_DeleteConfirmationMessage;
-
-   public static String I18NBundlesModelPropertyPage_NoSourceFolderMessage;
-
-   public static String I18NBundlesPropertyPage_Bundle_Basename_Label;
-
-   public static String I18NBundlesPropertyPage_NoLanguageBundles;
-
-   public static String I18NBundlesValidator_MISSING_VALUE;
-
-   public static String PropertyValuesEditor_NLS;
-
-   public static String PropertyValuesEditor_Value;
-   
-   public static String PropertiesList_PropertyName;
-
-   static
-   {
-      // initialize resource bundle
-      NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-   }
-
-   private Messages()
-   {}
-}
+/*******************************************************************************

+ * 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.model.i18n;

+

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

+

+public class I18N_Messages extends NLS

+{

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

+

+   public static String I18NBundlesModelPropertyPage_DeleteButtonLabel;

+

+   public static String I18NBundlesModelPropertyPage_DeleteConfirmationDialogTitle;

+

+   public static String I18NBundlesModelPropertyPage_DeleteConfirmationMessage;

+

+   public static String I18NBundlesModelPropertyPage_NoSourceFolderMessage;

+

+   public static String I18NBundlesPropertyPage_Bundle_Basename_Label;

+

+   public static String I18NBundlesPropertyPage_NoLanguageBundles;

+

+   public static String I18NBundlesValidator_MISSING_VALUE;

+

+   public static String PropertyValuesEditor_NLS;

+

+   public static String PropertyValuesEditor_Value;

+   

+   public static String PropertiesList_PropertyName;

+

+   static

+   {

+      // initialize resource bundle

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

+   }

+

+   private I18N_Messages()

+   {}

+}

diff --git a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/i18n-messages.properties b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/i18n-messages.properties
new file mode 100644
index 0000000..4d78a79
--- a/dev/null
+++ b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/i18n-messages.properties
@@ -0,0 +1,10 @@
+I18NBundlesModelPropertyPage_DeleteButtonLabel=Delete

+I18NBundlesModelPropertyPage_DeleteConfirmationDialogTitle=Delete

+I18NBundlesModelPropertyPage_DeleteConfirmationMessage=Do you want to delete all properties for locale {0} ?

+I18NBundlesModelPropertyPage_NoSourceFolderMessage=Project has no source folders. Locales cannot be created.

+I18NBundlesPropertyPage_Bundle_Basename_Label=Bundle Basename: 

+I18NBundlesPropertyPage_NoLanguageBundles=There are no language bundles. Please create one in the model properties.

+I18NBundlesValidator_MISSING_VALUE=Missing {1} value for property {0}

+PropertyValuesEditor_NLS=NLS

+PropertyValuesEditor_Value=Value

+PropertiesList_PropertyName=Property Name

diff --git a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/messages.properties b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/messages.properties
deleted file mode 100644
index 299c720..0000000
--- a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/messages.properties
+++ b/dev/null
@@ -1,20 +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
-###############################################################################
-I18NBundlesModelPropertyPage_DeleteButtonLabel=Delete
-I18NBundlesModelPropertyPage_DeleteConfirmationDialogTitle=Delete
-I18NBundlesModelPropertyPage_DeleteConfirmationMessage=Do you want to delete all properties for locale {0} ?
-I18NBundlesModelPropertyPage_NoSourceFolderMessage=Project has no source folders. Locales cannot be created.
-I18NBundlesPropertyPage_Bundle_Basename_Label=Bundle Basename: 
-I18NBundlesPropertyPage_NoLanguageBundles=There are no language bundles. Please create one in the model properties.
-I18NBundlesValidator_MISSING_VALUE=Missing {1} value for property {0}
-PropertyValuesEditor_NLS=NLS
-PropertyValuesEditor_Value=Value
-PropertiesList_PropertyName=Property Name
diff --git a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/I18NBundlesModelPropertyPage.java b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/I18NBundlesModelPropertyPage.java
index 0fcac00..2c77276 100644
--- a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/I18NBundlesModelPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/I18NBundlesModelPropertyPage.java
@@ -21,7 +21,7 @@ import org.eclipse.stardust.model.xpdl.carnot.IModelElementNodeSymbol;
 import org.eclipse.stardust.model.xpdl.carnot.ModelType;
 import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder;
 import org.eclipse.stardust.modeling.core.properties.AbstractModelElementPropertyPage;
-import org.eclipse.stardust.modeling.model.i18n.Messages;
+import org.eclipse.stardust.modeling.model.i18n.I18N_Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
@@ -49,7 +49,7 @@ public class I18NBundlesModelPropertyPage extends AbstractModelElementPropertyPa
    public Control createBody(Composite parent)
    {
       Composite composite = FormBuilder.createComposite(parent, 2);
-      FormBuilder.createLabel(composite, Messages.I18NBundlesPropertyPage_Bundle_Basename_Label);
+      FormBuilder.createLabel(composite, I18N_Messages.I18NBundlesPropertyPage_Bundle_Basename_Label);
       if (getModelElement() instanceof ModelType)
       {
          baseNameText = FormBuilder.createText(composite);
@@ -100,7 +100,7 @@ public class I18NBundlesModelPropertyPage extends AbstractModelElementPropertyPa
    public void contributeButtons(Composite parent)
    {
       ((GridLayout) parent.getLayout()).numColumns++;
-      deleteButton = FormBuilder.createButton(parent, Messages.I18NBundlesModelPropertyPage_DeleteButtonLabel, new SelectionListener()
+      deleteButton = FormBuilder.createButton(parent, I18N_Messages.I18NBundlesModelPropertyPage_DeleteButtonLabel, new SelectionListener()
       {
          public void widgetDefaultSelected(SelectionEvent e)
          {
@@ -110,9 +110,9 @@ public class I18NBundlesModelPropertyPage extends AbstractModelElementPropertyPa
          {
             Locale locale = localesList.getSelectedNLS();
             if (MessageDialog.openConfirm(getShell(),
-                  Messages.I18NBundlesModelPropertyPage_DeleteConfirmationDialogTitle,
+                  I18N_Messages.I18NBundlesModelPropertyPage_DeleteConfirmationDialogTitle,
                   MessageFormat.format(
-                        Messages.I18NBundlesModelPropertyPage_DeleteConfirmationMessage,
+                        I18N_Messages.I18NBundlesModelPropertyPage_DeleteConfirmationMessage,
                         new Object[] {locale.getDisplayName()})))
             {
                model.deleteNls(localesList.getSelectedNLS());
@@ -137,7 +137,7 @@ public class I18NBundlesModelPropertyPage extends AbstractModelElementPropertyPa
       
       if (!model.hasSourceFolders())
       {
-         setErrorMessage(Messages.I18NBundlesModelPropertyPage_NoSourceFolderMessage);
+         setErrorMessage(I18N_Messages.I18NBundlesModelPropertyPage_NoSourceFolderMessage);
       }
    }
 
diff --git a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/I18NBundlesPropertyPage.java b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/I18NBundlesPropertyPage.java
index 665889f..bd4a9c2 100644
--- a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/I18NBundlesPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/I18NBundlesPropertyPage.java
@@ -17,7 +17,7 @@ import org.eclipse.stardust.model.xpdl.carnot.IModelElement;
 import org.eclipse.stardust.model.xpdl.carnot.IModelElementNodeSymbol;
 import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder;
 import org.eclipse.stardust.modeling.core.properties.AbstractModelElementPropertyPage;
-import org.eclipse.stardust.modeling.model.i18n.Messages;
+import org.eclipse.stardust.modeling.model.i18n.I18N_Messages;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Control;
 
 public class I18NBundlesPropertyPage extends AbstractModelElementPropertyPage
 {
-   private static String MESSAGE = Messages.I18NBundlesPropertyPage_Bundle_Basename_Label;
+   private static String MESSAGE = I18N_Messages.I18NBundlesPropertyPage_Bundle_Basename_Label;
    
    private PropertiesList propertiesList;
    private PropertyValuesEditor valuesEditor;
@@ -88,7 +88,7 @@ public class I18NBundlesPropertyPage extends AbstractModelElementPropertyPage
    {
       if (!model.getPropertyModel().hasLocales())
       {
-         setMessage(Messages.I18NBundlesPropertyPage_NoLanguageBundles, INFORMATION);
+         setMessage(I18N_Messages.I18NBundlesPropertyPage_NoLanguageBundles, INFORMATION);
       }
       else
       {
diff --git a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/LocalesList.java b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/LocalesList.java
index e06c93e..c461199 100644
--- a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/LocalesList.java
+++ b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/LocalesList.java
@@ -28,7 +28,7 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.stardust.common.CollectionUtils;
 import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder;
 import org.eclipse.stardust.modeling.model.i18n.Activator;
-import org.eclipse.stardust.modeling.model.i18n.Messages;
+import org.eclipse.stardust.modeling.model.i18n.I18N_Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -38,7 +38,7 @@ public class LocalesList implements IPropertyModelListener
 {
    private static final String NEW_LOCALE_PLACEHOLDER = ""; //$NON-NLS-1$
 
-   private static final String[] columnProperties = new String[] {Messages.PropertyValuesEditor_NLS};
+   private static final String[] columnProperties = new String[] {I18N_Messages.PropertyValuesEditor_NLS};
    
    private TableViewer viewer;
    private PropertyModel model;
diff --git a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/PropertiesList.java b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/PropertiesList.java
index 6e83d8b..a2d48ac 100644
--- a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/PropertiesList.java
+++ b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/PropertiesList.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder;
-import org.eclipse.stardust.modeling.model.i18n.Messages;
+import org.eclipse.stardust.modeling.model.i18n.I18N_Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
@@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Table;
 public class PropertiesList implements IPropertyModelListener
 {
    private static final String[] columnProperties = new String[] {
-      Messages.PropertiesList_PropertyName};
+      I18N_Messages.PropertiesList_PropertyName};
    
    private TableViewer viewer;
    private ScopedPropertyModel model;
diff --git a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/PropertyValuesEditor.java b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/PropertyValuesEditor.java
index 8dbd5cb..3a4b262 100644
--- a/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/PropertyValuesEditor.java
+++ b/modeling/org.eclipse.stardust.modeling.model.i18n/src/org/eclipse/stardust/modeling/model/i18n/properties/PropertyValuesEditor.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder;
-import org.eclipse.stardust.modeling.model.i18n.Messages;
+import org.eclipse.stardust.modeling.model.i18n.I18N_Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.TableItem;
 
 public class PropertyValuesEditor implements IPropertyModelListener
 {
-   private static final String[] columnProperties = new String[] {Messages.PropertyValuesEditor_NLS, Messages.PropertyValuesEditor_Value};
+   private static final String[] columnProperties = new String[] {I18N_Messages.PropertyValuesEditor_NLS, I18N_Messages.PropertyValuesEditor_Value};
    private static final String[] updateProperties = new String[] {columnProperties[1]};
    
    private TableViewer viewer;