Attachment 144617 Details for Bug 278064 – The second version of the patch.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] The second version of the patch.

patch278064_2 (text/plain), 16.12 KB, created by Semion Chichelnitsky

on 2009-08-16 05:48:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Semion Chichelnitsky

Created: 2009-08-16 05:48:57 EDT

Size: 16.12 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java,v
>retrieving revision 1.40
>diff -u -r1.40 WorkbenchPreferenceInitializer.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java	6 May 2008 19:06:55 -0000	1.40
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchPreferenceInitializer.java	16 Aug 2009 09:45:16 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 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
>+ *     Semion Chichelnitsky (semion@il.ibm.com) - bug 278064
>  *******************************************************************************/
> package org.eclipse.ui.internal;
> 
>@@ -65,6 +66,7 @@
> 		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$
>Index: Eclipse UI/org/eclipse/ui/internal/FastViewBar.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/FastViewBar.java,v
>retrieving revision 1.67
>diff -u -r1.67 FastViewBar.java
>--- Eclipse UI/org/eclipse/ui/internal/FastViewBar.java	22 Oct 2008 19:03:25 -0000	1.67
>+++ Eclipse UI/org/eclipse/ui/internal/FastViewBar.java	16 Aug 2009 09:45:14 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2008 IBM Corporation and others.
>+ * Copyright (c) 2004, 2009 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
>  *     Kiryl Kazakevich, Intel - bug 88359
>+ *     Semion Chichelnitsky (semion@il.ibm.com) - bug 278064
>  *******************************************************************************/
> package org.eclipse.ui.internal;
> 
>@@ -16,7 +17,6 @@
> import java.util.Iterator;
> import java.util.List;
> import java.util.Map;
>-
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Status;
>@@ -978,4 +978,7 @@
> 	public boolean isResizeable() {
> 		return false;
> 	}
>+	public void checkVisibility() {
>+		getPerspective().getFastViewManager().updateTrim(FASTVIEWBAR_ID);
>+	}
> }
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java,v
>retrieving revision 1.120
>diff -u -r1.120 WorkbenchMessages.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java	13 Aug 2009 07:17:43 -0000	1.120
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java	16 Aug 2009 09:45:16 -0000
>@@ -8,6 +8,7 @@
>  * Contributors:
>  * IBM - Initial API and implementation
>  * Sebastian Davids - bug 128529
>+ * Semion Chichelnitsky (semion@il.ibm.com) - bug 278064
>  *******************************************************************************/
> package org.eclipse.ui.internal;
> 
>@@ -503,6 +504,8 @@
> 	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;
>Index: Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java,v
>retrieving revision 1.64
>diff -u -r1.64 IPreferenceConstants.java
>--- Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java	11 Apr 2008 18:14:50 -0000	1.64
>+++ Eclipse UI/org/eclipse/ui/internal/IPreferenceConstants.java	16 Aug 2009 09:45:15 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 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
>+ *     Semion Chichelnitsky (semion@il.ibm.com) - bug 278064
>  *******************************************************************************/
> 
> package org.eclipse.ui.internal;
>@@ -61,6 +62,9 @@
> 
>     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$
> 
>Index: Eclipse UI/org/eclipse/ui/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties,v
>retrieving revision 1.402
>diff -u -r1.402 messages.properties
>--- Eclipse UI/org/eclipse/ui/internal/messages.properties	13 Aug 2009 07:17:43 -0000	1.402
>+++ Eclipse UI/org/eclipse/ui/internal/messages.properties	16 Aug 2009 09:45:16 -0000
>@@ -11,6 +11,7 @@
> #        - Fix for Bug 57087
> #        - Fix for Bug 138034 [Preferences] Label decorations page - extra space
> #        - Fix for Bug 128529
>+#     Semion Chichelnitsky (semion@il.ibm.com) - bug 278064
> ###############################################################################
> 
> # package: org.eclipse.ui
>@@ -459,6 +460,8 @@
> 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 = &Reset
>Index: Eclipse UI/org/eclipse/ui/internal/FastViewManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/FastViewManager.java,v
>retrieving revision 1.28
>diff -u -r1.28 FastViewManager.java
>--- Eclipse UI/org/eclipse/ui/internal/FastViewManager.java	25 May 2009 20:52:11 -0000	1.28
>+++ Eclipse UI/org/eclipse/ui/internal/FastViewManager.java	16 Aug 2009 09:45:15 -0000
>@@ -9,6 +9,7 @@
>  *     IBM Corporation - initial API and implementation
>  *     Carlos Devoto carlos.devoto@compuware.com Bug 213645
>  *     Markus Alexander Kuppe, Versant Corporation - bug #215797
>+ *     Semion Chichelnitsky (semion@il.ibm.com) - bug 278064
>  *******************************************************************************/
> 
> package org.eclipse.ui.internal;
>@@ -18,7 +19,6 @@
> import java.util.Iterator;
> import java.util.List;
> import java.util.Map;
>-
> import org.eclipse.core.runtime.MultiStatus;
> import org.eclipse.jface.util.Geometry;
> import org.eclipse.swt.SWT;
>@@ -303,7 +303,7 @@
> 	 * @param id
> 	 *            The id of the {@link IWindowTrim} to update
> 	 */
>-	private void updateTrim(String id) {
>+	void updateTrim(String id) {
> 		// Get the trim part from the trim manager
> 		IWindowTrim trim = tbm.getTrim(id);
> 
>@@ -313,8 +313,10 @@
> 
> 		// If there are no fast views for the bar then hide it
> 		List fvs = (List) idToFastViewsMap.get(id);
>-		if (fvs != null && fvs.size() == 0
>-				&& !FastViewBar.FASTVIEWBAR_ID.equals(id)) {
>+		boolean hideEmptyFVB = WorkbenchPlugin.getDefault()
>+				.getPreferenceStore().getBoolean(IPreferenceConstants.FVB_HIDE);
>+		if ((fvs == null || fvs.size() == 0)
>+				&& (!FastViewBar.FASTVIEWBAR_ID.equals(id) || hideEmptyFVB)) {
> 			if (trim.getControl().getVisible()) {
> 				tbm.setTrimVisible(trim, false);
> 				tbm.forceLayout();
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/META-INF/MANIFEST.MF,v
>retrieving revision 1.64
>diff -u -r1.64 MANIFEST.MF
>--- META-INF/MANIFEST.MF	24 Jun 2009 08:03:36 -0000	1.64
>+++ META-INF/MANIFEST.MF	16 Aug 2009 09:45:17 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.ui.workbench; singleton:=true
>-Bundle-Version: 3.5.100.qualifier
>+Bundle-Version: 3.6.0.qualifier
> Bundle-ClassPath: e4-workbench.jar,
>  compatibility.jar,
>  .
>Index: Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java,v
>retrieving revision 1.35
>diff -u -r1.35 PerspectivesPreferencePage.java
>--- Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java	30 Nov 2007 14:45:11 -0000	1.35
>+++ Eclipse UI/org/eclipse/ui/internal/dialogs/PerspectivesPreferencePage.java	16 Aug 2009 09:45:17 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2007 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 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
>+ *     Semion Chichelnitsky (semion@il.ibm.com) - bug 278064
>  *******************************************************************************/
> 
> package org.eclipse.ui.internal.dialogs;
>@@ -15,7 +16,6 @@
> import java.util.ArrayList;
> import java.util.Collections;
> import java.util.Comparator;
>-
> import org.eclipse.jface.dialogs.IDialogConstants;
> import org.eclipse.jface.dialogs.MessageDialog;
> import org.eclipse.jface.preference.IPreferenceStore;
>@@ -49,6 +49,7 @@
> import org.eclipse.ui.internal.WorkbenchMessages;
> import org.eclipse.ui.internal.WorkbenchPage;
> 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;
>@@ -93,6 +94,9 @@
> 	private Button openEmbedButton;
> 
> 	private Button openFastButton;
>+
>+	private Button fvbHideButton;
>+	private boolean isFVBConfigured;
>     
> 	// labels
> 	private final String OVM_TITLE = WorkbenchMessages.OpenViewMode_title;
>@@ -100,6 +104,7 @@
> 	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; 
> 
>@@ -133,6 +138,7 @@
> 
> 		createOpenPerspButtonGroup(composite);
> 		createOpenViewButtonGroup(composite);
>+		createFVBHideButton(composite);
> 		createCustomizePerspective(composite);
> 
> 		return composite;
>@@ -249,6 +255,21 @@
> 
> 	}
> 
>+	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;
>+		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.
>@@ -413,6 +434,8 @@
> 
> 		openViewMode = store.getInt(IPreferenceConstants.OPEN_VIEW_MODE);
> 		openPerspMode = store.getInt(IPreferenceConstants.OPEN_PERSP_MODE);
>+		isFVBConfigured = ((WorkbenchWindow) workbench
>+				.getActiveWorkbenchWindow()).getShowFastViewBars();
> 	}
> 
> 	/**
>@@ -433,6 +456,10 @@
> 		openFastButton
> 				.setSelection(openViewMode == IPreferenceConstants.OVM_FAST);
> 
>+		if (isFVBConfigured)
>+			fvbHideButton.setSelection(store
>+					.getDefaultBoolean(IPreferenceConstants.FVB_HIDE));
>+
> 		openPerspMode = store
> 				.getDefaultInt(IPreferenceConstants.OPEN_PERSP_MODE);
> 		openSameWindowButton
>@@ -553,6 +580,13 @@
> 		// store the open view mode setting
> 		store.setValue(IPreferenceConstants.OPEN_VIEW_MODE, openViewMode);
> 
>+		if (isFVBConfigured) {
>+			store.setValue(IPreferenceConstants.FVB_HIDE, fvbHideButton
>+					.getSelection());
>+			((WorkbenchWindow) workbench.getActiveWorkbenchWindow())
>+					.getFastViewBar().checkVisibility();
>+		}
>+
> 		// store the open perspective mode setting
> 		store.setValue(IPreferenceConstants.OPEN_PERSP_MODE, openPerspMode);
> 
>#P org.eclipse.ui.ide
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/META-INF/MANIFEST.MF,v
>retrieving revision 1.46
>diff -u -r1.46 MANIFEST.MF
>--- META-INF/MANIFEST.MF	11 May 2009 17:18:19 -0000	1.46
>+++ META-INF/MANIFEST.MF	16 Aug 2009 09:45:19 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %Plugin.name
> Bundle-SymbolicName: org.eclipse.ui.ide; singleton:=true
>-Bundle-Version: 3.5.0.qualifier
>+Bundle-Version: 3.5.100.qualifier
> Bundle-ClassPath: e4-ide.jar,
>  .
> Bundle-Activator: org.eclipse.ui.internal.ide.IDEWorkbenchPlugin
>Index: src/org/eclipse/ui/internal/ide/dialogs/IDEPerspectivesPreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/IDEPerspectivesPreferencePage.java,v
>retrieving revision 1.12
>diff -u -r1.12 IDEPerspectivesPreferencePage.java
>--- src/org/eclipse/ui/internal/ide/dialogs/IDEPerspectivesPreferencePage.java	7 Mar 2005 19:17:39 -0000	1.12
>+++ src/org/eclipse/ui/internal/ide/dialogs/IDEPerspectivesPreferencePage.java	16 Aug 2009 09:45:19 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2005 IBM Corporation and others.
>+ * Copyright (c) 2000, 2009 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
>+ *     Semion Chichelnitsky (semion@il.ibm.com) - bug 278064
>  *******************************************************************************/
> package org.eclipse.ui.internal.ide.dialogs;
> 
>@@ -57,6 +58,7 @@
> 
>         createOpenPerspButtonGroup(composite);
>         createOpenViewButtonGroup(composite);
>+        createFVBHideButton(composite);
>         createProjectPerspectiveGroup(composite);
>         createCustomizePerspective(composite);
>

Actions: View | Diff

Attachments on bug 278064: 143913 | 144617 | 145353 | 145463