From 85ea9909442f8db5a49a49ca4bb4374d1d1565d9 Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Wed, 21 Feb 2007 17:38:23 +0000 Subject: [PATCH] Warnings elimination --- .../ui/newui/FileListControl.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/FileListControl.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/FileListControl.java index 9fbb74535a9..05d5527d120 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/FileListControl.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/FileListControl.java @@ -15,10 +15,10 @@ package org.eclipse.cdt.managedbuilder.ui.newui; import java.util.ArrayList; import java.util.Iterator; -import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; -import org.eclipse.cdt.internal.ui.dialogs.TypedViewerFilter; import org.eclipse.cdt.managedbuilder.core.IOption; +import org.eclipse.cdt.ui.newui.CDTStatusInfo; import org.eclipse.cdt.ui.newui.NewUIMessages; +import org.eclipse.cdt.ui.newui.TypedCDTViewerFilter; import org.eclipse.cdt.utils.cdtvariables.IVariableContextInfo; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; @@ -176,7 +176,7 @@ public class FileListControl { dialog.setInitialSelection(container); Class[] filteredResources = {IContainer.class, IProject.class}; - dialog.addFilter(new TypedViewerFilter(filteredResources)); + dialog.addFilter(new TypedCDTViewerFilter(filteredResources)); dialog.setTitle(WORKSPACE_DIR_DIALOG_TITLE); dialog.setMessage(WORKSPACE_DIR_DIALOG_MSG); } else { @@ -186,23 +186,18 @@ public class FileListControl { if(fs != null && fs.length > 0) resource = fs[0]; } - if(resource == null) - resource = rc; - + if(resource == null) resource = rc; dialog.setInitialSelection(resource); - dialog.setValidator(new ISelectionStatusValidator() { public IStatus validate(Object[] selection) { if (selection != null) if (selection.length > 0) if (!(selection[0] instanceof IFile)) - return new StatusInfo(IStatus.ERROR, WORKSPACE_FILE_DIALOG_ERR); - return new StatusInfo(); + return new CDTStatusInfo(IStatus.ERROR, WORKSPACE_FILE_DIALOG_ERR); + return new CDTStatusInfo(); } - }); - dialog.setTitle(WORKSPACE_FILE_DIALOG_TITLE); dialog.setMessage(WORKSPACE_FILE_DIALOG_MSG); }