From 20706240c3a27b1529e443375121c4367d167092 Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Wed, 7 Mar 2007 14:23:54 +0000 Subject: [PATCH] Changed updateViews() calls --- .../eclipse/cdt/ui/actions/BuildConfigAction.java | 4 ++-- .../cdt/ui/actions/DeleteResConfigsAction.java | 2 +- .../cdt/ui/actions/ExcludeFromBuildAction.java | 3 +-- .../src/org/eclipse/cdt/ui/newui/AbstractPage.java | 14 ++++++++------ .../eclipse/cdt/ui/newui/ManageConfigDialog.java | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java index 47e6cc051ba..77ee896f242 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 Intel Corporation and others. + * Copyright (c) 2006, 2007 Intel 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 @@ -58,7 +58,7 @@ public class BuildConfigAction extends Action { configs[i].setActive(); try { CoreModel.getDefault().setProjectDescription(prj, prjd); - AbstractPage.updateViews(); + AbstractPage.updateViews(prj); } catch (CoreException e) { } break; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java index 68e9617368a..fcec0ea69e1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java @@ -116,8 +116,8 @@ implements IWorkbenchWindowPulldownDelegate2, IObjectActionDelegate { if (selected != null && selected.length > 0) { for (int i = 0; i < selected.length; i++) { ((ResCfgData)selected[i]).delete(); + AbstractPage.updateViews(((ResCfgData)selected[i]).res); } - AbstractPage.updateViews(); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java index 56b716bb17c..bbe3260ca28 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ExcludeFromBuildAction.java @@ -184,9 +184,8 @@ outer: try { CoreModel.getDefault().setProjectDescription(p, prjd); } catch (CoreException e) {} - + AbstractPage.updateViews(res); } - AbstractPage.updateViews(); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java index a32ae8a8eb2..8ac27004d02 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java @@ -69,6 +69,8 @@ import org.eclipse.cdt.core.settings.model.ICResourceDescription; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.utils.ui.controls.ControlFactory; +import org.eclipse.cdt.internal.ui.util.ProblemMarkerManager; + /** * It is a parent for all standard CDT property pages * in new CDT model. @@ -95,7 +97,7 @@ public abstract class AbstractPage extends PropertyPage implements IWorkbenchPropertyPage, // ext point IPreferencePageContainer, // dynamic pages - ICPropertyProvider // utility methods for tabs + ICPropertyProvider // utility methods for tabs { // Toggle this constant to // to hide "Manage configurations" button. @@ -131,7 +133,7 @@ implements private static final Object NOT_NULL = new Object(); public static final String EMPTY_STR = ""; //$NON-NLS-1$ - + /* * Dialog widgets */ @@ -408,7 +410,7 @@ implements try { CoreModel.getDefault().setProjectDescription(getProject(), prjd); } catch (CoreException e) { } - updateViews(); + updateViews(internalElement); return true; } @@ -431,7 +433,7 @@ implements } catch (CoreException e) { System.out.println("setProjectDescription: " + e.getLocalizedMessage()); //$NON-NLS-1$ } - updateViews(); + updateViews(internalElement); } }; IRunnableWithProgress op = new WorkspaceModifyDelegatingOperation(runnable); @@ -853,7 +855,7 @@ implements } // update views (in particular, display resource configurations) - public static void updateViews() { + public static void updateViews(IResource res) { WorkbenchPlugin.getDefault().getDecoratorManager().updateForEnablementChange(); - } + } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java index 0fc7edc51a5..ded231ad652 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java @@ -76,7 +76,7 @@ public class ManageConfigDialog extends Dialog { if (d.open() == OK) { try { CoreModel.getDefault().setProjectDescription(prj, prjd); - AbstractPage.updateViews(); + AbstractPage.updateViews(prj); } catch (CoreException e) { return false; } return true; }