Bug 330453 - [FastView] Should remove preferences related to fast viewsI20150127-2000I20150127-0900

from preference pages

Change-Id: Ic8e9bb0c38f474dfa840c7ed21abfc7d9cddf22b
Signed-off-by: Denis Zygann <d.zygann@web.de>

3 files changed, 11 insertions, 41 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java
index 92e3e10f8bd..a17eec9f08e 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation 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
@@ -11,6 +11,7 @@
  *     Tristan Hume - <trishume@gmail.com> -
  *     		Fix for Bug 2369 [Workbench] Would like to be able to save workspace without exiting
  *     		Implemented workbench auto-save to correctly restore state in case of crash.
+ *     Denis Zygann <d.zygann@web.de> - Bug 330453
  *******************************************************************************/
 
 package org.eclipse.ui.internal;
@@ -70,18 +71,6 @@ public interface IPreferenceConstants {
     // menu.
     public static final String RECENT_FILES = "RECENT_FILES"; //$NON-NLS-1$
 
-    // (integer) Mode for opening a view.
-    public static final String OPEN_VIEW_MODE = "OPEN_VIEW_MODE"; //$NON-NLS-1$
-
-    public static final int OVM_EMBED = 0;
-
-    public static final int OVM_FAST = 1;
-
-    public static final int OVM_FLOAT = 2;
-
-	// Boolean: true = hide fast view bar, when it is empty
-	public static final String FVB_HIDE = "FVB_HIDE"; //$NON-NLS-1$
-
     // (int) Mode for opening a new perspective
     public static final String OPEN_PERSP_MODE = "OPEN_PERSPECTIVE_MODE"; //$NON-NLS-1$
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java
index fc2513db1fb..a04949302cb 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation 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
@@ -11,6 +11,7 @@
  *     Tristan Hume - <trishume@gmail.com> -
  *     		Fix for Bug 2369 [Workbench] Would like to be able to save workspace without exiting
  *     		Implemented workbench auto-save to correctly restore state in case of crash.
+ *     Denis Zygann <d.zygann@web.de> - Bug 330453
  *******************************************************************************/
 package org.eclipse.ui.internal;
 
@@ -66,19 +67,16 @@ public class WorkbenchPreferenceInitializer extends
 		// FIXME this does not actually set the default since it is the wrong
 		// node. It works because the default-default is false.
 		node.putBoolean(IWorkbenchPreferenceConstants.DISABLE_OPEN_EDITOR_IN_PLACE, false);
-		
+
 		// 5 minute workbench save interval
 		node.putInt(IPreferenceConstants.WORKBENCH_SAVE_INTERVAL, 5);
 
 		node.putBoolean(IPreferenceConstants.USE_IPERSISTABLE_EDITORS, true);
-		
+
 		node.putBoolean(IPreferenceConstants.COOLBAR_VISIBLE, true);
 		node.putBoolean(IPreferenceConstants.PERSPECTIVEBAR_VISIBLE, true);
 
 		node.putInt(IPreferenceConstants.EDITOR_TAB_WIDTH, 3); // high
-		node.putInt(IPreferenceConstants.OPEN_VIEW_MODE,
-				IPreferenceConstants.OVM_EMBED);
-		node.putBoolean(IPreferenceConstants.FVB_HIDE, false);
 		node.putInt(IPreferenceConstants.OPEN_PERSP_MODE,
 				IPreferenceConstants.OPM_ACTIVE_PAGE);
 		node.put(IPreferenceConstants.ENABLED_DECORATORS, ""); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java
index 83c301159fe..b726abb68b7 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java
@@ -78,7 +78,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 	private ArrayList<IPerspectiveDescriptor> perspToRevert = new ArrayList<IPerspectiveDescriptor>();
 
 	private Table perspectivesTable;
-	
+
 	private Button revertButton;
 
 	private Button deleteButton;
@@ -92,17 +92,12 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 
 	private int openPerspMode;
 
-	// widgets for open view mode
-	private int openViewMode;
-
-	private Button openEmbedButton;
-    
 	// labels
-	private final String OPM_TITLE = WorkbenchMessages.OpenPerspectiveMode_optionsTitle; 
+	private final String OPM_TITLE = WorkbenchMessages.OpenPerspectiveMode_optionsTitle;
 
-	private final String OPM_SAME_WINDOW = WorkbenchMessages.OpenPerspectiveMode_sameWindow; 
+	private final String OPM_SAME_WINDOW = WorkbenchMessages.OpenPerspectiveMode_sameWindow;
 
-	private final String OPM_NEW_WINDOW = WorkbenchMessages.OpenPerspectiveMode_newWindow; 
+	private final String OPM_NEW_WINDOW = WorkbenchMessages.OpenPerspectiveMode_newWindow;
 
 	/**
 	 * <code>Comparator</code> to compare two perspective descriptors
@@ -367,7 +362,6 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 				.getPreferenceStore();
 		setPreferenceStore(store);
 
-		openViewMode = store.getInt(IPreferenceConstants.OPEN_VIEW_MODE);
 		openPerspMode = store.getInt(IPreferenceConstants.OPEN_PERSP_MODE);
 	}
 
@@ -380,14 +374,6 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 		IPreferenceStore store = WorkbenchPlugin.getDefault()
 				.getPreferenceStore();
 
-		openViewMode = store.getDefaultInt(IPreferenceConstants.OPEN_VIEW_MODE);
-		// Open view as float no longer supported
-		if (openViewMode == IPreferenceConstants.OVM_FLOAT) {
-			openViewMode = IPreferenceConstants.OVM_FAST;
-		}
-		openEmbedButton
-				.setSelection(openViewMode == IPreferenceConstants.OVM_EMBED);
-
 		openPerspMode = store
 				.getDefaultInt(IPreferenceConstants.OPEN_PERSP_MODE);
 		openSameWindowButton
@@ -396,7 +382,7 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 				.setSelection(IPreferenceConstants.OPM_NEW_WINDOW == openPerspMode);
 
 		String currentDefault = perspectiveRegistry.getDefaultPerspective();
-		
+
 		int index = indexOf(currentDefault);
 		if (index >= 0){
 			defaultPerspectiveId = currentDefault;
@@ -497,9 +483,6 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 
 		IPreferenceStore store = getPreferenceStore();
 
-		// store the open view mode setting
-		store.setValue(IPreferenceConstants.OPEN_VIEW_MODE, openViewMode);
-
 		// store the open perspective mode setting
 		store.setValue(IPreferenceConstants.OPEN_PERSP_MODE, openPerspMode);