Index: Application/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -12,10 +12,15 @@
using Core.Common.Base;
using Core.Common.Base.Workflow;
using Core.Common.Controls.Swf;
-using Core.Common.Gui.Forms;
using Core.Common.Gui.Forms.MainWindow;
+using Core.Plugins.CommonTools;
+using Core.Plugins.CommonTools.Gui;
+using Core.Plugins.ProjectExplorer;
+using Core.Plugins.SharpMapGis;
+using Core.Plugins.SharpMapGis.Gui;
using log4net;
using NDesk.Options;
+using Ringtoets.Piping.Plugin;
using MessageBox = System.Windows.MessageBox;
namespace Application.Ringtoets
@@ -64,7 +69,23 @@
gui = new DeltaShellGui
{
- MainWindow = mainWindow
+ MainWindow = mainWindow,
+ Plugins =
+ {
+ new ProjectExplorerGuiPlugin(),
+ new CommonToolsGuiPlugin(),
+ new SharpMapGisGuiPlugin(),
+ new WtiGuiPlugin()
+ },
+ Application =
+ {
+ Plugins =
+ {
+ new CommonToolsApplicationPlugin(),
+ new SharpMapGisApplicationPlugin(),
+ new WtiApplicationPlugin()
+ }
+ }
};
//gui.Application.ProjectRepositoryFactory.SpeedUpSessionCreationUsingParallelThread = true;
Index: Application/Application.Ringtoets/Application.Ringtoets.csproj
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Application/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Application/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -76,9 +76,6 @@
False
..\..\lib\log4net.dll
-
- ..\..\lib\Mono.Addins.dll
-
..\..\lib\NDesk.Options.dll
@@ -292,10 +289,34 @@
Core.Common.Version
False
+
+ {93E73FAB-FAE8-49C6-9ABB-27D24DF761F6}
+ Core.Plugins.CommonTools.Gui
+
+
+ {BEFDCC44-2638-4972-B353-42D14C7DA2C6}
+ Core.Plugins.CommonTools
+
+
+ {ED20DBA9-D577-423F-A68D-A0A8130FB10B}
+ Core.Plugins.ProjectExplorer
+
+
+ {0BC3751E-EC42-40A0-A7D3-B7C2AA66976E}
+ Core.Plugins.SharpMapGis.Gui
+
+
+ {696DAAEE-D1D8-42D0-86AC-471B970FB17E}
+ Core.Plugins.SharpMapGis
+
{d64e4f0e-e341-496f-82b2-941ad202b4e3}
Ringtoets.Piping.Calculation
+
+ {1D3D58B6-EF7E-401E-92A0-104067D222EE}
+ Ringtoets.Piping.Plugin
+
{10b8d63d-87e8-46df-aca9-a8cf22ee8fb5}
Ringtoets.Piping.Service
Index: Application/Application.Ringtoets/DeltaShellGui.cs
===================================================================
diff -u -r2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Application/Application.Ringtoets/DeltaShellGui.cs (.../DeltaShellGui.cs) (revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
+++ Application/Application.Ringtoets/DeltaShellGui.cs (.../DeltaShellGui.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -22,7 +22,6 @@
using Core.Common.Controls;
using Core.Common.Controls.Swf;
using Core.Common.Gui;
-using Core.Common.Gui.Forms;
using Core.Common.Gui.Forms.MainWindow;
using Core.Common.Utils;
using Core.Common.Utils.Aop;
@@ -259,8 +258,6 @@
ShowSplashScreen();
- PluginManager.RegisterAdditionalPlugins(Plugins);
-
if (!String.IsNullOrEmpty(projectPath))
{
application.Run(projectPath);
@@ -667,8 +664,6 @@
private void Initialize()
{
- LoadPlugins();
-
InitializeWindows();
InitializePluginResources();
@@ -1124,36 +1119,6 @@
}
}
- private void LoadPlugins()
- {
- log.Debug(Resources.DeltaShellGui_LoadPlugins_Searching_for_Gui_plugins____);
-
- var newGuiPlugins = PluginManager.GetPlugins().Except(Plugins).ToList();
- foreach (var plugin in newGuiPlugins)
- {
- Plugins.Add(plugin);
- }
-
- log.InfoFormat(Resources.DeltaShellGui_LoadPlugins__0__gui_plugin_s__were_loaded, Plugins.Count);
-
-/*
- if (Directory.Exists(Application.Settings["pluginsDirectory"]))
- {
- var pluginConfigurationLoader = new PluginConfigurationLoader(Application.Settings["pluginsDirectory"]);
-
- pluginConfigurations = new List();
- pluginAssemblies = new List();
-
- // Needed for reading configuration files (menus, toolbars etc.)
- pluginConfigurationLoader.FillPluginConfigurationsFromPath(pluginConfigurations, pluginAssemblies);
- }
- else
- {
- log.Error("Could not load plugin configurations");
- }
-*/
- }
-
private void CopyDefaultViewsFromUserSettings()
{
StringCollection defaultViews;
Index: Application/Application.Ringtoets/Properties/Resources.Designer.cs
===================================================================
diff -u -r3112e21825ab694afebf3e220a867e7af913a5b2 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Application/Application.Ringtoets/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3112e21825ab694afebf3e220a867e7af913a5b2)
+++ Application/Application.Ringtoets/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -920,24 +920,6 @@
}
///
- /// Looks up a localized string similar to {0} gui plugin(s) were loaded.
- ///
- public static string DeltaShellGui_LoadPlugins__0__gui_plugin_s__were_loaded {
- get {
- return ResourceManager.GetString("DeltaShellGui_LoadPlugins__0__gui_plugin_s__were_loaded", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Searching for Gui plugins ....
- ///
- public static string DeltaShellGui_LoadPlugins_Searching_for_Gui_plugins____ {
- get {
- return ResourceManager.GetString("DeltaShellGui_LoadPlugins_Searching_for_Gui_plugins____", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Initializing graphical user interface ....
///
public static string DeltaShellGui_Run_Initializing_graphical_user_interface____ {
Index: Application/Application.Ringtoets/Properties/Resources.nl-NL.resx
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Application/Application.Ringtoets/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Application/Application.Ringtoets/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -330,12 +330,6 @@
NL Finished InitToolWindows
-
- NL {0} gui plugin(s) were loaded
-
-
- NL Searching for Gui plugins ...
-
NL Initializing graphical user interface ...
Index: Application/Application.Ringtoets/Properties/Resources.resx
===================================================================
diff -u -r3112e21825ab694afebf3e220a867e7af913a5b2 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Application/Application.Ringtoets/Properties/Resources.resx (.../Resources.resx) (revision 3112e21825ab694afebf3e220a867e7af913a5b2)
+++ Application/Application.Ringtoets/Properties/Resources.resx (.../Resources.resx) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -806,9 +806,6 @@
The model you are trying to delete is linked by other models: {0} after deletion these links will be lost. Do you wish to continue?
-
- Searching for Gui plugins ...
-
..\Resources\folder_feed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -938,9 +935,6 @@
Show Chart Contents (Shift + Alt + C)
-
- {0} gui plugin(s) were loaded
-
Opening new WTI project.
Index: Application/Application.Ringtoets/app.config
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Application/Application.Ringtoets/app.config (.../app.config) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Application/Application.Ringtoets/app.config (.../app.config) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -27,7 +27,6 @@
-
Index: Core/Common/src/Core.Common.Base/Core.Common.Base.csproj
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Common/src/Core.Common.Base/Core.Common.Base.csproj (.../Core.Common.Base.csproj) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Common/src/Core.Common.Base/Core.Common.Base.csproj (.../Core.Common.Base.csproj) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -96,7 +96,6 @@
-
@@ -106,10 +105,8 @@
-
-
@@ -118,7 +115,6 @@
Resources.resx
-
Index: Core/Common/src/Core.Common.Base/DeltaShellApplication.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Common/src/Core.Common.Base/DeltaShellApplication.cs (.../DeltaShellApplication.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Common/src/Core.Common.Base/DeltaShellApplication.cs (.../DeltaShellApplication.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -71,14 +71,6 @@
public bool IsProjectCreatedInTemporaryDirectory { get; set; }
- public string PluginVersions
- {
- get
- {
- return String.Join("\n", Plugins.Select(p => p.Name + " " + p.Version));
- }
- }
-
public Project Project
{
get
@@ -189,24 +181,6 @@
plugin.Resources = new ResourceManager(resourceName, plugin.GetType().Assembly);
}
- public ApplicationPlugin GetPluginForType(Type type)
- {
- foreach (var plugin in Plugins)
- {
- if (plugin.GetType().Assembly.Equals(type.Assembly))
- {
- return plugin;
- }
-
- if (plugin.GetDataItemInfos().Any(dii => dii.ValueType == type))
- {
- return plugin;
- }
- }
-
- return null;
- }
-
public string GetUserSettingsDirectoryPath()
{
return SettingsHelper.GetApplicationLocalUserSettingsDirectory();
@@ -251,11 +225,8 @@
InitializeLicense();
- log.Info(Properties.Resources.DeltaShellApplication_Run_Initializing_plugins____);
- InitializePlugins();
+ Plugins.ForEach(p => p.Application = this);
- log.Info(Properties.Resources.DeltaShellApplication_Run_Initializing_project_repository____);
-
isRunning = true;
log.Info(Properties.Resources.DeltaShellApplication_Run_Creating_new_project____);
@@ -424,25 +395,6 @@
log.Debug(Properties.Resources.DeltaShellApplication_ActivatePlugins_All_plugins_were_activated_);
}
- protected void InitializePlugins()
- {
- log.Debug(Properties.Resources.DeltaShellApplication_InitializePlugins_Searching_for_plugins____);
-
- var pluginsDirectory = GetPluginDirectory();
-
- PluginManager.RegisterAdditionalPlugins(Plugins);
- PluginManager.Initialize(pluginsDirectory);
-
- var newApplicationPlugins = PluginManager.GetPlugins().Except(Plugins).ToList();
- foreach (var plugin in newApplicationPlugins)
- {
- Plugins.Add(plugin);
- }
- Plugins.ForEach(p => p.Application = this);
-
- log.InfoFormat(Properties.Resources.DeltaShellApplication_InitializePlugins__0__plugin_s__were_loaded, Plugins.Count);
- }
-
///
/// Initialize the log4net part
///
@@ -511,21 +463,6 @@
log.Debug(Properties.Resources.DeltaShellApplication_InitializeLicense_License_is_initialized_);
}
- private string GetPluginDirectory()
- {
- // load plugins from a configured folder
- if (Settings != null)
- {
- string pluginsDirectory = Settings["pluginsDirectory"];
-
- if (Directory.Exists(pluginsDirectory))
- {
- return pluginsDirectory;
- }
- }
- return null;
- }
-
private void InitializePluginResources()
{
if (Plugins.Count > 0)
@@ -618,8 +555,6 @@
Plugins = null;
- PluginManager.Reset();
-
if (RunningActivityLogAppender.Instance != null)
{
RunningActivityLogAppender.Instance.ActivityRunner = null;
Fisheye: Tag e071372c05b65a79f5155b0fca6f37f6fd3ccc86 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/ForceLocalAddinFileSystemExtension.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/src/Core.Common.Base/IApplication.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Common/src/Core.Common.Base/IApplication.cs (.../IApplication.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Common/src/Core.Common.Base/IApplication.cs (.../IApplication.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -69,10 +69,6 @@
// TODO: hide it?
string ProjectFilePath { get; }
- string PluginVersions { get; }
-
- ApplicationPlugin GetPluginForType(Type type);
-
///
/// Check if any activity is running.
///
Index: Core/Common/src/Core.Common.Base/IPlugin.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Common/src/Core.Common.Base/IPlugin.cs (.../IPlugin.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Common/src/Core.Common.Base/IPlugin.cs (.../IPlugin.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -2,11 +2,9 @@
using System.Drawing;
using System.Reflection;
using System.Resources;
-using Mono.Addins;
namespace Core.Common.Base
{
- [TypeExtensionPoint]
public interface IPlugin
{
///
Fisheye: Tag e071372c05b65a79f5155b0fca6f37f6fd3ccc86 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/MonoAddinsConsoleLogger.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag e071372c05b65a79f5155b0fca6f37f6fd3ccc86 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/PluginConfigurationLoader.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag e071372c05b65a79f5155b0fca6f37f6fd3ccc86 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Base/PluginManager.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/src/Core.Common.Base/Properties/AssemblyInfo.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Common/src/Core.Common.Base/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Common/src/Core.Common.Base/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,8 +1,6 @@
using System.Reflection;
using System.Runtime.InteropServices;
-using Mono.Addins;
[assembly: AssemblyTitle("Core.Common.Base")]
[assembly: AssemblyProduct("Core.Common.Base")]
-[assembly: Guid("f6a5ae38-b8ce-49c5-a8d9-4729c140ce1f")]
-[assembly: AddinRoot("DeltaShellApplication", "1.0")]
\ No newline at end of file
+[assembly: Guid("f6a5ae38-b8ce-49c5-a8d9-4729c140ce1f")]
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.18063
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -143,24 +143,6 @@
}
///
- /// Looks up a localized string similar to {0} plugin(s) were loaded.
- ///
- internal static string DeltaShellApplication_InitializePlugins__0__plugin_s__were_loaded {
- get {
- return ResourceManager.GetString("DeltaShellApplication_InitializePlugins__0__plugin_s__were_loaded", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Searching for plugins ....
- ///
- internal static string DeltaShellApplication_InitializePlugins_Searching_for_plugins____ {
- get {
- return ResourceManager.GetString("DeltaShellApplication_InitializePlugins_Searching_for_plugins____", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Environmental variables:.
///
internal static string DeltaShellApplication_LogSystemInfo_Environmental_variables_ {
@@ -270,24 +252,6 @@
}
///
- /// Looks up a localized string similar to Initializing plugins ....
- ///
- internal static string DeltaShellApplication_Run_Initializing_plugins____ {
- get {
- return ResourceManager.GetString("DeltaShellApplication_Run_Initializing_plugins____", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Initializing project repository ....
- ///
- internal static string DeltaShellApplication_Run_Initializing_project_repository____ {
- get {
- return ResourceManager.GetString("DeltaShellApplication_Run_Initializing_project_repository____", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Starting Delta Shell ....
///
internal static string DeltaShellApplication_Run_Starting_Delta_Shell____ {
@@ -325,72 +289,6 @@
}
///
- /// Looks up a localized string similar to Error :.
- ///
- internal static string MonoAddinsConsoleLogger_ReportError_Error___ {
- get {
- return ResourceManager.GetString("MonoAddinsConsoleLogger_ReportError_Error___", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Warning :.
- ///
- internal static string MonoAddinsConsoleLogger_ReportWarning_Warning___ {
- get {
- return ResourceManager.GetString("MonoAddinsConsoleLogger_ReportWarning_Warning___", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Skipping the loading of {0}.
- ///
- internal static string PluginConfigurationLoader_CanContainAPlugin_Skipping_the_loading_of__0_ {
- get {
- return ResourceManager.GetString("PluginConfigurationLoader_CanContainAPlugin_Skipping_the_loading_of__0_", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to plugin configuration file '{0}' not found; skipped..
- ///
- internal static string PluginConfigurationLoader_GetPluginConfig_plugin_configuration_file___0___not_found__skipped_ {
- get {
- return ResourceManager.GetString("PluginConfigurationLoader_GetPluginConfig_plugin_configuration_file___0___not_fou" +
- "nd__skipped_", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to plugin could not be loaded: '{0}', {1}.
- ///
- internal static string PluginConfigurationLoader_GetPluginConfig_plugin_could_not_be_loaded____0_____1_ {
- get {
- return ResourceManager.GetString("PluginConfigurationLoader_GetPluginConfig_plugin_could_not_be_loaded____0_____1_", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Can't find directory to load assemblies from: {0}, fix your configuration file.
- ///
- internal static string PluginConfigurationLoader_LoadAssembliesWithConfigInDirectory_Can_t_find_directory_to_load_assemblies_from___0___fix_your_configuration_file {
- get {
- return ResourceManager.GetString("PluginConfigurationLoader_LoadAssembliesWithConfigInDirectory_Can_t_find_director" +
- "y_to_load_assemblies_from___0___fix_your_configuration_file", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Multiple plugins with the same name(s):{0}{1}.
- ///
- internal static string PluginManager_ThrowOnNonUniquePluginNames_Multiple_plugins_with_the_same_name_s___0__1_ {
- get {
- return ResourceManager.GetString("PluginManager_ThrowOnNonUniquePluginNames_Multiple_plugins_with_the_same_name_s__" +
- "_0__1_", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Creating new empty project in temporary folder ....
///
internal static string ProjectService_CreateNewProjectInTemporaryFolder_Creating_new_empty_project_in_temporary_folder____ {
Index: Core/Common/src/Core.Common.Base/Properties/Resources.nl-NL.resx
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Common/src/Core.Common.Base/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -144,12 +144,6 @@
NL Please check your configuration and plugins folder!
-
- NL {0} plugin(s) were loaded
-
-
- NL Searching for plugins ...
-
NL Environmental variables:
@@ -186,12 +180,6 @@
NL Delta Shell is ready, started in {0:F3} sec.
-
- NL Initializing plugins ...
-
-
- NL Initializing project repository ...
-
NL Starting Delta Shell ...
@@ -204,27 +192,6 @@
NL Can't read project from path, project can be only created in memory using this project repository
-
- NL Error :
-
-
- NL Warning :
-
-
- NL Skipping the loading of {0}
-
-
- NL plugin configuration file '{0}' not found; skipped.
-
-
- NL plugin could not be loaded: '{0}', {1}
-
-
- NL Can't find directory to load assemblies from: {0}, fix your configuration file
-
-
- NL Multiple plugins with the same name(s):{0}{1}
-
NL Creating new empty project in temporary folder ...
Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -100,27 +100,6 @@
Run report
-
- Multiple plugins with the same name(s):{0}{1}
-
-
- plugin configuration file '{0}' not found; skipped.
-
-
- plugin could not be loaded: '{0}', {1}
-
-
- Can't find directory to load assemblies from: {0}, fix your configuration file
-
-
- Skipping the loading of {0}
-
-
- Warning :
-
-
- Error :
-
Can't read project from path, project can be only created in memory using this project repository
@@ -133,12 +112,6 @@
Application is already running
-
- Initializing plugins ...
-
-
- Initializing project repository ...
-
Creating new project ...
@@ -172,12 +145,6 @@
License is initialized.
-
- Searching for plugins ...
-
-
- {0} plugin(s) were loaded
-
DeltaShell application started, active plugins:
Index: Core/Common/src/Core.Common.Gui/Properties/AssemblyInfo.cs
===================================================================
diff -u -ra1ee736dd697a8e0f0cc541fea830038a36d91a4 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Common/src/Core.Common.Gui/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision a1ee736dd697a8e0f0cc541fea830038a36d91a4)
+++ Core/Common/src/Core.Common.Gui/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,8 +1,6 @@
using System.Reflection;
using System.Runtime.InteropServices;
-using Mono.Addins;
[assembly: AssemblyTitle("Core.Common.Gui")]
[assembly: AssemblyProduct("Core.Common.Gui")]
-[assembly: Guid("b3c117b3-ebeb-43cd-9784-6ec81d1ced36")]
-[assembly: AddinRoot("DeltaShellGui", "1.0")]
\ No newline at end of file
+[assembly: Guid("b3c117b3-ebeb-43cd-9784-6ec81d1ced36")]
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs (.../CommonToolsGuiPlugin.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs (.../CommonToolsGuiPlugin.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -24,12 +24,10 @@
using Core.Plugins.CommonTools.Gui.Property;
using Core.Plugins.CommonTools.Gui.Property.Charting;
using DevExpress.Data.Access;
-using Mono.Addins;
using PropertyInfo = Core.Common.Gui.PropertyInfo;
namespace Core.Plugins.CommonTools.Gui
{
- [Extension(typeof(IPlugin))]
public class CommonToolsGuiPlugin : GuiPlugin
{
private static bool tableViewInitialized;
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/AssemblyInfo.cs
===================================================================
diff -u -ra1ee736dd697a8e0f0cc541fea830038a36d91a4 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision a1ee736dd697a8e0f0cc541fea830038a36d91a4)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,10 +1,6 @@
using System.Reflection;
using System.Runtime.InteropServices;
-using Mono.Addins;
[assembly: AssemblyTitle("Core.Plugins.CommonTools.Gui")]
[assembly: AssemblyProduct("Core.Plugins.CommonTools.Gui")]
-[assembly: Guid("bb54dc10-a400-4a6c-8ac2-50f1c6738308")]
-[assembly: Addin]
-[assembly: AddinDependency("DeltaShellApplication", "1.0")]
-[assembly: AddinDependency("DeltaShellGui", "1.0")]
\ No newline at end of file
+[assembly: Guid("bb54dc10-a400-4a6c-8ac2-50f1c6738308")]
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs (.../ProjectExplorerGuiPlugin.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs (.../ProjectExplorerGuiPlugin.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -7,11 +7,9 @@
using Core.Common.Gui;
using Core.Common.Gui.Forms;
using Core.Common.Utils.Collections;
-using Mono.Addins;
namespace Core.Plugins.ProjectExplorer
{
- [Extension(typeof(IPlugin))]
public class ProjectExplorerGuiPlugin : GuiPlugin
{
private readonly IList projectTreeViewNodePresenters;
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/AssemblyInfo.cs
===================================================================
diff -u -ra1ee736dd697a8e0f0cc541fea830038a36d91a4 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision a1ee736dd697a8e0f0cc541fea830038a36d91a4)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,9 +1,6 @@
using System.Reflection;
using System.Runtime.InteropServices;
-using Mono.Addins;
[assembly: AssemblyTitle("Core.Plugins.ProjectExplorer")]
[assembly: AssemblyProduct("Core.Plugins.ProjectExplorer")]
-[assembly: Guid("2e2a8b97-1123-4632-8415-7fcb74fe0503")]
-[assembly: Addin]
-[assembly: AddinDependency("DeltaShellApplication", "1.0")]
\ No newline at end of file
+[assembly: Guid("2e2a8b97-1123-4632-8415-7fcb74fe0503")]
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/AssemblyInfo.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,9 +1,6 @@
using System.Reflection;
using System.Runtime.InteropServices;
-using Mono.Addins;
[assembly: AssemblyTitle("DeltaShell.Plugins.SharpMapGis.Gui")]
[assembly: AssemblyProduct("DeltaShell.Plugins.SharpMapGis.Gui")]
-[assembly: Guid("fe1a0f62-20cb-41a7-ab51-f135393c05a3")]
-[assembly: Addin]
-[assembly: AddinDependency("DeltaShellApplication", "1.0")]
\ No newline at end of file
+[assembly: Guid("fe1a0f62-20cb-41a7-ab51-f135393c05a3")]
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs (.../SharpMapGisGuiPlugin.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs (.../SharpMapGisGuiPlugin.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -25,12 +25,10 @@
using Core.Plugins.SharpMapGis.Gui.Forms;
using Core.Plugins.SharpMapGis.Gui.Forms.MapLegendView;
using Core.Plugins.SharpMapGis.Gui.NodePresenters;
-using Mono.Addins;
using PropertyInfo = Core.Common.Gui.PropertyInfo;
namespace Core.Plugins.SharpMapGis.Gui
{
- [Extension(typeof(IPlugin))]
public class SharpMapGisGuiPlugin : GuiPlugin
{
private static IGui gui;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/AssemblyInfo.cs
===================================================================
diff -u -ra1ee736dd697a8e0f0cc541fea830038a36d91a4 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision a1ee736dd697a8e0f0cc541fea830038a36d91a4)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,9 +1,6 @@
using System.Reflection;
using System.Runtime.InteropServices;
-using Mono.Addins;
[assembly: AssemblyTitle("Core.Plugins.SharpMapGis")]
[assembly: AssemblyProduct("Core.Plugins.SharpMapGis")]
-[assembly: Guid("7948858a-9b8f-4c3a-a4fc-ea7cfedc32c0")]
-[assembly: Addin]
-[assembly: AddinDependency("DeltaShellApplication", "1.0")]
\ No newline at end of file
+[assembly: Guid("7948858a-9b8f-4c3a-a4fc-ea7cfedc32c0")]
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/SharpMapGisApplicationPlugin.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Core/Plugins/src/Core.Plugins.SharpMapGis/SharpMapGisApplicationPlugin.cs (.../SharpMapGisApplicationPlugin.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/SharpMapGisApplicationPlugin.cs (.../SharpMapGisApplicationPlugin.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -4,11 +4,9 @@
using Core.Common.Base;
using Core.GIS.SharpMap.Extensions.CoordinateSystems;
using Core.GIS.SharpMap.Map;
-using Mono.Addins;
namespace Core.Plugins.SharpMapGis
{
- [Extension(typeof(IPlugin))]
public class SharpMapGisApplicationPlugin : ApplicationPlugin
{
public SharpMapGisApplicationPlugin()
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/AssemblyInfo.cs
===================================================================
diff -u -ra1ee736dd697a8e0f0cc541fea830038a36d91a4 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision a1ee736dd697a8e0f0cc541fea830038a36d91a4)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,9 +1,6 @@
using System.Reflection;
using System.Runtime.InteropServices;
-using Mono.Addins;
[assembly: AssemblyTitle("Ringtoets.Piping.Plugin")]
[assembly: AssemblyProduct("Ringtoets.Piping.Plugin")]
-[assembly: Guid("09fffeaa-4d0a-4fbc-a745-1b249a030c3b")]
-[assembly: Addin]
-[assembly: AddinDependency("DeltaShellApplication", "1.0")]
\ No newline at end of file
+[assembly: Guid("09fffeaa-4d0a-4fbc-a745-1b249a030c3b")]
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/WtiApplicationPlugin.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/WtiApplicationPlugin.cs (.../WtiApplicationPlugin.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/WtiApplicationPlugin.cs (.../WtiApplicationPlugin.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using Core.Common.Base;
-using Mono.Addins;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Plugin.FileImporter;
@@ -10,7 +9,6 @@
namespace Ringtoets.Piping.Plugin
{
- [Extension(typeof(IPlugin))]
public class WtiApplicationPlugin : ApplicationPlugin
{
public override string Name
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/WtiGuiPlugin.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/WtiGuiPlugin.cs (.../WtiGuiPlugin.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/WtiGuiPlugin.cs (.../WtiGuiPlugin.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,9 +1,7 @@
using System.Collections.Generic;
-using Core.Common.Base;
using Core.Common.Controls;
using Core.Common.Gui;
using Core.Common.Gui.Forms;
-using Mono.Addins;
using Ringtoets.Piping.Data;
@@ -13,7 +11,6 @@
namespace Ringtoets.Piping.Plugin
{
- [Extension(typeof(IPlugin))]
public class WtiGuiPlugin : GuiPlugin
{
public override string Name
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiApplicationPluginTest.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiApplicationPluginTest.cs (.../WtiApplicationPluginTest.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiApplicationPluginTest.cs (.../WtiApplicationPluginTest.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -1,7 +1,6 @@
using System;
using System.Linq;
using Core.Common.Base;
-using Mono.Addins;
using NUnit.Framework;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Plugin.FileImporter;
@@ -28,18 +27,6 @@
}
[Test]
- public void WtiApplicationPlugin_ShouldBeDeltaShellPlugin()
- {
- // call
- var attribute = Attribute.GetCustomAttribute(typeof(WtiApplicationPlugin), typeof(ExtensionAttribute));
-
- // assert
- Assert.IsInstanceOf(attribute);
- var extensionAttribute = (ExtensionAttribute) attribute;
- Assert.AreEqual(typeof(IPlugin), extensionAttribute.Type);
- }
-
- [Test]
public void GetDataItemInfos_ReturnsExpectedDataItemDefinitions()
{
// setup
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiGuiPluginTest.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -re071372c05b65a79f5155b0fca6f37f6fd3ccc86
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiGuiPluginTest.cs (.../WtiGuiPluginTest.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiGuiPluginTest.cs (.../WtiGuiPluginTest.cs) (revision e071372c05b65a79f5155b0fca6f37f6fd3ccc86)
@@ -5,8 +5,6 @@
using Core.Common.Controls;
using Core.Common.Gui;
-using Mono.Addins;
-
using NUnit.Framework;
using Rhino.Mocks;
@@ -42,18 +40,6 @@
}
[Test]
- public void WtiApplicationPlugin_ShouldBeDeltaShellPlugin()
- {
- // call
- var attribute = Attribute.GetCustomAttribute(typeof(WtiApplicationPlugin), typeof(ExtensionAttribute));
-
- // assert
- Assert.IsInstanceOf(attribute);
- var extensionAttribute = (ExtensionAttribute) attribute;
- Assert.AreEqual(typeof(IPlugin), extensionAttribute.Type);
- }
-
- [Test]
public void GetPropertyInfos_ReturnsSupportedPropertyClasses()
{
// setup