Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/23/15 16:14:30 (9 years ago)
Author:
gkronber
Message:

#2522:

  • moved UI components out of HeuristicLab.PluginInfrastructure -> HeuristicLab.PluginInfrastructure.UI
  • moved ErrorDialog to HeuristicLab.MainForm.WindowsForms
  • moved ErrorHandling (for building an error message string) to HeuristicLab.Common
  • Changed exception handlers in Views to use MainForm.ShowError()
  • Changed usages for ErrorDialog in non-UI components to throw exceptions instead.
Location:
branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/AssemblyExtensions.cs

    r13337 r13338  
    2424
    2525namespace HeuristicLab.PluginInfrastructure {
    26   public static class AssemblyHelpers {
     26  public static class AssemblyExtensions {
    2727    //Based on the code from http://stackoverflow.com/a/7156425
    28     public static string GetCustomAttributeValue<T>(Assembly assembly, string propertyName)
     28    public static string GetCustomAttributeValue<T>(this Assembly assembly, string propertyName)
    2929       where T : Attribute {
    3030      if (assembly == null || string.IsNullOrEmpty(propertyName)) {
    … …  
    4949    }
    5050
    51     public static string GetFileVersion(Assembly assembly) {
     51    public static string GetFileVersion(this Assembly assembly) {
    5252      return GetCustomAttributeValue<AssemblyFileVersionAttribute>(assembly, "Version");
    5353    }

  • branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj

    r13335 r13338  
    110110    <Reference Include="System" />
    111111    <Reference Include="System.Core" />
    112     <Reference Include="System.Data" />
    113     <Reference Include="System.Deployment" />
    114     <Reference Include="System.Drawing" />
    115     <Reference Include="System.IdentityModel" />
    116     <Reference Include="System.IO.Compression" />
    117     <Reference Include="System.Runtime.Serialization" />
    118     <Reference Include="System.ServiceModel" />
    119     <Reference Include="System.Windows.Forms" />
    120     <Reference Include="System.Xml" />
    121112  </ItemGroup>
    122113  <ItemGroup>
    123     <Compile Include="Advanced\InstallationManagerControl.cs">
    124       <SubType>UserControl</SubType>
    125     </Compile>
    126     <Compile Include="Advanced\InstallationManagerControl.Designer.cs">
    127       <DependentUpon>InstallationManagerControl.cs</DependentUpon>
    128     </Compile>
    129     <Compile Include="Advanced\InstallationManagerForm.cs">
    130       <SubType>Form</SubType>
    131     </Compile>
    132     <Compile Include="Advanced\InstallationManagerForm.Designer.cs">
    133       <DependentUpon>InstallationManagerForm.cs</DependentUpon>
    134     </Compile>
    135     <Compile Include="Advanced\InstalledPluginsView.cs">
    136       <SubType>UserControl</SubType>
    137     </Compile>
    138     <Compile Include="Advanced\InstalledPluginsView.Designer.cs">
    139       <DependentUpon>InstalledPluginsView.cs</DependentUpon>
    140     </Compile>
    141     <Compile Include="Advanced\LicenseView.cs">
    142       <SubType>Form</SubType>
    143     </Compile>
    144     <Compile Include="Advanced\LicenseView.Designer.cs">
    145       <DependentUpon>LicenseView.cs</DependentUpon>
    146     </Compile>
    147     <Compile Include="Advanced\MultiSelectListView.cs">
    148       <SubType>Component</SubType>
    149     </Compile>
    150     <Compile Include="Advanced\MultiSelectListView.Designer.cs">
    151       <DependentUpon>MultiSelectListView.cs</DependentUpon>
    152     </Compile>
    153     <Compile Include="Advanced\PluginView.cs">
    154       <SubType>Form</SubType>
    155     </Compile>
    156     <Compile Include="Advanced\PluginView.Designer.cs">
    157       <DependentUpon>PluginView.cs</DependentUpon>
    158     </Compile>
    159     <Compile Include="Advanced\Util.cs">
    160       <SubType>Code</SubType>
    161     </Compile>
    162     <Compile Include="AssemblyHelpers.cs" />
     114    <Compile Include="AssemblyExtensions.cs" />
    163115    <Compile Include="CommandLineArgumentHandling\Arguments\OpenArgument.cs" />
    164116    <Compile Include="CommandLineArgumentHandling\Arguments\HideStarterArgument.cs" />
    … …  
    175127    <Compile Include="BaseClasses\ApplicationBase.cs" />
    176128    <Compile Include="BaseClasses\PluginBase.cs" />
    177     <Compile Include="Resources.Designer.cs">
    178       <AutoGen>True</AutoGen>
    179       <DesignTime>True</DesignTime>
    180       <DependentUpon>Resources.resx</DependentUpon>
    181     </Compile>
    182129    <Compile Include="SandboxApplicationManager.cs" />
    183130    <Compile Include="DefaultApplicationManager.cs" />
    184     <Compile Include="ErrorHandling\ErrorDialog.cs">
    185       <SubType>Form</SubType>
    186     </Compile>
    187     <Compile Include="ErrorHandling\ErrorDialog.Designer.cs">
    188       <DependentUpon>ErrorDialog.cs</DependentUpon>
    189     </Compile>
    190     <Compile Include="ErrorHandling\ErrorHandling.cs">
    191     </Compile>
    192     <Compile Include="ErrorHandling\FrameworkVersionErrorDialog.cs">
    193       <SubType>Form</SubType>
    194     </Compile>
    195     <Compile Include="ErrorHandling\FrameworkVersionErrorDialog.Designer.cs">
    196       <DependentUpon>FrameworkVersionErrorDialog.cs</DependentUpon>
    197     </Compile>
    198131    <Compile Include="LightweightApplicationManager.cs" />
    199132    <Compile Include="Interfaces\IPluginFile.cs" />
    … …  
    214147    <Compile Include="ApplicationManager.cs" />
    215148    <Compile Include="PluginState.cs" />
    216     <Compile Include="Main.cs" />
    217149    <Compile Include="Properties\AssemblyInfo.cs" />
    218150    <Compile Include="Sandboxing\SandboxManager.cs">
    … …  
    225157    <None Include="HeuristicLab.snk" />
    226158    <None Include="Properties\AssemblyInfo.cs.frame" />
    227     <Compile Include="Starter\AboutDialog.cs">
    228       <SubType>Form</SubType>
    229     </Compile>
    230     <Compile Include="Starter\AboutDialog.Designer.cs">
    231       <DependentUpon>AboutDialog.cs</DependentUpon>
    232     </Compile>
    233     <Compile Include="Starter\SplashScreen.cs">
    234       <SubType>Form</SubType>
    235     </Compile>
    236     <Compile Include="Starter\SplashScreen.Designer.cs">
    237       <DependentUpon>SplashScreen.cs</DependentUpon>
    238     </Compile>
    239     <Compile Include="Starter\StarterForm.cs">
    240       <SubType>Form</SubType>
    241     </Compile>
    242     <Compile Include="Starter\StarterForm.Designer.cs">
    243       <DependentUpon>StarterForm.cs</DependentUpon>
    244     </Compile>
    245   </ItemGroup>
    246   <ItemGroup>
    247     <None Include="Resources\Error.ico" />
    248     <Content Include="Resources\HeuristicLab.ico" />
    249     <None Include="Resources\HeuristicLabLogo.png" />
    250     <None Include="Resources\HeuristicLabBanner.png" />
    251     <None Include="Resources\VS2008ImageLibrary_Annotations_Error.png" />
    252     <Content Include="Resources\VS2008ImageLibrary_Objects_Plugin.png" />
    253     <EmbeddedResource Include="Resources.resx">
    254       <Generator>ResXFileCodeGenerator</Generator>
    255       <SubType>Designer</SubType>
    256       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    257     </EmbeddedResource>
    258     <None Include="Resources\show_icons.png" />
    259     <None Include="Resources\show_details.png" />
    260     <None Include="Resources\VS2008ImageLibrary_Objects_File.png" />
    261     <None Include="Resources\VS2008ImageLibrary_Objects_Document.png" />
    262     <None Include="Resources\VS2008ImageLibrary_Objects_Assembly.png" />
    263   </ItemGroup>
    264   <ItemGroup>
    265     <WCFMetadata Include="Service References\" />
    266159  </ItemGroup>
    267160  <ItemGroup>

  • branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Manager/ApplicationDescription.cs

    r12012 r13338  
    4242    /// Gets or sets the version of the application.
    4343    /// </summary>
    44     internal Version Version {
     44    public Version Version {
    4545      get { return version; }
    46       set { version = value; }
     46      internal set { version = value; }
    4747    }
    4848    private string description;
    … …  
    6060    /// Gets or sets the boolean flag if the application should be automatically restarted.
    6161    /// </summary>
    62     internal bool AutoRestart {
     62    public bool AutoRestart {
    6363      get { return autoRestart; }
    64       set { autoRestart = value; }
     64      internal set { autoRestart = value; }
    6565    }
    6666
    … …  
    6969    /// Gets or sets the name of the assembly that contains the IApplication type.
    7070    /// </summary>
    71     internal string DeclaringAssemblyName {
     71    public string DeclaringAssemblyName {
    7272      get { return declaringAssemblyName; }
    73       set { declaringAssemblyName = value; }
     73      internal set { declaringAssemblyName = value; }
    7474    }
    7575
    … …  
    7878    /// Gets or sets the name of the type that implements the interface IApplication.
    7979    /// </summary>
    80     internal string DeclaringTypeName {
     80    public string DeclaringTypeName {
    8181      get { return declaringTypeName; }
    82       set { declaringTypeName = value; }
     82      internal set { declaringTypeName = value; }
    8383    }
    8484

  • branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Manager/PluginDescription.cs

    r12012 r13338  
    9797    /// Gets the error message why this plugin has been disabled.
    9898    /// </summary>
    99     internal string LoadingErrorInformation {
     99    public string LoadingErrorInformation {
    100100      get {
    101101        return loadingErrorInformation;
Note: See TracChangeset for help on using the changeset viewer.