Bug 516893 - [Internationalization][Performances] Load of

internationalization of external files decrease performances
https://bugs.eclipse.org/bugs/show_bug.cgi?id=516893

- Change internationalization preference title
- The internationalization model preference in welcome page are not set
if the internationalization preference is not enabled
- The label fields are read-only if the internationalization preference
is not enabled

Change-Id: Iaa36787ce0a097a69e925c0c657cc8e462de08ac
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>

8 files changed, 24 insertions, 12 deletions

diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/LanguageObservableValue.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/LanguageObservableValue.java
index 062a8556070..66de9cb1a72 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/LanguageObservableValue.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/LanguageObservableValue.java
@@ -88,6 +88,10 @@ public class LanguageObservableValue extends AbstractObservableValue<String> imp
 	 */
 	@Override
 	protected String doGetValue() {
+		if(!InternationalizationPreferencesUtils.isInternationalizationNeedToBeLoaded()) {
+			return ""; //$NON-NLS-1$
+		}
+		
 		final InternationalizationPreferenceModel model = InternationalizationPreferenceModelUtils.getInternationalizationPreferenceModel((ModelSet) domain.getResourceSet());
 		return InternationalizationPreferencesUtils.getLocalePreference(model.getPrivateResourceURI()).toString();
 	}
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/PrivateInternationalizationPreferenceObservableValue.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/PrivateInternationalizationPreferenceObservableValue.java
index 8ec4e6ad70b..e4528b58011 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/PrivateInternationalizationPreferenceObservableValue.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/PrivateInternationalizationPreferenceObservableValue.java
@@ -29,6 +29,7 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.editor.welcome.internationalization.Activator;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet;
 import org.eclipse.papyrus.infra.internationalization.commands.InternationalizationPreferenceCommandFactory;
+import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
 import org.eclipse.papyrus.infra.internationalization.modelresource.InternationalizationPreferenceModel;
 import org.eclipse.papyrus.infra.internationalization.utils.InternationalizationPreferenceModelUtils;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
