From 26c21da5a656eb0aa96071c6c1b75f9473161a65 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Mon, 27 Feb 2006 22:25:35 +0000 Subject: [PATCH] Bug 89429: replaced the usage of the internal SourceLookupUIUtils class by DebugUITools. --- debug/org.eclipse.cdt.debug.ui/ChangeLog | 6 ++++++ .../internal/ui/sourcelookup/AddSourceContainerDialog.java | 6 +++--- .../debug/internal/ui/sourcelookup/EditContainerAction.java | 4 ++-- .../ui/sourcelookup/SourceContainerLabelProvider.java | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index ea8e4b1d1ef..41c007845bf 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,9 @@ +2006-02-27 Mikhail Khodjaiants + Bug 89429: replaced the usage of the internal SourceLookupUIUtils class by DebugUITools. + * AddSourceContainerDialog.java + * EditContainerAction.java + * SourceContainerLabelProvider.java + 2006-02-27 Mikhail Khodjaiants Added dependency to the org.eclipse.ui.views plugin (needed to use the breakpoint actions in the Outline view). diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java index 1a2f28c172a..8e335e51694 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/AddSourceContainerDialog.java @@ -16,7 +16,7 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.core.sourcelookup.ISourceContainerType; import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; -import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIUtils; +import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.sourcelookup.ISourceContainerBrowser; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.TitleAreaDialog; @@ -125,7 +125,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { for (int i=0; i< types.length; i++) { ISourceContainerType type = types[i]; if (fDirector.supportsSourceContainerType(type)) { - ISourceContainerBrowser sourceContainerBrowser = SourceLookupUIUtils.getSourceContainerBrowser(type.getId()); + ISourceContainerBrowser sourceContainerBrowser = DebugUITools.getSourceContainerBrowser(type.getId()); if(sourceContainerBrowser != null && sourceContainerBrowser.canAddSourceContainers(fDirector)) { validTypes.add(type); } @@ -142,7 +142,7 @@ public class AddSourceContainerDialog extends TitleAreaDialog { //single selection dialog, so take first item in array //there will always be a selected item since we set it with viewer.setSelection ISourceContainerType type = (ISourceContainerType) ((StructuredSelection) fViewer.getSelection()).getFirstElement(); - ISourceContainerBrowser browser = SourceLookupUIUtils.getSourceContainerBrowser(type.getId()); + ISourceContainerBrowser browser = DebugUITools.getSourceContainerBrowser(type.getId()); if (browser != null) { ISourceContainer[] results = browser.addSourceContainers(getShell(), fDirector); if(results != null) { diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java index 9c84a224585..4fa4e64cbc6 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/EditContainerAction.java @@ -14,7 +14,7 @@ import java.util.Iterator; import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.core.sourcelookup.ISourceContainerType; import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; -import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIUtils; +import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.sourcelookup.ISourceContainerBrowser; import org.eclipse.jface.viewers.IStructuredSelection; @@ -79,7 +79,7 @@ public class EditContainerAction extends SourceContainerAction { } } // all the same type, see if editing is supported - fBrowser = SourceLookupUIUtils.getSourceContainerBrowser(type.getId()); + fBrowser = DebugUITools.getSourceContainerBrowser(type.getId()); if (fBrowser != null) { return fBrowser.canEditSourceContainers(fDirector, fContainers); } diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java index a210e4c244b..be9994871b4 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/sourcelookup/SourceContainerLabelProvider.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.internal.ui.sourcelookup; import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.core.sourcelookup.ISourceContainerType; -import org.eclipse.debug.internal.ui.sourcelookup.SourceLookupUIUtils; +import org.eclipse.debug.ui.DebugUITools; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; @@ -40,7 +40,7 @@ public class SourceContainerLabelProvider extends LabelProvider { } if (type != null) { // next consult contributed image - image = SourceLookupUIUtils.getSourceContainerImage(type.getId()); + image = DebugUITools.getSourceContainerImage(type.getId()); } } if (image != null) {