Changeset 4254 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3

Timestamp:

08/18/10 17:23:09 (14 years ago)

Author:

cneumuel

Message:

some small refactorings (#1159)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3

Files:

• HeuristicLab.Hive.Server-3.3.csproj (modified) (3 diffs)
• HeuristicLabHiveServerApplication.cs (modified) (2 diffs)
• HeuristicLabHiveServerPlugin.cs (modified) (1 diff)
• MainForm.Designer.cs (modified) (2 diffs)
• MainForm.cs (modified) (1 diff)
• Properties/Resources.Designer.cs (deleted)
• Properties/Resources.resx (deleted)
• Properties/Settings.Designer.cs (deleted)
• Properties/Settings.settings (deleted)
• Resources (deleted)
• ServiceCallInterception.cs (deleted)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLab.Hive.Server-3.3.csproj

@@ -78 +78 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Common.Resources-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
@@ -133 +136 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <None Include="Properties\AssemblyInfo.frame" />
     <None Include="HeuristicLab.snk" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -164 +148 @@
       <Name>HeuristicLab.Hive.Server.Core-3.3</Name>
     </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\HeuristicLab.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLabHiveServerApplication.cs

@@ -30 +30 @@
 using HeuristicLab.Hive.Contracts.Interfaces;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Hive.Server.Core;
 
 namespace HeuristicLab.Hive.Server {
@@ -162 +163 @@
       baseAddrDict.Add(STR_ExecutionEngineFacade, StartService(Services.ExecutionEngineFacade, addresses[index], WcfSettings.DEFAULTPORT));
 
-      // [chn] why is lifecyclemanager instantiated here?? shouldnt Core.ServiceLocator be used?
-      IEnumerable<ILifecycleManager> lifecycleManagers = ApplicationManager.Manager.GetInstances<ILifecycleManager>();
-      if (lifecycleManagers.Count() > 0) {
-        ILifecycleManager lifecycleManager = lifecycleManagers.First();
+      ILifecycleManager lifecycleManager = ServiceLocator.GetLifecycleManager();
 
-        lifecycleManager.Init();
+      lifecycleManager.Init();
 
-        // [chn] remove gui code here, how to display any response from server?
-        Form mainForm = new MainForm(baseAddrDict);
-        Application.Run(mainForm);
+      Form mainForm = new MainForm(baseAddrDict);
+      Application.Run();
 
-        lifecycleManager.Shutdown();
-      }
+      lifecycleManager.Shutdown();
+      
       StopService(Services.All);
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/HeuristicLabHiveServerPlugin.cs

@@ -29 +29 @@
   [Plugin("HeuristicLab.Hive.Server", "3.3")]
   [PluginFile("HeuristicLab.Hive.Server-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
   [PluginDependency("HeuristicLab.Hive.Server.Core", "3.3")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/MainForm.Designer.cs

@@ -51 +51 @@
           // rtfServices
           // 
+          this.rtfServices.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                      | System.Windows.Forms.AnchorStyles.Left)
+                      | System.Windows.Forms.AnchorStyles.Right)));
           this.rtfServices.Location = new System.Drawing.Point(12, 25);
           this.rtfServices.Name = "rtfServices";
           this.rtfServices.ReadOnly = true;
-          this.rtfServices.Size = new System.Drawing.Size(280, 121);
+          this.rtfServices.Size = new System.Drawing.Size(377, 129);
           this.rtfServices.TabIndex = 1;
           this.rtfServices.Text = "";
@@ -96 +99 @@
           this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
           this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-          this.ClientSize = new System.Drawing.Size(304, 166);
+          this.ClientSize = new System.Drawing.Size(401, 166);
           this.Controls.Add(this.rtfServices);
           this.Controls.Add(this.label1);
-          this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
           this.Name = "MainForm";
-          this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
           this.Text = "Hive Server";
           this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3/MainForm.cs

@@ -7 +7 @@
 using System.Text;
 using System.Windows.Forms;
-using HeuristicLab.Hive.Server.Properties;
 
-namespace HeuristicLab.Hive.Server
-{
-    public partial class MainForm : Form {
-        public MainForm(Dictionary<string, Uri> addresses) {
-          InitializeComponent();
-          this.Visible = false;
-          this.Hide();
+namespace HeuristicLab.Hive.Server {
+  public partial class MainForm : Form {
+    public MainForm(Dictionary<string, Uri> addresses) {
+      InitializeComponent();
 
-          Uri uri;
-          StringBuilder servicesTxt = new StringBuilder();
-          addresses.TryGetValue(HeuristicLabHiveServerApplication.STR_ClientCommunicator, out uri);
-          if (uri != null)
-            servicesTxt.AppendLine(String.Format("Server Client: {0}", uri));
-          addresses.TryGetValue(HeuristicLabHiveServerApplication.STR_ServerConsoleFacade, out uri);
-          if (uri != null)
-            servicesTxt.AppendLine(String.Format("Server Console: {0}", uri));
-          addresses.TryGetValue(HeuristicLabHiveServerApplication.STR_ExecutionEngineFacade, out uri);
-          if (uri != null)
-            servicesTxt.AppendLine(String.Format("Execution Engine: {0}", uri));
+      Uri uri;
+      StringBuilder servicesTxt = new StringBuilder();
+      addresses.TryGetValue(HeuristicLabHiveServerApplication.STR_ClientCommunicator, out uri);
+      if (uri != null)
+        servicesTxt.AppendLine(String.Format("Server Client: {0}", uri));
+      addresses.TryGetValue(HeuristicLabHiveServerApplication.STR_ServerConsoleFacade, out uri);
+      if (uri != null)
+        servicesTxt.AppendLine(String.Format("Server Console: {0}", uri));
+      addresses.TryGetValue(HeuristicLabHiveServerApplication.STR_ExecutionEngineFacade, out uri);
+      if (uri != null)
+        servicesTxt.AppendLine(String.Format("Execution Engine: {0}", uri));
 
-          rtfServices.AppendText(servicesTxt.ToString());
+      rtfServices.AppendText(servicesTxt.ToString());
 
-          ni.Icon = Resources.HeuristicLab;
-          ni.BalloonTipTitle = "HL Hive Server Services";
-          ni.BalloonTipText = servicesTxt.ToString();
-          ni.BalloonTipIcon = ToolTipIcon.Info;
-          ni.Text = "HL Hive Server Services";
-          ni.ShowBalloonTip(10000);
-        }
+      ni.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
+      ni.BalloonTipTitle = "HL Hive Server Services";
+      ni.BalloonTipText = servicesTxt.ToString();
+      ni.BalloonTipIcon = ToolTipIcon.Info;
+      ni.Text = "HL Hive Server Services";
+      ni.ShowBalloonTip(10000);
+    }
 
-        private void CloseApp(object sender, EventArgs e) {
-          Dispose();
-        }
+    private void CloseApp(object sender, EventArgs e) {
+      this.Dispose();
+      Application.Exit();
+    }
 
-        private void ShowInfo(object sender, EventArgs e) {
-          this.Visible = true;
-        }
+    private void ShowInfo(object sender, EventArgs e) {
+      this.Visible = true;
+    }
 
-        private void btnClose_Click(object sender, EventArgs e) {
-          this.Visible = false;
-        }
-
-        private void MainForm_FormClosing(object sender, FormClosingEventArgs e) {          
-        }
-
+    private void MainForm_FormClosing(object sender, FormClosingEventArgs e) {
+      e.Cancel = true;
+      this.Visible = false;
     }
+  }
 }