Attachment 229515 Details for Bug 403872 – Possible fix for 3.4.2

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

[patch] Possible fix for 3.4.2

bug403872 _34m_patch.txt (text/plain), 5.27 KB, created by Dani Megert

on 2013-04-09 11:59:15 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2013-04-09 11:59:15 EDT

Size: 5.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/activities/IWorkbenchActivitySupport.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/activities/IWorkbenchActivitySupport.java,v
>retrieving revision 1.13
>diff -u -r1.13 IWorkbenchActivitySupport.java
>--- Eclipse UI/org/eclipse/ui/activities/IWorkbenchActivitySupport.java	9 May 2008 14:13:12 -0000	1.13
>+++ Eclipse UI/org/eclipse/ui/activities/IWorkbenchActivitySupport.java	9 Apr 2013 15:51:25 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2008 IBM Corporation and others.
>+ * Copyright (c) 2003, 2013 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
>@@ -36,7 +36,8 @@
>     IActivityManager getActivityManager();
> 
>     /**
>-     * Sets the set of identifiers to enabled activities.
>+     * Sets the set of identifiers to enabled activities and saves
>+     * the workbench plug-in preferences.
>      * 
>      * @param enabledActivityIds
>      *            the set of identifiers to enabled activities. This set may be
>@@ -44,7 +45,20 @@
>      *            is not empty, it must only contain instances of <code>String</code>.
>      */
>     void setEnabledActivityIds(Set enabledActivityIds);
>-    
>+
>+    /**
>+     * Sets the set of identifiers to enabled activities.
>+     * 
>+     * @param enabledActivityIds
>+     *            the set of identifiers to enabled activities. This set may be
>+     *            empty, but it must not be <code>null</code>. If this set
>+     *            is not empty, it must only contain instances of <code>String</code>.
>+     * @param savePluginPreferences
>+     *            <code>true</code> if the workbench plug-in preferences should be saved, <code>false</code> otherwise
>+     * @since N/A - not part of any official build
>+     */
>+    void setEnabledActivityIds(Set enabledActivityIds, boolean savePluginPreferences);
>+
>     /**
>      * Return the image associated with this activity.
>      * 
>Index: Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java,v
>retrieving revision 1.22
>diff -u -r1.22 ActivityPersistanceHelper.java
>--- Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java	9 May 2008 14:13:13 -0000	1.22
>+++ Eclipse UI/org/eclipse/ui/internal/ActivityPersistanceHelper.java	9 Apr 2013 15:51:25 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2008 IBM Corporation and others.
>+ * Copyright (c) 2003, 2013 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
>@@ -282,7 +282,6 @@
> 	            store.setValue(createPreferenceKey(activity.getId()), activity
> 	                    .isEnabled());
> 	        }
>-	        WorkbenchPlugin.getDefault().savePluginPreferences();
>         }
>         finally {
>             saving = false;
>Index: Eclipse UI/org/eclipse/ui/internal/activities/ws/WorkbenchActivitySupport.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/activities/ws/WorkbenchActivitySupport.java,v
>retrieving revision 1.26
>diff -u -r1.26 WorkbenchActivitySupport.java
>--- Eclipse UI/org/eclipse/ui/internal/activities/ws/WorkbenchActivitySupport.java	24 Mar 2008 19:22:00 -0000	1.26
>+++ Eclipse UI/org/eclipse/ui/internal/activities/ws/WorkbenchActivitySupport.java	9 Apr 2013 15:51:25 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2008 IBM Corporation and others.
>+ * Copyright (c) 2003, 2013 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
>@@ -317,7 +317,17 @@
>      * @see org.eclipse.ui.activities.IWorkbenchActivitySupport#setEnabledActivityIds(java.util.Set)
>      */
>     public void setEnabledActivityIds(Set enabledActivityIds) {
>-        mutableActivityManager.setEnabledActivityIds(enabledActivityIds);
>+        setEnabledActivityIds(enabledActivityIds, true);
>+    }
>+
>+    /* (non-Javadoc)
>+     * @see org.eclipse.ui.activities.IWorkbenchActivitySupport#setEnabledActivityIds(java.util.Set, boolean)
>+     */
>+    public void setEnabledActivityIds(Set enabledActivityIds, boolean savePluginPreferences) {
>+    	mutableActivityManager.setEnabledActivityIds(enabledActivityIds);
>+    	if (savePluginPreferences) {
>+    		WorkbenchPlugin.getDefault().savePluginPreferences();
>+    	}
>     }
> 
> 	/* (non-Javadoc)

Actions: View | Diff

Attachments on bug 403872: 228828 | 229275 | 229276 | 229277 | 229278 | 229515 | 229569