@@ -99,6 +100,10 @@ public class PrivateInternationalizationPreferenceObservableValue extends Abstra
 	 */
 	@Override
 	protected Boolean doGetValue() {
+		if(!InternationalizationPreferencesUtils.isInternationalizationNeedToBeLoaded()) {
+			return false;
+		}
+		
 		return internationalizationPrefModel.isLegacyMode();
 	}
 
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/UseInternationalizationObservableValue.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/UseInternationalizationObservableValue.java
index d90e174f181..c6f9c054542 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/UseInternationalizationObservableValue.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/modelelements/UseInternationalizationObservableValue.java
@@ -76,6 +76,9 @@ public class UseInternationalizationObservableValue extends AbstractObservableVa
 	 */
 	@Override
 	protected Boolean doGetValue() {
+		if(!InternationalizationPreferencesUtils.isInternationalizationNeedToBeLoaded()) {
+			return false;
+		}
 		final InternationalizationPreferenceModel model = InternationalizationPreferenceModelUtils.getInternationalizationPreferenceModel((ModelSet) domain.getResourceSet());
 		return InternationalizationPreferencesUtils.getInternationalizationPreference(model.getPrivateResourceURI());
 	}
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/widgets/editors/LanguageDialog.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/widgets/editors/LanguageDialog.java
index fe3fbcfaf58..3a372dc3e55 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/widgets/editors/LanguageDialog.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.editor.welcome.internationalization/src/org/eclipse/papyrus/infra/editor/welcome/internationalization/widgets/editors/LanguageDialog.java
@@ -123,14 +123,16 @@ public class LanguageDialog extends AbstractValueEditor implements SelectionList
 	public void setModelObservable(final IObservableValue modelProperty) {
 		super.setModelObservable(modelProperty);
 
-		if (modelProperty instanceof IObserving) {
-			Object observed = ((IObserving) modelProperty).getObserved();
-			if (observed instanceof URI) {
-				URI resourceURI = (URI) observed;
-				dialog.setResourceURI(resourceURI);
-
-				final String localeAsString = InternationalizationPreferencesUtils.getLocalePreference(resourceURI).toString();
-				currentValueLabel.setText(localeAsString);
+		if(InternationalizationPreferencesUtils.isInternationalizationNeedToBeLoaded()) {
+			if (modelProperty instanceof IObserving) {
+				Object observed = ((IObserving) modelProperty).getObserved();
+				if (observed instanceof URI) {
+					URI resourceURI = (URI) observed;
+					dialog.setResourceURI(resourceURI);
+	
+					final String localeAsString = InternationalizationPreferencesUtils.getLocalePreference(resourceURI).toString();
+					currentValueLabel.setText(localeAsString);
+				}
 			}
 		}
 	}
diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/Messages.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/Messages.java
index da9610e02f3..d615df9f95b 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/Messages.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/Messages.java
@@ -20,7 +20,6 @@ public class Messages extends NLS {
 	public static String InternationalizationDialog_UseInternationalizationLabel;

 	public static String InternationalizationPreferencePage_LoadInternationalizationFieldName;

 	public static String InternationalizationPreferencePage_LoadInternationalizationOfExternalFilesFieldName;

-	public static String InternationalizationPreferencePage_Title;

 	static {

 		// initialize resource bundle

 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/messages.properties b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/messages.properties
index 2d968ad0659..3172486c01a 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/messages.properties
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/messages/messages.properties
@@ -1,4 +1,3 @@
 InternationalizationDialog_UseInternationalizationLabel=Use internationalization

 InternationalizationPreferencePage_LoadInternationalizationFieldName=Load internationalization files (needs a reload of models).

 InternationalizationPreferencePage_LoadInternationalizationOfExternalFilesFieldName=Load internationalization of external files (profiles, imported packages, ...) (needs a reload of models).

-InternationalizationPreferencePage_Title=Internationalization Preferences

diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/preferences/pages/InternationalizationPreferencePage.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/preferences/pages/InternationalizationPreferencePage.java
index 13062557c29..ff719c8eb43 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/preferences/pages/InternationalizationPreferencePage.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.ui/src/org/eclipse/papyrus/infra/internationalization/ui/preferences/pages/InternationalizationPreferencePage.java
@@ -32,7 +32,6 @@ public class InternationalizationPreferencePage extends FieldEditorPreferencePag
 	public InternationalizationPreferencePage() {

 		super(GRID);

 		setPreferenceStore(Activator.getDefault().getPreferenceStore());

-		setDescription(Messages.InternationalizationPreferencePage_Title);

 	}

 

 	/**

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
index 70d877af5e8..ac1a1bf434e 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElement.java
@@ -42,6 +42,7 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.HistoryUtil;
+import org.eclipse.papyrus.infra.internationalization.common.utils.InternationalizationPreferencesUtils;
 import org.eclipse.papyrus.infra.internationalization.utils.utils.InternationalizationConstants;
 import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
 import org.eclipse.papyrus.infra.properties.ui.providers.FeatureContentProvider;
@@ -119,7 +120,7 @@ public class UMLModelElement extends EMFModelElement {
 	@Override
 	public IObservable doGetObservable(final String propertyPath) {
 		IObservable value = null;
-		if (InternationalizationConstants.LABEL_PROPERTY_PATH.equals(propertyPath)) {
+		if (InternationalizationConstants.LABEL_PROPERTY_PATH.equals(propertyPath) && InternationalizationPreferencesUtils.isInternationalizationNeedToBeLoaded()) {
 			value = new UMLLabelObservableValue((NamedElement) source, domain);
 		} else if (InternationalizationConstants.KEYWORD_PROPERTY_PATH.equals(propertyPath)) {
 			value = new KeywordObservableValue((Stereotype) source, domain);