Menu
▾
▴
andromdaplugins-cvs
|
From: Chris M. <cm...@us...> - 2006-05-30 18:52:23
|
User: cmicali
Date: 06/05/30 11:52:18
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe AndroMDA VS2005 Add-In
Setup.nsi
Log:
- Updated installer with new version
Revision Changes Path
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
|
|
From: Chris M. <cm...@us...> - 2006-05-30 23:01:58
|
User: cmicali
Date: 06/05/30 16:01:57
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AboutDialog.cs AboutDialog.designer.cs
AboutOptionsPage.cs AboutOptionsPage.designer.cs
AboutOptionsPage.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
MDASolutionManager.cs VS80AddIn.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe AndroMDA VS2005 Add-In
Setup.nsi
Log:
- Updated add-in version to 1.0
- Added statistics to about dialog (number of entities generated, number of files, lines of code, etc)
- Cleaned up about dialog
- Updated setup with latest version of add-in
Revision Changes Path
No revision
No revision
No revision
No revision
1.3 +7 -5 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.cs
Index: AboutDialog.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- AboutDialog.cs 3 May 2006 20:23:06 -0000 1.2
+++ AboutDialog.cs 30 May 2006 23:01:57 -0000 1.3
@@ -49,13 +49,11 @@
{
button1.Focus();
this.AcceptButton = button1;
+ aboutOptionsPage1.SolutionManager = m_solutionManager;
if (m_solutionManager.IsEnabled)
{
+ aboutOptionsPage1.Reset();
aboutOptionsPage1.SolutionUsingMDA = "Yes";
- if (m_solutionManager.MavenLastRunDateTime.HasValue)
- {
- aboutOptionsPage1.LastGenerated = m_solutionManager.MavenLastRunDateTime.ToString();
- }
if (m_solutionManager.CommonProject != null)
{
aboutOptionsPage1.CommonProject = m_solutionManager.CommonProject.Name;
@@ -76,6 +74,10 @@
modelFile = modelFile.Substring(0, position);
}
aboutOptionsPage1.ModelFile = FileUtils.GetFilename(modelFile);
+ if (m_solutionManager.MavenLastRunDateTime.HasValue)
+ {
+ aboutOptionsPage1.LastGenerated = m_solutionManager.MavenLastRunDateTime.ToString();
+ }
}
else
{
1.3 +3 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.designer.cs
Index: AboutDialog.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.designer.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- AboutDialog.designer.cs 3 May 2006 20:23:06 -0000 1.2
+++ AboutDialog.designer.cs 30 May 2006 23:01:57 -0000 1.3
@@ -35,7 +35,7 @@
// button1
//
this.button1.BackColor = System.Drawing.SystemColors.Control;
- this.button1.Location = new System.Drawing.Point(155, 297);
+ this.button1.Location = new System.Drawing.Point(155, 347);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(84, 25);
this.button1.TabIndex = 2;
@@ -48,7 +48,7 @@
this.aboutOptionsPage1.Dock = System.Windows.Forms.DockStyle.Top;
this.aboutOptionsPage1.Location = new System.Drawing.Point(0, 0);
this.aboutOptionsPage1.Name = "aboutOptionsPage1";
- this.aboutOptionsPage1.Size = new System.Drawing.Size(394, 291);
+ this.aboutOptionsPage1.Size = new System.Drawing.Size(394, 341);
this.aboutOptionsPage1.TabIndex = 1;
//
// AboutDialog
@@ -56,7 +56,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
- this.ClientSize = new System.Drawing.Size(394, 331);
+ this.ClientSize = new System.Drawing.Size(394, 381);
this.ControlBox = false;
this.Controls.Add(this.button1);
this.Controls.Add(this.aboutOptionsPage1);
1.4 +166 -17 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.cs
Index: AboutOptionsPage.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AboutOptionsPage.cs 3 May 2006 20:23:06 -0000 1.3
+++ AboutOptionsPage.cs 30 May 2006 23:01:57 -0000 1.4
@@ -5,7 +5,7 @@
#region Using statements
using System;
-using System.Collections.Generic;
+using System.Collections;
using System.ComponentModel;
using System.Drawing;
using System.Data;
@@ -21,45 +21,131 @@
#region Member variables
- static AboutOptionsPage m_properties = new AboutOptionsPage();
-
+ static AboutOptionsPageProperties m_properties = new AboutOptionsPageProperties();
+ private MDASolutionManager m_solutionManager = null;
+ private StatisticsGenerator m_statsGenerator = null;
#endregion
#region Properties
+ public MDASolutionManager SolutionManager
+ {
+ get { return m_solutionManager; }
+ set { m_solutionManager = value; }
+ }
+
public string SolutionUsingMDA
{
set
{
- bool solutionEnabled = value == "Yes";
- pnlSolutionInfo.Visible = solutionEnabled;
- lblSolutionUsingMDA.Text = value;
+ InsertListViewItem(listViewStatus, "Solution Is Using MDA", value, "AndroMDA");
+ }
+ }
+
+ public string ModelFile
+ {
+ set
+ {
+ InsertListViewItem(listViewStatus, "Model File", value, "AndroMDA");
}
}
public string LastGenerated
{
- set { lblLastGenerated.Text = value; }
+ set
+ {
+ InsertListViewItem(listViewStatus, "Last Generated", value, "AndroMDA");
+ }
}
public string CoreProject
{
- set { lblCoreProject.Text = value; }
+ set
+ {
+ InsertListViewItem(listViewStatus, "Core Project", value, "Projects");
+ }
}
public string CommonProject
{
- set { lblCommonProject.Text = value; }
+ set
+ {
+ InsertListViewItem(listViewStatus, "Common Project", value, "Projects");
+ }
+ }
+
+ public string SchemaExportProject
+ {
+ set
+ {
+ InsertListViewItem(listViewStatus, "Schema Export Project", value, "Projects");
+ }
}
- public string ModelFile
+
+
+ private ListViewItem GetListViewItem(string name, string value)
{
- set { lblModelFile.Text = value; }
+ ListViewItem lvi = new ListViewItem();
+ lvi.Text = name;
+ lvi.SubItems.Add(new ListViewItem.ListViewSubItem(lvi, value));
+ return lvi;
}
- public string SchemaExportProject
+ private void InsertListViewItem(ListView listView, string name, string value, string groupName)
+ {
+ ListViewItem lvi = new ListViewItem();
+ lvi.Group = null;
+ foreach (ListViewGroup group in listView.Groups)
+ {
+ if (group.Header == groupName)
+ {
+ lvi.Group = group;
+ }
+ }
+ if (lvi.Group == null)
+ {
+ lvi.Group = new ListViewGroup(groupName);
+ listView.Groups.Add(lvi.Group);
+ }
+ lvi.Text = name;
+ lvi.SubItems.Add(new ListViewItem.ListViewSubItem(lvi, value));
+ listView.Items.Add(lvi);
+ }
+
+ public void Reset()
{
- set { lblSchemaExportProject.Text = value; }
+ listViewStatus.Items.Clear();
+ }
+
+ public ArrayList Statistics
+ {
+ set
+ {
+ listViewStatistics.BeginUpdate();
+ listViewStatistics.Items.Clear();
+ listViewStatistics.Groups.Clear();
+ ListViewGroup codeGroup = new ListViewGroup("Code Statistics");
+ ListViewGroup fileGroup = new ListViewGroup("File Statistics");
+ listViewStatistics.Groups.Add(codeGroup);
+ listViewStatistics.Groups.Add(fileGroup);
+ ArrayList stats = value;
+ foreach (MDASolutionManager.SolutionStatistic stat in stats)
+ {
+ ListViewItem lvi = GetListViewItem(stat.Name, stat.Value);
+ switch(stat.StatGroup)
+ {
+ case MDASolutionManager.SolutionStatistic.Group.CodeStatistics:
+ lvi.Group = codeGroup;
+ break;
+ case MDASolutionManager.SolutionStatistic.Group.FileStatistics:
+ lvi.Group = fileGroup;
+ break;
+ }
+ listViewStatistics.Items.Add(lvi);
+ }
+ listViewStatistics.EndUpdate();
+ }
}
#endregion
@@ -69,12 +155,15 @@
InitializeComponent();
//linkLabel1.Links.Add(0, linkLabel1.Text.Length);
lblVersion.Text = "v" + VS80AddIn.ADD_IN_VERSION;
+ m_statsGenerator = new StatisticsGenerator(this);
+ m_statsGenerator.Completed += new EventHandler(m_statsGenerator_Completed);
}
#region IDTToolsOptionsPage Members
public void OnAfterCreated(EnvDTE.DTE DTEObject)
{
+
}
public void OnOK()
@@ -102,8 +191,68 @@
System.Diagnostics.Process.Start(label.Text);
}
+ private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (tabControl1.SelectedIndex == 1)
+ {
+ if (listViewStatistics.Items.Count == 0)
+ {
+ listViewStatistics.Visible = false;
+ pnlGenerating.Visible = true;
+ m_statsGenerator.SolutionManager = m_solutionManager;
+ m_statsGenerator.Start();
+ }
+ }
+ }
+
+ void m_statsGenerator_Completed(object sender, EventArgs e)
+ {
+ this.Statistics = m_statsGenerator.Statistics;
+ listViewStatistics.Visible = true;
+ pnlGenerating.Visible = false;
+ }
+
+
+ private class StatisticsGenerator : AsyncOperation
+ {
+ private ArrayList m_statistics;
+ private MDASolutionManager m_solutionManager;
+
+ public MDASolutionManager SolutionManager
+ {
+ get { return m_solutionManager; }
+ set { m_solutionManager = value; }
+ }
+
+ public ArrayList Statistics
+ {
+ get { return m_statistics; }
+ set { m_statistics = value; }
+ }
+
+ public StatisticsGenerator(ISynchronizeInvoke target)
+ : base(target)
+ {
+ m_statistics = null;
+ }
+
+ public StatisticsGenerator(ISynchronizeInvoke target, MDASolutionManager solutionManager)
+ : base(target)
+ {
+ m_statistics = null;
+ m_solutionManager = solutionManager;
+ }
+
+ protected override void DoWork()
+ {
+ m_statistics = m_solutionManager.GetSolutionStatistics();
+ }
+ }
+
}
+
+
[System.Runtime.InteropServices.ComVisible(true)]
[System.Runtime.InteropServices.ClassInterface(System.Runtime.InteropServices.ClassInterfaceType.AutoDual)]
public class AboutOptionsPageProperties
1.5 +168 -209 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.designer.cs
Index: AboutOptionsPage.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.designer.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- AboutOptionsPage.designer.cs 3 May 2006 20:23:06 -0000 1.4
+++ AboutOptionsPage.designer.cs 30 May 2006 23:01:57 -0000 1.5
@@ -30,52 +30,39 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutOptionsPage));
- this.linkLabel2 = new System.Windows.Forms.LinkLabel();
+ System.Windows.Forms.ListViewGroup listViewGroup3 = new System.Windows.Forms.ListViewGroup("Code Statistics", System.Windows.Forms.HorizontalAlignment.Left);
+ System.Windows.Forms.ListViewGroup listViewGroup4 = new System.Windows.Forms.ListViewGroup("File Statistics", System.Windows.Forms.HorizontalAlignment.Left);
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.lblVersion = new System.Windows.Forms.Label();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.pnlSolutionInfo = new System.Windows.Forms.Panel();
- this.label7 = new System.Windows.Forms.Label();
- this.lblModelFile = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
- this.lblSchemaExportProject = new System.Windows.Forms.Label();
- this.lblCommonProject = new System.Windows.Forms.Label();
- this.label9 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.lblLastGenerated = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.lblCoreProject = new System.Windows.Forms.Label();
- this.lblSolutionUsingMDA = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
+ this.listViewStatus = new System.Windows.Forms.ListView();
+ this.columnHeader3 = new System.Windows.Forms.ColumnHeader();
+ this.columnHeader4 = new System.Windows.Forms.ColumnHeader();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.listViewStatistics = new System.Windows.Forms.ListView();
+ this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
+ this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
this.tabPage2 = new System.Windows.Forms.TabPage();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.panel1 = new System.Windows.Forms.Panel();
this.label8 = new System.Windows.Forms.Label();
+ this.linkLabel2 = new System.Windows.Forms.LinkLabel();
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
+ this.pnlGenerating = new System.Windows.Forms.Panel();
+ this.pictureBox2 = new System.Windows.Forms.PictureBox();
+ this.label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.pnlSolutionInfo.SuspendLayout();
+ this.tabPage3.SuspendLayout();
this.tabPage2.SuspendLayout();
- this.groupBox1.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.pnlGenerating.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.SuspendLayout();
//
- // linkLabel2
- //
- this.linkLabel2.ForeColor = System.Drawing.Color.Black;
- this.linkLabel2.Location = new System.Drawing.Point(6, 50);
- this.linkLabel2.Name = "linkLabel2";
- this.linkLabel2.Size = new System.Drawing.Size(369, 17);
- this.linkLabel2.TabIndex = 1;
- this.linkLabel2.TabStop = true;
- this.linkLabel2.Text = "http://www.andromda.org/";
- this.linkLabel2.TextAlign = System.Drawing.ContentAlignment.TopCenter;
- this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel_LinkClicked);
- //
// label1
//
this.label1.AutoSize = true;
@@ -125,207 +112,183 @@
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.ImageList = this.imageList1;
this.tabControl1.Location = new System.Drawing.Point(0, 99);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(395, 190);
+ this.tabControl1.Size = new System.Drawing.Size(395, 239);
this.tabControl1.TabIndex = 5;
+ this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
// tabPage1
//
- this.tabPage1.Controls.Add(this.groupBox2);
- this.tabPage1.ImageIndex = 0;
+ this.tabPage1.Controls.Add(this.listViewStatus);
+ this.tabPage1.ImageIndex = 2;
this.tabPage1.Location = new System.Drawing.Point(4, 23);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(387, 163);
+ this.tabPage1.Size = new System.Drawing.Size(387, 212);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "Status";
this.tabPage1.UseVisualStyleBackColor = true;
//
- // groupBox2
+ // listViewStatus
//
- this.groupBox2.Controls.Add(this.pnlSolutionInfo);
- this.groupBox2.Controls.Add(this.lblSolutionUsingMDA);
- this.groupBox2.Controls.Add(this.label3);
- this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.groupBox2.Location = new System.Drawing.Point(3, 3);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(381, 157);
- this.groupBox2.TabIndex = 0;
- this.groupBox2.TabStop = false;
- //
- // pnlSolutionInfo
- //
- this.pnlSolutionInfo.Controls.Add(this.label7);
- this.pnlSolutionInfo.Controls.Add(this.lblModelFile);
- this.pnlSolutionInfo.Controls.Add(this.label4);
- this.pnlSolutionInfo.Controls.Add(this.lblSchemaExportProject);
- this.pnlSolutionInfo.Controls.Add(this.lblCommonProject);
- this.pnlSolutionInfo.Controls.Add(this.label9);
- this.pnlSolutionInfo.Controls.Add(this.label5);
- this.pnlSolutionInfo.Controls.Add(this.lblLastGenerated);
- this.pnlSolutionInfo.Controls.Add(this.label6);
- this.pnlSolutionInfo.Controls.Add(this.lblCoreProject);
- this.pnlSolutionInfo.Location = new System.Drawing.Point(6, 36);
- this.pnlSolutionInfo.Name = "pnlSolutionInfo";
- this.pnlSolutionInfo.Size = new System.Drawing.Size(372, 115);
- this.pnlSolutionInfo.TabIndex = 8;
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(69, 0);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(83, 13);
- this.label7.TabIndex = 0;
- this.label7.Text = "Last Generated:";
- this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // lblModelFile
- //
- this.lblModelFile.AutoSize = true;
- this.lblModelFile.Location = new System.Drawing.Point(158, 76);
- this.lblModelFile.Name = "lblModelFile";
- this.lblModelFile.Size = new System.Drawing.Size(83, 13);
- this.lblModelFile.TabIndex = 1;
- this.lblModelFile.Text = "unable to locate";
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(84, 19);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(68, 13);
- this.label4.TabIndex = 0;
- this.label4.Text = "Core Project:";
- this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // lblSchemaExportProject
- //
- this.lblSchemaExportProject.AutoSize = true;
- this.lblSchemaExportProject.Location = new System.Drawing.Point(158, 57);
- this.lblSchemaExportProject.Name = "lblSchemaExportProject";
- this.lblSchemaExportProject.Size = new System.Drawing.Size(83, 13);
- this.lblSchemaExportProject.TabIndex = 1;
- this.lblSchemaExportProject.Text = "unable to locate";
- //
- // lblCommonProject
- //
- this.lblCommonProject.AutoSize = true;
- this.lblCommonProject.Location = new System.Drawing.Point(158, 38);
- this.lblCommonProject.Name = "lblCommonProject";
- this.lblCommonProject.Size = new System.Drawing.Size(83, 13);
- this.lblCommonProject.TabIndex = 1;
- this.lblCommonProject.Text = "unable to locate";
- //
- // label9
- //
- this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(34, 57);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(118, 13);
- this.label9.TabIndex = 0;
- this.label9.Text = "Schema Export Project:";
- this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(65, 38);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(87, 13);
- this.label5.TabIndex = 0;
- this.label5.Text = "Common Project:";
- this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // lblLastGenerated
- //
- this.lblLastGenerated.AutoSize = true;
- this.lblLastGenerated.Location = new System.Drawing.Point(158, 0);
- this.lblLastGenerated.Name = "lblLastGenerated";
- this.lblLastGenerated.Size = new System.Drawing.Size(34, 13);
- this.lblLastGenerated.TabIndex = 1;
- this.lblLastGenerated.Text = "never";
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(94, 76);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(58, 13);
- this.label6.TabIndex = 0;
- this.label6.Text = "Model File:";
- this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // lblCoreProject
- //
- this.lblCoreProject.AutoSize = true;
- this.lblCoreProject.Location = new System.Drawing.Point(158, 19);
- this.lblCoreProject.Name = "lblCoreProject";
- this.lblCoreProject.Size = new System.Drawing.Size(83, 13);
- this.lblCoreProject.TabIndex = 1;
- this.lblCoreProject.Text = "unable to locate";
- //
- // lblSolutionUsingMDA
- //
- this.lblSolutionUsingMDA.AutoSize = true;
- this.lblSolutionUsingMDA.Location = new System.Drawing.Point(164, 16);
- this.lblSolutionUsingMDA.Name = "lblSolutionUsingMDA";
- this.lblSolutionUsingMDA.Size = new System.Drawing.Size(40, 13);
- this.lblSolutionUsingMDA.TabIndex = 7;
- this.lblSolutionUsingMDA.Text = "yes/no";
+ this.listViewStatus.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.columnHeader3,
+ this.columnHeader4});
+ this.listViewStatus.FullRowSelect = true;
+ this.listViewStatus.GridLines = true;
+ this.listViewStatus.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+ this.listViewStatus.Location = new System.Drawing.Point(3, 3);
+ this.listViewStatus.MultiSelect = false;
+ this.listViewStatus.Name = "listViewStatus";
+ this.listViewStatus.Size = new System.Drawing.Size(381, 208);
+ this.listViewStatus.TabIndex = 7;
+ this.listViewStatus.UseCompatibleStateImageBehavior = false;
+ this.listViewStatus.View = System.Windows.Forms.View.Details;
+ //
+ // columnHeader3
+ //
+ this.columnHeader3.Text = "Stat";
+ this.columnHeader3.Width = 153;
+ //
+ // columnHeader4
+ //
+ this.columnHeader4.Text = "Value";
+ this.columnHeader4.Width = 224;
+ //
+ // tabPage3
+ //
+ this.tabPage3.Controls.Add(this.pnlGenerating);
+ this.tabPage3.Controls.Add(this.listViewStatistics);
+ this.tabPage3.ImageIndex = 0;
+ this.tabPage3.Location = new System.Drawing.Point(4, 23);
+ this.tabPage3.Name = "tabPage3";
+ this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage3.Size = new System.Drawing.Size(387, 212);
+ this.tabPage3.TabIndex = 2;
+ this.tabPage3.Text = "Statistics";
+ this.tabPage3.UseVisualStyleBackColor = true;
+ //
+ // listViewStatistics
+ //
+ this.listViewStatistics.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.columnHeader1,
+ this.columnHeader2});
+ this.listViewStatistics.FullRowSelect = true;
+ this.listViewStatistics.GridLines = true;
+ listViewGroup3.Header = "Code Statistics";
+ listViewGroup3.Name = "listViewGroup1";
+ listViewGroup4.Header = "File Statistics";
+ listViewGroup4.Name = "listViewGroup2";
+ this.listViewStatistics.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] {
+ listViewGroup3,
+ listViewGroup4});
+ this.listViewStatistics.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+ this.listViewStatistics.Location = new System.Drawing.Point(3, 3);
+ this.listViewStatistics.MultiSelect = false;
+ this.listViewStatistics.Name = "listViewStatistics";
+ this.listViewStatistics.Size = new System.Drawing.Size(381, 208);
+ this.listViewStatistics.TabIndex = 6;
+ this.listViewStatistics.UseCompatibleStateImageBehavior = false;
+ this.listViewStatistics.View = System.Windows.Forms.View.Details;
+ //
+ // columnHeader1
//
- // label3
+ this.columnHeader1.Text = "Stat";
+ this.columnHeader1.Width = 219;
//
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(3, 16);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(155, 13);
- this.label3.TabIndex = 6;
- this.label3.Text = "Solution is AndroMDA Enabled:";
- this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ // columnHeader2
+ //
+ this.columnHeader2.Text = "Value";
+ this.columnHeader2.Width = 127;
//
// tabPage2
//
- this.tabPage2.Controls.Add(this.groupBox1);
+ this.tabPage2.Controls.Add(this.panel1);
this.tabPage2.ImageIndex = 1;
this.tabPage2.Location = new System.Drawing.Point(4, 23);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(387, 163);
+ this.tabPage2.Size = new System.Drawing.Size(387, 212);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "About";
this.tabPage2.UseVisualStyleBackColor = true;
//
- // groupBox1
+ // panel1
//
- this.groupBox1.Controls.Add(this.label8);
- this.groupBox1.Controls.Add(this.linkLabel2);
- this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.groupBox1.Location = new System.Drawing.Point(3, 3);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(381, 157);
- this.groupBox1.TabIndex = 2;
- this.groupBox1.TabStop = false;
+ this.panel1.BackColor = System.Drawing.SystemColors.Window;
+ this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.panel1.Controls.Add(this.label8);
+ this.panel1.Controls.Add(this.linkLabel2);
+ this.panel1.Location = new System.Drawing.Point(3, 3);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(381, 208);
+ this.panel1.TabIndex = 5;
//
// label8
//
- this.label8.Location = new System.Drawing.Point(6, 16);
+ this.label8.Location = new System.Drawing.Point(4, 23);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(369, 34);
- this.label8.TabIndex = 2;
+ this.label8.TabIndex = 6;
this.label8.Text = "AndroMDA Visual Studio 2005 Add-In\r\n(c)2006 AndroMDA.org";
this.label8.TextAlign = System.Drawing.ContentAlignment.TopCenter;
//
+ // linkLabel2
+ //
+ this.linkLabel2.ForeColor = System.Drawing.Color.Black;
+ this.linkLabel2.Location = new System.Drawing.Point(4, 57);
+ this.linkLabel2.Name = "linkLabel2";
+ this.linkLabel2.Size = new System.Drawing.Size(369, 17);
+ this.linkLabel2.TabIndex = 5;
+ this.linkLabel2.TabStop = true;
+ this.linkLabel2.Text = "http://www.andromda.org/";
+ this.linkLabel2.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+ //
// imageList1
//
this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
this.imageList1.Images.SetKeyName(0, "propertiesORoptions.ico");
this.imageList1.Images.SetKeyName(1, "help.ico");
+ this.imageList1.Images.SetKeyName(2, "install.ico");
+ //
+ // pnlGenerating
+ //
+ this.pnlGenerating.BackColor = System.Drawing.Color.White;
+ this.pnlGenerating.Controls.Add(this.label3);
+ this.pnlGenerating.Controls.Add(this.pictureBox2);
+ this.pnlGenerating.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pnlGenerating.Location = new System.Drawing.Point(3, 3);
+ this.pnlGenerating.Name = "pnlGenerating";
+ this.pnlGenerating.Size = new System.Drawing.Size(381, 206);
+ this.pnlGenerating.TabIndex = 7;
+ //
+ // pictureBox2
+ //
+ this.pictureBox2.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.pictureBox2.BackColor = System.Drawing.Color.White;
+ this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
+ this.pictureBox2.Location = new System.Drawing.Point(147, 54);
+ this.pictureBox2.Name = "pictureBox2";
+ this.pictureBox2.Size = new System.Drawing.Size(87, 83);
+ this.pictureBox2.TabIndex = 8;
+ this.pictureBox2.TabStop = false;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(134, 140);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(111, 13);
+ this.label3.TabIndex = 9;
+ this.label3.Text = "Generating statistics...";
//
// AboutOptionsPage
//
@@ -337,16 +300,16 @@
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBox1);
this.Name = "AboutOptionsPage";
- this.Size = new System.Drawing.Size(395, 289);
+ this.Size = new System.Drawing.Size(395, 340);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- this.pnlSolutionInfo.ResumeLayout(false);
- this.pnlSolutionInfo.PerformLayout();
+ this.tabPage3.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
- this.groupBox1.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.pnlGenerating.ResumeLayout(false);
+ this.pnlGenerating.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -355,7 +318,6 @@
#endregion
private System.Windows.Forms.PictureBox pictureBox1;
- private System.Windows.Forms.LinkLabel linkLabel2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label lblVersion;
@@ -363,21 +325,18 @@
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.ImageList imageList1;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.Panel pnlSolutionInfo;
- private System.Windows.Forms.Label label7;
- private System.Windows.Forms.Label lblModelFile;
- private System.Windows.Forms.Label label4;
- private System.Windows.Forms.Label lblCommonProject;
- private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Label lblLastGenerated;
- private System.Windows.Forms.Label label6;
- private System.Windows.Forms.Label lblCoreProject;
- private System.Windows.Forms.Label lblSolutionUsingMDA;
- private System.Windows.Forms.Label label3;
- private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.TabPage tabPage3;
+ private System.Windows.Forms.ListView listViewStatus;
+ private System.Windows.Forms.ColumnHeader columnHeader3;
+ private System.Windows.Forms.ColumnHeader columnHeader4;
+ private System.Windows.Forms.ListView listViewStatistics;
+ private System.Windows.Forms.ColumnHeader columnHeader1;
+ private System.Windows.Forms.ColumnHeader columnHeader2;
+ private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label8;
- private System.Windows.Forms.Label lblSchemaExportProject;
- private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.LinkLabel linkLabel2;
+ private System.Windows.Forms.Panel pnlGenerating;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.PictureBox pictureBox2;
}
}
1.3 +321 -53 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.resx
Index: AboutOptionsPage.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.resx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- AboutOptionsPage.resx 3 May 2006 20:23:06 -0000 1.2
+++ AboutOptionsPage.resx 30 May 2006 23:01:57 -0000 1.3
@@ -691,59 +691,327 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8
- CwAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
- AwABEAMAAQEBAAEgBgABEBoAAX0CAwH/AWACAwH/AWACAwH/AWACAwH/AWACAwH/AWACAwH/AWACAwH/
- AWACAwH/AWACAwH/AWACAwH/AWACAwH/AWECAwH/AbcCAwH/EAABBwIBAQcBHgIBASgBPQIBAWcBTAIC
- AZkBTwICAa0BTgICAa4BTgICAaIBQwIBAXcBJwIBATgBDAIBAQ4BAgMBkAAB7AHaAdMC/wHoAdYC/wHm
- AdIC/wHlAc4C/wHiAcoC/wHhAcYC/wHgAcMC/wHdAb8C/wHcAbsC/wHaAbgC/wHZAbMB/wGLAVkBVQH/
- AbMCAwH/DAABCgIBAQwBMwIBAU8B3QHJAcAB/AH0AegB4wH/AvQB8wH/AfAB8gHzAf8B8QHyAfMB/wH0
- Ae0B6QH/Ae4B2wHQAf8BVgITAdQBQQIBAXABFAIBARkBAgMBjAAB4gHZAdIC/wHqAdUC/wHoAc8C/wHl
- AcoC/wHiAcQC/wHeAb8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAVcBWwH/AbMCAwH/
- CAABCQIBAQoBRQICAXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAXUB/wHCAXsBVQH/AcwBjwF0
- Af8B3wHOAcQB/wHtAfAB8gH/AfYC9AH/AbEBkAGIAfgBRQIBAX0BEgIBARYBAgMBiAAB5AHdAdYC/wHt
- AdsC/wHqAdYC/wHoAdEC/wHqAccB/wHBAboB0gL/AecBvgL/Ad4BuwL/AdsBtgL/AdgBsQL/AdcBqQH/
- AYsBWQFcAf8BswIDAf8IAAEwAgEBSgH3AfEB7QH/AfAB9AH1Af8ByAGBAWAB/wG/AV4BLQH/AcIBaQE7
- Af8B7AHuAe8B/wHSAYgBZgH/AcABYQEwAf8BvQFjATUB/wHqAekB6AH/AfUB9gH3Af8BigFfAVoB8QE7
- AgEBYAEIAgEBCYgAAeYB4AHbAv8B8wHmAv8B8wHmAv8B7gG+Af8BJwFDAe8B/wEDATYC/wFjAXIB4AL/
- Ad4BvQL/Ad4BvQL/Ad4BvQL/Ad4BvQH/AY4BXAFdAf8BswIDAf8IAAHxAd4B0wH/AfQC9gH/AcQBcQFG
- Af8BxQFmATUB/wHLAWkBNgH/AcABcgFKAf8B/gP/AdkBqAGPAf8BygFoATYB/wHHAWYBNAH/AbwBWwEp
- Af8B7gHvAfAB/wH2Ae4B6gH/AVACBAG6ARwCAQEliAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/AQMBKwL/
- AQMBLAL/ARQBQwL/AQMBLQL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgFdAV4B/wGzAgMB/wQA
- ATECAQFLAfkB+gH5Af8B4QHBAbEB/wHGAWYBNQH/AcwBagE4Af8BzAFqATcB/wHMAWkBNQH/AcoBYwEu
- Af8BywFmATIB/wHMAWkBNgH/AcsBaQE3Af8BxwFnATUB/wHGAXkBUAH/AfMC9QH/AdMBvwG0AfwBNAIB
- AVKIAAHrAeYB4wL/AeUByQH/AVgBcwHzAf8BJwFNAv8B/AHkAbkC/wHpAbIB/wEDASoC/wEfAUIB8wL/
- AdwBrAL/AdUBrAL/Ad4BuQH/AY8BXgFgAf8BswIDAf8EAAGlAWcBYQHhAfoB/QH+Af8BxgFpATkB/wHN
- AWsBOQH/Ac0BawE4Af8BzAFpATYB/wHHAWoBOgX/AdoBkQFuAf8BzAFpATYB/wHMAWoBNwH/AcsBaQE3
- Af8BwQFfASsB/wPxAf8B8gHfAdUB/wFDAgEBd4gAAe0B6gHnAv8B5wHOAv8B5AHCAv8B4wG+Av8B3gG9
- Av8B3AG6Af8CpQHZAf8BAwEzAv8BxgGzAbwC/wHXAa8C/wHhAb4B/wGTAWABYgH/AbMCAwH/BAAB6gHT
- AcgC/gP/AcoBaAE1Af8B0AFuATsB/wHMAWkBNgH/AcwBaQE2Af8BzAFmATIB/wHkAeoB7AH/AfoB8QHs
- Af8BygFjAS8B/wHMAWkBNgH/Ac0BawE4Af8ByAFnATUB/wHrAdsB0wH/AfUB6QHjAf8BRwICAYKIAAHv
- Ae0B6wL/AegB0QL/AeEBwwL/AeABwAL/Ad8BvgL/Ad0BuwL/AeUBtQH/AQ4BOAL/AQMBKgP/Ad4BvQL/
- AeQBxAH/AZQBYgFkAf8BswIDAf8EAAHwAdwB0QX/AdIBbwE8Af8B0wFxAT4B/wHMAWkBNgH/AcwBaQE2
- Af8BzAFpATYB/wHFAWsBPAH/AfYB+QH7Af8B+wHxAe0B/wHLAWUBMAH/Ac8BbAE6Af8BzAFrATkB/wHu
- AdsB0gH/AfcB7AHlAf8BRQIBAXyIAAHyAvEC/wHnAdEC/wHgAcAC/wHfAb8C/wHdAbwC/wHcAboC/wHb
- AbgB/wHtAdYBvwH/AQMBMAL/AWMBbgHbAv8B5gHJAf8BmAFkAWYB/wGzAgMB/wQAAdMBrAGjAfUE/wHf
- AXwBSQH/AdsBeQFHAf8BzgFrATgB/wHLAWQBLwH/AcsBZwEzAf8BzAFpATYB/wHEAXcBTwX/AdwBlAFz
- Af8B0gFwAT4B/wHPAWwBOQH/AfsB9QHzAf8B9QHkAdwB/wE6AgEBX4gAAfQC8wL/AeIBxgL/AdcBsQL/
- AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AUkBZQHzAf8B/AHdAaUC/wHpAc8B/wGaAWQBZgH/
- AbMCAwH/BAABSgIFAYAE/wH7AckBrgH/Ae4BigFaAf8B0gF5AUsB/wHxAfYB+QH/AesBwgGuAf8BywFm
- ATIB/wHKAXMBRgX/Ad8BpQGJAf8B3AF6AUgB/wHYAXkBRwX/AegB0AHGAf4BIwIBATGIAAL2AfUC/wHh
- AcIC/wHWAawC/wHVAasC/wHVAasC/wHUAakC/wHUAakC/wHTAagC/wHVAaYC/wHRAaQC/wHtAdYB/wGc
- AWIBYwH/AbMCAwH/CAAB9gHoAeAG/wGjAXEB/wH6AZUBZAH/Ac0BxgHDBf8B/AH1AfEF/wH2AfsB/QH/
- AeYBgwFVAf8B6wGDAVIB/wH9AfUB7gH/Af4C/AH/AU0CBAGTAQwCAQEOiAAC+AH1Cv8B/gP/AfsB+QL/
- AfkB9AL/AfYB7wL/AfQB6gL/AfMB5gH/AfsB8AHjAv8B8QHXAf8BnwFeAV8B/wGwAgMB/wgAAU0CBQGG
- Cf8B0AGcAv8BuwGHAf8B6QG/AaoB/wHXAccBwAH/Ad8ByQG/Af8B/AGpAX8C/wGkAXIC/wHoAdcF/wHe
- AcoBwQH8AR4CAQEoAQMCAQECiAAB+gH5AfcO/wL+Av8B+wH4Av8B+QH0Av8B9gHuAf8B7gHfAdoB/wHx
- AZgBJQH/Ad4BgQEPAf8BugGJAX4B/wHKAgMB/wgAAQIDAQGLAUYBQgHTCv8B7QL/AfsB0QL/Ae8BuwL/
- AeQBsQL/AesBzQn/AesB1AHKAf4BIwIBATEBBAIBAQSMAAH9AfoB+BL/Av4C/wH8AfkC/wH5AfQB/wHv
- AeEB3AL/Ac8BfAH/AboBiQF+Af8BygIDAf8QAAECAwEBSAEEAQMBewH1AeYB3hX/AfoB8QHsAf8BrgF2
- AXAB6QEYAgEBHwEDAgEBA5AAAfcB0gGvAf8B8gHLAasB/wHqAcQBpwH/AeEBuwGiAf8B2QGzAZ0B/wHQ
- AaoBmAH/AcoBpAGUAf8ByAGiAZMB/wHIAaIBkwH/AboBiQF+Af8BygIDAf8gAAFBAQMBAgFtAb4BiwGF
- AewB6wHUAckB/gHgAcUBuQH6AVoCDQGemAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGA
- FwAD/wEAAcABAQHgAQMEAAHAAQEBwAEBBAABwAEBAYAFAAHAAQEBgAUAAcABAQGABQABwAEBBgABwAEB
- BgABwAEBBgABwAEBBgABwAEBBgABwAEBBgABwAEBAYAFAAHAAQEBgAUAAcABAQGAAQEEAAHAAQMBwAED
- BAABwAEHAfgBPwQACw==
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACK
+ EQAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ AwABEAMAAQEBAAEgBgABEBoAAYECCwH/AWgCCwH/AWgCCwH/AWgCCwH/AWgCCwH/AWgCCwH/AWgCCwH/
+ AWgCCwH/AWgCCwH/AWgCCwH/AWgCCwH/AWkCCwH/AbcCCwH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC
+ AZkBVgICAa0BVQICAa4BUgICAaIBRAIBAXcBJwIBATgBDAIBAQ4BAgMBDAABBwIBAQgBTwICAZkBZAIS
+ AeQBWwICAb0BSwICAYwBPAIBAWQBJQIBATUBHAIBASYBRQIBAXsBVgICAa8BUgICAaUBQwIBAXMBGgIB
+ ASIBAgMBTAAB7AHaAdMC/wHoAdYC/wHmAdIC/wHlAc4C/wHiAcoC/wHhAcYC/wHgAcMC/wHdAb8C/wHc
+ AbsC/wHaAbgC/wHZAbMB/wGLAWEBXQH/AbMCCwH/DAABCgIBAQwBMwIBAU8ByAGpAZ8B/AH0AegB4wH/
+ AvQB8wH/AfAB8gHzAf8B8QHyAfMB/wH0Ae0B6QH/Ae4B2wHQAf8BYgIDAdQBQQIBAXABFAIBARkBAgMB
+ CAABXgIEAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0ATUBMAHzAbYCawH9Af8CxgL/AtoC/wLp
+ Af8ByAKpAf8BVwICAbYBKQIBATwBAgMBSAAB4gHZAdIC/wHqAdUC/wHoAc8C/wHlAcoC/wHiAcQC/wHe
+ Ab8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAV8BYwH/AbMCCwH/CAABCQIBAQoBRQIB
+ AXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAX0B/wHCAYEBXQH/AcwBjwF8Af8B3wHOAcQB/wHt
+ AfAB8gH/AfYC9AH/AZkBXQFXAfgBRgIBAX0BEgIBARYBAgMBBAADtwH/AcECwgL/AfYB7gH/AUQBrAE9
+ Af8BsAHZAaUB/wHvAcYBjQH/AccCgQL/AqEC/wKyAv8CxAL/AtQC/wL+Af8B8QLqAf8BVwICAbEBGAIB
+ AR9IAAHkAd0B1gL/Ae0B2wL/AeoB1gL/AegB0QL/AeoBxwH/AcEBugHSAv8B5wG+Av8B3gG7Av8B2wG2
+ Av8B2AGxAv8B1wGpAf8BiwFhAWQB/wGzAgsB/wgAATACAQFKAfcB8QHtAf8B8AH0AfUB/wHIAYEBaAH/
+ Ab8BZgE1Af8BwgFxAUMB/wHsAe4B7wH/AdIBiAFuAf8BwAFpATgB/wG9AWsBPQH/AeoB6QHoAf8B9QH2
+ AfcB/wF3ASkBJgHxATsCAQFgAQgCAQEJBAADvwH/AtkB2gL/Ae4B3wH/ARIBsAEjAf8BGwGtASYB/wFJ
+ AYEBNAL/ArUC/wKeAv8CoAL/AbEBsAL/AcUBwwn/AbYCjwH+AUACAQFtSAAB5gHgAdsC/wHzAeYC/wHz
+ AeYC/wHuAb4B/wEvAUsB7wH/AQsBPgL/AWsBegHgAv8B3gG9Av8B3gG9Av8B3gG9Av8B3gG9Af8BjgFk
+ AWUB/wGzAgsB/wgAAfEB3gHTAf8B9AL2Af8BxAF5AU4B/wHFAW4BPQH/AcsBcQE+Af8BwAF6AVIB/wH+
+ A/8B2QGoAY8B/wHKAXABPgH/AccBbgE8Af8BvAFjATEB/wHuAe8B8AH/AfYB7gHqAf8BWAICAboBHAIB
+ ASUEAAPLAf8B2wLcAv8B5gHOAf8BLwHMAU8B/wEoAb4BPAH/AaYBiAGBAv8CwwL/ArAC/wHRAdkB/wH4
+ AbEBzAL/AecG/wH9AfwB/QH/AfwC+wH/AVMCAgGkSAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/AQsBMwL/
+ AQsBNAL/ARwBSwL/AQsBNQL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgFlAWYB/wGzAgsB/wQA
+ ATECAQFLAfkB+gH5Af8B4QHBAbEB/wHGAW4BPQH/AcwBcgFAAf8BzAFyAT8B/wHMAXEBPQH/AcoBawE2
+ Af8BywFuAToB/wHMAXEBPgH/AcsBcQE/Af8BxwFvAT0B/wHGAYEBWAH/AfMC9QH/AcMBngGTAfwBNAIB
+ AVIEAAPPAf8B3wHgAeIC/wHdAbwB/wFNAeoBfQH/AToB0wFXAf8BywGcAZ8C/wLNAv8CwwL/AfQB/AH/
+ AaICzAH/Aa0BggGBAf8B9wHzAfIB/wHrAeIB3wH/AfAB6QHlAf8BWgIDAcJIAAHrAeYB4wL/AeUByQH/
+ AWABewHzAf8BLwFVAv8B/AHkAbkC/wHpAbIB/wELATIC/wEnAUoB8wL/AdwBrAL/AdUBrAL/Ad4BuQH/
+ AY8BZgFoAf8BswILAf8EAAFuAhAB4QH6Af0B/gH/AcYBcQFBAf8BzQFzAUEB/wHNAXMBQAH/AcwBcQE+
+ Af8BxwFyAUIF/wHaAZEBdgH/AcwBcQE+Af8BzAFyAT8B/wHLAXEBPwH/AcEBZwEzAf8D8QH/AfIB3wHV
+ Af8BRAIBAXcEAAPSAf8B4wHmAegC/wHXAaoB/wFIAcIB4AH/AVQBswL/AZ0BgQGOAv8CygL/AtYC/wH1
+ Av8BywGhAZ4B/wHdAZQBmAL/AcUBxgL/ArIC/wLKAf8BWwICAb1IAAHtAeoB5wL/AecBzgL/AeQBwgL/
+ AeMBvgL/Ad4BvQL/AdwBugH/AqUB2QH/AQsBOwL/AcYBswG8Av8B1wGvAv8B4QG+Af8BkwFoAWoB/wGz
+ AgsB/wQAAdoBvQG2Av4D/wHKAXABPQH/AdABdgFDAf8BzAFxAT4B/wHMAXEBPgH/AcwBbgE6Af8B5AHq
+ AewB/wH6AfEB7AH/AcoBawE3Af8BzAFxAT4B/wHNAXMBQAH/AcgBbwE9Af8B6wHbAdMB/wH1AekB4wH/
+ AUgCAgGCBAAB1wHTAcsB/wHyAbgBbQL/Ac8BnAH/AbABuwHFAf8BgQG2AeMB/wFMAV0Bow7/AcsB6AL/
+ AckB2AL/ApwC/wKgAf8B/QKyAf8BQwIBAXVIAAHvAe0B6wL/AegB0QL/AeEBwwL/AeABwAL/Ad8BvgL/
+ Ad0BuwL/AeUBtQH/ARYBQAL/AQsBMgP/Ad4BvQL/AeQBxAH/AZQBagFsAf8BswILAf8EAAHwAdwB0QX/
+ AdIBdwFEAf8B0wF5AUYB/wHMAXEBPgH/AcwBcQE+Af8BzAFxAT4B/wHFAXMBRAH/AfYB+QH7Af8B+wHx
+ Ae0B/wHLAW0BOAH/Ac8BdAFCAf8BzAFzAUEB/wHuAdsB0gH/AfcB7AHlAf8BRgIBAXwEAAHbAcEBnQH/
+ AeIBqAFqAv8BxwGKAv8ByQGPAv8ByQGOAv8ByQGQAf8BvgGgAaQG/wL+Av8CzwL/AsMC/wKxAv8CngH/
+ AbkCaAH9ARUCAQEbSAAB8gLxAv8B5wHRAv8B4AHAAv8B3wG/Av8B3QG8Av8B3AG6Av8B2wG4Af8B7QHW
+ Ab8B/wELATgC/wFrAXYB2wL/AeYByQH/AZgBbAFuAf8BswILAf8EAAGeAVsBVgH1BP8B3wGBAVEB/wHb
+ AYEBTwH/Ac4BcwFAAf8BywFsATcB/wHLAW8BOwH/AcwBcQE+Af8BxAF/AVcF/wHcAZQBewH/AdIBeAFG
+ Af8BzwF0AUEB/wH7AfUB8wH/AfUB5AHcAf8BOgIBAV8EAAHbAccBsgH/A9kC/wG6AWwC/wG7AW8C/wG8
+ AXIC/wG9AXQB/wH5AboBcQH/AcUBqwGtAv8C9wL/AuEC/wLQAv8CxgH/AdICjwH/AR8CAQEqAQIDAUgA
+ AfQC8wL/AeIBxgL/AdcBsQL/AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AVEBbQHzAf8B/AHd
+ AaUC/wHpAc8B/wGaAWwBbgH/AbMCCwH/BAABSAICAYAE/wH7AckBrgH/Ae4BigFiAf8B0gGBAVMB/wHx
+ AfYB+QH/AesBwgGuAf8BywFuAToB/wHKAXsBTgX/Ad8BpQGJAf8B3AGBAVAB/wHYAYEBTwX/AdgBuwG0
+ Af4BIwIBATEEAAPRAf8BxwHKAc0B/wH+Aa0BQQH/AfMB8QHvAf8B8gHWAaoB/wH0Ab8BeQH/AfoBrgFJ
+ Av8BqAEqAf8ByAGBAUUB/wG+AZEBhQH/AbICewH9AVsCAgG4ARQCAQEZUAAC9gH1Av8B4QHCAv8B1gGs
+ Av8B1QGrAv8B1QGrAv8B1AGpAv8B1AGpAv8B0wGoAv8B1QGmAv8B0QGkAv8B7QHWAf8BnAFqAWsB/wGz
+ AgsB/wgAAfYB6AHgBv8BowF5Af8B+gGVAWwB/wHNAcYBwwX/AfwB9QHxBf8B9gH7Af0B/wHmAYMBXQH/
+ AesBgwFaAf8B/QH1Ae4B/wH+AvwB/wFNAgIBkwEMAgEBDgQAA+gB/wHqAusB/wHNAbQBtQH/AecC3AH/
+ AfUC9wH/Ae8C8QH/AeoB7AHtAf8B4QHkAeYB/wHbAd8B5QH/AdYB2AHaAf8BvAGyAasB/gFvAiUB6QEX
+ AgEBHVAAAvgB9Qr/Af4D/wH7AfkC/wH5AfQC/wH2Ae8C/wH0AeoC/wHzAeYB/wH7AfAB4wL/AfEB1wH/
+ AZ8BZgFnAf8BsAILAf8IAAFKAgIBhgn/AdABnAL/AbsBhwH/AekBvwGqAf8B1wHHAcAB/wHfAckBvwH/
+ AfwBqQGBAv8BpAF6Av8B6AHXBf8ByAGqAZ8B/AEeAgEBKAEDAgEBAgEEAgEBBAHfAt4B/wHdAcsBvAH/
+ AbYBgQF6Af8BqwKAAf8BsAKBAf8BswKBAf8BuwGEAYUB/wHKAp8B/wHqAuwB/wHpAuoB/wGXAm4B+AEn
+ AgEBOFQAAfoB+QH3Dv8C/gL/AfsB+AL/AfkB9AL/AfYB7gH/Ae4B3wHaAf8B8QGYAS0B/wHeAYEBFwH/
+ AboBiQGBAf8BygILAf8IAAECAwEBYgIGAdMK/wHtAv8B+wHRAv8B7wG7Av8B5AGxAv8B6wHNCf8B2wG+
+ AbcB/gEjAgEBMQEEAgEBBAQAATwCAQFkAfUB+QH+Af8B/QHDAYEC/wHMAZcC/wHNAZ8C/wHPAakC/wHR
+ AbEB/wH9AcoBtgH/AfMBwQG3Av8C2wL/AuQB/wHvAugB/wFGAgEBfAEDAgEBA1AAAf0B+gH4Ev8C/gL/
+ AfwB+QL/AfkB9AH/Ae8B4QHcAv8BzwGBAf8BugGJAYEB/wHKAgsB/xAAAQIDAQFGAgEBewH1AeYB3hX/
+ AfoB8QHsAf8BdgEfARoB6QEYAgEBHwEDAgEBAwgAAUsCAgGLAf4BtwFmAf8B/gHLAZYC/wHMAZ8C/wHO
+ AagC/wHOAbAC/wHOAbgC/wHNAcAB/wHgAbMBsAH+AYICNAHrAf8C/QX/AUwCAgGOAQgCAQEJUAAB9wHS
+ Aa8B/wHyAcsBqwH/AeoBxAGnAf8B4QG7AaIB/wHZAbMBnQH/AdABqgGYAf8BygGkAZQB/wHIAaIBkwH/
+ AcgBogGTAf8BugGJAYEB/wHKAgsB/yAAAUACAQFtAYACKQHsAdsBvgG2Af4BvQGPAYcB+gFSAgIBniAA
+ AQIDAQECAwEBFAIBARoBKAIBATkBNwIBAVgBSgICAYUBTgICAY8BFAIBARoBLQIBAUQBCgIBAQwBAgMB
+ TAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAcABAQHgAQMBgAEBAgABwAEB
+ AcABAQGAAwABwAEBAYABAAGAAwABwAEBAYABAAGAAwABwAEBAYABAAGAAwABwAEBAgABgAMAAcABAQIA
+ AYADAAHAAQECAAGAAwABwAEBAgABgAMAAcABAQIAAYADAAHAAQECAAGAAQMCAAHAAQEBgAEAAYABAwIA
+ AcABAQGAAgABBwIAAcABAQGAAQEBAAEDAgABwAEDAcABAwEAAQMCAAHAAQcB+AE/AcABBwIACw==
+</value>
+ </data>
+ <data name="pictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhVQBRAPf/AP3ajfLy8vf399HR0eHeuoyTiLGtj9Lg0tbIpunp6Zq3xcnUyvDw8Lnj+e7cperq
+ 6pGqtN7evpSPdNHc08DAwMnJye7u7tbEk/raksTFxNncyezs7N7e3urRmMfh5L7i8b2+vca5j6uYavbb
+ mcPc48Di7ufn58iwedzc3OPj48O9rcvc29/g33ySmrnN1eTk5NTfzundrvDcotTMtbvR2eLcyszCp7zb
+ 687g2c7OzvPbntnfxtra2rvi98zb1NjY2Pfbl8rh3ufdsbmlc8jh4d3b0tLSytTU1MvS093ewdLb3NTe
+ 4rjd8LrCvOHNmtbW1ufMjLm5o8LMy8PDusLi67zCwtffysvLw7y6srm5ueLUq+He1MzMzNvUuvnblMPU
+ 09vQq8zc4tPTw83LvN3TssHd6dTUvKfH17zi9KmsqevWoeXSo/PVk6C1udXaxcXKw+TdtcLP0ercq8PA
+ s7bg+bzW4MXa3ePVs5mhlcrEsrTS4cLV2qjAxtLOwrS6vLnGyuzcqL3JzeXarenaqd3g4tvew6eyqNnU
+ wenas77Z5crW2uLg2sTh6KaRYc3Qu/TbnLPDybe3toWdp+Hbt8/JsuPdt7++t7m+v+nardHU1cjGus7N
+ yLG+tqzT6LbAxNXUz+bYscfGwLbZ6+HWu9jd3cPIyNrZv9bQssfHxsnOz9Hcz7zJwd3d2NjVyuHYsNna
+ xc/g1vPZmu/Wm87Yzd7Yt5yLYbu7uufWqdHYyL7f7t7YyNjd2L/GxrTJ0cDGv57A0tXa0Ly8vOTZttLU
+ 0dfYy7PV5+fbvcbIvt/f3NnY0du/gMTHsu3ZpsfOx6rN3cjd5/zaj+DZwNbX09va1+vZrc/X19PX1tve
+ 36+3taOdf8LX4dfb293bxbvf8ri2rr/g8dze2+DOodfb1uLi3tbYwLjX57m7u/DOhr/e7szQztTcy8PD
+ wfz8/Pv7+/n5+fr6+vj4+PT09PX19bjj/Mzg3PLcn+bl5NrZ2MjY1uXl5dnZ2cPDw9rb2+Hh4f39/f//
+ /yH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBgD/ACwAAAAAVQBRAAAI/wD/CRxIsKDBgwj/+VvIsOHChBAj
+ Spwo0R87du3evXPnDp7Hjx45amzH7iHFkygrYuwoQF68ADBjyowZL54AAfDekfSXsmdKi+3ctYTJwMKD
+ BwmSmli6NGnSBxssMAhgM+dOn1gRWnwHT0CAokjzpWDBggMHFPzSqkVhlkW/FyYSPJhq093VrFm3wpMX
+ wKiJFISWPCuD7lsPOmyUncMADQOGWLKY3RqlaxqHfvkSbJiK8y7ek3r5WkiQL/Czbg3mqV6toNY5ALBj
+ Q5vtRc2dVj84pDAxN4AAuzw/T/QX1OvoF4INr14+r1OLE7Flz54OjY2aUZ9QsODNwOa7ksITbv8VEI/B
+ AxOC0TRYv575vF8tXkcHQH22Y8eyyHzi0c/EhgDywNNOcOERRJxQAWxgAiHPqMcee+7RIckQ89FX3333
+ ydLFESikkEB3AnxX4EDEwVPeAyks8c2DLEboTC3KYMAGYxZOh6FjXuS4hhg/bPffb+CFV2I8ozHYw5Es
+ PkiHKMW40AskkKggZR422ICAEx2wYR+GOXYZCxkcpjCXPO4EiZc/7xiHHjpHtsniki5AcsklwVCwzz4Z
+ oIJKnqjsQ8EUeSAQzoz3ddklEGsYoU8/H8YD3JnteLVBPkt0g0abSK7XjR6Q+GELBRlUwEUOAxxh6hOm
+ mjpADhWgsk6gHWD/YKihQKhhxBMsNPqoT8RJmk8YaASL6ZGbepIFCKHmcMQPPHBAVgrQQttPWSjoc8QA
+ XKASCgKyzJojEEDI0scRuXZXJq/twJPgr8G2i2k5kBybARcD/KDdbnJBZcG+FmyAFGkpcMDDEaxqAgYb
+ tIIbbh+4fkgmOz2xY6IFJoRxRjHtCttNL34EM+8R+nDwglxSwRSPPCijXBNRfgX8xACoULLGtwoDAdm4
+ 5YZI4ETsuCMPA+jd0MIvH2R8AySRUFBBvSxkZgFV8uDkjk7tVF31Rl3xxcAGCQRMcCjh1KzMCSKI4MQm
+ T/TzgG8DUoSmAAwkcE0JaEgCQcbleGLLPlwc/yFyAk8HqJOZBi3Ezkbk9ZVAPzwMUAECsQABRS0inHAC
+ FFpw8UMK/8ED8UTpBvBAP2V88MEZLUDwix7leJpBDj0C7puAhKuU5ksP5MPBEVzMEMsJjUQ+wvBg5MBP
+ PhY4+jlEPRP5wjOmf9CNApJUj00wqAzAg5jd5VQ7aIcblwALT+QwQ+XDD/9ILGMMwEECbO9ceKQBJLBE
+ CdGbjoYofpiTPQr5+NF35IeuvcStHz/gQgicAIT0DU8NFXiCmALgOea5Ix4b6Acj8me6XOgtAwMA4NN0
+ NiKLIGh0CdSCA0fwiBHMwHgmYAAJERIpoC2Bg6brRRbWYTzkxUNABBRO+P9Eh8BNqCEWLHyEEtVwhQGo
+ jYLLK0jPEkQIRpQAf9GrQ9JyoA/OUbBtIzJQmurHgiP0IRZKTKMLuaCPfDBAHu8IYg3Rc8U6fsCDtqjA
+ EZ4oADCGUYxwSwAHBqAFNKbxEWoIBbnWVsGC+OOCGbRiHa/ogkiA8H3x++NBmmeBfOijD2pIow508AhK
+ cIEHMeyjQdjhFftRYZIlKIMfQMBG5MExiJr8h8REV0YyPGKUwFwDKva4AUfJ7x3ysEAKwgDLErggC8Nk
+ ASOjmEsDzZEffZABMIGpiRxgspECeaToqvjKOlLBE7REpQz9WE1HQrIfT9DCNkeJgAr84AUWUOVAapj/
+ j21Q4Z//LEEdsgBCaQbgXO2kIdxMwINDALMe9ZDBGjKwyHjEMZzvIBIhwgBQgLogj/e0gDzakVDxuIOX
+ n2AGRFeqhm5+MzjifMASONrRc1IgByiAHzhLapB2JPMFT7jDSldqSnUK4HOstCEJakoCP1BUmhbFJU93
+ aQJ+dAGiMsiqDGaAipDqM1IWeN5S/8kIKgw0gikQKUl5qpWTPoADh9CqDCAKBor2o5hrzegGUvAMRpS1
+ rFT4aAX0kUpqspUgeu1HKwYhV4muYwBQfYdA9MoBD/j1sowIBAhwqlOpshWsL/gBY+V6Cwq4b23uUMhJ
+ BWlZzDLiDzfFpDs8O1W4/3nyFlllRlbVsFnZLmS1KGgtZmF72oMeNiFJNcE0QCGDEDQiBGq4RW/hN1tx
+ CrKvriVuZI+rFXVV1QYikMAJJCCCC2w2pxRciHdRsIc6XNYDdfCEabfL3cJ5lwchGIITHBAOERjgvJ21
+ LgfaAAE+kIARkGgBJ+b7AIvW174BqCooAAEIBziAGWsAcHoF3Is2FMBuLWgDcTmA2gdLcaHTwISFV6yF
+ 6R70t6LjwAo8QAMI4KEXHohDbKlL25ImNR/JkAOFVwyGHb/4Hxl9AAvCQAIieIAEHvDAHm7KDxOk18T7
+ TGYKdEHhLgOiyMVN7T98qswV2CHKaCZBFQbrxqNief+yGOxHNLxMYUo8Vm0OHrNtlYAPNKOZF8NM60jf
+ LGBh0HkQeaCooNe6ywSQAglRJoKkiRCHfUAWtT2uZnKnMQg638IS9sSnPmPKgkxMetJ2qAIMfWPYw5J5
+ y3KItZC/TMsqy3B5yFTmE1ZwaknzAq0ivWh9Cy1rWefBtL4dCCsjzA9F9JoIX3jsN1tdUn4WIQbFlsMg
+ LDHMu+Y5nG4tdRAmHYRy/zqkt+TuFJUcjWzL4RTBYPM6CwLWfPwAH0Qot76/cEmdUjuXaPpZPq4dA2zL
+ eg7S9rcU1SXITOhb3/QohT3Tqjy29oqMkyi4xuWghXhLMHnCJlFGdY0PiNMjCPj/eB0KUhnydjZvr9wQ
+ gsY1Pgcqp3Kt9G4lB5AQBHr4/OdfiCb8Zqhpn1GsCHCYecHBYItuN3i2B3kkBlPwBHz8/OrNiCAf2RnG
+ nv3MBByYhBBkPvOaw3DeCq3fIFdwdXrgYAVSgN0EQ/RvrJjwZwlARjTGzveCzyCPe0Ttv6WuzB8g4ec4
+ SPzbm8HFuQ+wQEOKGwu6AAZXCILvQnCFJSz9vnV6ln7jOwI+FE96H6Si8WMC4mfGQyQT6N0GEpBANkLA
+ 95prjuIIFQ8ygYaCAfiA9IlfwCoYH7sRlinTm0wXXybFimjAQQhkCIEBJOAKIeQh3otkG89MtNcfpOP3
+ iofF/yoK8IUFcOEJHMjHXOoyIOQDBUGjSUERnA+H+sMBDBIIwQzMcckYprsi9DM6T/B9iQcLOIANBTAB
+ sDAL6aA9/bEZVTE4JkEiFrESQ2EeuqMLk1AJ9md/EmAAe5MDPOBDuVcRaSJ5R5AOsLCCUlAAEHAAMDgB
+ C1AqHcIdUCM1U6MRG8ESfNEXucMC80cAlTCEHQgHUbBFXcRIXBcRXgc0g5QKhoAHBVAAnAALMAiDqjCD
+ HNI0JDMVJrMyMQEWf8EBRfAKBHCGQ0iE9XcKtsBDm7M2RHcSnAR2R1AFaQAJVniFVwgDqmAEwzAMIcMC
+ +JIvR/EvJiAWLDANycANZ9iIQv9IhJVACSH4A4ziGy0HGunSehyQCc2wAHmohwcAA6IIA7OAC3/4BPrA
+ Fs5CFmUBDiiQDMTwCqYQARHgiI04hLRwfa9DiR9Cd3mRiRRDPlzQDBMAiqM4ilagDuqAC8TAjJ9ADNAI
+ ja/wCkmQBLRIi7aIhqdgCSCQPUkIICVYQOUxPj/gOAugh8coilawjuu4A+64A8vgCIVQCNVYjdeIjY6Y
+ i5+iRyjwAnAYjnYXFD+DIvzAO80wCzAQisdoBTDAjlbwjjtgAAVADvVoj/fYiJMwBtz4OujnH5ZYdz/R
+ M5ICdj/AKleAkAvpkA/5jm5QAAZAj/V4j7UYARoZDPuwNPz/ITu++EdDFH8oQDAV8AYLgAvqqJIQuQNR
+ UACOUJHWSItmoAnceJP1kn6pt4SQp3wJYgL9UJCsggpv0Ay4gAsOCZFm4JIwaY3k8JRTAAKgsjS54SHG
+ 9z1hxHrmoZUo8DLZkgEZ8AZX4Ahi4AaAqQES6ZeO4AiasJZsmSzLohuyEyAkcVgH4hV1GTADsyqtsg/r
+ QAEUAAIgkAZpwJmaiSeioiz2woVP4x1ymVAWWB6j8RcsUC2oMgCrkgO0WZukYirM4ixw8QCnGSJWaXEW
+ qDVGATDTYhYocJzHaRbOkgJwQTIwITi/OWyHkzUs4y9OcZ1PoS90ETV2kZqEthU8CIYzIkETUYMTEvhm
+ 4IMRGsERIAEPHDE1VVMSyIeeEOEQDHFYAQEAIfkEBQYA/wAsAwAFAE4ARgAACP8A/wkcSLCgwYNbahij
+ xkxGrBECnYyIFUsHM2bU7vxLdrCjx48gO75YVIOaDi8oUwI58Q8KECAjYsZ89EjHrZA4c4bcgkgHEAwY
+ UqaEUuvfS5gyR9CkqUPNrUM6o+LMV/InUKBCMQBRVsvly6RKl+oYq2NQF6loDS5CBATa1atCUbIRYfSr
+ zKVMydardzNtWmOxoAl2+zaul1hQBFKkOFOs3r31ZGgx4jfnImqDM7/V2sEJAgQ2VAicIzDPv3Br1OQd
+ C1mGa2ZnK3+sEQtA5sFXOyBQocLSPxDrCKL6l0EghX+U/qlh3dq1azKyOxrDYNv2bQxObGDxO+XfmubO
+ ZTj/0BKd4Atj0ACoV4/biejyyNeEd+7AQd/yiNKvXw+tg41I8A0UygxqhFdffYP8c0Rl9hijzDn7sYeA
+ NwEapIkWrh1YHzO3bCIbHY2cECEbNgg0XIUFgXEgMxcY8E824fi1RAN0/DPEflCokAWKHs3ADCBO2GhA
+ COFAJxUh38wzj0BDPAjFdjyClKAEg9QHCCCnRJXPP0rOU6NAIkQR5Uc/cNHHPwZcqSY1UnXppkDBjBlS
+ FOE4oCYgcpCXU5JuegmJOXJ+lMIT/5ChphyIypFTGH0qKdA+geKkBZ6JygEKKsOw8BGfbhYTaVSDVIpo
+ SGE0MI+pStYY56c4kSGqHK6A//RNA7TWqgerOd2ziSCJxuArSD3USms3uEbVhRy+JmvkQc8IS+utxeLE
+ gxGCJOurEB7NKmwP0ep0RBfW+jqDQS8sEayw5fjRLU4oiCFEuMsW5GwD/wC6Lk7CxCDEvkK4EopBZTjL
+ 7b04/dAFv/xqUtAz3/TgcLBMEJzTIQjvS0kFBDHSzcMOl2OvxB+1UrEQWRKEDhoc9wAtyB99IkzFZED6
+ zwMsNJxyLyyD9MQkQsDRsxC0FGQzxzjn/BEtcCSddKwDcfANGlBDPbDRHfFAyyT/SPCPK0ETlEvUUVMN
+ Ujb/iJmNDasm8E85ooBdDCRiH3RPFAaAAccpZBekwD+/MP+Bxhn/8BH3QVdPUgkck5Q8kDMKtDCQAkUP
+ TpDhlVQ+SdcDlfGNp5I4gwYNkhdEAOWVKy7QMyej0c0HH5QT+kDEECB7JbKPS1AYibCuey6vC0QM7bLL
+ rvARmgqkje66/9G7KcHP3l1BiiDPOuivR9A8AbSAcCJBJUhfxuuxX29GRyRI/0Egob8iu/XCe6R7CfDX
+ IbPY00Rgv/0ERPAR/PzDL/kr97ufIwRyj4OQoH/xG1wSAmg/kCgCgfBDH9VescAAjm97BkQgFRJRCqMl
+ IwkgrGAEngeS/lHhhHvI2TQKEcIQjg8n2ijBCWdIhThILAHg0EALQ+gbnCCBETQ84ff/CMYCDRSChS0c
+ oE4UEUQqMKIMUlgXMojhCDMcEYnksEVUhqENGjLii2WwYQFZxQENLKMAaFTBFXsoFRKc8ItfrEMvbIgr
+ YOygEGYQTQHIUQiFpQUJJIDjF3vRgjp8IQcLktMuNLCDRjZyfFFQYmXKIMg2SIIEHrBDKuQEDHVYwQqO
+ 3IEbCpCG8qQCji6QxD+I4AEPkAAf6SBUgHbhyU+CEpSNxII31sEF2RxBCpb8Rwv40Mpi2gEJ5WGBOIAB
+ A1t+cge4lGSAINALTBazlUQggh3wgYRERoUfy4RBM5vpTGgeg0dH4MIXronNbGYzCPioBhIy8REUgNMa
+ wFCFOPdJy05buoGEUYqDNdvpziAYdAUr8EE1FspQa0zgoRM4gERhcAB+9tMKYliVnHIghS+w0p3vNGgQ
+ 6EFSeuAAFiddRTNgAQuJurSiFm0mLnwRLSngwwMgFWlJSYqDnuKglPho6Uthyk91vAEE97JpQQ26U5P6
+ dAX/SANLh0pUdVwBqSArxRfsoNOd+vSk2PjHAqb6UlUs4KhUQ0UppBAHfKygpF/FwQJaYAiyTmAWZw1O
+ 7/4hBbYuwAf48AEsDMFXvDbjDTTdq0EyMD+NsiogACH5BAUGAP8ALAQABQBMAEYAAAj/AP8JHEiwoEGD
+ i/5FE4YJ0yAHakL8A8RskBxMoISN0nWwo8ePIA/mEyiMmox6MlLKACTQiYOXgGLGvCjsUMibOD8aY6aj
+ nk+fKp1ICPESpkxAcpLKEUTr35GcUEFuQSRDh1WrP1PWk+iy6FGlSWOIdWUzqlmCxmQ8Wnu1J9CUav5l
+ k2FUJlg5YvPSKns2Zw0ZI9ayvZo15SAn/y4MWjzIrtK8eYUI6dIXJ6IRmAUPtipjTbh/ef7NwWJJdGhK
+ p8DcegxZsmRhYip/ZIa5tmarawRasvWPwr4MBtf9mzIlzylXeCO7FgKHsmyDOmrbXhsrnAqCqKJSIiN2
+ uWQ4cJo+/x84AggQ6ZhlfR7/TzgZ78zB09r03Jj5+9Jzszfo6nt8+Zs8cdZI/0Bxn3kjxCIQb/sNVMEx
+ 74EnIRyTiGdWDWzU8o8XB8riYIMFoTKDhJPYINc/p3AR1RYjeCHCPwd2ACJIY0xSCQISZPNPFKeYAdUi
+ MnjhhTIaFijjjDROYsA/BFRSCRwE9PEPCiG9gIiQXmBwgggveoPkTTo6ScCYBFxxUw1AYIllB1F8GVIO
+ KJJJpnMfjcOMmlkCoQKDbnr0wz9myEnmGCAZgwEGeCIQiXB9hmSKoASY8tEiOhyKaJYdeNnoTVdEQKan
+ ERDakaGWHurFnpviZAaoEbRqCirDHP8kQ6mHIpbqTfr8Y0qrvIZ6UA20YsAGFrfmJEavrfpoECLQQFOq
+ E5EUexMKOSSBbAShFLRILM426+x10uJEjrURJGGuqAPV4K23HRAbbkj8GFGuueYqK9AiwqzbLAJ8vvvR
+ EabQay456wxA5U76QmOivzeNK3ASxwyECLfrDrsPwyEZUYjAhRAqIDNAAAAAu+5i/NEnhaSssiMD6QCN
+ yDDbajJIr6iccmz/cDACzDAjMHNINdtMzkAh8wwAAiD8/JEbO+xQSNNuCIRC0TwvrHRHTEdRgArkRC0Q
+ 1TDbwOjVBi2DRwGG/IPHHEmz0sE5PJ9jNdkEoZC2IzuwnLZAJwz/oYzIyjQiEd0GuWGFFTtYoQ7L//AA
+ BeEh8aDO4U3vgMtA3dDRiUCdaA45QT8gfvjhYiTdTxl0zDMPHamL8vlAyYw+upkCPXOD6rjT8bpAwMh+
+ +DEX/xNGIrjjvvs/vcuuji8EaVO86nq8rs/kMFhR/eUVCMRBNQ08z8TnL0gDw/jVW7GAQbcX30Avn6tC
+ PvnM1+38PA3U30A5kPPw/vjqBGNQNT2wn/3+QDhg7A8GzRBIrghSBgHWD39k0x8MDvA+CnjEgfUjGwcm
+ MMEOwuB8HrmBAAPIBF4oTRwHSGEKx2dBjygigA6sQylmxgMV2hCEH0mEA3vQAxqYbIM2VGET/27Sjfrx
+ kIfdiIOK3rVBWBzAiSpshv9CsocGHPGISXwXC2YRh1lA0YmzMEdOEnFFHqIhFwos1gRWMRBOOBEWQ8wJ
+ Em5wRTSgQRTO8OGm7EGKCeAAFl/gRBr+4QNYxC8qdOyBHdHgjH+IYg+pEJCbtuEDHFgSFoAsACeakYWz
+ IKEbi+yBAv4BykQgwU3VsKQq/+gDgYixL3H4Bhq6Eb1/2PEDudgDEp6yn22sAAf0WOUlOYGN8YxSEv/4
+ BRo+wMwPlEGX41GCEuhBTWoKsxmvfI4n/nEGJiyzmc1MhDb+kYmzKGEFQQhCNaupSimAKBV1+CY4mVmC
+ ElBBG3ZQRDVCItjNFayACOlM5zqDiQ9e9KtBuZjnB+rJUHuWgQR2yKciVqBPf64gDETIqEYDOtAvgGCK
+ MxrAP+qQ0GY2tJ5USGlKGcHSXtCAER6IqQc0mtGAqjMIPuBFNvsUhzrQ86QqXSlLGQGBFthBpjGlKUDT
+ uQIpXCJccUjESe0Z1KEywg6SgABSZ0rTIKwgDk9lWCD2IFWUVtWqbWjBHpC60S8EYohj81f2xlqHMpyV
+ pXX4RxvYage3VuFzpeBFIOJAA20kggQkIGoLvtDXOASCF2E93kDG1kL/Jc1NAQEAIfkEBQYA/wAsAwAF
+ AE0ARgAACP8A/wkcSLCgwYPIinCLNqkhHFdRwDScRCBaBFOvWv3jcbCjx48gOxaJJkyISZNwhBiQAAZO
+ pZcEYsa82OpTyJs4P3ITFqNnjJMmwQic9BKmzJkETJnSyC+n05DRhMjx2RMonH8s4bg0ejSC1whJTBl5
+ StZgtBhy0k71CVSIq2z/Jm09OvOr1yRJyI0tSxYRILVpqf48OQmBBBsTKcqMQMAu3sdi+OY0NgjQX8BU
+ BZE5RenfHIJTpmj656iLqcaOHycp9MrIMMkf/Vq2DFiOZkqfB647uO8fhX+aHJm6q7qQ8UJiBsA2WEPO
+ 7OdpBYHJLbCC03VjzBQ/vmOHmxzLB9b/cED+ueVBp8IPvKJ9tfHu3d2o/0e+/nMwKrLMHzjGzWr48H13
+ hGQ1XOBEfeUN8k8kwexXkBiFAAgfLlxIpsY/IciA4C0qONiRIwAuk0YBeDjCFzMywKWhDICs8Y8tHnZ0
+ RXfH/IOHIaTtldM4csggwwUCheBEOP+YE6NHMxpSgBs7WOHkAk4Z42M9zPwDF1xHfpRDM/8Y4uSX6uS0
+ hQz1TOmADC7CmOVH2DjypZMw4IITNfXUWSaVRa7pUT8CGfElDFbAAAOXINVgp50y2KCfniBxgUugggoa
+ 5oAdscCMDjocGk4kjN7EhTqRRkpoRzU8gimmZf7TYKchGRGqoLP8/0NpQeNQc+qpCLCKUzqghnrAGx7d
+ iqksuua0QKQHwHBArAcZ88izmD6CwKLFgjSAKskekG0GBiHDzLPgxlJtTrMoq622owpkTxHggrsGp+Pe
+ dO65UBY0ygjtPhJvThPMe4AqGeTAQTz/1HDLCAiD2+G+Ic3i7wGlEGQMM/giPAKx3DL80TCwHNBxx82g
+ 8oNAtlqMsBNqatzRNcN4DMvLsNQrEDOxmDxCOEaq7JE1E8D8ssz/yGAyEOLq/NEPPfvsA0E6AOE0EAjb
+ 8JvRHfngMyxLC8RB0087TfVHPvjAyT+chM10115/3dEqArVRwD+eDITCPx10DYXaB02DDQRxwP/iAh4d
+ sQEE3h5ZDQsOOPjwxUAcXHBCLSIMUcsJuRJO0AqI40APDvgQxAwQUAwhgjJeEGn5QJvTszkOX0zNAiax
+ eCG77B1YcvoL1qiuOz1SECSMGrPLHgt1hFezu+q8EBTNLcHLbsPp/6xwPD1VEFREFxg0bzrh26wQxO6d
+ E8RCK817wcYUhKegRBDss0/P4gapkT0G9GOAACqEe98++8kXxM8d9aOfFzrAvSAQYX8ruMRBWgGEANIv
+ D3jzHhEmyL44eOQWAYQGBgj4tW1M8IMTrF5HDoEBDZYQGtConNFW4AEQEmFx1umI/FCIQgywYTQ6U0IL
+ XShCj5CQhjQMB/7/NLYNDxhxh0TYw03WAERoACCFDDPBNcJwxCMSoYcfEcMJaQgADMyAYSysohHjkLOQ
+ kAGIAEgjG744LjvQQBtitMNTmOjENKbRi/+4h67C0IsWtEASfCCCEePmFCPIwo52PIcyhMKofPwjDIxg
+ xB4gAYEWkMADfyhLH9iASABAoRHnqAOjSEGCSJpyDy3ggwX5MgMMIPIEjQDAPG6wyhhBkgqmNOU/ILCc
+ GXghjedoxBD+MY950EEbHlLCM6iAS1zmkg+cAo9kZgDLRjSCmMUsJhPUw4F/PIMRzAxnLmmwnzkMQRlo
+ aEA217lNRZSFFGFYZglKEE5xMiIQ5tjNfPqQ5oh1+rMBDejBDZD5D2t45BrbeOQzyjDPhtaTmST4w6o8
+ RAM6+HMeAM1oA9DQDXQkQhvaCIMdRhoGEpCAod/4wAca6tBw7kGBWQJPOSyaTY1qtAc9QENOe+CMYqAB
+ DSoN6kpZSk8qlCGTrHLBDYpp05viNKdo+IckRAFUoQ6VpWVwQbyU2lSAPhWnOt3mP6pq1YaWgQaEZFg5
+ mNADpz71p2hQwD+oatUP5KIOLlBgb3TmAj3cgAkB/apORfEPBfxUpd9IRB16gdTTucAFdSjHX5nwDYEU
+ oxx1oAFjoSeQJ4QEBL5ZU0AAACH5BAUGAP8ALAMABQBMAEYAAAj/AP8JHEiwoMGD/1hp0PCK4Q43/xxZ
+ 0aDOirqLwKRJ44ewo8ePIP8h+8cwSSGThU4aKiBxh5WXVmDEVKdq2LCQOHMWVMgtQpKfP1MWcvQvikuX
+ MGPCWApD1axh1nRK7ciqZ4SrPoGm3BGF5Q6kSZkyPXCg5pGpaEX2JID1KlCUhcgVwFMILEyxMMjqfZpW
+ Z5EkBNiyxfoW5Q5KBZa5cUMxptKlB/LqPQBr1oC+H5FxC8x5MOEkZhyNmTKlyT8spn35OtYMFy6xk8nC
+ gjUh3VnMBfNtidY5cATPZsZYyrmO9SzJsinProy7YBEClSr1DmyKaBZzad/Mmrx8Ng4fzQdG/4/ee5Kj
+ OeEzaIelvPv3dLhrRIcznvOpOZHCD8zQzEd3WDgE6AN8aXFjAxhwJDjeJJTod1ApCywXYIAr4JPWFq5I
+ 8A8BCdJHC3r/oOKgQQvgACAOTRgiyT9xoJXgP9l0WAkZWIzoUTMBrtKCQG188YVUkwghhA0SGPDPKafY
+ CFIzKwi0Aj304EAPfByBxI2QQghiZDZK5rQilFAGsUIzOGFpJhneYNclSF8EASY9QVj4UQpBmimEK3PY
+ sqZHKQiExJtBBNriR0LEEIOZeUSyz54h4QNnoIGuUIpHcBhqqJBgMJpTKo9CGsSgCFlqqSDDaYoTPpAS
+ oaodCPUjjKiGNv9oak4rqGorEVIcVEQMc...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-06-15 03:29:37
|
User: cmicali
Date: 06/06/14 20:29:32
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs MDASolutionManager.cs
MavenProxy.cs VS80AddIn.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AboutOptionsPage.designer.cs AboutOptionsPage.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
VSExternalToolProxy.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe AndroMDA VS2005 Add-In
Setup.nsi
Log:
- Reworked and simplified the process launch code
- Added dialog to catch missing dependencies and ask user to rerun with online mode
- Slightly tweaked about dialog
Revision Changes Path
No revision
No revision
No revision
No revision
1.8 +15 -7 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AddInSettings.cs
Index: AddInSettings.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AddInSettings.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- AddInSettings.cs 5 Jun 2006 22:27:23 -0000 1.7
+++ AddInSettings.cs 15 Jun 2006 03:29:32 -0000 1.8
@@ -239,22 +239,30 @@
#region Helper methods
- public bool IsInIgnoreList(string file)
+ public bool IsInIgnoreList(string fileToTest)
{
- return IsInIgnoreList(file, true);
+ return IsInIgnoreList(fileToTest, true);
}
- public bool IsInIgnoreList(string file, bool stripPath)
+ public bool IsInIgnoreList(string fileToTest, bool stripPath)
{
// Get the list of files to ignore
- string[] ignoreFiles = ResyncIgnoreList.Split(new char[] { ';' });
+ string[] filesIgnored = ResyncIgnoreList.Split(new char[] { ';' });
+
+ // Strip the path of the input file
if (stripPath)
{
- file = FileUtils.GetFilename(file);
+ fileToTest = FileUtils.GetFilename(fileToTest);
}
- foreach (string s in ignoreFiles)
+ // Make the file name lowercase and trim space off the ends
+ fileToTest = fileToTest.ToLower().Trim();
+
+ // Iterate through the ignored files
+ foreach (string ignoredFile in filesIgnored)
{
- if (s.ToLower().Equals(file.ToLower()))
+ string ignoredFileCleaned = ignoredFile.ToLower().Trim();
+ // TODO: Support regular expressions
+ if (ignoredFileCleaned == fileToTest)
{
return true;
}
1.13 +27 -8 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDASolutionManager.cs
Index: MDASolutionManager.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDASolutionManager.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- MDASolutionManager.cs 5 Jun 2006 22:27:23 -0000 1.12
+++ MDASolutionManager.cs 15 Jun 2006 03:29:32 -0000 1.13
@@ -45,7 +45,7 @@
private Mutex m_restartBuildMutex = new Mutex(false);
//private MavenProxy m_mavenProxy = null;
- private VSExternalToolProxy m_mavenProxy = null;
+ private MavenProxy m_mavenProxy = null;
private int m_progress;
@@ -355,6 +355,12 @@
MavenLastRunDateTime = null;
}
+ public void RunMaven(bool forceOnlineMode)
+ {
+ m_mavenProxy.ForceOnlineMode = forceOnlineMode;
+ RunMaven();
+ }
+
public void RunMaven()
{
if (IsEnabled)
@@ -392,6 +398,16 @@
break;
case VSExternalToolProxy.ToolExitStatus.Error:
m_applicationObject.StatusBar.Text = "AndroMDA: Generation failed";
+ if (m_mavenProxy.Status == MavenProxy.MavenStatus.UnsatisfiedDependency &&
+ (m_addInSettings.MavenUseOfflineMode || (m_addInSettings.MavenUseCustomCommandLine && m_addInSettings.MavenCustomCommandLine.ToLower().Contains("-o")))
+ )
+ {
+ if ( System.Windows.Forms.MessageBox.Show("It appears that AndroMDA is missing one or more packages it needs to run. AndroMDA can automatically connect to the internet and download any missing dependencies, but it is currently running in offline mode. Would you like to re-run AndroMDA with offline mode temporarily disabled?" + Environment.NewLine + Environment.NewLine + "Please note that downloading all the required packages may take up to 10 minutes or more depending on your connection speed. You will only need to download these packages this one time as long as you leave offline mode enabled.", "AndroMDA Generate Failed", System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question, System.Windows.Forms.MessageBoxDefaultButton.Button1) == System.Windows.Forms.DialogResult.Yes)
+ {
+ // Rerun maven without the -o option
+ RunMaven(true);
+ }
+ }
break;
}
}
@@ -616,18 +632,21 @@
private ArrayList GetFileListFromProjectTree(ProjectItem item)
{
ArrayList filesList = new ArrayList();
+ if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFile)
+ {
for (short i = 1; i <= item.FileCount; i++)
{
string filename = item.get_FileNames(i);
- if (!m_addInSettings.IsInIgnoreList(filename))
- {
filesList.Add(filename);
}
}
+ else if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder)
+ {
foreach (ProjectItem childItem in item.ProjectItems)
{
filesList.AddRange(GetFileListFromProjectTree(childItem));
}
+ }
return filesList;
}
1.4 +55 -20 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MavenProxy.cs
Index: MavenProxy.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MavenProxy.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MavenProxy.cs 3 May 2006 20:23:05 -0000 1.3
+++ MavenProxy.cs 15 Jun 2006 03:29:32 -0000 1.4
@@ -32,8 +32,23 @@
public class MavenProxy : VSExternalToolProxy
{
+ public enum MavenStatus { None, UnsatisfiedDependency }
+
private AddInSettings m_addInSettings = null;
private string m_mavenOptions;
+ private MavenStatus m_mavenStatus;
+ private bool m_forceOnlineMode;
+
+ public MavenStatus Status
+ {
+ get { return m_mavenStatus; }
+ }
+
+ public bool ForceOnlineMode
+ {
+ get { return m_forceOnlineMode; }
+ set { m_forceOnlineMode = value; }
+ }
public MavenProxy(EnvDTE.DTE applicationObject, AddInSettings addInSettings)
: base(applicationObject)
@@ -51,16 +66,16 @@
{
m_addInSettings = addInSettings;
this.Failed += new ThreadExceptionEventHandler(m_mavenProxy_Failed);
- this.Cancelled += new EventHandler(m_mavenProxy_Cancelled);
- this.ProcessStdOut += new ProcessTextDelegate(MavenProxy_ProcessOutput);
- this.ProcessStdErr += new ProcessTextDelegate(MavenProxy_ProcessOutput);
+ this.Cancelled += new EventHandler(m_mavenProxy_Canceled);
+ this.ProcessStdOut += new ProcessTextDelegate(MavenProxy_ProcessStdOut);
+ this.ProcessStdErr += new ProcessTextDelegate(MavenProxy_ProcessStdErr);
}
- void m_mavenProxy_Cancelled(object sender, EventArgs e)
+ void m_mavenProxy_Canceled(object sender, EventArgs e)
{
this.OutputWindowPane.OutputString("\n");
- this.OutputWindowPane.OutputString("Generation cancelled\n");
- ApplicationObject.StatusBar.Text = "AndroMDA: Generation cancelled";
+ this.OutputWindowPane.OutputString("Generation canceled\n");
+ ApplicationObject.StatusBar.Text = "AndroMDA: Generation canceled";
}
void m_mavenProxy_Failed(object sender, ThreadExceptionEventArgs e)
@@ -78,10 +93,23 @@
ApplicationObject.StatusBar.Highlight(true);
}
- void MavenProxy_ProcessOutput(ref string text, ref bool cancelOutput)
+ void MavenProxy_ProcessStdErr(ref string text, ref bool cancelOutput)
{
- if (text.Length > 0)
+ ProcessOutput(ref text, ref cancelOutput);
+ if (text.Contains("The build cannot continue because of the following unsatisfied dependency"))
{
+ m_mavenStatus = MavenStatus.UnsatisfiedDependency;
+ }
+ }
+
+ void MavenProxy_ProcessStdOut(ref string text, ref bool cancelOutput)
+ {
+ ProcessOutput(ref text, ref cancelOutput);
+ }
+
+ private void ProcessOutput(ref string text, ref bool cancelOutput)
+ {
+ if (text == string.Empty) return;
// Filter out the full java strack trace from any errors that occur when maven runs
if (text.Trim()[0] == '\t' || text.Contains(".java:") || text.Contains("(Native Method)"))
{
@@ -96,7 +124,6 @@
}
}
}
- }
public override void BeforeStart()
{
@@ -125,6 +152,12 @@
}
}
+ if (m_forceOnlineMode)
+ {
+ m_mavenOptions = m_mavenOptions.Replace("-o", string.Empty);
+ m_forceOnlineMode = false;
+ }
+
this.OutputWindowPane.OutputString("Launching 'maven " + m_mavenOptions + "'...\n\n");
string java_home = System.Environment.GetEnvironmentVariable("JAVA_HOME");
@@ -177,6 +210,8 @@
this.CommandLine += maven_cmd_line_args;
+ m_mavenStatus = MavenStatus.None;
+
base.BeforeStart();
}
1.10 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/VS80AddIn.cs
Index: VS80AddIn.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/VS80AddIn.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- VS80AddIn.cs 30 May 2006 23:01:57 -0000 1.9
+++ VS80AddIn.cs 15 Jun 2006 03:29:32 -0000 1.10
@@ -20,7 +20,7 @@
public class VS80AddIn
{
- public const string ADD_IN_VERSION = "1.3";
+ public const string ADD_IN_VERSION = "1.3.1";
#region Constants
1.7 +17 -17 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.designer.cs
Index: AboutOptionsPage.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.designer.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- AboutOptionsPage.designer.cs 4 Jun 2006 02:06:01 -0000 1.6
+++ AboutOptionsPage.designer.cs 15 Jun 2006 03:29:32 -0000 1.7
@@ -30,8 +30,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutOptionsPage));
- System.Windows.Forms.ListViewGroup listViewGroup5 = new System.Windows.Forms.ListViewGroup("Code Statistics", System.Windows.Forms.HorizontalAlignment.Left);
- System.Windows.Forms.ListViewGroup listViewGroup6 = new System.Windows.Forms.ListViewGroup("File Statistics", System.Windows.Forms.HorizontalAlignment.Left);
+ System.Windows.Forms.ListViewGroup listViewGroup1 = new System.Windows.Forms.ListViewGroup("Code Statistics", System.Windows.Forms.HorizontalAlignment.Left);
+ System.Windows.Forms.ListViewGroup listViewGroup2 = new System.Windows.Forms.ListViewGroup("File Statistics", System.Windows.Forms.HorizontalAlignment.Left);
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
@@ -142,10 +142,10 @@
this.listViewStatus.FullRowSelect = true;
this.listViewStatus.GridLines = true;
this.listViewStatus.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.listViewStatus.Location = new System.Drawing.Point(3, 3);
+ this.listViewStatus.Location = new System.Drawing.Point(1, 3);
this.listViewStatus.MultiSelect = false;
this.listViewStatus.Name = "listViewStatus";
- this.listViewStatus.Size = new System.Drawing.Size(381, 208);
+ this.listViewStatus.Size = new System.Drawing.Size(385, 208);
this.listViewStatus.TabIndex = 7;
this.listViewStatus.UseCompatibleStateImageBehavior = false;
this.listViewStatus.View = System.Windows.Forms.View.Details;
@@ -179,9 +179,9 @@
this.pnlGenerating.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.pnlGenerating.Controls.Add(this.label3);
this.pnlGenerating.Controls.Add(this.pictureBox2);
- this.pnlGenerating.Location = new System.Drawing.Point(3, 3);
+ this.pnlGenerating.Location = new System.Drawing.Point(1, 3);
this.pnlGenerating.Name = "pnlGenerating";
- this.pnlGenerating.Size = new System.Drawing.Size(381, 208);
+ this.pnlGenerating.Size = new System.Drawing.Size(385, 208);
this.pnlGenerating.TabIndex = 7;
//
// label3
@@ -203,7 +203,7 @@
this.pictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox2.Image")));
this.pictureBox2.Location = new System.Drawing.Point(147, 41);
this.pictureBox2.Name = "pictureBox2";
- this.pictureBox2.Size = new System.Drawing.Size(83, 81);
+ this.pictureBox2.Size = new System.Drawing.Size(87, 81);
this.pictureBox2.TabIndex = 8;
this.pictureBox2.TabStop = false;
//
@@ -214,18 +214,18 @@
this.columnHeader2});
this.listViewStatistics.FullRowSelect = true;
this.listViewStatistics.GridLines = true;
- listViewGroup5.Header = "Code Statistics";
- listViewGroup5.Name = "listViewGroup1";
- listViewGroup6.Header = "File Statistics";
- listViewGroup6.Name = "listViewGroup2";
+ listViewGroup1.Header = "Code Statistics";
+ listViewGroup1.Name = "listViewGroup1";
+ listViewGroup2.Header = "File Statistics";
+ listViewGroup2.Name = "listViewGroup2";
this.listViewStatistics.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] {
- listViewGroup5,
- listViewGroup6});
+ listViewGroup1,
+ listViewGroup2});
this.listViewStatistics.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.listViewStatistics.Location = new System.Drawing.Point(3, 3);
+ this.listViewStatistics.Location = new System.Drawing.Point(1, 3);
this.listViewStatistics.MultiSelect = false;
this.listViewStatistics.Name = "listViewStatistics";
- this.listViewStatistics.Size = new System.Drawing.Size(381, 208);
+ this.listViewStatistics.Size = new System.Drawing.Size(385, 208);
this.listViewStatistics.TabIndex = 6;
this.listViewStatistics.UseCompatibleStateImageBehavior = false;
this.listViewStatistics.View = System.Windows.Forms.View.Details;
@@ -258,9 +258,9 @@
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel1.Controls.Add(this.label8);
this.panel1.Controls.Add(this.linkLabel2);
- this.panel1.Location = new System.Drawing.Point(3, 3);
+ this.panel1.Location = new System.Drawing.Point(1, 3);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(381, 208);
+ this.panel1.Size = new System.Drawing.Size(385, 208);
this.panel1.TabIndex = 5;
//
// label8
1.5 +57 -57 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.resx
Index: AboutOptionsPage.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutOptionsPage.resx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- AboutOptionsPage.resx 4 Jun 2006 02:06:01 -0000 1.4
+++ AboutOptionsPage.resx 15 Jun 2006 03:29:32 -0000 1.5
@@ -938,75 +938,75 @@
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACK
EQAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
- AwABEAMAAQEBAAEgBgABEBoAAYECDgH/AWsCDgH/AWsCDgH/AWsCDgH/AWsCDgH/AWsCDgH/AWsCDgH/
- AWsCDgH/AWsCDgH/AWsCDgH/AWsCDgH/AWwCDgH/AbcCDgH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC
- AZkBVgICAa0BVQICAa4BUgICAaIBRAIBAXcBJwIBATgBDAIBAQ4BAgMBDAABBwIBAQgBTwICAZkBZAIM
+ AwABEAMAAQEBAAEgBgABEBoAAYECEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/
+ AW0CEAH/AW0CEAH/AW0CEAH/AW0CEAH/AW4CEAH/AbcCEAH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC
+ AZkBVgICAa0BVQICAa4BUgICAaIBRAIBAXcBJwIBATgBDAIBAQ4BAgMBDAABBwIBAQgBTwICAZkBZAIK
AeQBWwICAb0BSwICAYwBPAIBAWQBJQIBATUBHAIBASYBRQIBAXsBVgICAa8BUgICAaUBQwIBAXMBGgIB
ASIBAgMBTAAB7AHaAdMC/wHoAdYC/wHmAdIC/wHlAc4C/wHiAcoC/wHhAcYC/wHgAcMC/wHdAb8C/wHc
- AbsC/wHaAbgC/wHZAbMB/wGLAWQBYAH/AbMCDgH/DAABCgIBAQwBMwIBAU8BwgGbAZMB/AH0AegB4wH/
+ AbsC/wHaAbgC/wHZAbMB/wGLAWYBYgH/AbMCEAH/DAABCgIBAQwBMwIBAU8BvgGTAYsB/AH0AegB4wH/
AvQB8wH/AfAB8gHzAf8B8QHyAfMB/wH0Ae0B6QH/Ae4B2wHQAf8BYgIDAdQBQQIBAXABFAIBARkBAgMB
- CAABXgIDAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0ASsBJgHzAbYCZQH9Af8CxgL/AtoC/wLp
+ CAABXgIDAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0ASQBHgHzAbYCYQH9Af8CxgL/AtoC/wLp
Af8ByAKpAf8BVwICAbYBKQIBATwBAgMBSAAB4gHZAdIC/wHqAdUC/wHoAc8C/wHlAcoC/wHiAcQC/wHe
- Ab8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAWIBZgH/AbMCDgH/CAABCQIBAQoBRQIB
- AXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAYAB/wHCAYEBYAH/AcwBjwF/Af8B3wHOAcQB/wHt
- AfAB8gH/AfYC9AH/AZMBTwFMAfgBRgIBAX0BEgIBARYBAgMBBAADtwH/AcECwgL/AfYB7gH/AUcBrAFA
+ Ab8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAWQBaAH/AbMCEAH/CAABCQIBAQoBRQIB
+ AXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAYEB/wHCAYEBYgH/AcwBjwGBAf8B3wHOAcQB/wHt
+ AfAB8gH/AfYC9AH/AY4BSQFGAfgBRgIBAX0BEgIBARYBAgMBBAADtwH/AcECwgL/AfYB7gH/AUkBrAFC
Af8BsAHZAaUB/wHvAcYBjQH/AccCgQL/AqEC/wKyAv8CxAL/AtQC/wL+Af8B8QLqAf8BVwICAbEBGAIB
AR9IAAHkAd0B1gL/Ae0B2wL/AeoB1gL/AegB0QL/AeoBxwH/AcEBugHSAv8B5wG+Av8B3gG7Av8B2wG2
- Av8B2AGxAv8B1wGpAf8BiwFkAWcB/wGzAg4B/wgAATACAQFKAfcB8QHtAf8B8AH0AfUB/wHIAYEBawH/
- Ab8BaQE4Af8BwgF0AUYB/wHsAe4B7wH/AdIBiAFxAf8BwAFsATsB/wG9AW4BQAH/AeoB6QHoAf8B9QH2
- AfcB/wF2AR8BGwHxATsCAQFgAQgCAQEJBAADvwH/AtkB2gL/Ae4B3wH/ARUBsAEmAf8BHgGtASkB/wFM
- AYEBNwL/ArUC/wKeAv8CoAL/AbEBsAL/AcUBwwn/AbMCiQH+AUACAQFtSAAB5gHgAdsC/wHzAeYC/wHz
- AeYC/wHuAb4B/wEyAU4B7wH/AQ4BQQL/AW4BfQHgAv8B3gG9Av8B3gG9Av8B3gG9Av8B3gG9Af8BjgFn
- AWgB/wGzAg4B/wgAAfEB3gHTAf8B9AL2Af8BxAF8AVEB/wHFAXEBQAH/AcsBdAFBAf8BwAF9AVUB/wH+
- A/8B2QGoAY8B/wHKAXMBQQH/AccBcQE/Af8BvAFmATQB/wHuAe8B8AH/AfYB7gHqAf8BWAICAboBHAIB
- ASUEAAPLAf8B2wLcAv8B5gHOAf8BMgHMAVIB/wErAb4BPwH/AaYBiAGBAv8CwwL/ArAC/wHRAdkB/wH4
- AbEBzAL/AecG/wH9AfwB/QH/AfwC+wH/AVMCAgGkSAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/AQ4BNgL/
- AQ4BNwL/AR8BTgL/AQ4BOAL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgFoAWkB/wGzAg4B/wQA
- ATECAQFLAfkB+gH5Af8B4QHBAbEB/wHGAXEBQAH/AcwBdQFDAf8BzAF1AUIB/wHMAXQBQAH/AcoBbgE5
- Af8BywFxAT0B/wHMAXQBQQH/AcsBdAFCAf8BxwFyAUAB/wHGAYEBWwH/AfMC9QH/Ab0BkgGHAfwBNAIB
- AVIEAAPPAf8B3wHgAeIC/wHdAbwB/wFQAeoBgAH/AT0B0wFaAf8BywGcAZ8C/wLNAv8CwwL/AfQB/AH/
+ Av8B2AGxAv8B1wGpAf8BiwFmAWkB/wGzAhAB/wgAATACAQFKAfcB8QHtAf8B8AH0AfUB/wHIAYEBbQH/
+ Ab8BawE6Af8BwgF2AUgB/wHsAe4B7wH/AdIBiAFzAf8BwAFuAT0B/wG9AXABQgH/AeoB6QHoAf8B9QH2
+ AfcB/wF2ARkBGAHxATsCAQFgAQgCAQEJBAADvwH/AtkB2gL/Ae4B3wH/ARcBsAEoAf8BIAGtASsB/wFO
+ AYEBOQL/ArUC/wKeAv8CoAL/AbEBsAL/AcUBwwn/AbEChQH+AUACAQFtSAAB5gHgAdsC/wHzAeYC/wHz
+ AeYC/wHuAb4B/wE0AVAB7wH/ARABQwL/AXABfwHgAv8B3gG9Av8B3gG9Av8B3gG9Av8B3gG9Af8BjgFp
+ AWoB/wGzAhAB/wgAAfEB3gHTAf8B9AL2Af8BxAF+AVMB/wHFAXMBQgH/AcsBdgFDAf8BwAF/AVcB/wH+
+ A/8B2QGoAY8B/wHKAXUBQwH/AccBcwFBAf8BvAFoATYB/wHuAe8B8AH/AfYB7gHqAf8BWAICAboBHAIB
+ ASUEAAPLAf8B2wLcAv8B5gHOAf8BNAHMAVQB/wEtAb4BQQH/AaYBiAGBAv8CwwL/ArAC/wHRAdkB/wH4
+ AbEBzAL/AecG/wH9AfwB/QH/AfwC+wH/AVMCAgGkSAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/ARABOAL/
+ ARABOQL/ASEBUAL/ARABOgL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgFqAWsB/wGzAhAB/wQA
+ ATECAQFLAfkB+gH5Af8B4QHBAbEB/wHGAXMBQgH/AcwBdwFFAf8BzAF3AUQB/wHMAXYBQgH/AcoBcAE7
+ Af8BywFzAT8B/wHMAXYBQwH/AcsBdgFEAf8BxwF0AUIB/wHGAYEBXQH/AfMC9QH/AbkBigF/AfwBNAIB
+ AVIEAAPPAf8B3wHgAeIC/wHdAbwB/wFSAeoBgQH/AT8B0wFcAf8BywGcAZ8C/wLNAv8CwwL/AfQB/AH/
AaICzAH/Aa0BggGBAf8B9wHzAfIB/wHrAeIB3wH/AfAB6QHlAf8BWgIDAcJIAAHrAeYB4wL/AeUByQH/
- AWMBfgHzAf8BMgFYAv8B/AHkAbkC/wHpAbIB/wEOATUC/wEqAU0B8wL/AdwBrAL/AdUBrAL/Ad4BuQH/
- AY8BaQFrAf8BswIOAf8EAAFqAgoB4QH6Af0B/gH/AcYBdAFEAf8BzQF2AUQB/wHNAXYBQwH/AcwBdAFB
- Af8BxwF1AUUF/wHaAZEBeQH/AcwBdAFBAf8BzAF1AUIB/wHLAXQBQgH/AcEBagE2Af8D8QH/AfIB3wHV
- Af8BRAIBAXcEAAPSAf8B4wHmAegC/wHXAaoB/wFLAcIB4AH/AVcBswL/AZ0BgQGOAv8CygL/AtYC/wH1
+ AWUBgAHzAf8BNAFaAv8B/AHkAbkC/wHpAbIB/wEQATcC/wEsAU8B8wL/AdwBrAL/AdUBrAL/Ad4BuQH/
+ AY8BawFtAf8BswIQAf8EAAFqAggB4QH6Af0B/gH/AcYBdgFGAf8BzQF4AUYB/wHNAXgBRQH/AcwBdgFD
+ Af8BxwF3AUcF/wHaAZEBewH/AcwBdgFDAf8BzAF3AUQB/wHLAXYBRAH/AcEBbAE4Af8D8QH/AfIB3wHV
+ Af8BRAIBAXcEAAPSAf8B4wHmAegC/wHXAaoB/wFNAcIB4AH/AVkBswL/AZ0BgQGOAv8CygL/AtYC/wH1
Av8BywGhAZ4B/wHdAZQBmAL/AcUBxgL/ArIC/wLKAf8BWwICAb1IAAHtAeoB5wL/AecBzgL/AeQBwgL/
- AeMBvgL/Ad4BvQL/AdwBugH/AqUB2QH/AQ4BPgL/AcYBswG8Av8B1wGvAv8B4QG+Af8BkwFrAW0B/wGz
- Ag4B/wQAAdQBtwGwAv4D/wHKAXMBQAH/AdABeQFGAf8BzAF0AUEB/wHMAXQBQQH/AcwBcQE9Af8B5AHq
- AewB/wH6AfEB7AH/AcoBbgE6Af8BzAF0AUEB/wHNAXYBQwH/AcgBcgFAAf8B6wHbAdMB/wH1AekB4wH/
- AUgCAgGCBAAB1wHTAcsB/wHyAbgBcAL/Ac8BnAH/AbABuwHFAf8BgQG2AeMB/wFPAWABow7/AcsB6AL/
+ AeMBvgL/Ad4BvQL/AdwBugH/AqUB2QH/ARABQAL/AcYBswG8Av8B1wGvAv8B4QG+Af8BkwFtAW8B/wGz
+ AhAB/wQAAdABswGsAv4D/wHKAXUBQgH/AdABewFIAf8BzAF2AUMB/wHMAXYBQwH/AcwBcwE/Af8B5AHq
+ AewB/wH6AfEB7AH/AcoBcAE8Af8BzAF2AUMB/wHNAXgBRQH/AcgBdAFCAf8B6wHbAdMB/wH1AekB4wH/
+ AUgCAgGCBAAB1wHTAcsB/wHyAbgBcgL/Ac8BnAH/AbABuwHFAf8BgQG2AeMB/wFRAWIBow7/AcsB6AL/
AckB2AL/ApwC/wKgAf8B/QKyAf8BQwIBAXVIAAHvAe0B6wL/AegB0QL/AeEBwwL/AeABwAL/Ad8BvgL/
- Ad0BuwL/AeUBtQH/ARkBQwL/AQ4BNQP/Ad4BvQL/AeQBxAH/AZQBbQFvAf8BswIOAf8EAAHwAdwB0QX/
- AdIBegFHAf8B0wF8AUkB/wHMAXQBQQH/AcwBdAFBAf8BzAF0AUEB/wHFAXYBRwH/AfYB+QH7Af8B+wHx
- Ae0B/wHLAXABOwH/Ac8BdwFFAf8BzAF2AUQB/wHuAdsB0gH/AfcB7AHlAf8BRgIBAXwEAAHbAcEBnQH/
- AeIBqAFtAv8BxwGKAv8ByQGPAv8ByQGOAv8ByQGQAf8BvgGgAaQG/wL+Av8CzwL/AsMC/wKxAv8CngH/
- AbkCYgH9ARUCAQEbSAAB8gLxAv8B5wHRAv8B4AHAAv8B3wG/Av8B3QG8Av8B3AG6Av8B2wG4Af8B7QHW
- Ab8B/wEOATsC/wFuAXkB2wL/AeYByQH/AZgBbwFxAf8BswIOAf8EAAGSAUkBRQH1BP8B3wGBAVQB/wHb
- AYEBUgH/Ac4BdgFDAf8BywFvAToB/wHLAXIBPgH/AcwBdAFBAf8BxAGBAVoF/wHcAZQBfgH/AdIBewFJ
- Af8BzwF3AUQB/wH7AfUB8wH/AfUB5AHcAf8BOgIBAV8EAAHbAccBsgH/A9kC/wG6AW8C/wG7AXIC/wG8
- AXUC/wG9AXcB/wH5AboBdAH/AcUBqwGtAv8C9wL/AuEC/wLQAv8CxgH/AdICjwH/AR8CAQEqAQIDAUgA
- AfQC8wL/AeIBxgL/AdcBsQL/AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AVQBcAHzAf8B/AHd
- AaUC/wHpAc8B/wGaAW8BcQH/AbMCDgH/BAABSAICAYAE/wH7AckBrgH/Ae4BigFlAf8B0gGBAVYB/wHx
- AfYB+QH/AesBwgGuAf8BywFxAT0B/wHKAX4BUQX/Ad8BpQGJAf8B3AGBAVMB/wHYAYEBUgX/AdIBtQGu
- Af4BIwIBATEEAAPRAf8BxwHKAc0B/wH+Aa0BRAH/AfMB8QHvAf8B8gHWAaoB/wH0Ab8BfAH/AfoBrgFM
- Av8BqAEtAf8ByAGBAUgB/wG+AZEBhQH/AbICdQH9AVsCAgG4ARQCAQEZUAAC9gH1Av8B4QHCAv8B1gGs
- Av8B1QGrAv8B1QGrAv8B1AGpAv8B1AGpAv8B0wGoAv8B1QGmAv8B0QGkAv8B7QHWAf8BnAFtAW4B/wGz
- Ag4B/wgAAfYB6AHgBv8BowF8Af8B+gGVAW8B/wHNAcYBwwX/AfwB9QHxBf8B9gH7Af0B/wHmAYMBYAH/
- AesBgwFdAf8B/QH1Ae4B/wH+AvwB/wFNAgIBkwEMAgEBDgQAA+gB/wHqAusB/wHNAbQBtQH/AecC3AH/
- AfUC9wH/Ae8C8QH/AeoB7AHtAf8B4QHkAeYB/wHbAd8B5QH/AdYB2AHaAf8BuQGsAaUB/gFrAhcB6QEX
+ Ad0BuwL/AeUBtQH/ARsBRQL/ARABNwP/Ad4BvQL/AeQBxAH/AZQBbwFxAf8BswIQAf8EAAHwAdwB0QX/
+ AdIBfAFJAf8B0wF+AUsB/wHMAXYBQwH/AcwBdgFDAf8BzAF2AUMB/wHFAXgBSQH/AfYB+QH7Af8B+wHx
+ Ae0B/wHLAXIBPQH/Ac8BeQFHAf8BzAF4AUYB/wHuAdsB0gH/AfcB7AHlAf8BRgIBAXwEAAHbAcEBnQH/
+ AeIBqAFvAv8BxwGKAv8ByQGPAv8ByQGOAv8ByQGQAf8BvgGgAaQG/wL+Av8CzwL/AsMC/wKxAv8CngH/
+ AbkCXgH9ARUCAQEbSAAB8gLxAv8B5wHRAv8B4AHAAv8B3wG/Av8B3QG8Av8B3AG6Av8B2wG4Af8B7QHW
+ Ab8B/wEQAT0C/wFwAXsB2wL/AeYByQH/AZgBcQFzAf8BswIQAf8EAAGKAT0BOwH1BP8B3wGBAVYB/wHb
+ AYEBVAH/Ac4BeAFFAf8BywFxATwB/wHLAXQBQAH/AcwBdgFDAf8BxAGBAVwF/wHcAZQBgAH/AdIBfQFL
+ Af8BzwF5AUYB/wH7AfUB8wH/AfUB5AHcAf8BOgIBAV8EAAHbAccBsgH/A9kC/wG6AXEC/wG7AXQC/wG8
+ AXcC/wG9AXkB/wH5AboBdgH/AcUBqwGtAv8C9wL/AuEC/wLQAv8CxgH/AdICjwH/AR8CAQEqAQIDAUgA
+ AfQC8wL/AeIBxgL/AdcBsQL/AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AVYBcgHzAf8B/AHd
+ AaUC/wHpAc8B/wGaAXEBcwH/AbMCEAH/BAABSAICAYAE/wH7AckBrgH/Ae4BigFnAf8B0gGBAVgB/wHx
+ AfYB+QH/AesBwgGuAf8BywFzAT8B/wHKAYABUwX/Ad8BpQGJAf8B3AGBAVUB/wHYAYEBVAX/Ac4BsQGq
+ Af4BIwIBATEEAAPRAf8BxwHKAc0B/wH+Aa0BRgH/AfMB8QHvAf8B8gHWAaoB/wH0Ab8BfgH/AfoBrgFO
+ Av8BqAEvAf8ByAGBAUoB/wG+AZEBhQH/AbICcQH9AVsCAgG4ARQCAQEZUAAC9gH1Av8B4QHCAv8B1gGs
+ Av8B1QGrAv8B1QGrAv8B1AGpAv8B1AGpAv8B0wGoAv8B1QGmAv8B0QGkAv8B7QHWAf8BnAFvAXAB/wGz
+ AhAB/wgAAfYB6AHgBv8BowF+Af8B+gGVAXEB/wHNAcYBwwX/AfwB9QHxBf8B9gH7Af0B/wHmAYMBYgH/
+ AesBgwFfAf8B/QH1Ae4B/wH+AvwB/wFNAgIBkwEMAgEBDgQAA+gB/wHqAusB/wHNAbQBtQH/AecC3AH/
+ AfUC9wH/Ae8C8QH/AeoB7AHtAf8B4QHkAeYB/wHbAd8B5QH/AdYB2AHaAf8BtwGoAaEB/gFrAhAB6QEX
AgEBHVAAAvgB9Qr/Af4D/wH7AfkC/wH5AfQC/wH2Ae8C/wH0AeoC/wHzAeYB/wH7AfAB4wL/AfEB1wH/
- AZ8BaQFqAf8BsAIOAf8IAAFKAgIBhgn/AdABnAL/AbsBhwH/AekBvwGqAf8B1wHHAcAB/wHfAckBvwH/
- AfwBqQGBAv8BpAF9Av8B6AHXBf8BwgGcAZMB/AEeAgEBKAEDAgEBAgEEAgEBBAHfAt4B/wHdAcsBvAH/
- AbYBgQF9Af8BqwKBAf8BsAKBAf8BswKBAf8BuwGEAYUB/wHKAp8B/wHqAuwB/wHpAuoB/wGRAl0B+AEn
- AgEBOFQAAfoB+QH3Dv8C/gL/AfsB+AL/AfkB9AL/AfYB7gH/Ae4B3wHaAf8B8QGYATAB/wHeAYEBGgH/
- AboBiQGBAf8BygIOAf8IAAECAwEBYAIDAdMK/wHtAv8B+wHRAv8B7wG7Av8B5AGxAv8B6wHNCf8B1QG4
- AbEB/gEjAgEBMQEEAgEBBAQAATwCAQFkAfUB+QH+Af8B/QHDAYEC/wHMAZcC/wHNAZ8C/wHPAakC/wHR
+ AZ8BawFsAf8BsAIQAf8IAAFKAgIBhgn/AdABnAL/AbsBhwH/AekBvwGqAf8B1wHHAcAB/wHfAckBvwH/
+ AfwBqQGBAv8BpAF/Av8B6AHXBf8BvgGUAYsB/AEeAgEBKAEDAgEBAgEEAgEBBAHfAt4B/wHdAcsBvAH/
+ AbYBgQF/Af8BqwKBAf8BsAKBAf8BswKBAf8BuwGEAYUB/wHKAp8B/wHqAuwB/wHpAuoB/wGMAlMB+AEn
+ AgEBOFQAAfoB+QH3Dv8C/gL/AfsB+AL/AfkB9AL/AfYB7gH/Ae4B3wHaAf8B8QGYATIB/wHeAYEBHAH/
+ AboBiQGBAf8BygIQAf8IAAECAwEBYAIDAdMK/wHtAv8B+wHRAv8B7wG7Av8B5AGxAv8B6wHNCf8B0QG0
+ Aa0B/gEjAgEBMQEEAgEBBAQAATwCAQFkAfUB+QH+Af8B/QHDAYEC/wHMAZcC/wHNAZ8C/wHPAakC/wHR
AbEB/wH9AcoBtgH/AfMBwQG3Av8C2wL/AuQB/wHvAugB/wFGAgEBfAEDAgEBA1AAAf0B+gH4Ev8C/gL/
- AfwB+QL/AfkB9AH/Ae8B4QHcAv8BzwGBAf8BugGJAYEB/wHKAg4B/xAAAQIDAQFGAgEBewH1AeYB3hX/
- AfoB8QHsAf8BbwETARAB6QEYAgEBHwEDAgEBAwgAAUsCAgGLAf4BtwFpAf8B/gHLAZYC/wHMAZ8C/wHO
- AagC/wHOAbAC/wHOAbgC/wHNAcAB/wHaAa0BqgH+AXcCIgHrAf8C/QX/AUwCAgGOAQgCAQEJUAAB9wHS
+ AfwB+QL/AfkB9AH/Ae8B4QHcAv8BzwGBAf8BugGJAYEB/wHKAhAB/xAAAQIDAQFGAgEBewH1AeYB3hX/
+ AfoB8QHsAf8BbAEPAQ4B6QEYAgEBHwEDAgEBAwgAAUsCAgGLAf4BtwFrAf8B/gHLAZYC/wHMAZ8C/wHO
+ AagC/wHOAbAC/wHOAbgC/wHNAcAB/wHWAakBpgH+AXUCGgHrAf8C/QX/AUwCAgGOAQgCAQEJUAAB9wHS
Aa8B/wHyAcsBqwH/AeoBxAGnAf8B4QG7AaIB/wHZAbMBnQH/AdABqgGYAf8BygGkAZQB/wHIAaIBkwH/
- AcgBogGTAf8BugGJAYEB/wHKAg4B/yAAAUACAQFtAXkCHAHsAdUBuAGwAf4BsQF9AXcB+gFSAgIBniAA
+ AcgBogGTAf8BugGJAYEB/wHKAhAB/yAAAUACAQFtAXQCFQHsAdEBtAGsAf4BrQF1AW8B+gFSAgIBniAA
AQIDAQECAwEBFAIBARoBKAIBATkBNwIBAVgBSgICAYUBTgICAY8BFAIBARoBLQIBAUQBCgIBAQwBAgMB
TAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAcABAQHgAQMBgAEBAgABwAEB
AcABAQGAAwABwAEBAYABAAGAAwABwAEBAYABAAGAAwABwAEBAYABAAGAAwABwAEBAgABgAMAAcABAQIA
1.3 +56 -56 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/VSExternalToolProxy.cs
Index: VSExternalToolProxy.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/VSExternalToolProxy.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- VSExternalToolProxy.cs 3 May 2006 20:23:06 -0000 1.2
+++ VSExternalToolProxy.cs 15 Jun 2006 03:29:32 -0000 1.3
@@ -29,7 +29,7 @@
public event ProcessTextDelegate ProcessStdOut;
public event ProcessTextDelegate ProcessStdErr;
- public enum ToolExitStatus { DidNotExit, Cancelled, Error, Success };
+ public enum ToolExitStatus { DidNotExit, Canceled, Error, Success };
private string m_executablePath = string.Empty;
private string m_workingDirectory = string.Empty;
@@ -40,6 +40,7 @@
private NameValueCollection m_environmentVariables = new NameValueCollection();
public ArrayList m_outputLines;
public string m_output = string.Empty;
+ System.Diagnostics.ProcessStartInfo m_psi = null;
#endregion
@@ -122,6 +123,18 @@
m_applicationObject = applicationObject;
}
+ public bool OutputContains(string value)
+ {
+ foreach (string line in OutputLines)
+ {
+ if (line.Contains(value))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
public override void BeforeStart()
{
m_psi = new System.Diagnostics.ProcessStartInfo();
@@ -141,46 +154,6 @@
}
}
- private void RedirectStream(object parameters)
- {
- object[] paramlist = parameters as object[];
- System.IO.StreamReader sr = paramlist[0] as System.IO.StreamReader;
- bool isStdErr = (bool)paramlist[1] ;
- if (sr == null)
- {
- return;
- }
- string str;
- bool cancelOutput;
- while (this.IsRunning && !CancelRequested && (str = sr.ReadLine()) != null)
- {
- cancelOutput = false;
- if (isStdErr)
- {
- ProcessStdErr(ref str, ref cancelOutput);
- }
- else
- {
- ProcessStdOut(ref str, ref cancelOutput);
- }
-
-/*
- if (str.ToLower().Contains("model validation failed"))
- {
- lock (this) { m_eventArgs.ExitStatus = ExitStatus.ModelValidationFailed; }
- }
-*/
- if (!cancelOutput)
- {
- this.OutputLines.Add(str);
- m_outputWindowPane.OutputString(str + "\n");
- }
- System.Threading.Thread.Sleep(0);
- }
- }
-
- System.Diagnostics.ProcessStartInfo m_psi = null;
-
protected override void DoWork()
{
Process toolProcess = new Process();
@@ -195,38 +168,33 @@
m_psi.RedirectStandardOutput = true;
m_psi.RedirectStandardError = true;
+ toolProcess.EnableRaisingEvents = true;
+ toolProcess.ErrorDataReceived += new DataReceivedEventHandler(toolProcess_ErrorDataReceived);
+ toolProcess.OutputDataReceived += new DataReceivedEventHandler(toolProcess_OutputDataReceived);
+
// Associate process info with the process.
toolProcess.StartInfo = m_psi;
VSExternalToolEventArgs eventArguments = new VSExternalToolEventArgs();
this.EventArguments = eventArguments;
- if (CancelRequested)
- {
- eventArguments.ExitStatus = ToolExitStatus.Cancelled;
- AcknowledgeCancel();
- return;
- }
-
if (!toolProcess.Start())
{
throw new Exception("External tool failed to start");
}
+ toolProcess.BeginOutputReadLine();
+ toolProcess.BeginErrorReadLine();
+
try
{
- Thread stdoutThread = new Thread(new ParameterizedThreadStart(RedirectStream));
- Thread stderrThread = new Thread(new ParameterizedThreadStart(RedirectStream));
m_applicationObject.MainWindow.SetFocus();
- stdoutThread.Start(new object[] { toolProcess.StandardOutput, false });
- stderrThread.Start(new object[] { toolProcess.StandardError, true });
-
- // Loop until the process has completed
while (!toolProcess.WaitForExit(250) && !CancelRequested)
{
}
+
if (!CancelRequested)
{
eventArguments.ExitCode = toolProcess.ExitCode;
@@ -234,8 +202,8 @@
}
else
{
- eventArguments.ExitStatus = ToolExitStatus.Cancelled;
toolProcess.Kill();
+ eventArguments.ExitStatus = ToolExitStatus.Canceled;
AcknowledgeCancel();
}
}
@@ -256,5 +224,37 @@
}
}
}
+
+ void toolProcess_ErrorDataReceived(object sender, DataReceivedEventArgs e)
+ {
+ ProcessOutput(e.Data, true);
+ }
+
+ void toolProcess_OutputDataReceived(object sender, DataReceivedEventArgs e)
+ {
+ ProcessOutput(e.Data, false);
+ }
+
+ void ProcessOutput(string input, bool isStdErr)
+ {
+ if (input != null)
+ {
+ bool cancelOutput = false;
+ if (isStdErr)
+ {
+ ProcessStdErr(ref input, ref cancelOutput);
+ }
+ else
+ {
+ ProcessStdOut(ref input, ref cancelOutput);
+ }
+ if (!cancelOutput)
+ {
+ this.OutputLines.Add(input);
+ this.OutputWindowPane.OutputString(input + "\n");
+ }
+ }
+ }
+
}
}
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X