X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Flaunch%2FMainMachineLaunchConfigTab.java;h=836b8a91d66cd5823948e76b006cae44d29b7c13;hb=0eb525202d3c871a2a20f789af1728248f3cff11;hp=3072c8aa48dcae40d02af972139f0407b1de517c;hpb=18a120638da6387fbc895f30c64fb570b8d51cae;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MainMachineLaunchConfigTab.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MainMachineLaunchConfigTab.java
index 3072c8aa..836b8a91 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MainMachineLaunchConfigTab.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/launch/MainMachineLaunchConfigTab.java
@@ -37,6 +37,7 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
 import net.mograsim.plugin.nature.MograsimNature;
 import net.mograsim.plugin.util.FileExtensionViewerFilter;
 import net.mograsim.plugin.util.ImageDescriptorWithMargins;
+import net.mograsim.plugin.util.ProjectViewerFilter;
 
 //a big part of this class is stolen from org.eclipse.jdt.debug.ui
 public class MainMachineLaunchConfigTab extends AbstractLaunchConfigurationTab
@@ -101,7 +102,7 @@ public class MainMachineLaunchConfigTab extends AbstractLaunchConfigurationTab
 			@Override
 			protected ImageDescriptor decorateImage(ImageDescriptor input, Object element)
 			{
-				return new ImageDescriptorWithMargins(input, new Point(22, 16));
+				return new ImageDescriptorWithMargins(input, new Point(20, 16));
 			}
 		};
 		ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), renderer);
@@ -115,19 +116,13 @@ public class MainMachineLaunchConfigTab extends AbstractLaunchConfigurationTab
 
 	private String chooseMPMFile()
 	{
-		WorkbenchLabelProvider renderer = new WorkbenchLabelProvider()
-		{
-			@Override
-			protected ImageDescriptor decorateImage(ImageDescriptor input, Object element)
-			{
-				return new ImageDescriptorWithMargins(input, new Point(22, 16));
-			}
-		};
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), renderer, new WorkbenchContentProvider());
+		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(),
+				new WorkbenchContentProvider());
 		dialog.setTitle("MPM Selection");
 		dialog.setMessage("Select a MPM file");
-		dialog.setInput(getSelectedProject());
+		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
 		dialog.addFilter(new FileExtensionViewerFilter("mpm"));
+		dialog.addFilter(new ProjectViewerFilter(getSelectedProject()));
 
 		if (dialog.open() == Window.OK)
 			return ((IResource) dialog.getResult()[0]).getProjectRelativePath().toPortableString();
@@ -136,19 +131,13 @@ public class MainMachineLaunchConfigTab extends AbstractLaunchConfigurationTab
 
 	private String chooseInitialRAMFile()
 	{
-		WorkbenchLabelProvider renderer = new WorkbenchLabelProvider()
-		{
-			@Override
-			protected ImageDescriptor decorateImage(ImageDescriptor input, Object element)
-			{
-				return new ImageDescriptorWithMargins(input, new Point(22, 16));
-			}
-		};
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), renderer, new WorkbenchContentProvider());
+		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(),
+				new WorkbenchContentProvider());
 		dialog.setTitle("Initial RAM Selection");
 		dialog.setMessage("Select a RAM file");
-		dialog.setInput(getSelectedProject());
+		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
 		dialog.addFilter(new FileExtensionViewerFilter("mem"));
+		dialog.addFilter(new ProjectViewerFilter(getSelectedProject()));
 
 		if (dialog.open() == Window.OK)
 			return ((IResource) dialog.getResult()[0]).getProjectRelativePath().toPortableString();