Bug 482504 - [Composite Structure Diagram]Port position preference

should be removed

 - delete CustomDiagramPreferencePage (allowed with the change of
version from 2.0.x to 3.0.0

Change-Id: I6c2c52fc3a03d05a5103066ece1463772aedddd9
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

2 files changed, 1 insertions, 63 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/CustomDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/CustomDiagramPreferencePage.java
deleted file mode 100644
index 8fef8c7964a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/CustomDiagramPreferencePage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2009-2011 CEA LIST.
- *
- *
- * 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:
- *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.diagram.composite.custom.preferences;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramGeneralPreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Group;
-
-public class CustomDiagramPreferencePage extends DiagramGeneralPreferencePage {
-
-	public static String IS_INSIDE_COMPOSITE_COMPOSITE_DIAGRAM = "isInsideComposite_CompositeDiagram"; //$NON-NLS-1$
-
-	public CustomDiagramPreferencePage() {
-		super();
-	}
-
-	@Override
-	public void createFieldEditors() {
-		Group group = createGroup("Port position");
-		addField(new BooleanFieldEditor(IS_INSIDE_COMPOSITE_COMPOSITE_DIAGRAM, "is inside the composite", group));
-
-	}
-
-	/**
-	 * Initialize preferences.
-	 */
-	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(IS_INSIDE_COMPOSITE_COMPOSITE_DIAGRAM, false);
-	}
-
-	private Group createGroup(String text) {
-		Group group = new Group(getFieldEditorParent(), SWT.NONE);
-		// group.setLayout(new GridLayout(1, false));
-
-		GridLayout gridLayout = new GridLayout(2, false);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.grabExcessHorizontalSpace = true;
-		gridData.horizontalSpan = 2;
-
-		group.setLayoutData(gridData);
-		group.setLayout(gridLayout);
-
-		group.setText(text);
-
-		return group;
-	}
-}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
index 2609f2f3211..099ad5dfd8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
@@ -46,7 +46,7 @@
             id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.CompositeStructure"

             name="CompositeStructure Diagram"

             category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"

-            class="org.eclipse.papyrus.uml.diagram.composite.custom.preferences.CustomDiagramPreferencePage">

+            class="org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramGeneralPreferencePage">

       </page>

       

       <page