Browse Source

Prevent PropertyContainer from failing when there is no workbench (in unit tests)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2466 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 19 years ago
parent
commit
f552da43ca
  1. 6
      src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyContainer.cs
  2. 5
      src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs

6
src/Main/Base/Project/Src/Gui/Pads/PropertyPad/PropertyContainer.cs

@ -40,8 +40,10 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -40,8 +40,10 @@ namespace ICSharpCode.SharpDevelop.Gui
/// </summary>
public PropertyContainer()
{
PadDescriptor desc = WorkbenchSingleton.Workbench.GetPad(typeof(PropertyPad));
if (desc != null) desc.CreatePad();
if (WorkbenchSingleton.Workbench != null) {
PadDescriptor desc = WorkbenchSingleton.Workbench.GetPad(typeof(PropertyPad));
if (desc != null) desc.CreatePad();
}
}
object selectedObject;

5
src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs

@ -19,7 +19,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -19,7 +19,7 @@ namespace ICSharpCode.SharpDevelop.Gui
const string workbenchMemento = "WorkbenchMemento";
static STAThreadCaller caller;
static DefaultWorkbench workbench = null;
static DefaultWorkbench workbench;
public static Form MainForm {
get {
@ -27,6 +27,9 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -27,6 +27,9 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
/// <summary>
/// Gets the workbench. Returns null in unit-testing mode.
/// </summary>
public static IWorkbench Workbench {
get {
return workbench;

Loading…
Cancel
Save