[126641] Relative paths [148416] Key value warning fixed [158037] URI/Location [159368] Dialog box enhancement.  Icons not shown.
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectSingleFileView.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectSingleFileView.java
index 708b675..70533c7 100644
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectSingleFileView.java
+++ b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/viewers/SelectSingleFileView.java
@@ -52,7 +52,6 @@
 import org.eclipse.ui.wizards.datatransfer.FileSystemImportWizard;
 import org.eclipse.wst.common.ui.internal.Messages;
 import org.eclipse.wst.common.ui.internal.UIPlugin;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
 
     
 
@@ -102,7 +101,7 @@
     toolBar.setLayoutData(new GridData(GridData.END, GridData.END, true, false));
     
     ToolItem toolItem = new ToolItem(toolBar, SWT.NONE);
-    ImageDescriptor imageDescriptor = ImageDescriptor.createFromFile(SelectSingleFileDialog.class, "/../icons/expandAll.gif");
+    ImageDescriptor imageDescriptor = UIPlugin.getDefault().getImageDescriptor("icons/expandAll.gif");
     Image image = imageDescriptor.createImage();
     toolItem.setImage(image);
     toolItem.setToolTipText(Messages._UI_POPUP_EXPAND_ALL);
@@ -118,7 +117,7 @@
     
     
     toolItem = new ToolItem(toolBar, SWT.NONE);
-    imageDescriptor = ImageDescriptor.createFromFile(SelectSingleFileDialog.class, "/../icons/collapseAll.gif");
+    imageDescriptor = UIPlugin.getDefault().getImageDescriptor("icons/collapseAll.gif");
     image = imageDescriptor.createImage();
     toolItem.setImage(image);
     toolItem.setToolTipText(Messages._UI_POPUP_COLLAPSE_ALL);