Free cookie consent management tool by TermsFeed Policy Generator

Changeset 384


Ignore:
Timestamp:
07/12/08 11:50:43 (16 years ago)
Author:
gkronber
Message:

merged changesets r382 and r383 (fix references and compiler warnings) into the "collections" branch

Location:
branches/Collections/sources
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/Collections/sources/HeuristicLab.CEDMA.Core/AgentList.cs

    r377 r384  
    3333namespace HeuristicLab.CEDMA.Core {
    3434  public class AgentList : ItemBase, IAgentList {
    35     private string serverUri;
    3635    private List<IAgent> agentList;
    3736    private IDatabase database;

  • branches/Collections/sources/HeuristicLab.CEDMA.Core/AgentListView.cs

    r377 r384  
    3131namespace HeuristicLab.CEDMA.Core {
    3232  public partial class AgentListView : ViewBase {
    33     private ChooseItemDialog chooseItemDialog;
    34 
    3533    public IAgentList AgentList {
    3634      get { return (IAgentList)Item; }

  • branches/Collections/sources/HeuristicLab.CEDMA.Core/Console.cs

    r377 r384  
    5353    }
    5454
    55     public IView CreateView() {
     55    public override IView CreateView() {
    5656      return new ConsoleEditor(this);
    5757    }

  • branches/Collections/sources/HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj

    r377 r384  
    3434  </PropertyGroup>
    3535  <ItemGroup>
    36     <Reference Include="HeuristicLab.PluginInfrastructure, Version=3.0.0.316, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    37       <SpecificVersion>False</SpecificVersion>
    38       <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.0\HeuristicLab.PluginInfrastructure.dll</HintPath>
    39     </Reference>
    4036    <Reference Include="System" />
    4137    <Reference Include="System.Core">
    … …  
    9793      <Name>HeuristicLab.Core</Name>
    9894    </ProjectReference>
     95    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
     96      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     97      <Name>HeuristicLab.PluginInfrastructure</Name>
     98    </ProjectReference>
    9999  </ItemGroup>
    100100  <ItemGroup>

  • branches/Collections/sources/HeuristicLab.CEDMA.Core/IAgent.cs

    r377 r384  
    3232    ProcessStatus Status { get; }
    3333    IOperatorGraph OperatorGraph { get; }
    34     void Save();
    3534    void Activate();
    3635  }

  • branches/Collections/sources/HeuristicLab.CEDMA.DB.Interfaces/HeuristicLab.CEDMA.DB.Interfaces.csproj

    r375 r384  
    3434  </PropertyGroup>
    3535  <ItemGroup>
    36     <Reference Include="HeuristicLab.PluginInfrastructure, Version=3.0.0.316, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    37       <SpecificVersion>False</SpecificVersion>
    38       <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.0\HeuristicLab.PluginInfrastructure.dll</HintPath>
    39     </Reference>
    4036    <Reference Include="System" />
    4137    <Reference Include="System.Core">
    … …  
    6965    <None Include="HeuristicLab.snk" />
    7066  </ItemGroup>
     67  <ItemGroup>
     68    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
     69      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     70      <Name>HeuristicLab.PluginInfrastructure</Name>
     71    </ProjectReference>
     72  </ItemGroup>
    7173  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    7274  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/Collections/sources/HeuristicLab.CEDMA.DB/HeuristicLab.CEDMA.DB.csproj

    r373 r384  
    3636  </PropertyGroup>
    3737  <ItemGroup>
    38     <Reference Include="HeuristicLab.PluginInfrastructure, Version=3.0.0.316, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    39       <SpecificVersion>False</SpecificVersion>
    40       <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.0\HeuristicLab.PluginInfrastructure.dll</HintPath>
    41     </Reference>
    4238    <Reference Include="System" />
    4339    <Reference Include="System.Core">
    … …  
    7672      <Name>HeuristicLab.CEDMA.DB.Interfaces</Name>
    7773    </ProjectReference>
     74    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
     75      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     76      <Name>HeuristicLab.PluginInfrastructure</Name>
     77    </ProjectReference>
    7878    <ProjectReference Include="..\HeuristicLab.SQLite\HeuristicLab.SQLite.csproj">
    7979      <Project>{6960CBCD-E44B-49B0-BA86-671091C42C36}</Project>

  • branches/Collections/sources/HeuristicLab.CEDMA.Operators/HeuristicLab.CEDMA.Operators.csproj

    r377 r384  
    3434  </PropertyGroup>
    3535  <ItemGroup>
    36     <Reference Include="HeuristicLab.PluginInfrastructure, Version=3.0.0.316, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    37       <SpecificVersion>False</SpecificVersion>
    38       <HintPath>..\..\..\..\..\..\..\Program Files\HeuristicLab 3.0\HeuristicLab.PluginInfrastructure.dll</HintPath>
    39     </Reference>
    4036    <Reference Include="System" />
    4137    <Reference Include="System.Core">
    … …  
    8278      <Name>HeuristicLab.Data</Name>
    8379    </ProjectReference>
     80    <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
     81      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     82      <Name>HeuristicLab.PluginInfrastructure</Name>
     83    </ProjectReference>
    8484  </ItemGroup>
    8585  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/Collections/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs

    r299 r384  
    3737  public class DistributedEngine : EngineBase, IEditable {
    3838    private JobManager jobManager;
    39     private CompositeOperation waitingOperations;
    4039    private string serverAddress;
    4140    public string ServerAddress {

  • branches/Collections/sources/HeuristicLab.Grid/ClientForm.cs

    r252 r384  
    111111        try {
    112112          gotEngine = engineStore.TryTakeEngine(out currentGuid, out engineXml);
    113         } catch(TimeoutException timeoutException) {
     113        } catch(TimeoutException) {
    114114          currentEngine = null;
    115115          currentGuid = Guid.Empty;
    … …  
    117117          fetchOperationTimer.Interval = 5000;
    118118          fetchOperationTimer.Start();
    119         } catch(CommunicationException communicationException) {
     119        } catch(CommunicationException) {
    120120          // connection problem -> reset connection and start the timer again
    121121          ResetConnection();
    … …  
    155155              engineStore.StoreResult(currentGuid, resultXml);
    156156              success = true;
    157             } catch(TimeoutException timeoutException) {
     157            } catch(TimeoutException) {
    158158              success = false;
    159159              retries++;
    160160              Thread.Sleep(TimeSpan.FromSeconds(CONNECTION_RETRY_TIMEOUT_SEC));
    161             } catch(CommunicationException communicationException) {
     161            } catch(CommunicationException) {
    162162              ResetConnection();
    163163              success = false;

  • branches/Collections/sources/HeuristicLab.Grid/JobManager.cs

    r379 r384  
    189189          }
    190190          return;
    191         } catch(TimeoutException timeoutException) {
    192           retries++;
    193           Thread.Sleep(TimeSpan.FromSeconds(RETRY_TIMEOUT_SEC));
    194         } catch(CommunicationException communicationException) {
     191        } catch(TimeoutException) {
     192          retries++;
     193          Thread.Sleep(TimeSpan.FromSeconds(RETRY_TIMEOUT_SEC));
     194        } catch(CommunicationException) {
    195195          ResetConnection();
    196196          retries++;
    … …  
    208208            return zippedResult;
    209209          }
    210         } catch(TimeoutException timeoutException) {
    211           retries++;
    212           Thread.Sleep(TimeSpan.FromSeconds(RETRY_TIMEOUT_SEC));
    213         } catch(CommunicationException communicationException) {
     210        } catch(TimeoutException) {
     211          retries++;
     212          Thread.Sleep(TimeSpan.FromSeconds(RETRY_TIMEOUT_SEC));
     213        } catch(CommunicationException) {
    214214          ResetConnection();
    215215          retries++;
    … …  
    229229            return jobState;
    230230          }
    231         } catch(TimeoutException timeoutException) {
    232           retries++;
    233           Thread.Sleep(TimeSpan.FromSeconds(RETRY_TIMEOUT_SEC));
    234         } catch(CommunicationException communicationException) {
     231        } catch(TimeoutException) {
     232          retries++;
     233          Thread.Sleep(TimeSpan.FromSeconds(RETRY_TIMEOUT_SEC));
     234        } catch(CommunicationException) {
    235235          ResetConnection();
    236236          retries++;

  • branches/Collections/sources/HeuristicLab.Grid/ProcessingEngine.cs

    r268 r384  
    6363        try {
    6464          next = atomicOperation.Operator.Execute(atomicOperation.Scope);
    65         } catch(Exception ex) {
     65        } catch(Exception) {
    6666          // push operation on stack again
    6767          myExecutionStack.Push(atomicOperation);

  • branches/Collections/sources/HeuristicLab.PluginInfrastructure.GUI/PluginAction.cs

    r8 r384  
    6565          // this method is not defined for actions other than "Install" and "Remove"
    6666          throw new InvalidOperationException();
    67           return "";
    6867      }
    6968    }

  • branches/Collections/sources/HeuristicLab.PluginInfrastructure/Loader.cs

    r242 r384  
    9595        try {
    9696          return Assembly.ReflectionOnlyLoad(args.Name);
    97         } catch(FileLoadException ex) {
     97        } catch(FileLoadException) {
    9898          return null;
    9999        }
Note: See TracChangeset for help on using the changeset viewer.