Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/25/14 05:15:09 (10 years ago)
Author:
swagner
Message:

#2205: Restructured solution and projects and switched all projects to .NET 4.5

Location:
branches/OptimizationNetworks/HeuristicLab.Networks.Views
Files:
7 added
5 deleted
1 edited
9 copied
1 moved

Legend:

Unmodified
Added
Removed

  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/AlgorithmNodeView.Designer.cs

    r11576 r11577  
    2020#endregion
    2121
    22 namespace HeuristicLab.Optimization.Networks.Views {
     22namespace HeuristicLab.Networks.Views {
    2323  partial class AlgorithmNodeView {
    2424    /// <summary>

  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/AlgorithmNodeView.cs

    r11576 r11577  
    2323using HeuristicLab.Core.Views;
    2424using HeuristicLab.MainForm;
     25using HeuristicLab.Optimization;
    2526using HeuristicLab.PluginInfrastructure;
    2627using System;
    2728using System.Windows.Forms;
    2829
    29 namespace HeuristicLab.Optimization.Networks.Views {
     30namespace HeuristicLab.Networks.Views {
    3031  [View("AlgorithmNode View")]
    3132  [Content(typeof(AlgorithmNode), true)]

  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/HeuristicLab.Networks.Views-3.3.csproj

    r11576 r11577  
    88    <OutputType>Library</OutputType>
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    10     <RootNamespace>HeuristicLab.Optimization.Networks.Views</RootNamespace>
    11     <AssemblyName>HeuristicLab.Optimization.Networks.Views-3.3</AssemblyName>
     10    <RootNamespace>HeuristicLab.Networks.Views</RootNamespace>
     11    <AssemblyName>HeuristicLab.Networks.Views-3.3</AssemblyName>
    1212    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    … …  
    9191  </ItemGroup>
    9292  <ItemGroup>
    93     <Compile Include="Core.Networks.Views\MessageCollectionView.cs">
    94       <SubType>UserControl</SubType>
    95     </Compile>
    96     <Compile Include="Core.Networks.Views\MessageCollectionView.Designer.cs">
    97       <DependentUpon>MessageCollectionView.cs</DependentUpon>
    98     </Compile>
    99     <Compile Include="Core.Networks.Views\MessagePortView.cs">
    100       <SubType>UserControl</SubType>
    101     </Compile>
    102     <Compile Include="Core.Networks.Views\MessagePortView.Designer.cs">
    103       <DependentUpon>MessagePortView.cs</DependentUpon>
    104     </Compile>
    105     <Compile Include="Core.Networks.Views\MessageValueCollectionView.cs">
    106       <SubType>UserControl</SubType>
    107     </Compile>
    108     <Compile Include="Core.Networks.Views\MessageValueCollectionView.Designer.cs">
    109       <DependentUpon>MessageValueCollectionView.cs</DependentUpon>
    110     </Compile>
    111     <Compile Include="Core.Networks.Views\MessageValueView.cs">
    112       <SubType>UserControl</SubType>
    113     </Compile>
    114     <Compile Include="Core.Networks.Views\MessageValueView.Designer.cs">
    115       <DependentUpon>MessageValueView.cs</DependentUpon>
    116     </Compile>
    117     <Compile Include="Core.Networks.Views\MessageView.cs">
    118       <SubType>UserControl</SubType>
    119     </Compile>
    120     <Compile Include="Core.Networks.Views\MessageView.Designer.cs">
    121       <DependentUpon>MessageView.cs</DependentUpon>
    122     </Compile>
    123     <Compile Include="Core.Networks.Views\NetworkItemSelector.cs">
    124       <SubType>UserControl</SubType>
    125     </Compile>
    126     <Compile Include="Core.Networks.Views\NetworkItemSelector.Designer.cs">
    127       <DependentUpon>NetworkItemSelector.cs</DependentUpon>
    128     </Compile>
    129     <Compile Include="Core.Networks.Views\NetworkItemSelectorDialog.cs">
    130       <SubType>Form</SubType>
    131     </Compile>
    132     <Compile Include="Core.Networks.Views\NetworkItemSelectorDialog.Designer.cs">
    133       <DependentUpon>NetworkItemSelectorDialog.cs</DependentUpon>
    134     </Compile>
    135     <Compile Include="Core.Networks.Views\NetworkItemView.cs">
    136       <SubType>UserControl</SubType>
    137     </Compile>
    138     <Compile Include="Core.Networks.Views\NetworkItemView.Designer.cs">
    139       <DependentUpon>NetworkItemView.cs</DependentUpon>
    140     </Compile>
    141     <Compile Include="Core.Networks.Views\NetworkView.cs">
    142       <SubType>UserControl</SubType>
    143     </Compile>
    144     <Compile Include="Core.Networks.Views\NetworkView.Designer.cs">
    145       <DependentUpon>NetworkView.cs</DependentUpon>
    146     </Compile>
    147     <Compile Include="Core.Networks.Views\NodeCollectionView.cs">
    148       <SubType>UserControl</SubType>
    149     </Compile>
    150     <Compile Include="Core.Networks.Views\NodeCollectionView.Designer.cs">
    151       <DependentUpon>NodeCollectionView.cs</DependentUpon>
    152     </Compile>
    153     <Compile Include="Core.Networks.Views\NodeView.cs">
    154       <SubType>UserControl</SubType>
    155     </Compile>
    156     <Compile Include="Core.Networks.Views\NodeView.Designer.cs">
    157       <DependentUpon>NodeView.cs</DependentUpon>
    158     </Compile>
    159     <Compile Include="Core.Networks.Views\ParameterizedPortView.cs">
    160       <SubType>UserControl</SubType>
    161     </Compile>
    162     <Compile Include="Core.Networks.Views\ParameterizedPortView.Designer.cs">
    163       <DependentUpon>ParameterizedPortView.cs</DependentUpon>
    164     </Compile>
    165     <Compile Include="Core.Networks.Views\PortCollectionView.cs">
    166       <SubType>UserControl</SubType>
    167     </Compile>
    168     <Compile Include="Core.Networks.Views\PortCollectionView.Designer.cs">
    169       <DependentUpon>PortCollectionView.cs</DependentUpon>
    170     </Compile>
    171     <Compile Include="Core.Networks.Views\PortParameterCollectionView.cs">
    172       <SubType>UserControl</SubType>
    173     </Compile>
    174     <Compile Include="Core.Networks.Views\PortParameterCollectionView.Designer.cs">
    175       <DependentUpon>PortParameterCollectionView.cs</DependentUpon>
    176     </Compile>
    177     <Compile Include="Core.Networks.Views\PortParameterView.cs">
    178       <SubType>UserControl</SubType>
    179     </Compile>
    180     <Compile Include="Core.Networks.Views\PortParameterView.Designer.cs">
    181       <DependentUpon>PortParameterView.cs</DependentUpon>
    182     </Compile>
    183     <Compile Include="Core.Networks.Views\PortView.cs">
    184       <SubType>UserControl</SubType>
    185     </Compile>
    186     <Compile Include="Core.Networks.Views\PortView.Designer.cs">
    187       <DependentUpon>PortView.cs</DependentUpon>
    188     </Compile>
    189     <Compile Include="Core.Views\ProgrammableItemView.cs">
    190       <SubType>UserControl</SubType>
    191     </Compile>
    192     <Compile Include="Core.Views\ProgrammableItemView.Designer.cs">
    193       <DependentUpon>ProgrammableItemView.cs</DependentUpon>
    194     </Compile>
    195     <Compile Include="Core.Networks.Views\UserDefinedNetworkView.cs">
    196       <SubType>UserControl</SubType>
    197     </Compile>
    198     <Compile Include="Core.Networks.Views\UserDefinedNetworkView.Designer.cs">
     93    <Compile Include="AlgorithmNodeView.cs">
     94      <SubType>UserControl</SubType>
     95    </Compile>
     96    <Compile Include="AlgorithmNodeView.Designer.cs">
     97      <DependentUpon>AlgorithmNodeView.cs</DependentUpon>
     98    </Compile>
     99    <Compile Include="Plugin.cs" />
     100    <Compile Include="Programmable\ProgrammableNodeView.cs">
     101      <SubType>UserControl</SubType>
     102    </Compile>
     103    <Compile Include="Programmable\ProgrammableNodeView.Designer.cs">
     104      <DependentUpon>ProgrammableNodeView.cs</DependentUpon>
     105    </Compile>
     106    <Compile Include="Programmable\ProgrammableNetworkView.cs">
     107      <SubType>UserControl</SubType>
     108    </Compile>
     109    <Compile Include="Programmable\ProgrammableNetworkView.Designer.cs">
     110      <DependentUpon>ProgrammableNetworkView.cs</DependentUpon>
     111    </Compile>
     112    <Compile Include="Programmable\ProgrammableNetworkItemView.cs">
     113      <SubType>UserControl</SubType>
     114    </Compile>
     115    <Compile Include="Programmable\ProgrammableNetworkItemView.Designer.cs">
     116      <DependentUpon>ProgrammableNetworkItemView.cs</DependentUpon>
     117    </Compile>
     118    <Compile Include="Programmable\UserDefinedNetworkView.cs">
     119      <SubType>UserControl</SubType>
     120    </Compile>
     121    <Compile Include="Programmable\UserDefinedNetworkView.Designer.cs">
    199122      <DependentUpon>UserDefinedNetworkView.cs</DependentUpon>
    200123    </Compile>
    201     <Compile Include="Core.Networks.Views\UserDefinedMessagePortView.cs">
    202       <SubType>UserControl</SubType>
    203     </Compile>
    204     <Compile Include="Core.Networks.Views\UserDefinedMessagePortView.Designer.cs">
     124    <Compile Include="Programmable\UserDefinedNodeView.cs">
     125      <SubType>UserControl</SubType>
     126    </Compile>
     127    <Compile Include="Programmable\UserDefinedNodeView.Designer.cs">
     128      <DependentUpon>UserDefinedNodeView.cs</DependentUpon>
     129    </Compile>
     130    <Compile Include="Properties\AssemblyInfo.cs" />
     131    <Compile Include="UserDefinedMessagePortView.cs">
     132      <SubType>UserControl</SubType>
     133    </Compile>
     134    <Compile Include="UserDefinedMessagePortView.Designer.cs">
    205135      <DependentUpon>UserDefinedMessagePortView.cs</DependentUpon>
    206136    </Compile>
    207     <Compile Include="Core.Networks.Views\UserDefinedNodeView.cs">
    208       <SubType>UserControl</SubType>
    209     </Compile>
    210     <Compile Include="Core.Networks.Views\UserDefinedNodeView.Designer.cs">
    211       <DependentUpon>UserDefinedNodeView.cs</DependentUpon>
    212     </Compile>
    213     <Compile Include="Operators.Views\HookOperatorView.cs">
    214       <SubType>UserControl</SubType>
    215     </Compile>
    216     <Compile Include="Operators.Views\HookOperatorView.Designer.cs">
    217       <DependentUpon>HookOperatorView.cs</DependentUpon>
    218     </Compile>
    219     <Compile Include="Optimization.Networks.Views\AlgorithmNodeView.cs">
    220       <SubType>UserControl</SubType>
    221     </Compile>
    222     <Compile Include="Optimization.Networks.Views\AlgorithmNodeView.Designer.cs">
    223       <DependentUpon>AlgorithmNodeView.cs</DependentUpon>
    224     </Compile>
    225     <Compile Include="Plugin.cs" />
    226     <Compile Include="Properties\AssemblyInfo.cs" />
    227137  </ItemGroup>
    228138  <ItemGroup>
    … …  
    287197      <Private>False</Private>
    288198    </ProjectReference>
    289     <ProjectReference Include="..\..\HeuristicLab.Optimization.Networks\3.3\HeuristicLab.Optimization.Networks-3.3.csproj">
     199    <ProjectReference Include="..\..\HeuristicLab.Networks\3.3\HeuristicLab.Networks-3.3.csproj">
    290200      <Project>{7cf51332-0e37-447c-8017-82a258c59ef2}</Project>
    291201      <Name>HeuristicLab.Optimization.Networks-3.3</Name>
    … …  
    302212      <Private>False</Private>
    303213    </ProjectReference>
     214    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     215      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     216      <Name>HeuristicLab.Persistence-3.3</Name>
     217    </ProjectReference>
    304218    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    305219      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
    … …  
    307221      <Private>False</Private>
    308222    </ProjectReference>
    309   </ItemGroup>
     223    <ProjectReference Include="..\..\HeuristicLab.Scripting.Views\3.3\HeuristicLab.Scripting.Views-3.3.csproj">
     224      <Project>{0c2917c8-7aa8-4e18-800a-c4d064f992ed}</Project>
     225      <Name>HeuristicLab.Scripting.Views-3.3</Name>
     226    </ProjectReference>
     227    <ProjectReference Include="..\..\HeuristicLab.Scripting\3.3\HeuristicLab.Scripting-3.3.csproj">
     228      <Project>{21977cc3-1757-4b3b-87bd-ff817aaa900f}</Project>
     229      <Name>HeuristicLab.Scripting-3.3</Name>
     230    </ProjectReference>
     231  </ItemGroup>
     232  <ItemGroup />
    310233  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    311234  <PropertyGroup>

  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/Plugin.cs.frame

    r11563 r11577  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Optimization.Networks.Views {
     24namespace HeuristicLab.Networks.Views {
    2525  /// <summary>
    26   /// Plugin class for HeuristicLab.Optimization.Networks.Views plugin.
     26  /// Plugin class for HeuristicLab.Networks.Views plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Optimization.Networks.Views", "3.3.11.$WCREV$")]
    29   [PluginFile("HeuristicLab.Optimization.Networks.Views-3.3.dll", PluginFileType.Assembly)]
     28  [Plugin("HeuristicLab.Networks.Views", "3.3.11.$WCREV$")]
     29  [PluginFile("HeuristicLab.Networks.Views-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.CodeEditor", "3.3")]
    3131  [PluginDependency("HeuristicLab.Collections", "3.3")]
    … …  
    3737  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3838  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
     39  [PluginDependency("HeuristicLab.Networks", "3.3")]
    3940  [PluginDependency("HeuristicLab.Operators", "3.3")]
    4041  [PluginDependency("HeuristicLab.Operators.Views", "3.3")]
    4142  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    4243  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    43   [PluginDependency("HeuristicLab.Optimization.Networks", "3.3")]
     44  [PluginDependency("HeuristicLab.Scripting", "3.3")]
     45  [PluginDependency("HeuristicLab.Scripting.Views", "3.3")]
    4446  public class HeuristicLabOptimizationNetworksViewsPlugin : PluginBase {
    4547  }

  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/Programmable/UserDefinedNetworkView.Designer.cs

    r11576 r11577  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core.Networks.Views {
     22namespace HeuristicLab.Networks.Programmable.Views {
    2323  partial class UserDefinedNetworkView {
    2424    /// <summary>
    … …  
    4646    private void InitializeComponent() {
    4747      this.codeTabPage = new System.Windows.Forms.TabPage();
    48       this.programmableItemView = new HeuristicLab.Core.Views.ProgrammableItemView();
     48      this.programmableItemView = new HeuristicLab.Scripting.Views.ProgrammableItemView();
    4949      this.initializeButton = new System.Windows.Forms.Button();
    5050      this.tabControl.SuspendLayout();
    … …  
    116116
    117117    protected System.Windows.Forms.TabPage codeTabPage;
    118     protected HeuristicLab.Core.Views.ProgrammableItemView programmableItemView;
     118    protected HeuristicLab.Scripting.Views.ProgrammableItemView programmableItemView;
    119119    protected System.Windows.Forms.Button initializeButton;
    120120  }

  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/Programmable/UserDefinedNetworkView.cs

    r11576 r11577  
    2020#endregion
    2121
     22using HeuristicLab.Core.Networks.Views;
    2223using HeuristicLab.MainForm;
    2324using System.Windows.Forms;
    2425
    25 namespace HeuristicLab.Core.Networks.Views {
     26namespace HeuristicLab.Networks.Programmable.Views {
    2627  [View("UserDefinedNetwork View")]
    2728  [Content(typeof(UserDefinedNetwork), true)]

  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/Programmable/UserDefinedNodeView.Designer.cs

    r11576 r11577  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core.Networks.Views {
     22namespace HeuristicLab.Networks.Programmable.Views {
    2323  partial class UserDefinedNodeView {
    2424    /// <summary>
    … …  
    4949      this.portCollectionView = new HeuristicLab.Core.Networks.Views.PortCollectionView();
    5050      this.codeTabPage = new System.Windows.Forms.TabPage();
    51       this.programmableItemView = new HeuristicLab.Core.Views.ProgrammableItemView();
     51      this.programmableItemView = new HeuristicLab.Scripting.Views.ProgrammableItemView();
    5252      this.initializeButton = new System.Windows.Forms.Button();
    5353      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    … …  
    154154    protected MainForm.WindowsForms.DragOverTabControl tabControl;
    155155    protected System.Windows.Forms.TabPage portsTabPage;
    156     protected PortCollectionView portCollectionView;
     156    protected HeuristicLab.Core.Networks.Views.PortCollectionView portCollectionView;
    157157    protected System.Windows.Forms.TabPage codeTabPage;
    158     protected HeuristicLab.Core.Views.ProgrammableItemView programmableItemView;
     158    protected HeuristicLab.Scripting.Views.ProgrammableItemView programmableItemView;
    159159    protected System.Windows.Forms.Button initializeButton;
    160160

  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/Programmable/UserDefinedNodeView.cs

    r11576 r11577  
    2020#endregion
    2121
     22using HeuristicLab.Core.Networks.Views;
    2223using HeuristicLab.MainForm;
    2324using System.Windows.Forms;
    2425
    25 namespace HeuristicLab.Core.Networks.Views {
     26namespace HeuristicLab.Networks.Programmable.Views {
    2627  [View("UserDefinedNode View")]
    2728  [Content(typeof(UserDefinedNode), true)]

  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/UserDefinedMessagePortView.Designer.cs

    r11576 r11577  
    2020#endregion
    2121
    22 namespace HeuristicLab.Core.Networks.Views {
     22namespace HeuristicLab.Networks.Views {
    2323  partial class UserDefinedMessagePortView {
    2424    /// <summary>

  • branches/OptimizationNetworks/HeuristicLab.Networks.Views/3.3/UserDefinedMessagePortView.cs

    r11576 r11577  
    2020#endregion
    2121
     22using HeuristicLab.Core.Networks.Views;
    2223using HeuristicLab.MainForm;
    2324using System.Windows.Forms;
    2425
    25 namespace HeuristicLab.Core.Networks.Views {
     26namespace HeuristicLab.Networks.Views {
    2627  [View("UserDefinedMessagePort View")]
    2728  [Content(typeof(UserDefinedMessagePort), true)]
Note: See TracChangeset for help on using the changeset viewer.