Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs ExternalToolsOptionsPage.cs ExternalToolsOptionsPage.designer.cs ExternalToolsOptionsPage.resx
|
From: Chris M. <cm...@us...> - 2006-06-06 01:54:32
|
User: cmicali
Date: 06/06/05 15:27:23
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs MDASolutionManager.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
CreateEntityVOConvertorCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
ExternalToolsOptionsPage.cs
ExternalToolsOptionsPage.designer.cs
ExternalToolsOptionsPage.resx
Log:
- Added schema export command line option to about dialog and solution manager
- Fixed exception in the entity/vo convertor command
Revision Changes Path
No revision
No revision
No revision
No revision
1.7 +21 -3 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.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- AddInSettings.cs 27 May 2006 15:05:58 -0000 1.6
+++ AddInSettings.cs 5 Jun 2006 22:27:23 -0000 1.7
@@ -22,7 +22,7 @@
public class AddInSettings
{
- public const int ADDIN_SETTINGS_VERSION = 7;
+ public const int ADDIN_SETTINGS_VERSION = 8;
#region Member variables
@@ -38,7 +38,7 @@
m_applicationObject = applicationObject;
m_settings = new SettingsManager(m_applicationObject);
//FirstRun = true;
- if (FirstRun || AddInBuild < ADDIN_SETTINGS_VERSION)
+ if (FirstRun)
{
FirstRun = false;
AddInBuild = ADDIN_SETTINGS_VERSION;
@@ -49,9 +49,15 @@
MavenUseCustomCommandLine = false;
MavenCustomCommandLine = "-o clean mda";
UMLModellerPath = "C:\\Program Files\\MagicDraw UML Community Edition\\bin\\mduml.exe";
+ PassSchemaExportArguments = true;
+ SchemaExportCommandLine = "t t";
Dialogs.AddInWelcome welcome = new Dialogs.AddInWelcome();
welcome.ShowDialog();
}
+ else if (AddInBuild < 8)
+ {
+ SchemaExportCommandLine = "t t";
+ }
}
#endregion
@@ -107,6 +113,18 @@
set { m_settings["AMDAMgcDrawPth"] = value; }
}
+ public string SchemaExportCommandLine
+ {
+ get { return m_settings["AMDAScExCmdLn"]; }
+ set { m_settings["AMDAScExCmdLn"] = value; }
+ }
+
+ public bool PassSchemaExportArguments
+ {
+ get { return m_settings.GetBool("AMDAScExPass", true); }
+ set { m_settings.SetBool("AMDAScExPass", value); }
+ }
+
public bool AutoMakeModelFileWritable
{
get { return m_settings.GetBool("AMDAMdlWritbl", false); }
1.12 +6 -0 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.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- MDASolutionManager.cs 4 Jun 2006 02:06:01 -0000 1.11
+++ MDASolutionManager.cs 5 Jun 2006 22:27:23 -0000 1.12
@@ -317,6 +317,12 @@
{
if (IsSchemaExportProjectAvailable && m_schemaExportProject != null)
{
+ if (m_addInSettings.PassSchemaExportArguments)
+ {
+ Property prop = m_schemaExportProject.Project.ConfigurationManager.ActiveConfiguration.Properties.Item("StartArguments");
+ prop.Value = m_addInSettings.SchemaExportCommandLine;
+ }
+
string solutionName = VSSolutionUtils.GetSolutionName(m_applicationObject.Solution);
// Activate the solution explorer window
m_applicationObject.Windows.Item(Constants.vsWindowKindSolutionExplorer).Activate();
1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/CreateEntityVOConvertorCommand.cs
Index: CreateEntityVOConvertorCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/CreateEntityVOConvertorCommand.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- CreateEntityVOConvertorCommand.cs 30 May 2006 17:36:21 -0000 1.1
+++ CreateEntityVOConvertorCommand.cs 5 Jun 2006 22:27:23 -0000 1.2
@@ -28,7 +28,7 @@
public override void QueryStatus(string commandName, vsCommandStatusTextWanted neededText, ref vsCommandStatus status, ref object commandText)
{
- if (m_application.ActiveDocument.Name.Contains("DaoImpl"))
+ if (m_solutionManager.IsEnabled && m_application.ActiveDocument != null && m_application.ActiveDocument.Name.Contains("DaoImpl"))
{
status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;
if (IsCommandAvailable(false))
1.4 +4 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.cs
Index: ExternalToolsOptionsPage.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- ExternalToolsOptionsPage.cs 27 May 2006 15:05:59 -0000 1.3
+++ ExternalToolsOptionsPage.cs 5 Jun 2006 22:27:23 -0000 1.4
@@ -44,6 +44,8 @@
txtCustomCommandLine.Text = m_settings.MavenCustomCommandLine;
txtMagicDrawPath.Text = m_settings.UMLModellerPath;
cbMakeModelWritable.Checked = m_settings.AutoMakeModelFileWritable;
+ cbPassSchemaExportArguments.Checked = m_settings.PassSchemaExportArguments;
+ txtSchemaExportCommandLine.Text = m_settings.SchemaExportCommandLine;
UpdateState();
}
@@ -55,6 +57,8 @@
m_settings.MavenCustomCommandLine = txtCustomCommandLine.Text;
m_settings.UMLModellerPath = txtMagicDrawPath.Text;
m_settings.AutoMakeModelFileWritable = cbMakeModelWritable.Checked;
+ m_settings.PassSchemaExportArguments = cbPassSchemaExportArguments.Checked;
+ m_settings.SchemaExportCommandLine = txtSchemaExportCommandLine.Text;
}
public void OnEnter()
1.3 +39 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.designer.cs
Index: ExternalToolsOptionsPage.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.designer.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ExternalToolsOptionsPage.designer.cs 3 May 2006 20:23:06 -0000 1.2
+++ ExternalToolsOptionsPage.designer.cs 5 Jun 2006 22:27:23 -0000 1.3
@@ -42,8 +42,12 @@
this.txtMagicDrawPath = new System.Windows.Forms.TextBox();
this.cbMakeModelWritable = new System.Windows.Forms.CheckBox();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.txtSchemaExportCommandLine = new System.Windows.Forms.TextBox();
+ this.cbPassSchemaExportArguments = new System.Windows.Forms.CheckBox();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// groupBox2
@@ -109,7 +113,7 @@
this.groupBox3.Controls.Add(this.label3);
this.groupBox3.Controls.Add(this.txtMagicDrawPath);
this.groupBox3.Controls.Add(this.cbMakeModelWritable);
- this.groupBox3.Location = new System.Drawing.Point(0, 83);
+ this.groupBox3.Location = new System.Drawing.Point(0, 78);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(395, 87);
this.groupBox3.TabIndex = 1;
@@ -158,10 +162,39 @@
this.openFileDialog1.FileName = "openFileDialog1";
this.openFileDialog1.Filter = "Executables (*.exe; *.bat)|*.exe;*.bat";
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.txtSchemaExportCommandLine);
+ this.groupBox1.Controls.Add(this.cbPassSchemaExportArguments);
+ this.groupBox1.Location = new System.Drawing.Point(0, 171);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(395, 49);
+ this.groupBox1.TabIndex = 2;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Schema Export Project";
+ //
+ // txtSchemaExportCommandLine
+ //
+ this.txtSchemaExportCommandLine.Location = new System.Drawing.Point(234, 17);
+ this.txtSchemaExportCommandLine.Name = "txtSchemaExportCommandLine";
+ this.txtSchemaExportCommandLine.Size = new System.Drawing.Size(150, 20);
+ this.txtSchemaExportCommandLine.TabIndex = 0;
+ //
+ // cbPassSchemaExportArguments
+ //
+ this.cbPassSchemaExportArguments.AutoSize = true;
+ this.cbPassSchemaExportArguments.Location = new System.Drawing.Point(11, 19);
+ this.cbPassSchemaExportArguments.Name = "cbPassSchemaExportArguments";
+ this.cbPassSchemaExportArguments.Size = new System.Drawing.Size(217, 17);
+ this.cbPassSchemaExportArguments.TabIndex = 1;
+ this.cbPassSchemaExportArguments.Text = "Pass arguments on Run Schema Export:";
+ this.cbPassSchemaExportArguments.UseVisualStyleBackColor = true;
+ //
// ExternalToolsOptionsPage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Name = "ExternalToolsOptionsPage";
@@ -170,6 +203,8 @@
this.groupBox2.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
@@ -188,6 +223,9 @@
private System.Windows.Forms.Button button2;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
private System.Windows.Forms.CheckBox cbMakeModelWritable;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.TextBox txtSchemaExportCommandLine;
+ private System.Windows.Forms.CheckBox cbPassSchemaExportArguments;
1.3 +19 -19 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.resx
Index: ExternalToolsOptionsPage.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/ExternalToolsOptionsPage.resx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ExternalToolsOptionsPage.resx 3 May 2006 20:23:06 -0000 1.2
+++ ExternalToolsOptionsPage.resx 5 Jun 2006 22:27:23 -0000 1.3
@@ -124,26 +124,26 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABG
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABO
BAAAAk1TRnQBSQFMAwEBAAEEAQABBAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA
- ARADAAEBAQABIAYAARASAAEGAgEBBgE7AgEBYQFKAgIBiAEzAgEBTwEEAgEBBOwAAUUCAQF6AWcBcQGA
- Af8BiwGBAaMB/wFgAgoB0wE2AgEBVgEEAgEBBOgAAT0CAQFlAU8BrwL/AUsBeQHDAf8BiwGBAaMB/wFg
- AgoB0wE2AgEBVgEEAgEBBOgAAlcBfAHwAU8BrwL/AUoBewHGAf8BiwGBAaMB/wFgAgoB0wE2AgEBVgEE
- AgEBBOgAAlcBfAHwAU8BrwL/AUoBewHGAf8BiwGBAaMB/wFgAgoB0wEwAgEBSQQAAQIDAQECAwEBAgMB
- AQIDAdgAAlcBfAHwAU8BrwL/AUoBewHGAf8BiwGBAaMB/wFDAgEBdAEdAgEBJwE/AgEBaQFNAgIBkgFP
- AgIBlQFEAgEBdwEiAgEBMAEEAgEBBNQAAlcBfAHwAU8BrwL/A4IB/wGHAlQB8gG2AYUBgQH/Ae0B0gGo
- Av8B+gHHAf8B/AH4AcwB/wHWAbYBpQH/AV4CCwHXAT4CAQFnAQYCAQEG1AABAwIBAQIBwAK2Af8B5AG0
- AZQC/wH1AcoC/wH9AcoD/wHWA/8B4AP/AekB/wH6AfcB7AH/AWsCFwHlATICAQFO1AABAgMBAdIBogGV
- Av8B+AHOAv8B6QG2A/8BzgP/Ad8D/wHvCf8B6AHbAb4B/wFTAgIBodQAAR8CAQEqAf8B2wGoAv8B5wG0
- Av8B6gG3A/8B0AP/AeAD/wHxA/8B+AP/AegD/wHYAf8BawIaAenUAAFLAgIBiQH/Ae4BxAL/AdYBowL/
- AeQBsQL/Af0BygP/AdoD/wHkA/8B5gP/Ad8D/wHRAf8BmgJtAf/UAAEtAgEBRAH/AewBvwL/Ad4BrQL/
- Ae8BwgL/AfUBwgL/Af4BzAP/AdQD/wHVA/8B0AL/AfgBygH/AXUCLAHw2AAB8AHWAbAC/wH8AecC/wHy
- AdsC/wHbAawC/wHzAcAC/wHwAb0C/wHwAb0C/wHwAb0C/wHjAbAB/wFWAgIBsNgAAWkCDgHRAv8B+Qb/
- AeYBuwL/Ad8BrwL/AdoBpwL/AegBtQL/Ae8BxQH/AbUBhAGAAf8BGAIBAR/cAAGLAj4B8AH/AfcB2AL/
- AfwB2AL/AfwBzwL/AfsBzwL/AdsBqwH/Ab8BjwGFAf8BGgIBASLkAAEkAgEBMgFyAhkB4gGsAoAB/wHK
- ApcB/wFIAgIBgQEGAgEBBsgAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAEH
- Af8GAAEDAf8GAAEBAf8GAAGAAf8GAAHAAYcGAAHgAQEGAAHwBwAB+AcAAfgHAAH4BwAB+AcAAfgHAAH8
- BwAB/AcAAf4BAQYAAf8BAwYACw==
+ ARADAAEBAQABIAYAARASAAEGAgEBBgE7AgEBYQFKAgIBiAEzAgEBTwEEAgEBBOwAAUUCAQF6AWkBcwGB
+ Af8BiwGBAaMB/wFgAgYB0wE2AgEBVgEEAgEBBOgAAT0CAQFlAVEBrwL/AU0BewHDAf8BiwGBAaMB/wFg
+ AgYB0wE2AgEBVgEEAgEBBOgAAVsBRQFjAfABUQGvAv8BTAF9AcYB/wGLAYEBowH/AWACBgHTATYCAQFW
+ AQQCAQEE6AABWwFFAWMB8AFRAa8C/wFMAX0BxgH/AYsBgQGjAf8BYAIGAdMBMAIBAUkEAAECAwEBAgMB
+ AQIDAQECAwHYAAFbAUUBYwHwAVEBrwL/AUwBfQHGAf8BiwGBAaMB/wFDAgEBdAEdAgEBJwE/AgEBaQFN
+ AgIBkgFPAgIBlQFEAgEBdwEiAgEBMAEEAgEBBNQAAVsBRQFjAfABUQGvAv8DggH/AYACRQHyAbYBhQGB
+ Af8B7QHSAagC/wH6AccB/wH8AfgBzAH/AdYBtgGlAf8BXgIHAdcBPgIBAWcBBgIBAQbUAAEDAgEBAgHA
+ ArYB/wHkAbQBlAL/AfUBygL/Af0BygP/AdYD/wHgA/8B6QH/AfoB9wHsAf8BaQIRAeUBMgIBAU7UAAEC
+ AwEB0gGiAZUC/wH4Ac4C/wHpAbYD/wHOA/8B3wP/Ae8J/wHoAdsBvgH/AVMCAgGh1AABHwIBASoB/wHb
+ AagC/wHnAbQC/wHqAbcD/wHQA/8B4AP/AfED/wH4A/8B6AP/AdgB/wFrAhMB6dQAAUsCAgGJAf8B7gHE
+ Av8B1gGjAv8B5AGxAv8B/QHKA/8B2gP/AeQD/wHmA/8B3wP/AdEB/wGaAm8B/9QAAS0CAQFEAf8B7AG/
+ Av8B3gGtAv8B7wHCAv8B9QHCAv8B/gHMA/8B1AP/AdUD/wHQAv8B+AHKAf8BcAIkAfDYAAHwAdYBsAL/
+ AfwB5wL/AfIB2wL/AdsBrAL/AfMBwAL/AfABvQL/AfABvQL/AfABvQL/AeMBsAH/AVYCAgGw2AABZAIH
+ AdEC/wH5Bv8B5gG7Av8B3wGvAv8B2gGnAv8B6AG1Av8B7wHFAf8BtQGEAYEB/wEYAgEBH9wAAYICMQHw
+ Af8B9wHYAv8B/AHYAv8B/AHPAv8B+wHPAv8B2wGrAf8BvwGPAYUB/wEaAgEBIuQAASQCAQEyAWwCEQHi
+ AawCgQH/AcoClwH/AUgCAgGBAQYCAQEGyAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGA
+ FwAD/wEAAQcB/wYAAQMB/wYAAQEB/wYAAYAB/wYAAcABhwYAAeABAQYAAfAHAAH4BwAB+AcAAfgHAAH4
+ BwAB+AcAAfwHAAH8BwAB/gEBBgAB/wEDBgAL
</value>
</data>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
