diff options
| author | Maxime PORHEL | 2014-03-26 11:11:31 +0000 |
|---|---|---|
| committer | Maxime PORHEL | 2014-03-28 14:20:30 +0000 |
| commit | b6bcacd2043f6eac174854d959200140554de8b2 (patch) | |
| tree | 9d892e336922c530d860be511d24aa350e75b3b9 | |
| parent | 9057209399349d6280f2cf3bd8e6ae24f876f895 (diff) | |
| download | org.eclipse.sirius-b6bcacd2043f6eac174854d959200140554de8b2.tar.gz org.eclipse.sirius-b6bcacd2043f6eac174854d959200140554de8b2.tar.xz org.eclipse.sirius-b6bcacd2043f6eac174854d959200140554de8b2.zip | |
[431390] Rename DesignerUIPreferencesKeys into SiriusUIPreferencesKeys
Change-Id: Ic64aec677200914327796a78bf00f6ebf12628cf
Signed-off-by: Maxime PORHEL <maxime.porhel@obeo.fr>
11 files changed, 40 insertions, 27 deletions
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release Notes.html index 93fa9483d6..b7ab8e5091 100644 --- a/plugins/org.eclipse.sirius.doc/doc/Release Notes.html +++ b/plugins/org.eclipse.sirius.doc/doc/Release Notes.html @@ -235,6 +235,15 @@ </ul> </li> </ul> + <h4 id="Changesinorg.eclipse.sirius.ui">Changes in + <code>org.eclipse.sirius.ui</code> + </h4> + <ul> + <li> + <code>org.eclipse.sirius.ui.business.api.preferences.DesignerUIPreferencesKeys</code> has been renamed into + <code>org.eclipse.sirius.ui.business.api.preferences.SiriusUIPreferencesKeys</code> + </li> + </ul> <h4 id="Changesinorg.eclipse.sirius.tests.support">Changes in <code>org.eclipse.sirius.tests.support</code> </h4> @@ -343,7 +352,7 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. <code>new org.eclipse.sirius.business.api.query.EObjectQuery(element).getParentDiagram()</code> instead. </li> </ul> - <h4 id="Changesinorg.eclipse.sirius.ui">Changes in + <h4 id="Changesinorg.eclipse.sirius.ui2">Changes in <code>org.eclipse.sirius.ui</code> </h4> <ul> @@ -503,7 +512,7 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. <code>DCellQuery.getExportableLabel()</code> to compute the cell labels used in HTML export. </li> </ul> - <h4 id="Changesinorg.eclipse.sirius.ui2">Changes in + <h4 id="Changesinorg.eclipse.sirius.ui3">Changes in <code>org.eclipse.sirius.ui</code> </h4> <ul> @@ -753,7 +762,7 @@ if (rootPackage != null && rootPackage.getNsURI().equals(DiagramPackage. <code>ECrossReferenceAdapter</code> can be null. </li> </ul> - <h4 id="Changesinorg.eclipse.sirius.ui3">Changes in + <h4 id="Changesinorg.eclipse.sirius.ui4">Changes in <code>org.eclipse.sirius.ui</code> </h4> <ul> diff --git a/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile index acd93dbf96..af966d0354 100644 --- a/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile +++ b/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile @@ -68,6 +68,10 @@ h4. Changes in @org.eclipse.sirius@ * @org.eclipse.sirius.business.api.query.URIQuery.isSiriusEnvironmentURI@ has been replaced by ** @isSiriusCoreEnvironmentURI@ which checks that the given resource is the Sirius core Environment.xmi file. ** and @isEnvironmentURI@ which checks that the given resource has an @environment@ uri scheme. + +h4. Changes in @org.eclipse.sirius.ui@ + +* @org.eclipse.sirius.ui.business.api.preferences.DesignerUIPreferencesKeys@ has been renamed into @org.eclipse.sirius.ui.business.api.preferences.SiriusUIPreferencesKeys@ h4. Changes in @org.eclipse.sirius.tests.support@ diff --git a/plugins/org.eclipse.sirius.ui/plugin.xml b/plugins/org.eclipse.sirius.ui/plugin.xml index 7e4fc0d290..a40a50b7b1 100644 --- a/plugins/org.eclipse.sirius.ui/plugin.xml +++ b/plugins/org.eclipse.sirius.ui/plugin.xml @@ -180,7 +180,7 @@ <extension point="org.eclipse.ui.preferencePages"> <page - class="org.eclipse.sirius.ui.tools.internal.preference.DesignerPreferencePage" + class="org.eclipse.sirius.ui.tools.internal.preference.SiriusPreferencePage" id="org.eclipse.sirius.ui.page" name="Sirius"> </page> diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java index f9563f1638..e9f83b3e58 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/SiriusEditPlugin.java @@ -47,7 +47,7 @@ import org.eclipse.sirius.business.api.preferences.SiriusPreferencesKeys; import org.eclipse.sirius.common.tools.api.util.EclipseUtil; import org.eclipse.sirius.tools.api.command.ui.UICallBack; import org.eclipse.sirius.tools.api.preferences.DCorePreferences; -import org.eclipse.sirius.ui.business.api.preferences.DesignerUIPreferencesKeys; +import org.eclipse.sirius.ui.business.api.preferences.SiriusUIPreferencesKeys; import org.eclipse.sirius.ui.business.internal.dialect.LogThroughActiveDialectEditorLogListener; import org.eclipse.sirius.ui.business.internal.session.GenericSWTCallBack; import org.eclipse.sirius.ui.business.internal.session.factory.UISessionFactoryDescriptorRegistryListener; @@ -252,7 +252,7 @@ public final class SiriusEditPlugin extends EMFPlugin { /* should be in dialect ui, and not in the start stop of the plugin */ getPreferenceStore().addPropertyChangeListener(new IPropertyChangeListener() { public void propertyChange(PropertyChangeEvent event) { - DialectManager.INSTANCE.setRefreshActivatedOnRepresentationOpening(getPreferenceStore().getBoolean(DesignerUIPreferencesKeys.PREF_REFRESH_ON_REPRESENTATION_OPENING.name())); + DialectManager.INSTANCE.setRefreshActivatedOnRepresentationOpening(getPreferenceStore().getBoolean(SiriusUIPreferencesKeys.PREF_REFRESH_ON_REPRESENTATION_OPENING.name())); } }); /* @@ -260,7 +260,7 @@ public final class SiriusEditPlugin extends EMFPlugin { * should be in DialectUI init */ if (DialectManager.INSTANCE != null) - DialectManager.INSTANCE.setRefreshActivatedOnRepresentationOpening(getPreferenceStore().getBoolean(DesignerUIPreferencesKeys.PREF_REFRESH_ON_REPRESENTATION_OPENING.name())); + DialectManager.INSTANCE.setRefreshActivatedOnRepresentationOpening(getPreferenceStore().getBoolean(SiriusUIPreferencesKeys.PREF_REFRESH_ON_REPRESENTATION_OPENING.name())); } private void reflectAllPreferencesOnCore() { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/preferences/DesignerUIPreferencesKeys.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/preferences/SiriusUIPreferencesKeys.java index ff2cf39854..e7c2cfe4a5 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/preferences/DesignerUIPreferencesKeys.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/preferences/SiriusUIPreferencesKeys.java @@ -15,7 +15,7 @@ package org.eclipse.sirius.ui.business.api.preferences; * * @author ymortier */ -public enum DesignerUIPreferencesKeys { +public enum SiriusUIPreferencesKeys { /** * Says if the refresh should automatically be done on representation diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/LogThroughActiveDialectEditorLogListener.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/LogThroughActiveDialectEditorLogListener.java index 142942337b..9e3ad7b7a9 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/LogThroughActiveDialectEditorLogListener.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/dialect/LogThroughActiveDialectEditorLogListener.java @@ -21,7 +21,7 @@ import org.eclipse.sirius.business.api.session.SessionManager; import org.eclipse.sirius.common.ui.tools.api.util.EclipseUIUtil; import org.eclipse.sirius.ecore.extender.business.api.permission.exception.LockedInstanceException; import org.eclipse.sirius.ui.business.api.dialect.DialectEditor; -import org.eclipse.sirius.ui.business.api.preferences.DesignerUIPreferencesKeys; +import org.eclipse.sirius.ui.business.api.preferences.SiriusUIPreferencesKeys; import org.eclipse.sirius.ui.tools.internal.views.common.navigator.SiriusCommonLabelProvider; import org.eclipse.sirius.viewpoint.DRepresentation; import org.eclipse.sirius.viewpoint.DRepresentationElement; @@ -68,10 +68,10 @@ public final class LogThroughActiveDialectEditorLogListener implements ILogListe final Throwable exception = getFinalCause(status); // Step 1: check preferences (should indicate that errors should be // logged through a pop-up) - if (SiriusEditPlugin.getPlugin().getPreferenceStore().getBoolean(DesignerUIPreferencesKeys.PREF_REACT_TO_PERMISSION_ISSUES_BY_GRAPHICAL_DISPLAY.name())) { + if (SiriusEditPlugin.getPlugin().getPreferenceStore().getBoolean(SiriusUIPreferencesKeys.PREF_REACT_TO_PERMISSION_ISSUES_BY_GRAPHICAL_DISPLAY.name())) { // Step 2: logging this error using a through the dialect if // possible and required - if (SiriusEditPlugin.getPlugin().getPreferenceStore().getBoolean(DesignerUIPreferencesKeys.PREF_DISPLAY_PERMISSION_ISSUES_THROUGH_DIALOG.name())) { + if (SiriusEditPlugin.getPlugin().getPreferenceStore().getBoolean(SiriusUIPreferencesKeys.PREF_DISPLAY_PERMISSION_ISSUES_THROUGH_DIALOG.name())) { IEditorPart activeEditor = EclipseUIUtil.getActiveEditor(); if ((activeEditor != null) && (activeEditor instanceof DialectEditor)) { if (shouldBeLoggedThroughDialect((DialectEditor) activeEditor, exception)) { diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/preference/GenericPreferencesInitializer.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/preference/GenericPreferencesInitializer.java index 3171dcb415..3937a12dcc 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/preference/GenericPreferencesInitializer.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/preference/GenericPreferencesInitializer.java @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.sirius.business.api.preferences.SiriusPreferencesKeys; -import org.eclipse.sirius.ui.business.api.preferences.DesignerUIPreferencesKeys; +import org.eclipse.sirius.ui.business.api.preferences.SiriusUIPreferencesKeys; import org.eclipse.sirius.viewpoint.SiriusPlugin; import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin; @@ -36,11 +36,11 @@ public class GenericPreferencesInitializer extends AbstractPreferenceInitializer final IPreferenceStore uiPreferenceStore = SiriusEditPlugin.getPlugin().getPreferenceStore(); final IEclipsePreferences defaultCorePreferences = DefaultScope.INSTANCE.getNode(SiriusPlugin.ID); - uiPreferenceStore.setDefault(DesignerUIPreferencesKeys.PREF_REFRESH_ON_REPRESENTATION_OPENING.name(), getValue("_Pref_RefreshOnRepresentationOpening")); - uiPreferenceStore.setDefault(DesignerUIPreferencesKeys.PREF_RELOAD_ON_LAST_EDITOR_CLOSE.name(), getValue("_Pref_ReloadOnLastEditorClose")); - uiPreferenceStore.setDefault(DesignerUIPreferencesKeys.PREF_SAVE_WHEN_NO_EDITOR.name(), getValue("_Pref_SaveWhenNoEditor")); - uiPreferenceStore.setDefault(DesignerUIPreferencesKeys.PREF_REACT_TO_PERMISSION_ISSUES_BY_GRAPHICAL_DISPLAY.name(), getValue("_Pref_ReactToPermissionIssuesByDisplayingPopup")); - uiPreferenceStore.setDefault(DesignerUIPreferencesKeys.PREF_DISPLAY_PERMISSION_ISSUES_THROUGH_DIALOG.name(), getValue("_Pref_DisplayPermissionIssuesThroughDialog")); + uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_REFRESH_ON_REPRESENTATION_OPENING.name(), getValue("_Pref_RefreshOnRepresentationOpening")); + uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_RELOAD_ON_LAST_EDITOR_CLOSE.name(), getValue("_Pref_ReloadOnLastEditorClose")); + uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_SAVE_WHEN_NO_EDITOR.name(), getValue("_Pref_SaveWhenNoEditor")); + uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_REACT_TO_PERMISSION_ISSUES_BY_GRAPHICAL_DISPLAY.name(), getValue("_Pref_ReactToPermissionIssuesByDisplayingPopup")); + uiPreferenceStore.setDefault(SiriusUIPreferencesKeys.PREF_DISPLAY_PERMISSION_ISSUES_THROUGH_DIALOG.name(), getValue("_Pref_DisplayPermissionIssuesThroughDialog")); final boolean autoRefreshDefValue = getValue("_Pref_AutoRefresh"); defaultCorePreferences.putBoolean(SiriusPreferencesKeys.PREF_AUTO_REFRESH.name(), autoRefreshDefValue); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/RestoreToLastSavePointListener.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/RestoreToLastSavePointListener.java index 1830333195..6ac2f572f5 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/RestoreToLastSavePointListener.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/RestoreToLastSavePointListener.java @@ -31,7 +31,7 @@ import org.eclipse.sirius.common.tools.api.resource.ResourceSetSync; import org.eclipse.sirius.common.tools.api.resource.ResourceSetSync.ResourceStatus; import org.eclipse.sirius.common.tools.api.resource.ResourceSyncClient; import org.eclipse.sirius.tools.api.command.EditingDomainUndoContext; -import org.eclipse.sirius.ui.business.api.preferences.DesignerUIPreferencesKeys; +import org.eclipse.sirius.ui.business.api.preferences.SiriusUIPreferencesKeys; import org.eclipse.sirius.viewpoint.SiriusPlugin; import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin; @@ -117,7 +117,7 @@ public class RestoreToLastSavePointListener implements ResourceSyncClient, IOper */ public static boolean isAllowedToReturnToSyncState() { IPreferenceStore preferenceStore = SiriusEditPlugin.getPlugin().getPreferenceStore(); - return preferenceStore != null && preferenceStore.getBoolean(DesignerUIPreferencesKeys.PREF_RELOAD_ON_LAST_EDITOR_CLOSE.name()); + return preferenceStore != null && preferenceStore.getBoolean(SiriusUIPreferencesKeys.PREF_RELOAD_ON_LAST_EDITOR_CLOSE.name()); } /** diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SaveSessionWhenNoDialectEditorsListener.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SaveSessionWhenNoDialectEditorsListener.java index 204c2e1ece..4369fa5d6e 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SaveSessionWhenNoDialectEditorsListener.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/SaveSessionWhenNoDialectEditorsListener.java @@ -24,7 +24,7 @@ import org.eclipse.sirius.business.internal.session.danalysis.SaveSessionJob; import org.eclipse.sirius.common.tools.api.resource.ResourceSetSync; import org.eclipse.sirius.common.tools.api.resource.ResourceSetSync.ResourceStatus; import org.eclipse.sirius.common.tools.api.resource.ResourceSyncClient; -import org.eclipse.sirius.ui.business.api.preferences.DesignerUIPreferencesKeys; +import org.eclipse.sirius.ui.business.api.preferences.SiriusUIPreferencesKeys; import org.eclipse.sirius.ui.business.api.session.EditingSessionEvent; import org.eclipse.sirius.ui.business.api.session.IEditingSession; import org.eclipse.sirius.ui.business.api.session.SessionUIManager; @@ -92,7 +92,7 @@ public class SaveSessionWhenNoDialectEditorsListener implements ResourceSyncClie private boolean newMode() { final IPreferenceStore preferenceStore = SiriusEditPlugin.getPlugin().getPreferenceStore(); - return preferenceStore != null && preferenceStore.getBoolean(DesignerUIPreferencesKeys.PREF_SAVE_WHEN_NO_EDITOR.name()); + return preferenceStore != null && preferenceStore.getBoolean(SiriusUIPreferencesKeys.PREF_SAVE_WHEN_NO_EDITOR.name()); } /** diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/preference/DesignerPreferencePage.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/preference/SiriusPreferencePage.java index 6e2a7ea856..22e23c8398 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/preference/DesignerPreferencePage.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/preference/SiriusPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 THALES GLOBAL SERVICES. + * Copyright (c) 2008, 2014 THALES GLOBAL SERVICES 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 @@ -16,7 +16,7 @@ import org.eclipse.jface.preference.IntegerFieldEditor; import org.eclipse.sirius.business.api.preferences.SiriusPreferencesKeys; import org.eclipse.sirius.common.tools.api.constant.CommonPreferencesConstants; import org.eclipse.sirius.common.ui.SiriusTransPlugin; -import org.eclipse.sirius.ui.business.api.preferences.DesignerUIPreferencesKeys; +import org.eclipse.sirius.ui.business.api.preferences.SiriusUIPreferencesKeys; import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -31,7 +31,7 @@ import org.eclipse.ui.IWorkbenchPreferencePage; * * @author ymortier */ -public class DesignerPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { +public class SiriusPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { /** * Label of the check box emptyAirdFragmentOnControl. @@ -91,7 +91,7 @@ public class DesignerPreferencePage extends FieldEditorPreferencePage implements private void addRefreshFields(Composite parent) { Composite refreshComposite = createGroup(parent, "Refresh"); - refreshOnRepresentationOpening = new BooleanFieldEditor(DesignerUIPreferencesKeys.PREF_REFRESH_ON_REPRESENTATION_OPENING.name(), "Do refresh on representation opening", new Composite( + refreshOnRepresentationOpening = new BooleanFieldEditor(SiriusUIPreferencesKeys.PREF_REFRESH_ON_REPRESENTATION_OPENING.name(), "Do refresh on representation opening", new Composite( refreshComposite, SWT.NONE)); addField(refreshOnRepresentationOpening); diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonLabelProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonLabelProvider.java index 647aea337d..ded132aeba 100644 --- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonLabelProvider.java +++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonLabelProvider.java @@ -25,7 +25,7 @@ import org.eclipse.sirius.business.api.modelingproject.ModelingProject; import org.eclipse.sirius.business.api.session.Session; import org.eclipse.sirius.business.api.session.SessionStatus; import org.eclipse.sirius.ext.base.Option; -import org.eclipse.sirius.ui.business.api.preferences.DesignerUIPreferencesKeys; +import org.eclipse.sirius.ui.business.api.preferences.SiriusUIPreferencesKeys; import org.eclipse.sirius.ui.business.api.session.IEditingSession; import org.eclipse.sirius.ui.business.api.session.SessionUIManager; import org.eclipse.sirius.ui.tools.api.color.VisualBindingManager; @@ -180,7 +180,7 @@ public class SiriusCommonLabelProvider implements ICommonLabelProvider, IColorPr if (session != null && uiSession != null && session.isOpen() && uiSession.isOpen()) { IPreferenceStore preferenceStore = SiriusEditPlugin.getPlugin().getPreferenceStore(); - boolean shouldBeSavedWithoutEditor = preferenceStore != null && preferenceStore.getBoolean(DesignerUIPreferencesKeys.PREF_SAVE_WHEN_NO_EDITOR.name()); + boolean shouldBeSavedWithoutEditor = preferenceStore != null && preferenceStore.getBoolean(SiriusUIPreferencesKeys.PREF_SAVE_WHEN_NO_EDITOR.name()); // When option PREF_SAVE_WHEN_NO_EDITOR is enabled, show dirty // status only when there si no editors to detect bugs. |
