Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2012-02-14 05:33:53 -0500
committercletavernie2012-02-14 05:33:53 -0500
commitb77c9cf432654e41df9d514739f15a8e22687072 (patch)
tree36c43dfe8e89f2ddd17d24b06af0792d8df35f17 /plugins/customization/org.eclipse.papyrus.customization.properties
parent53436177a9621a1c1d16bebfdca7fa152bbb4743 (diff)
downloadorg.eclipse.papyrus-b77c9cf432654e41df9d514739f15a8e22687072.tar.gz
org.eclipse.papyrus-b77c9cf432654e41df9d514739f15a8e22687072.tar.xz
org.eclipse.papyrus-b77c9cf432654e41df9d514739f15a8e22687072.zip
371460: [UML Diagram Common] The UML Diagram Common plug-in should be split
https://bugs.eclipse.org/bugs/show_bug.cgi?id=371460
Diffstat (limited to 'plugins/customization/org.eclipse.papyrus.customization.properties')
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt4
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java24
2 files changed, 13 insertions, 15 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt b/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt
index 858ca014eb4..f20ae461153 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/Model/ui/SingleLayoutType.xwt
@@ -10,8 +10,8 @@
<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
</Composite.layout>
<ppe:StringEditor input="{Binding}"
- property="properties:environment:WidgetType:label" showLabel="false"></ppe:StringEditor>
+ property="properties:environment:WidgetType:label"></ppe:StringEditor>
<ppe:StringEditor input="{Binding}"
- property="properties:environment:WidgetType:widgetClass" showLabel="false"></ppe:StringEditor>
+ property="properties:environment:WidgetType:widgetClass"></ppe:StringEditor>
</Composite>
</Composite> \ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
index 040ca422ef7..2c48bdfc7f8 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
@@ -33,8 +33,6 @@ import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
@@ -44,7 +42,6 @@ import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.papyrus.customization.properties.Activator;
import org.eclipse.papyrus.customization.properties.editor.preview.Preview;
import org.eclipse.papyrus.customization.properties.messages.Messages;
-import org.eclipse.papyrus.customization.properties.preferences.CustomizationPreferencePage;
import org.eclipse.papyrus.customization.properties.providers.ContextContentProvider;
import org.eclipse.papyrus.customization.properties.providers.ContextLabelProvider;
import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
@@ -197,16 +194,17 @@ public class UIEditor extends EcoreEditor implements ITabbedPropertySheetPageCon
return;
}
- boolean openPerspective;
-
- if(CustomizationPreferencePage.askForConfirmation()) {
- int defaultIndex = CustomizationPreferencePage.openCustomizationPerspective() ? 0 : 1;
- MessageDialog confirmationDialog = new MessageDialog(getContainer().getShell(), Messages.UIEditor_ChangePerspective, null, Messages.UIEditor_ChangePerspectiveMessage, MessageDialog.QUESTION, new String[]{ IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, defaultIndex);
- confirmationDialog.open();
- openPerspective = confirmationDialog.getReturnCode() == 0;
- } else {
- openPerspective = CustomizationPreferencePage.openCustomizationPerspective();
- }
+ boolean openPerspective = false;
+
+ // if(CustomizationPreferencePage.askForConfirmation()) {
+ // int defaultIndex = CustomizationPreferencePage.openCustomizationPerspective() ? 0 : 1;
+ // System.out.println(getContainer().getShell());
+ // MessageDialog confirmationDialog = new MessageDialog(getContainer().getShell(), Messages.UIEditor_ChangePerspective, null, Messages.UIEditor_ChangePerspectiveMessage, MessageDialog.QUESTION, new String[]{ IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, defaultIndex);
+ // confirmationDialog.open();
+ // openPerspective = confirmationDialog.getReturnCode() == 0;
+ // } else {
+ // openPerspective = CustomizationPreferencePage.openCustomizationPerspective();
+ // }
if(openPerspective) {
try {

Back to the top