Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -r06deb0e20a4ee1c111052ec3b7c106cada5d5d0b -r38278c797e4fe1fafdb2fdd32547c417670687a6
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj (.../Core.Common.Controls.csproj) (revision 06deb0e20a4ee1c111052ec3b7c106cada5d5d0b)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj (.../Core.Common.Controls.csproj) (revision 38278c797e4fe1fafdb2fdd32547c417670687a6)
@@ -115,12 +115,6 @@
RichTextBoxControl.cs
-
- UserControl
-
-
- HtmlPageView.cs
-
@@ -184,9 +178,6 @@
RichTextBoxControl.cs
-
- HtmlPageView.cs
-
Fisheye: Tag 38278c797e4fe1fafdb2fdd32547c417670687a6 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/Views/HtmlPageView.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 38278c797e4fe1fafdb2fdd32547c417670687a6 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/Views/HtmlPageView.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 38278c797e4fe1fafdb2fdd32547c417670687a6 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/Views/HtmlPageView.resx'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj
===================================================================
diff -u -r33bb120fbaf0452934a7762b24d675201325e774 -r38278c797e4fe1fafdb2fdd32547c417670687a6
--- Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj (.../Core.Common.Controls.Test.csproj) (revision 33bb120fbaf0452934a7762b24d675201325e774)
+++ Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj (.../Core.Common.Controls.Test.csproj) (revision 38278c797e4fe1fafdb2fdd32547c417670687a6)
@@ -68,7 +68,6 @@
Resources.resx
-
Fisheye: Tag 38278c797e4fe1fafdb2fdd32547c417670687a6 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Controls.Test/Views/HtmlPageViewTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsGuiPlugin.cs
===================================================================
diff -u -r6fefc4422dcc5076f0ff430f73d829a6670f0285 -r38278c797e4fe1fafdb2fdd32547c417670687a6
--- Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsGuiPlugin.cs (.../CommonToolsGuiPlugin.cs) (revision 6fefc4422dcc5076f0ff430f73d829a6670f0285)
+++ Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsGuiPlugin.cs (.../CommonToolsGuiPlugin.cs) (revision 38278c797e4fe1fafdb2fdd32547c417670687a6)
@@ -21,11 +21,9 @@
using System.Collections.Generic;
using Core.Common.Base.Data;
-using Core.Common.Controls.Views;
using Core.Common.Gui.Forms;
using Core.Common.Gui.Plugin;
using Core.Common.Utils;
-using Core.Plugins.CommonTools.Properties;
using Core.Plugins.CommonTools.Property;
using PropertyInfo = Core.Common.Gui.Plugin.PropertyInfo;
@@ -49,12 +47,6 @@
Image = Common.Gui.Properties.Resources.key,
GetViewName = (v, o) => o != null ? o.Name : ""
};
- yield return new ViewInfo
- {
- Image = Resources.HomeIcon,
- Description = Resources.CommonToolsGuiPlugin_GetViewInfoObjects_Browser,
- GetViewName = (v, o) => o != null ? o.Name : ""
- };
}
}
}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.Designer.cs
===================================================================
diff -u -r7329f08513e8bf911ee4a5e5db6782497587b6ae -r38278c797e4fe1fafdb2fdd32547c417670687a6
--- Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7329f08513e8bf911ee4a5e5db6782497587b6ae)
+++ Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 38278c797e4fe1fafdb2fdd32547c417670687a6)
@@ -79,25 +79,6 @@
}
///
- /// Looks up a localized string similar to Browser.
- ///
- public static string CommonToolsGuiPlugin_GetViewInfoObjects_Browser {
- get {
- return ResourceManager.GetString("CommonToolsGuiPlugin_GetViewInfoObjects_Browser", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap HomeIcon {
- get {
- object obj = ResourceManager.GetObject("HomeIcon", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
/// Looks up a localized string similar to Korte beschrijving van het project..
///
public static string ProjectProperties_Description_Description {
Index: Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.resx
===================================================================
diff -u -r7329f08513e8bf911ee4a5e5db6782497587b6ae -r38278c797e4fe1fafdb2fdd32547c417670687a6
--- Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.resx (.../Resources.resx) (revision 7329f08513e8bf911ee4a5e5db6782497587b6ae)
+++ Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.resx (.../Resources.resx) (revision 38278c797e4fe1fafdb2fdd32547c417670687a6)
@@ -141,11 +141,4 @@
Omschrijving
-
- Browser
-
-
-
- ..\Resources\home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs
===================================================================
diff -u -r151bab16a7ebc1bffc0621ab56c6dc219db1e90f -r38278c797e4fe1fafdb2fdd32547c417670687a6
--- Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs (.../CommonToolsGuiPluginTest.cs) (revision 151bab16a7ebc1bffc0621ab56c6dc219db1e90f)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsGuiPluginTest.cs (.../CommonToolsGuiPluginTest.cs) (revision 38278c797e4fe1fafdb2fdd32547c417670687a6)
@@ -21,11 +21,9 @@
using System.Linq;
using Core.Common.Base.Data;
-using Core.Common.Controls.Views;
using Core.Common.Gui.Forms;
using Core.Common.TestUtil;
using Core.Common.Utils;
-using Core.Plugins.CommonTools.Properties;
using Core.Plugins.CommonTools.Property;
using NUnit.Framework;
@@ -64,18 +62,13 @@
// Assert
Assert.NotNull(viewInfos);
- Assert.AreEqual(2, viewInfos.Length);
+ Assert.AreEqual(1, viewInfos.Length);
var richTextFileInfo = viewInfos.First(vi => vi.DataType == typeof(RichTextFile));
- var webLinkInfo = viewInfos.First(vi => vi.DataType == typeof(WebLink));
Assert.AreEqual(richTextFileInfo.ViewType, typeof(RichTextView));
Assert.IsNull(richTextFileInfo.Description);
TestHelper.AssertImagesAreEqual(Common.Gui.Properties.Resources.key, richTextFileInfo.Image);
-
- Assert.AreEqual(webLinkInfo.ViewType, typeof(HtmlPageView));
- Assert.AreEqual(webLinkInfo.Description, Resources.CommonToolsGuiPlugin_GetViewInfoObjects_Browser);
- TestHelper.AssertImagesAreEqual(Resources.HomeIcon, webLinkInfo.Image);
}
[Test]
@@ -112,37 +105,5 @@
// Assert
Assert.AreEqual(expected, name);
}
-
- [Test]
- public void HtmlPageViewInfoName_WithoutData_EmptyString()
- {
- // Setup
- var guiPlugin = new CommonToolsGuiPlugin();
-
- var info = guiPlugin.GetViewInfos().First(vi => vi.DataType == typeof(WebLink));
-
- // Call
- var name = info.GetViewName(null, null);
-
- // Assert
- Assert.IsEmpty(name);
- }
-
- [Test]
- public void HtmlPageViewInfoName_WithData_NameOfData()
- {
- // Setup
- var expected = "SomeName";
- var guiPlugin = new CommonToolsGuiPlugin();
-
- var info = guiPlugin.GetViewInfos().First(vi => vi.DataType == typeof(WebLink));
- var webLink = new WebLink(expected, null);
-
- // Call
- var name = info.GetViewName(null, webLink);
-
- // Assert
- Assert.AreEqual(expected, name);
- }
}
}
\ No newline at end of file