merge heads from Austin sync
authorcawthron
Sat, 25 Apr 2009 12:47:00 -0500
changeset 7 81d8e95d1a02
parent 0 0e6d23e2b466 (current diff)
parent 6 648636cfa849 (diff)
child 8 2cfb52d98e82
child 10 79d8b140b8cd
merge heads from Austin sync
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.branch.txt	Sat Apr 25 12:47:00 2009 -0500
@@ -0,0 +1,1 @@
+default
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Sat Apr 25 12:47:00 2009 -0500
@@ -0,0 +1,4 @@
+# use glob syntax.
+syntax: glob
+bin
+
--- a/cdt/cdt_5_0_x/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java	Fri Apr 03 17:12:41 2009 +0100
+++ b/cdt/cdt_5_0_x/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java	Sat Apr 25 12:47:00 2009 -0500
@@ -177,10 +177,15 @@
 								// open the file from the breakpoints view it opens in the
 								// proper editor.
 								IProject project = b.getMarker().getResource().getProject();
-								ICProject cproject = CoreModel.getDefault().create(project);
-								String id = CoreModel.getRegistedContentTypeId(project, path.lastSegment());
-								ExternalTranslationUnit tu = new ExternalTranslationUnit(cproject, URIUtil.toURI(path), id);
-								return new ExternalEditorInput( tu, new LocalFileStorage( fsfile ) );
+								if (project != null)
+									{
+									ICProject cproject = CoreModel.getDefault().create(project);
+									String id = CoreModel.getRegistedContentTypeId(project, path.lastSegment());
+									ExternalTranslationUnit tu = new ExternalTranslationUnit(cproject, URIUtil.toURI(path), id);
+									return new ExternalEditorInput( tu, new LocalFileStorage( fsfile ) );
+									}
+								else
+									return new FileEditorInput( file );
 							}
 						}
 					}