Changeset 359 for trunk

Timestamp:

07/02/08 19:59:39 (16 years ago)

Author:

gkronber

Message:

worked on #187

Location:

trunk/sources/HeuristicLab.CEDMA.Console

Files:

• Console.cs (modified) (3 diffs)
• ConsoleEditor.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.CEDMA.Console/Console.cs

@@ -17 +17 @@
     public string ServerUri {
       get { return serverUri; }
-      set {
-        serverUri = value;
-        ResetConnection();
-      }
     }
 
@@ -51 +47 @@
     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
-      ServerUri = node.Attributes["ServerURI"].Value;
+      serverUri = node.Attributes["ServerURI"].Value;
     }
     #endregion
@@ -67 +63 @@
     }
     #endregion
+
+    internal void Connect(string serverUri) {
+      this.serverUri = serverUri;
+      ResetConnection();
+    }
   }
 }

trunk/sources/HeuristicLab.CEDMA.Console/ConsoleEditor.cs

@@ -5 +5 @@
 using HeuristicLab.Core;
 using System.Windows.Forms;
+using System.ServiceModel;
 
 namespace HeuristicLab.CEDMA.Console {
@@ -14 +15 @@
     private System.Windows.Forms.TabPage agentsPage;
     private System.Windows.Forms.TabPage resultsPage;
+    private Button connectButton;
     private Console console;
 
     public ConsoleEditor(Console console) {
+      InitializeComponent();
       this.console = console;
-      agentsPage.Controls.Add((Control)console.AgentList.CreateView());
     }
 
@@ -28 +30 @@
       this.agentsPage = new System.Windows.Forms.TabPage();
       this.resultsPage = new System.Windows.Forms.TabPage();
+      this.connectButton = new System.Windows.Forms.Button();
       this.tabControl.SuspendLayout();
-      this.agentsPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -38 +40 @@
       this.uriTextBox.Size = new System.Drawing.Size(205, 20);
       this.uriTextBox.TabIndex = 0;
-      this.uriTextBox.Validated += new System.EventHandler(this.uriTextBox_Validated);
       // 
       // uriLabel
@@ -57 +58 @@
       this.tabControl.Controls.Add(this.agentsPage);
       this.tabControl.Controls.Add(this.resultsPage);
+      this.tabControl.Enabled = false;
       this.tabControl.Location = new System.Drawing.Point(6, 29);
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(310, 242);
+      this.tabControl.Size = new System.Drawing.Size(407, 242);
       this.tabControl.TabIndex = 2;
       // 
@@ -68 +70 @@
       this.overviewPage.Name = "overviewPage";
       this.overviewPage.Padding = new System.Windows.Forms.Padding(3);
-      this.overviewPage.Size = new System.Drawing.Size(288, 194);
+      this.overviewPage.Size = new System.Drawing.Size(399, 216);
       this.overviewPage.TabIndex = 0;
       this.overviewPage.Text = "Overview";
@@ -78 +80 @@
       this.agentsPage.Name = "agentsPage";
       this.agentsPage.Padding = new System.Windows.Forms.Padding(3);
-      this.agentsPage.Size = new System.Drawing.Size(302, 216);
+      this.agentsPage.Size = new System.Drawing.Size(399, 216);
       this.agentsPage.TabIndex = 1;
       this.agentsPage.Text = "Agents";
@@ -88 +90 @@
       this.resultsPage.Name = "resultsPage";
       this.resultsPage.Padding = new System.Windows.Forms.Padding(3);
-      this.resultsPage.Size = new System.Drawing.Size(288, 194);
+      this.resultsPage.Size = new System.Drawing.Size(399, 216);
       this.resultsPage.TabIndex = 2;
       this.resultsPage.Text = "Results";
       this.resultsPage.UseVisualStyleBackColor = true;
       // 
+      // connectButton
+      // 
+      this.connectButton.Location = new System.Drawing.Point(302, 1);
+      this.connectButton.Name = "connectButton";
+      this.connectButton.Size = new System.Drawing.Size(75, 23);
+      this.connectButton.TabIndex = 3;
+      this.connectButton.Text = "&Connect";
+      this.connectButton.UseVisualStyleBackColor = true;
+      this.connectButton.Click += new System.EventHandler(this.connectButton_Click);
+      // 
       // ConsoleEditor
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.Controls.Add(this.connectButton);
       this.Controls.Add(this.tabControl);
       this.Controls.Add(this.uriLabel);
       this.Controls.Add(this.uriTextBox);
       this.Name = "ConsoleEditor";
-      this.Size = new System.Drawing.Size(319, 274);
+      this.Size = new System.Drawing.Size(416, 274);
       this.tabControl.ResumeLayout(false);
-      this.agentsPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -108 +120 @@
     }
 
-    private void uriTextBox_Validated(object sender, EventArgs e) {
-      console.ServerUri = uriTextBox.Text;
+    private void connectButton_Click(object sender, EventArgs e) {
+      try {
+        console.Connect(uriTextBox.Text);
+        connectButton.Enabled = false;
+        tabControl.Enabled = true;
+        agentsPage.Controls.Add((Control)console.AgentList.CreateView());
+      } catch(CommunicationException ex) {
+        // TASK create helper class for error reporting
+        MessageBox.Show("Exception while trying to connect to " + uriTextBox.Text + "\n" + ex.Message);
+      }
     }
   }