Bug 330453 - [FastView] Should remove preferences related to fast views

from preference pages 


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

4 files changed, 4 insertions, 148 deletions

diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEPerspectivesPreferencePage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEPerspectivesPreferencePage.java
index beda6a7deac..63f4d2aa152 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEPerspectivesPreferencePage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEPerspectivesPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 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
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Denis Zygann <d.zygann@web.de> - Bug 330453
  *******************************************************************************/
 package org.eclipse.ui.internal.ide.dialogs;
 
@@ -57,7 +58,6 @@ public class IDEPerspectivesPreferencePage extends PerspectivesPreferencePage {
         Composite composite = createComposite(parent);
 
         createOpenPerspButtonGroup(composite);
-        createOpenViewButtonGroup(composite);
         createProjectPerspectiveGroup(composite);
         createCustomizePerspective(composite);
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
index 42240f1cb0b..e397c275604 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
@@ -524,13 +524,6 @@ public class WorkbenchMessages extends NLS {
 	public static String OpenPerspectiveMode_sameWindow;
 	public static String OpenPerspectiveMode_newWindow;
 
-	public static String FastViewsGroup_title;
-	public static String OpenViewMode_title;
-	public static String OpenViewMode_embed;
-	public static String OpenViewMode_fast;
-
-	public static String FastViewBar_hide;
-
 	public static String PerspectivesPreference_MakeDefault;
 	public static String PerspectivesPreference_MakeDefaultTip;
 	public static String PerspectivesPreference_Reset;
@@ -701,7 +694,6 @@ public class WorkbenchMessages extends NLS {
 	public static String StandardSystemToolbar_Restore;
 
 	public static String EditorArea_Tooltip;
-	public static String ViewPane_fastView;
 	public static String ViewPane_minimizeView;
 	public static String ViewPane_moveView;
 	public static String ViewPane_moveFolder;
@@ -950,12 +942,6 @@ public class WorkbenchMessages extends NLS {
 	public static String PerspectiveSwitcher_topLeft;
 	public static String PerspectiveSwitcher_left;
 
-
-	public static String FastViewBar_view_orientation;
-	public static String FastViewBar_horizontal;
-	public static String FastViewBar_vertical;
-	public static String FastViewBar_0;
-
 	public static String WorkbenchPlugin_extension;
 
 	public static String EventLoopProgressMonitor_OpenDialogJobName;
@@ -1080,7 +1066,6 @@ public class WorkbenchMessages extends NLS {
     // Trim area Display Names
     public static String TrimCommon_Main_TrimName;
     public static String TrimCommon_PerspectiveSwitcher_TrimName;
-    public static String TrimCommon_FastView_TrimName;
     public static String TrimCommon_HeapStatus_TrimName;
     public static String TrimCommon_IntroBar_TrimName;
     public static String TrimCommon_Progress_TrimName;
@@ -1119,8 +1104,6 @@ public class WorkbenchMessages extends NLS {
 	}
 
 
-    public static String FastViewBar_show_view;
-    
     // Content assist support
     public static String ContentAssist_Cue_Description_Key;
 	
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 62a5f4e0e1c..83c301159fe 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 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
@@ -8,6 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Semion Chichelnitsky (semion@il.ibm.com) - bug 278064
+ *     Denis Zygann <d.zygann@web.de> - Bug 330453
  *******************************************************************************/
 
 package org.eclipse.ui.internal.dialogs;
@@ -52,7 +53,6 @@ import org.eclipse.ui.internal.IWorkbenchHelpContextIds;
 import org.eclipse.ui.internal.Workbench;
 import org.eclipse.ui.internal.WorkbenchMessages;
 import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.WorkbenchWindow;
 import org.eclipse.ui.internal.registry.PerspectiveDescriptor;
 import org.eclipse.ui.internal.registry.PerspectiveRegistry;
 import org.eclipse.ui.internal.util.Descriptors;
@@ -86,8 +86,6 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 	private Button setDefaultButton;
 
 	// widgets for open perspective mode;
-	private Label openViewModeLabel;
-
 	private Button openSameWindowButton;
 
 	private Button openNewWindowButton;
@@ -98,24 +96,8 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 	private int openViewMode;
 
 	private Button openEmbedButton;
-
-	private Button openFastButton;
-
-	private Button fvbHideButton;
-	
-	private boolean isFVBConfigured;
     
 	// labels
-	private final String FVG_TITLE = WorkbenchMessages.FastViewsGroup_title;
-
-	private final String OVM_TITLE = WorkbenchMessages.OpenViewMode_title;
-
-	private final String OVM_EMBED = WorkbenchMessages.OpenViewMode_embed;
-
-	private final String OVM_FAST = WorkbenchMessages.OpenViewMode_fast; 
-
-	private final String FVB_HIDE = WorkbenchMessages.FastViewBar_hide;
-
 	private final String OPM_TITLE = WorkbenchMessages.OpenPerspectiveMode_optionsTitle; 
 
 	private final String OPM_SAME_WINDOW = WorkbenchMessages.OpenPerspectiveMode_sameWindow; 
@@ -149,7 +131,6 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 		Composite composite = createComposite(parent);
 
 		createOpenPerspButtonGroup(composite);
-		createOpenViewButtonGroup(composite);
 		createCustomizePerspective(composite);
 
 		return composite;
@@ -222,78 +203,6 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 	}
 
 	/**
-	 * Creates a composite that contains buttons for selecting open view mode.
-	 * 
-	 * @param composite
-	 *            the parent composite
-	 */
-	protected void createOpenViewButtonGroup(Composite composite) {
-
-		Font font = composite.getFont();
-
-		Group buttonComposite = new Group(composite, SWT.LEFT);
-		buttonComposite.setText(FVG_TITLE);
-		buttonComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		buttonComposite.setFont(composite.getFont());
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		buttonComposite.setLayout(layout);
-
-		openViewModeLabel = new Label(buttonComposite, SWT.NONE);
-		openViewModeLabel.setText(OVM_TITLE);
-		GridData data = new GridData();
-		data.horizontalSpan = 2;
-		openViewModeLabel.setLayoutData(data);
-
-		openEmbedButton = new Button(buttonComposite, SWT.RADIO);
-		openEmbedButton.setText(OVM_EMBED);
-		openEmbedButton
-				.setSelection(openViewMode == IPreferenceConstants.OVM_EMBED);
-		openEmbedButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				openViewMode = IPreferenceConstants.OVM_EMBED;
-			}
-		});
-		openEmbedButton.setFont(font);
-
-		// Open view as float no longer supported
-		if (openViewMode == IPreferenceConstants.OVM_FLOAT) {
-			openViewMode = IPreferenceConstants.OVM_FAST;
-		}
-
-		openFastButton = new Button(buttonComposite, SWT.RADIO);
-		openFastButton.setText(OVM_FAST);
-		openFastButton
-				.setSelection(openViewMode == IPreferenceConstants.OVM_FAST);
-		openFastButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				openViewMode = IPreferenceConstants.OVM_FAST;
-			}
-		});
-		openFastButton.setFont(font);
-
-		createFVBHideButton(buttonComposite);
-	}
-
-	protected void createFVBHideButton(Composite composite) {
-		if (!isFVBConfigured)
-			return;
-		Font font = composite.getFont();
-		fvbHideButton = new Button(composite, SWT.CHECK);
-		GridData data = new GridData();
-		// data.horizontalIndent = 10;
-		data.horizontalSpan = 2;
-		fvbHideButton.setLayoutData(data);
-		fvbHideButton.setText(FVB_HIDE);
-
-		fvbHideButton.setSelection(this.getPreferenceStore().getBoolean(
-				IPreferenceConstants.FVB_HIDE));
-		fvbHideButton.setFont(font);
-	}
-
-	/**
 	 * Create a table of 3 buttons to enable the user to manage customized
 	 * perspectives.
 	 * 
@@ -460,9 +369,6 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 
 		openViewMode = store.getInt(IPreferenceConstants.OPEN_VIEW_MODE);
 		openPerspMode = store.getInt(IPreferenceConstants.OPEN_PERSP_MODE);
-		isFVBConfigured = ((WorkbenchWindow) workbench
-				.getActiveWorkbenchWindow()).getShowFastViewBars();
-
 	}
 
 	/**
@@ -481,12 +387,6 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 		}
 		openEmbedButton
 				.setSelection(openViewMode == IPreferenceConstants.OVM_EMBED);
-		openFastButton
-				.setSelection(openViewMode == IPreferenceConstants.OVM_FAST);
-
-		if (isFVBConfigured)
-			fvbHideButton.setSelection(store
-					.getDefaultBoolean(IPreferenceConstants.FVB_HIDE));
 
 		openPerspMode = store
 				.getDefaultInt(IPreferenceConstants.OPEN_PERSP_MODE);
@@ -600,17 +500,6 @@ public class PerspectivesPreferencePage extends PreferencePage implements
 		// store the open view mode setting
 		store.setValue(IPreferenceConstants.OPEN_VIEW_MODE, openViewMode);
 
-		if (isFVBConfigured) {
-			store.setValue(IPreferenceConstants.FVB_HIDE, fvbHideButton
-					.getSelection());
-			// WorkbenchPage page = (WorkbenchPage) workbench
-			// .getActiveWorkbenchWindow().getActivePage();
-			// FastViewManager fvm = page.getActivePerspective()
-			// .getFastViewManager();
-			// if (fvm != null)
-			// fvm.updateTrim(FastViewBar.FASTVIEWBAR_ID);
-		}
-
 		// store the open perspective mode setting
 		store.setValue(IPreferenceConstants.OPEN_PERSP_MODE, openPerspMode);
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
index d00fd1da2b8..65ed323c3f4 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
@@ -473,13 +473,6 @@ OpenPerspectiveMode_optionsTitle = Open a new perspective
 OpenPerspectiveMode_sameWindow = In the &same window
 OpenPerspectiveMode_newWindow = In a &new window
 
-FastViewsGroup_title = Fast Views
-OpenViewMode_title = Open a new view:
-OpenViewMode_embed = &Within the perspective
-OpenViewMode_fast = As &fast view
-
-FastViewBar_hide = &Hide empty fast view bar 
-
 PerspectivesPreference_MakeDefault = Ma&ke Default
 PerspectivesPreference_MakeDefaultTip = Make the Current Selection the Default Perspective
 PerspectivesPreference_Reset = &Revert
@@ -658,7 +651,6 @@ StandardSystemToolbar_Maximize = Maximize
 StandardSystemToolbar_Restore = Restore
 
 EditorArea_Tooltip = Editor Area
-ViewPane_fastView = &Fast View
 ViewPane_minimizeView= Mi&nimize
 ViewPane_moveView=&View
 ViewPane_moveFolder=&Tab Group
@@ -911,13 +903,6 @@ PerspectiveSwitcher_topRight=Top Right
 PerspectiveSwitcher_topLeft=Top Left
 PerspectiveSwitcher_left=Left
 
-
-FastViewBar_view_orientation=&Orientation
-FastViewBar_horizontal=&Horizontal
-FastViewBar_vertical=&Vertical
-FastViewBar_show_view=&New Fast View
-FastViewBar_0=Show View as a fast view
-
 WorkbenchPlugin_extension=Cannot create extension
 
 EventLoopProgressMonitor_OpenDialogJobName=Open Blocked Dialog
@@ -1066,7 +1051,6 @@ TrimCommon_Close=&Close
 # Trim Display Names
 TrimCommon_Main_TrimName=&Main Toolbar
 TrimCommon_PerspectiveSwitcher_TrimName=&Perspective Switcher
-TrimCommon_FastView_TrimName=&Fast View Bar
 TrimCommon_HeapStatus_TrimName=&Heap Status
 TrimCommon_IntroBar_TrimName=&Welcome
 TrimCommon_Progress_TrimName=&Progress