Menu
▾
▴
andromdaplugins-cvs — Each commit to the project CVS repository posts a message to this mailing list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(178) |
Feb
(169) |
Mar
(286) |
Apr
(117) |
May
(98) |
Jun
(68) |
Jul
(63) |
Aug
(121) |
Sep
(88) |
Oct
(124) |
Nov
(2) |
Dec
(111) |
| 2007 |
Jan
(224) |
Feb
(69) |
Mar
(10) |
Apr
(72) |
May
(7) |
Jun
(21) |
Jul
(33) |
Aug
(35) |
Sep
(12) |
Oct
(22) |
Nov
(5) |
Dec
(6) |
| 2008 |
Jan
(2) |
Feb
(10) |
Mar
(39) |
Apr
(58) |
May
(34) |
Jun
(9) |
Jul
(27) |
Aug
(10) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: Chris M. <cm...@us...> - 2006-06-11 15:35:28
|
User: cmicali
Date: 06/06/11 08:35:26
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
MDAProjectSetupControl.cs MDASolutionWizard.cs
MDASolutionWizard.designer.cs
MDASolutionWizard.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
MDAProject.cs WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web
web.config web.config.nhibernate
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
VSSolutionUtils.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Log:
- Fixed bugs in solution wizard's handling of existing projects
- Rewrote and improved web.config rendering/updating in solution wizard
- Improved solution wizard UI behavior with existing project
- Added view log option to solution wizard completion page
Revision Changes Path
No revision
No revision
No revision
No revision
1.4 +28 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDAProjectSetupControl.cs
Index: MDAProjectSetupControl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDAProjectSetupControl.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MDAProjectSetupControl.cs 9 Jun 2006 22:27:23 -0000 1.3
+++ MDAProjectSetupControl.cs 11 Jun 2006 15:35:23 -0000 1.4
@@ -121,23 +121,48 @@
public void OnEnter(object sender, EventArgs e, DTE applicationObject)
{
+ string webProjectKind = "{E24C65DC-7377-472b-9ABA-BC803B73C61A}";
if (m_firstEnter)
{
m_firstEnter = false;
ddlExistingProject.Items.Clear();
+ string itemToSelect = string.Empty;
foreach (Project p in applicationObject.Solution.Projects)
{
if (
- (m_webProjectMode && p.Kind == "{E24C65DC-7377-472b-9ABA-BC803B73C61A}") ||
- (!m_webProjectMode && p.Kind != "{E24C65DC-7377-472b-9ABA-BC803B73C61A}")
+ (m_webProjectMode && p.Kind == webProjectKind) ||
+ (!m_webProjectMode && p.Kind != webProjectKind)
)
{
+
ddlExistingProject.Items.Add(p.Name);
+
+ // If there is a project in the solution with the same
+ // name as the pre-generated project
+ if (!m_webProjectMode && p.Name == txtNewProject.Text)
+ {
+ // Select it by default
+ itemToSelect = p.Name;
+ }
+ // Or if we are in web project mode select the first web site automatically
+ else if (m_webProjectMode && itemToSelect == string.Empty)
+ {
+ itemToSelect = p.Name;
+ }
}
}
if (ddlExistingProject.Items.Count > 0)
{
+ if (itemToSelect != string.Empty)
+ {
+ ddlExistingProject.SelectedIndex = ddlExistingProject.Items.IndexOf(itemToSelect);
+ rbExisting.Checked = true;
+ }
+ else
+ {
ddlExistingProject.SelectedIndex = 0;
+ rbExisting.Checked = false;
+ }
}
else
{
1.9 +26 -10 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs
Index: MDASolutionWizard.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- MDASolutionWizard.cs 9 Jun 2006 22:27:23 -0000 1.8
+++ MDASolutionWizard.cs 11 Jun 2006 15:35:23 -0000 1.9
@@ -361,6 +361,11 @@
#endregion
+ private static string BoolToString(bool condition)
+ {
+ return condition ? "true" : "false";
+ }
+
/// <summary>
/// Creates a ConfigFile with all the settings that will be needed for parsing the
/// variables in the files that will be written out by the solution wizard.
@@ -384,27 +389,27 @@
config["projects.common.name"] = usrCommonProject.ProjectName;
config["projects.common.dir"] = usrCommonProject.ProjectName;
- config["projects.common.create"] = usrCommonProject.CreateNewProject ? "true" : "false";
+ config["projects.common.create"] = BoolToString(usrCommonProject.CreateNewProject);
config["projects.core.name"] = usrCoreProject.ProjectName;
config["projects.core.dir"] = usrCoreProject.ProjectName;
- config["projects.core.create"] = usrCoreProject.CreateNewProject ? "true" : "false";
+ config["projects.core.create"] = BoolToString(usrCoreProject.CreateNewProject);
config["projects.schemaexport.name"] = txtSchemaExportProject.Text;
config["projects.schemaexport.dir"] = txtSchemaExportProject.Text;
- config["projects.schemaexport.create"] = cbCreateSchemaExport.Checked ? "true" : "false";
+ config["projects.schemaexport.create"] = BoolToString(cbCreateSchemaExport.Checked);
- config["projects.web.configure"] = cbConfigureWebProject.Checked ? "true" : "false";
+ config["projects.web.configure"] = BoolToString(cbConfigureWebProject.Checked);
config["projects.web.name"] = usrWebProject.ProjectName;
config["projects.web.dir"] = usrWebProject.ProjectName;
- config["projects.web.create"] = usrWebProject.CreateNewProject ? "true" : "false";
- config["projects.web.usenhibernateconfig"] = rbNHibernateConfig.Checked ? "true" : "false";
- config["projects.web.addmembership"] = cbAddMembershipSupport.Checked ? "true" : "false";
+ config["projects.web.create"] = BoolToString(usrWebProject.CreateNewProject);
+ config["projects.web.usenhibernateconfig"] = BoolToString(rbNHibernateConfig.Checked);
+ config["projects.web.addmembership"] = BoolToString(cbAddMembershipSupport.Checked);
- config["projects.web.common.configure"] = cbConfigureWebCommonProject.Checked ? "true" : "false";
+ config["projects.web.common.configure"] = BoolToString(cbConfigureWebCommonProject.Checked);
config["projects.web.common.name"] = usrWebCommonProject.ProjectName;
config["projects.web.common.dir"] = usrWebCommonProject.ProjectName;
- config["projects.web.common.create"] = cbConfigureWebCommonProject.Checked ? "true" : "false";
+ config["projects.web.common.create"] = BoolToString(usrWebCommonProject.CreateNewProject);
config["database.name"] = txtApplicationName.Text.Replace(" ", string.Empty).Replace(".", string.Empty);
@@ -485,6 +490,7 @@
m_solutionManager.OnSolutionOpened();
AddStatusText("Processing complete.");
txtErrorMessage.Visible = false;
+ lnkViewLog.Visible = true;
lblFinishPageTitleImage.ImageIndex = 0;
}
else
@@ -493,6 +499,7 @@
lblFinishPageDescription.Visible = false;
lblFinishPageTitleImage.ImageIndex = 1;
txtErrorMessage.Visible = true;
+ lnkViewLog.Visible = false;
txtErrorMessage.Text = errorMessage;
}
wizard1.NextEnabled = true;
@@ -513,5 +520,14 @@
System.Threading.Thread.Sleep(0);
}
+ private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+ {
+ lstLog.Items.AddRange(lstStatus.Items);
+ lstStatus.Items.Clear();
+ lblFinishPageDescription.Visible = false;
+ lnkViewLog.Visible = false;
+ lstLog.Visible = true;
+ }
+
}
}
\ No newline at end of file
1.7 +182 -155 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs
Index: MDASolutionWizard.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- MDASolutionWizard.designer.cs 9 Jun 2006 22:27:23 -0000 1.6
+++ MDASolutionWizard.designer.cs 11 Jun 2006 15:35:24 -0000 1.7
@@ -32,6 +32,19 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard));
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.wizard1 = new Gui.Wizard.Wizard();
+ this.wizardPageComplete = new Gui.Wizard.WizardPage();
+ this.lstLog = new System.Windows.Forms.ListBox();
+ this.lnkViewLog = new System.Windows.Forms.LinkLabel();
+ this.lblFinishPageTitle = new System.Windows.Forms.Label();
+ this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
+ this.lblFinishPageDescription = new System.Windows.Forms.Label();
+ this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
+ this.txtErrorMessage = new System.Windows.Forms.TextBox();
+ this.wizardPageProcessing = new Gui.Wizard.WizardPage();
+ this.lstStatus = new System.Windows.Forms.ListBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.header5 = new Gui.Wizard.Header();
+ this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
this.lstChoiceOverview = new System.Windows.Forms.ListView();
this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
@@ -76,18 +89,12 @@
this.label2 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
- this.wizardPageComplete = new Gui.Wizard.WizardPage();
- this.lblFinishPageTitle = new System.Windows.Forms.Label();
- this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
- this.lblFinishPageDescription = new System.Windows.Forms.Label();
- this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
- this.txtErrorMessage = new System.Windows.Forms.TextBox();
- this.wizardPageProcessing = new Gui.Wizard.WizardPage();
- this.lstStatus = new System.Windows.Forms.ListBox();
- this.label7 = new System.Windows.Forms.Label();
- this.header5 = new Gui.Wizard.Header();
- this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
this.wizard1.SuspendLayout();
+ this.wizardPageComplete.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
+ this.wizardPageProcessing.SuspendLayout();
+ this.header5.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
this.wizardPageConfirmChoices.SuspendLayout();
this.wizardPageWebCommonProject.SuspendLayout();
this.wizardPageWebProject.SuspendLayout();
@@ -97,11 +104,6 @@
this.wizardPageSolutionInfo.SuspendLayout();
this.wizardPageWelcome.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
- this.wizardPageComplete.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
- this.wizardPageProcessing.SuspendLayout();
- this.header5.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
this.SuspendLayout();
//
// imageList1
@@ -114,16 +116,16 @@
// wizard1
//
this.wizard1.ContainingForm = null;
- this.wizard1.Controls.Add(this.wizardPageWebProject);
- this.wizard1.Controls.Add(this.wizardPageWebCommonProject);
+ this.wizard1.Controls.Add(this.wizardPageComplete);
+ this.wizard1.Controls.Add(this.wizardPageProcessing);
this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
+ this.wizard1.Controls.Add(this.wizardPageWebCommonProject);
+ this.wizard1.Controls.Add(this.wizardPageWebProject);
this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
this.wizard1.Controls.Add(this.wizardPageCoreProject);
this.wizard1.Controls.Add(this.wizardPageCommonProject);
this.wizard1.Controls.Add(this.wizardPageSolutionInfo);
this.wizard1.Controls.Add(this.wizardPageWelcome);
- this.wizard1.Controls.Add(this.wizardPageComplete);
- this.wizard1.Controls.Add(this.wizardPageProcessing);
this.wizard1.Dock = System.Windows.Forms.DockStyle.Fill;
this.wizard1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.wizard1.Location = new System.Drawing.Point(0, 0);
@@ -143,6 +145,157 @@
this.wizard1.TabIndex = 0;
this.wizard1.Load += new System.EventHandler(this.wizard1_Load);
//
+ // wizardPageComplete
+ //
+ this.wizardPageComplete.BackColor = System.Drawing.Color.White;
+ this.wizardPageComplete.Controls.Add(this.lnkViewLog);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
+ this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
+ this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
+ this.wizardPageComplete.Controls.Add(this.lstLog);
+ this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageComplete.IsFinishPage = true;
+ this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageComplete.Name = "wizardPageComplete";
+ this.wizardPageComplete.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageComplete.TabIndex = 7;
+ this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
+ //
+ // lstLog
+ //
+ this.lstLog.FormattingEnabled = true;
+ this.lstLog.HorizontalScrollbar = true;
+ this.lstLog.Location = new System.Drawing.Point(174, 49);
+ this.lstLog.Name = "lstLog";
+ this.lstLog.Size = new System.Drawing.Size(339, 251);
+ this.lstLog.TabIndex = 17;
+ this.lstLog.Visible = false;
+ //
+ // lnkViewLog
+ //
+ this.lnkViewLog.AutoSize = true;
+ this.lnkViewLog.Location = new System.Drawing.Point(210, 111);
+ this.lnkViewLog.Name = "lnkViewLog";
+ this.lnkViewLog.Size = new System.Drawing.Size(49, 13);
+ this.lnkViewLog.TabIndex = 16;
+ this.lnkViewLog.TabStop = true;
+ this.lnkViewLog.Text = "View Log";
+ this.lnkViewLog.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+ //
+ // lblFinishPageTitle
+ //
+ this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
+ this.lblFinishPageTitle.Name = "lblFinishPageTitle";
+ this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
+ this.lblFinishPageTitle.TabIndex = 15;
+ this.lblFinishPageTitle.Text = "Solution Update Complete";
+ this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // pictureBoxComplete
+ //
+ this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
+ this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxComplete.Name = "pictureBoxComplete";
+ this.pictureBoxComplete.Size = new System.Drawing.Size(164, 312);
+ this.pictureBoxComplete.TabIndex = 13;
+ this.pictureBoxComplete.TabStop = false;
+ //
+ // lblFinishPageDescription
+ //
+ this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
+ this.lblFinishPageDescription.Name = "lblFinishPageDescription";
+ this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 62);
+ this.lblFinishPageDescription.TabIndex = 12;
+ this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
+ "tion. You can now add classes to the solution model file and generate code base" +
+ "d on the model.\r\n";
+ //
+ // lblFinishPageTitleImage
+ //
+ this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblFinishPageTitleImage.ImageIndex = 0;
+ this.lblFinishPageTitleImage.ImageList = this.imageList1;
+ this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
+ this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
+ this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
+ this.lblFinishPageTitleImage.TabIndex = 11;
+ this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // txtErrorMessage
+ //
+ this.txtErrorMessage.BackColor = System.Drawing.Color.White;
+ this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
+ this.txtErrorMessage.Multiline = true;
+ this.txtErrorMessage.Name = "txtErrorMessage";
+ this.txtErrorMessage.ReadOnly = true;
+ this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+ this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
+ this.txtErrorMessage.TabIndex = 14;
+ //
+ // wizardPageProcessing
+ //
+ this.wizardPageProcessing.Controls.Add(this.lstStatus);
+ this.wizardPageProcessing.Controls.Add(this.label7);
+ this.wizardPageProcessing.Controls.Add(this.header5);
+ this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageProcessing.IsFinishPage = false;
+ this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageProcessing.Name = "wizardPageProcessing";
+ this.wizardPageProcessing.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageProcessing.TabIndex = 6;
+ this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
+ //
+ // lstStatus
+ //
+ this.lstStatus.FormattingEnabled = true;
+ this.lstStatus.Location = new System.Drawing.Point(12, 100);
+ this.lstStatus.Name = "lstStatus";
+ this.lstStatus.Size = new System.Drawing.Size(501, 199);
+ this.lstStatus.TabIndex = 9;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(12, 77);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(273, 13);
+ this.label7.TabIndex = 8;
+ this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
+ //
+ // header5
+ //
+ this.header5.BackColor = System.Drawing.SystemColors.Control;
+ this.header5.CausesValidation = false;
+ this.header5.Controls.Add(this.pictureBoxThrobber);
+ this.header5.Description = "Please wait...";
+ this.header5.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
+ this.header5.Location = new System.Drawing.Point(0, 0);
+ this.header5.Name = "header5";
+ this.header5.Size = new System.Drawing.Size(525, 65);
+ this.header5.TabIndex = 6;
+ this.header5.Title = "Processing Solution";
+ //
+ // pictureBoxThrobber
+ //
+ this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
+ this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
+ this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
+ this.pictureBoxThrobber.Name = "pictureBoxThrobber";
+ this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
+ this.pictureBoxThrobber.TabIndex = 10;
+ this.pictureBoxThrobber.TabStop = false;
+ //
// wizardPageConfirmChoices
//
this.wizardPageConfirmChoices.Controls.Add(this.lstChoiceOverview);
@@ -650,134 +803,6 @@
this.pictureBoxWelcome.TabIndex = 1;
this.pictureBoxWelcome.TabStop = false;
//
- // wizardPageComplete
- //
- this.wizardPageComplete.BackColor = System.Drawing.Color.White;
- this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
- this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
- this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
- this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
- this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
- this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageComplete.IsFinishPage = true;
- this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
- this.wizardPageComplete.Name = "wizardPageComplete";
- this.wizardPageComplete.Size = new System.Drawing.Size(525, 312);
- this.wizardPageComplete.TabIndex = 7;
- this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
- //
- // lblFinishPageTitle
- //
- this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
- this.lblFinishPageTitle.Name = "lblFinishPageTitle";
- this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
- this.lblFinishPageTitle.TabIndex = 15;
- this.lblFinishPageTitle.Text = "Solution Update Complete";
- this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // pictureBoxComplete
- //
- this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
- this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxComplete.Name = "pictureBoxComplete";
- this.pictureBoxComplete.Size = new System.Drawing.Size(164, 312);
- this.pictureBoxComplete.TabIndex = 13;
- this.pictureBoxComplete.TabStop = false;
- //
- // lblFinishPageDescription
- //
- this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
- this.lblFinishPageDescription.Name = "lblFinishPageDescription";
- this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 72);
- this.lblFinishPageDescription.TabIndex = 12;
- this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
- "tion. You can now add classes to the solution model file and generate code base" +
- "d on the model.\r\n";
- //
- // lblFinishPageTitleImage
- //
- this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblFinishPageTitleImage.ImageIndex = 0;
- this.lblFinishPageTitleImage.ImageList = this.imageList1;
- this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
- this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
- this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
- this.lblFinishPageTitleImage.TabIndex = 11;
- this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // txtErrorMessage
- //
- this.txtErrorMessage.BackColor = System.Drawing.Color.White;
- this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
- this.txtErrorMessage.Multiline = true;
- this.txtErrorMessage.Name = "txtErrorMessage";
- this.txtErrorMessage.ReadOnly = true;
- this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
- this.txtErrorMessage.TabIndex = 14;
- //
- // wizardPageProcessing
- //
- this.wizardPageProcessing.Controls.Add(this.lstStatus);
- this.wizardPageProcessing.Controls.Add(this.label7);
- this.wizardPageProcessing.Controls.Add(this.header5);
- this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageProcessing.IsFinishPage = false;
- this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
- this.wizardPageProcessing.Name = "wizardPageProcessing";
- this.wizardPageProcessing.Size = new System.Drawing.Size(525, 312);
- this.wizardPageProcessing.TabIndex = 6;
- this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
- //
- // lstStatus
- //
- this.lstStatus.FormattingEnabled = true;
- this.lstStatus.Location = new System.Drawing.Point(12, 100);
- this.lstStatus.Name = "lstStatus";
- this.lstStatus.Size = new System.Drawing.Size(501, 199);
- this.lstStatus.TabIndex = 9;
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(12, 77);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(273, 13);
- this.label7.TabIndex = 8;
- this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
- //
- // header5
- //
- this.header5.BackColor = System.Drawing.SystemColors.Control;
- this.header5.CausesValidation = false;
- this.header5.Controls.Add(this.pictureBoxThrobber);
- this.header5.Description = "Please wait...";
- this.header5.Dock = System.Windows.Forms.DockStyle.Top;
- this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
- this.header5.Location = new System.Drawing.Point(0, 0);
- this.header5.Name = "header5";
- this.header5.Size = new System.Drawing.Size(525, 65);
- this.header5.TabIndex = 6;
- this.header5.Title = "Processing Solution";
- //
- // pictureBoxThrobber
- //
- this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
- this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
- this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
- this.pictureBoxThrobber.Name = "pictureBoxThrobber";
- this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
- this.pictureBoxThrobber.TabIndex = 10;
- this.pictureBoxThrobber.TabStop = false;
- //
// MDASolutionWizard
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -793,6 +818,13 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "AndroMDA Solution Wizard";
this.wizard1.ResumeLayout(false);
+ this.wizardPageComplete.ResumeLayout(false);
+ this.wizardPageComplete.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).EndInit();
+ this.wizardPageProcessing.ResumeLayout(false);
+ this.wizardPageProcessing.PerformLayout();
+ this.header5.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).EndInit();
this.wizardPageConfirmChoices.ResumeLayout(false);
this.wizardPageWebCommonProject.ResumeLayout(false);
this.wizardPageWebCommonProject.PerformLayout();
@@ -806,13 +838,6 @@
this.wizardPageSolutionInfo.PerformLayout();
this.wizardPageWelcome.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
- this.wizardPageComplete.ResumeLayout(false);
- this.wizardPageComplete.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).EndInit();
- this.wizardPageProcessing.ResumeLayout(false);
- this.wizardPageProcessing.PerformLayout();
- this.header5.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).EndInit();
this.ResumeLayout(false);
}
@@ -876,5 +901,7 @@
private System.Windows.Forms.ColumnHeader columnHeader2;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.LinkLabel lnkViewLog;
+ private System.Windows.Forms.ListBox lstLog;
}
}
\ No newline at end of file
1.7 +1361 -1361plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.resx
Index: MDASolutionWizard.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.resx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- MDASolutionWizard.resx 9 Jun 2006 22:27:23 -0000 1.6
+++ MDASolutionWizard.resx 11 Jun 2006 15:35:24 -0000 1.7
@@ -261,266 +261,271 @@
</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="header7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="pictureBoxComplete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- /9j/4AAQSkZJRgABAgEASABIAAD/4QadRXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ /9j/4AAQSkZJRgABAgEASABIAAD/4QpURXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAcAAAAcgEyAAIAAAAUAAAAjodpAAQAAAAB
AAAApAAAANAACvyAAAAnEAAK/IAAACcQQWRvYmUgUGhvdG9zaG9wIENTMiBXaW5kb3dzADIwMDY6MDQ6
- MDIgMjM6MTk6NDQAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAM6ADAAQAAAABAAAAMwAAAAAAAAAG
+ MDIgMjM6MTU6NTYAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAApKADAAQAAAABAAABgwAAAAAAAAAG
AQMAAwAAAAEABgAAARoABQAAAAEAAAEeARsABQAAAAEAAAEmASgAAwAAAAEAAgAAAgEABAAAAAEAAAEu
- AgIABAAAAAEAAAVnAAAAAAAAAEgAAAABAAAASAAAAAH/2P/gABBKRklGAAECAABIAEgAAP/tAAxBZG9i
+ AgIABAAAAAEAAAkeAAAAAAAAAEgAAAABAAAASAAAAAH/2P/gABBKRklGAAECAABIAEgAAP/tAAxBZG9i
ZV9DTQAB/+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwM
DAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwR
- EQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAMwAzAwEiAAIRAQMRAf/dAAQA
- BP/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcI
+ EQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAoABEAwEiAAIRAQMRAf/dAAQA
+ Bf/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcI
CQoLEAABBAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVSwWIzNHKC0UMHJZJT
8OHxY3M1FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePzRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm
9jdHV2d3h5ent8fX5/cRAAICAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAz
JGLhcoKSQ1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSFtJXE1OT0pbXF1eX1
- VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMRAD8A5gugwi1VPsQ2sL7QPJb3TsAv4bMCT5Dx
- Kgz5xjHiz4MHuGzpEdWgzppd4qTulkDkrcrFWgpb6pP0dsndH7gaHOeh5WTk47ZOI0z9H1RYyfhu2tVQ
- Z+YlrVDxbv3SHDcYSy3+4N/7vHKHH/gPPW4jq+FWLi0wVtvz7rNH4WM6fzG2w/7t6pXU4uUXMqY/FyQJ
- FVhlrv6r1ajlnEA5YmIP6RHpczJPHZAEo8Okro8P97glLhaaSSSsIf/Qxum4zXufkXu9LFoANtp/6NbP
- 3rHq8c23KNbdoxunwXsx599rW/Rtu/4Nzv3vprGGTNmPh3a4we+57OziA2GH+ttatGil7sGzqNpLsm13
- 6T+SzhrGj81rVUzCMQcs+svaxj+v+9JtcjjOfmceKVe3E+5KJ+UxjKtR+nxT/wAR6H6kmzK+sgsd9Gmq
- x3kJiof9WtD693NzugYvUK+Kcx1Zjwm7FP8A062oH+LandlZ2R+4xlYP9Yuf/wB8R+pXdGzPqPkV9Pcc
- er1nOoZlODXGxl/rWuG9zvY9/qbE/DEyxEAWZcTe5/NHH8RhO+GOE4ok/oxj88r/AMd4nFrxbcxtWTWH
- ttG0E8g/moow2s6wzFY4urx2+reSZ9Nrfdtc7+qlj1OssL8GLH1/TzrJbj0/y2bv5239z/z2qHU+o04+
- LZg9NLrGvO7LzH6Otd/31n7jEwROOM4mVyyxEfavihj9XF7k/wCu1fiufFzHMD2YXw2fc4eGU+KPB/e9
- n+tL+c/QYJJJK20X/9HlndQ6dXaMPOY7aR6jLmfSaT7P++LSxrsZrNuL1cNqP+Dur3aeGm5cn10kZjCP
- 9GP+qeh4md6ZAeAfiopQnHiOORHF80fmgf8ABkoQBPzcP0uv7v6UXtm5NdP0ertrHJGNTtd/3xDLMK94
- dXjZHUbBxZlOLa/+22f+lFkYvWaWAQ1oPwCs2fWL2wHKtPLzJ9IJr/Fj/iwbcMGLeeWz3EY+5/4bPjy/
- 85v5gyLWD7fcBWz6GLT7a2/Jq5rq2WyPTrAa0cAJs7rTrJAKx7bXWOkp+DBK+KZRlyY4gxxRq9zvKX96
- T1qSSSttV//S5pJcekkp7BJcekkp7BJcekkp7BJcekkp/9n/7QuCUGhvdG9zaG9wIDMuMAA4QklNBCUA
- AAAAABAAAAAAAAAAAAAAAAAAAAAAOEJJTQPtAAAAAAAQAEgAAAABAAEASAAAAAEAAThCSU0EJgAAAAAA
- DgAAAAAAAAAAAAA/gAAAOEJJTQQNAAAAAAAEAAAAeDhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkA
- AAAAAAAAAAEAOEJJTQQKAAAAAAABAAA4QklNJxAAAAAAAAoAAQAAAAAAAAACOEJJTQP1AAAAAABIAC9m
- ZgABAGxmZgAGAAAAAAABAC9mZgABAKGZmgAGAAAAAAABADIAAAABAFoAAAAGAAAAAAABADUAAAABAC0A
- AAAGAAAAAAABOEJJTQP4AAAAAABwAAD/////////////////////////////A+gAAAAA////////////
- /////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////
- ////////////A+gAADhCSU0EAAAAAAAAAgADOEJJTQQCAAAAAAAIAAAAAAAAAAA4QklNBDAAAAAAAAQB
- AQEBOEJJTQQtAAAAAAAGAAEAAAAEOEJJTQQIAAAAAAAQAAAAAQAAAkAAAAJAAAAAADhCSU0EHgAAAAAA
- BAAAAAA4QklNBBoAAAAAA0sAAAAGAAAAAAAAAAAAAAAzAAAAMwAAAAsAVwBpAHoAYQByAGQAUwBtAGEA
- bABsAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAzAAAAMwAAAAAAAAAAAAAAAAAAAAAB
- AAAAAAAAAAAAAAAAAAAAAAAAABAAAAABAAAAAAAAbnVsbAAAAAIAAAAGYm91bmRzT2JqYwAAAAEAAAAA
- AABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21sb25nAAAAMwAA
- AABSZ2h0bG9uZwAAADMAAAAGc2xpY2VzVmxMcwAAAAFPYmpjAAAAAQAAAAAABXNsaWNlAAAAEgAAAAdz
- bGljZUlEbG9uZwAAAAAAAAAHZ3JvdXBJRGxvbmcAAAAAAAAABm9yaWdpbmVudW0AAAAMRVNsaWNlT3Jp
- Z2luAAAADWF1dG9HZW5lcmF0ZWQAAAAAVHlwZWVudW0AAAAKRVNsaWNlVHlwZQAAAABJbWcgAAAABmJv
- dW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAA
- AABCdG9tbG9uZwAAADMAAAAAUmdodGxvbmcAAAAzAAAAA3VybFRFWFQAAAABAAAAAAAAbnVsbFRFWFQA
- AAABAAAAAAAATXNnZVRFWFQAAAABAAAAAAAGYWx0VGFnVEVYVAAAAAEAAAAAAA5jZWxsVGV4dElzSFRN
- TGJvb2wBAAAACGNlbGxUZXh0VEVYVAAAAAEAAAAAAAlob3J6QWxpZ25lbnVtAAAAD0VTbGljZUhvcnpB
- bGlnbgAAAAdkZWZhdWx0AAAACXZlcnRBbGlnbmVudW0AAAAPRVNsaWNlVmVydEFsaWduAAAAB2RlZmF1
- bHQAAAALYmdDb2xvclR5cGVlbnVtAAAAEUVTbGljZUJHQ29sb3JUeXBlAAAAAE5vbmUAAAAJdG9wT3V0
- c2V0bG9uZwAAAAAAAAAKbGVmdE91dHNldGxvbmcAAAAAAAAADGJvdHRvbU91dHNldGxvbmcAAAAAAAAA
- C3JpZ2h0T3V0c2V0bG9uZwAAAAAAOEJJTQQoAAAAAAAMAAAAAT/wAAAAAAAAOEJJTQQUAAAAAAAEAAAA
- BDhCSU0EDAAAAAAFgwAAAAEAAAAzAAAAMwAAAJwAAB8UAAAFZwAYAAH/2P/gABBKRklGAAECAABIAEgA
- AP/tAAxBZG9iZV9DTQAB/+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMT
- FRMTGBEMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4O
- DhQRDAwMDAwREQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAMwAzAwEiAAIR
- AQMRAf/dAAQABP/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAA
- AQACAwQFBgcICQoLEAABBAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVSwWIz
- NHKC0UMHJZJT8OHxY3M1FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePzRieUpIW0lcTU5PSltcXV5fVW
- ZnaGlqa2xtbm9jdHV2d3h5ent8fX5/cRAAICAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEU
- obFCI8FS0fAzJGLhcoKSQ1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSFtJXE
- 1OT0pbXF1eX1VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMRAD8A5gugwi1VPsQ2sL7QPJb3
- TsAv4bMCT5DxKgz5xjHiz4MHuGzpEdWgzppd4qTulkDkrcrFWgpb6pP0dsndH7gaHOeh5WTk47ZOI0z9
- H1RYyfhu2tVQZ+YlrVDxbv3SHDcYSy3+4N/7vHKHH/gPPW4jq+FWLi0wVtvz7rNH4WM6fzG2w/7t6pXU
- 4uUXMqY/FyQJFVhlrv6r1ajlnEA5YmIP6RHpczJPHZAEo8Okro8P97glLhaaSSSsIf/Qxum4zXufkXu9
- LFoANtp/6NbP3rHq8c23KNbdoxunwXsx599rW/Rtu/4Nzv3vprGGTNmPh3a4we+57OziA2GH+ttatGil
- 7sGzqNpLsm136T+SzhrGj81rVUzCMQcs+svaxj+v+9JtcjjOfmceKVe3E+5KJ+UxjKtR+nxT/wAR6H6k
- mzK+sgsd9Gmqx3kJiof9WtD693NzugYvUK+Kcx1Zjwm7FP8A062oH+LandlZ2R+4xlYP9Yuf/wB8R+pX
- dGzPqPkV9Pccer1nOoZlODXGxl/rWuG9zvY9/qbE/DEyxEAWZcTe5/NHH8RhO+GOE4ok/oxj88r/AMd4
- nFrxbcxtWTWHttG0E8g/moow2s6wzFY4urx2+reSZ9Nrfdtc7+qlj1OssL8GLH1/TzrJbj0/y2bv5239
- z/z2qHU+o04+LZg9NLrGvO7LzH6Otd/31n7jEwROOM4mVyyxEfavihj9XF7k/wCu1fiufFzHMD2YXw2f
- c4eGU+KPB/e9n+tL+c/QYJJJK20X/9HlndQ6dXaMPOY7aR6jLmfSaT7P++LSxrsZrNuL1cNqP+Dur3ae
- Gm5cn10kZjCP9GP+qeh4md6ZAeAfiopQnHiOORHF80fmgf8ABkoQBPzcP0uv7v6UXtm5NdP0ertrHJGN
- Ttd/3xDLMK94dXjZHUbBxZlOLa/+22f+lFkYvWaWAQ1oPwCs2fWL2wHKtPLzJ9IJr/Fj/iwbcMGLeeWz
- 3EY+5/4bPjy/85v5gyLWD7fcBWz6GLT7a2/Jq5rq2WyPTrAa0cAJs7rTrJAKx7bXWOkp+DBK+KZRlyY4
- gxxRq9zvKX96T1qSSSttV//S5pJcekkp7BJcekkp7BJcekkp7BJcekkp/9kAOEJJTQQhAAAAAABVAAAA
- AQEAAAAPAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwAAAAEwBBAGQAbwBiAGUAIABQAGgAbwB0
- AG8AcwBoAG8AcAAgAEMAUwAyAAAAAQA4QklNBAYAAAAAAAcABAABAAEBAP/hOq9odHRwOi8vbnMuYWRv
- YmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5U
- Y3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IjMuMS4x
- LTExMSI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1y
- ZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAg
- ICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyI+CiAgICAgICAgIDxk
- Yzpmb3JtYXQ+aW1hZ2UvanBlZzwvZGM6Zm9ybWF0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAg
- ICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eGFwPSJodHRw
- Oi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KICAgICAgICAgPHhhcDpDcmVhdG9yVG9vbD5BZG9iZSBQ
- aG90b3Nob3AgQ1MyIFdpbmRvd3M8L3hhcDpDcmVhdG9yVG9vbD4KICAgICAgICAgPHhhcDpDcmVhdGVE
- YXRlPjIwMDYtMDQtMDJUMjM6MTk6NDQtMDQ6MDA8L3hhcDpDcmVhdGVEYXRlPgogICAgICAgICA8eGFw
- Ok1vZGlmeURhdGU+MjAwNi0wNC0wMlQyMzoxOTo0NC0wNDowMDwveGFwOk1vZGlmeURhdGU+CiAgICAg
- ICAgIDx4YXA6TWV0YWRhdGFEYXRlPjIwMDYtMDQtMDJUMjM6MTk6NDQtMDQ6MDA8L3hhcDpNZXRhZGF0
- YURhdGU+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjph
- Ym91dD0iIgogICAgICAgICAgICB4bWxuczp4YXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4w
- L21tLyIKICAgICAgICAgICAgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9z
- VHlwZS9SZXNvdXJjZVJlZiMiPgogICAgICAgICA8eGFwTU06RG9jdW1lbnRJRD51dWlkOjJBQzNGRjY5
- QzBDMkRBMTE5Mzc2QzQ3MTBEQjAxNUU5PC94YXBNTTpEb2N1bWVudElEPgogICAgICAgICA8eGFwTU06
- SW5zdGFuY2VJRD51dWlkOkQwNzg4QUIyQzBDMkRBMTE5Mzc2QzQ3MTBEQjAxNUU5PC94YXBNTTpJbnN0
- YW5jZUlEPgogICAgICAgICA8eGFwTU06RGVyaXZlZEZyb20gcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2Ui
- PgogICAgICAgICAgICA8c3RSZWY6aW5zdGFuY2VJRD51dWlkOjBBN0FFQkMwQkZDMkRBMTE5Mzc2QzQ3
- MTBEQjAxNUU5PC9zdFJlZjppbnN0YW5jZUlEPgogICAgICAgICAgICA8c3RSZWY6ZG9jdW1lbnRJRD51
- dWlkOjFBOEExMDM5QkNDMkRBMTE5Mzc2QzQ3MTBEQjAxNUU5PC9zdFJlZjpkb2N1bWVudElEPgogICAg
- ICAgICA8L3hhcE1NOkRlcml2ZWRGcm9tPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJk
- ZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25z
- LmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9y
- aWVudGF0aW9uPgogICAgICAgICA8dGlmZjpYUmVzb2x1dGlvbj43MjAwMDAvMTAwMDA8L3RpZmY6WFJl
- c29sdXRpb24+CiAgICAgICAgIDx0aWZmOllSZXNvbHV0aW9uPjcyMDAwMC8xMDAwMDwvdGlmZjpZUmVz
- b2x1dGlvbj4KICAgICAgICAgPHRpZmY6UmVzb2x1dGlvblVuaXQ+MjwvdGlmZjpSZXNvbHV0aW9uVW5p
- dD4KICAgICAgICAgPHRpZmY6TmF0aXZlRGlnZXN0PjI1NiwyNTcsMjU4LDI1OSwyNjIsMjc0LDI3Nywy
- ODQsNTMwLDUzMSwyODIsMjgzLDI5NiwzMDEsMzE4LDMxOSw1MjksNTMyLDMwNiwyNzAsMjcxLDI3Miwz
- MDUsMzE1LDMzNDMyO0FDNkRGQ0I0RDM4NTlGRjI4NjFCOUIzRUJBMzYyODNGPC90aWZmOk5hdGl2ZURp
- Z2VzdD4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFi
- b3V0PSIiCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAv
- Ij4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjUxPC9leGlmOlBpeGVsWERpbWVuc2lvbj4K
- ICAgICAgICAgPGV4aWY6UGl4ZWxZRGltZW5zaW9uPjUxPC9leGlmOlBpeGVsWURpbWVuc2lvbj4KICAg
- ICAgICAgPGV4aWY6Q29sb3JTcGFjZT4xPC9leGlmOkNvbG9yU3BhY2U+CiAgICAgICAgIDxleGlmOk5h
- dGl2ZURpZ2VzdD4zNjg2NCw0MDk2MCw0MDk2MSwzNzEyMSwzNzEyMiw0MDk2Miw0MDk2MywzNzUxMCw0
- MDk2NCwzNjg2NywzNjg2OCwzMzQzNCwzMzQzNywzNDg1MCwzNDg1MiwzNDg1NSwzNDg1NiwzNzM3Nywz
- NzM3OCwzNzM3OSwzNzM4MCwzNzM4MSwzNzM4MiwzNzM4MywzNzM4NCwzNzM4NSwzNzM4NiwzNzM5Niw0
- MTQ4Myw0MTQ4NCw0MTQ4Niw0MTQ4Nyw0MTQ4OCw0MTQ5Miw0MTQ5Myw0MTQ5NSw0MTcyOCw0MTcyOSw0
- MTczMCw0MTk4NSw0MTk4Niw0MTk4Nyw0MTk4OCw0MTk4OSw0MTk5MCw0MTk5MSw0MTk5Miw0MTk5Myw0
- MTk5NCw0MTk5NSw0MTk5Niw0MjAxNiwwLDIsNCw1LDYsNyw4LDksMTAsMTEsMTIsMTMsMTQsMTUsMTYs
- MTcsMTgsMjAsMjIsMjMsMjQsMjUsMjYsMjcsMjgsMzA7RUNGQjE2N0RFMjhBNThBOTBDNEQwRkI2NkQw
- NjY0NTg8L2V4aWY6TmF0aXZlRGlnZXN0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJk
- ZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6cGhvdG9zaG9wPSJodHRw
- Oi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIj4KICAgICAgICAgPHBob3Rvc2hvcDpDb2xvck1v
- ZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICAgICAgICAgPHBob3Rvc2hvcDpJQ0NQcm9maWxlPnNS
- R0IgSUVDNjE5NjYtMi4xPC9waG90b3Nob3A6SUNDUHJvZmlsZT4KICAgICAgICAgPHBob3Rvc2hvcDpI
- aXN0b3J5Lz4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+
- CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAog
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- IAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMRAD8AqOyHPurbOjnAH5r03F6P0s4lO/Fqc7YJ
+ JaJOi8v6ZWLep4tZ132tH4r2ANDWho4AgKrywviJ1d343MwOGECY6Sl6TTU/Y3SP+4lX+YFF/Ruk+m+M
+ Sqdp/MHgrhexpDXGHHgKUTI8QrPDHsHG97L+/L/GL4s++Mq6vgMe4AeEFS9RN1yj7L9Zs/H4DbJHz1UV
+ Qyx4ZU9ZyOb3sImd2F9ZtE1nZYOD4/FUBbmbiIdLeYK0SU9DmNvBePa7QqXDzmbFAxiSYjURafxP4Xg5
+ g+9w1lHzmP8AlI95f12h9szY2+/4Skup+x4u31YEQkl/pzL28Nurk/6Fw9/Hps//0G+quOMjruMD/gz6
+ n3L1Q8rzr6gUCzrT7D/gqpHzK9F7qDlh6L7l1fjc75oR/cgP+d6nnuq9RbV9bemYBMG+p74+BXRd1559
+ Ysz/ANeT0yD/ADNez/O3L0I8qYdXMlGhHxD5N9fqfR+tb7IgXsaZ8ws0cLpf8amP6eb07KA+nvY4+Y1X
+ M1mWhVOZHqei+CzvCR2UUN3B/BEchO5UMXRy7Oh9uP7NifdO1JZe/wBnp9t8pIexHt+lxuXw/wDT4P8A
+ Bf/R3P8AF1je/KyvhX/FduFy/wDi9pLOkWWn/C2kj5LqFHhFY4/a3fik+LnMv9U8P+KHx/6w5k/4wH2A
+ n9BkMZwfHWP85ewHXUcFVH9J6ZZech+Mx1xMl5aJn4q35eCeBRPi1pzEowAGsbt4z/Gjjl/R6cgD+YsB
+ Pz0XB0Gax8F6h9fMf1/qrmgCXMaHt+RC8rw3TUFX5kaAuv8AA56yincgvMKwyu254rqaXvPDW6rVp6Ph
+ dOYMvrLwXcsxQdZ/lKPBgnlNQF+PRv8AxDnsHKwvLKj+jAfPPyi4f7Pzfs3270nfZt23dH/Sj91Ja/8A
+ zvt+2fzbfscbPRgRtSWj/o7+v0r/AA3nP9Nz/wAx/lPc3/yf/fv/0u5+p+O6joNAd+f7/vW0Fi9L630T
+ G6XiU2Z1Ic2pgI3DmNVoU9V6ZdJpya36ToZTYD0gDXRm5oyObJKQI4pyOunV896z/jL6zhdZy8Oimt1O
+ Pd6bSRqQOV6H0zKdmdPx8p42uuYHEfFeT5f1ezsvrudkPDaqLLi9tr+C0/ursj9ccHpmDVi1uFllLdpj
+ y8FJDFkkdIGu7HmnghCJ9yJmT8kfmjF6Tq+O3I6Zk0OIHqMIE+MLyvpX1ftpqdb1R4xKmOI2u+k4D91W
+ +q/XvLvJbW70ge7lzd/UMvOtPqWl/wDKJ9vylSS5bFEXnkKH6IW8tzfNcRjykSJz04yP+i9Bk/WHC6fW
+ 6jpNQHjc7Ulc7l5mTkuddc8uJ/OdP3AK5gdFy854GNU62dDYRDB811GJ9Xuk9JDcjqTxkZDdWs5rH9lQ
+ 5OfjGPDhiMcB+ky5OUx4ScvO5ve5g/5MS45cX9ebx/7A6t+z/wBpei/05+e396El2P8Azvq+1+ntb9ni
+ Nn5v+akqf3ufeW/Fs1/vWP8AzUf3f8F//9Ohb17AH0MOr+01V7PrFfEUVsqH8hsK1T9TuqO5qrb5lxV+
+ j6m3NE5F7ah4M1Tj8RjH5MUR5r/uPLb5+e4vCPFkk86/qHUsr2ue/b5u0QXY1r9C8ucezRJXZM6F0HF9
+ 2TkOucPzXcJ39Z6DgiMbHY5w4MKtk+IZp6cYj/VgvE/hWAejFPmJfvT9EfseWwfql1POd+jpLG/6S2QP
+ xXR4f1V6N0pot6ld69rdfTH0PuVPO+uWXaCyohjPDhYGR1O69xL3ucT27KEzyz/jJhlzeWZrBD2h/U+b
+ /GeszvrZVQw0dPrFTBp7NAuXzurXXuLrXlxPYKvXjZWQdBsafBaGN0ZrPdZqfEph9uGs5cUl+H4dkyHi
+ yFyvUyP5zZ7PxSXQfZ6Y2Rokh95j+5/vNz/R2Lt0p//Uo2/WnNfw4D5qld13Lf8ASsI+CDX0gu+k6Vaq
+ 6PSOVnE4I76ssPhcjvJz3511h+k5yZtWXafa2PNb1WBjs7BWGtpYNAEw81EaQg28fwvFHWWvm4dPRL7N
+ bST5LSx+j0VakK2bmjhCfkeahlmzT60PBuQw4sY0ASbaax7QEC28INuR5qnbkeaMMRJsqnkA2bHr+9JZ
+ v2j3pKx7P5MHu/m//9XJZkogyvNYrcnzRBleazzy/g6gzOx9p80xyvNZX2rzTHK80Pu6733TdleaC/J8
+ 1nuyfNBdkp8eX8FkszdsyVVtyFWdcT3QnPJU8MIDBPN4pvWO6UlXk8pKXgDB7xf/1uEDynFigkhQXCcu
+ 6T1T4peohpJUE+5JkXpi4pkkaQZk9VSkkkktUkkkkp//1+CSSSSUpJJJJSkkkklKSSSSUpJJJJT/AP/Q
+ 4JJJJJSkkkklKSSSSUpJJJJSkkkklP8A/9n/7RB0UGhvdG9zaG9wIDMuMAA4QklNBCUAAAAAABAAAAAA
+ AAAAAAAAAAAAAAAAOEJJTQPtAAAAAAAQAEgAAAABAAEASAAAAAEAAThCSU0EJgAAAAAADgAAAAAAAAAA
+ AAA/gAAAOEJJTQQNAAAAAAAEAAAAHjhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkAAAAAAAAAAAEA
+ OEJJTQQKAAAAAAABAAA4QklNJxAAAAAAAAoAAQAAAAAAAAACOEJJTQP1AAAAAABIAC9mZgABAGxmZgAG
+ AAAAAAABAC9mZgABAKGZmgAGAAAAAAABADIAAAABAFoAAAAGAAAAAAABADUAAAABAC0AAAAGAAAAAAAB
+ OEJJTQP4AAAAAABwAAD/////////////////////////////A+gAAAAA////////////////////////
+ /////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////
+ A+gAADhCSU0EAAAAAAAAAgADOEJJTQQCAAAAAAAIAAAAAAAAAAA4QklNBDAAAAAAAAQBAQEBOEJJTQQt
+ AAAAAAAGAAEAAAAEOEJJTQQIAAAAAAAQAAAAAQAAAkAAAAJAAAAAADhCSU0EHgAAAAAABAAAAAA4QklN
+ BBoAAAAAA0cAAAAGAAAAAAAAAAAAAAGDAAAApAAAAAkAVwBpAHoAYQByAGQAQgBpAGcAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAKQAAAGDAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAA
+ AAAAAAAAEAAAAAEAAAAAAABudWxsAAAAAgAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAA
+ AFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAAGDAAAAAFJnaHRsb25nAAAA
+ pAAAAAZzbGljZXNWbExzAAAAAU9iamMAAAABAAAAAAAFc2xpY2UAAAASAAAAB3NsaWNlSURsb25nAAAA
+ AAAAAAdncm91cElEbG9uZwAAAAAAAAAGb3JpZ2luZW51bQAAAAxFU2xpY2VPcmlnaW4AAAANYXV0b0dl
+ bmVyYXRlZAAAAABUeXBlZW51bQAAAApFU2xpY2VUeXBlAAAAAEltZyAAAAAGYm91bmRzT2JqYwAAAAEA
+ AAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21sb25nAAAB
+ gwAAAABSZ2h0bG9uZwAAAKQAAAADdXJsVEVYVAAAAAEAAAAAAABudWxsVEVYVAAAAAEAAAAAAABNc2dl
+ VEVYVAAAAAEAAAAAAAZhbHRUYWdURVhUAAAAAQAAAAAADmNlbGxUZXh0SXNIVE1MYm9vbAEAAAAIY2Vs
+ bFRleHRURVhUAAAAAQAAAAAACWhvcnpBbGlnbmVudW0AAAAPRVNsaWNlSG9yekFsaWduAAAAB2RlZmF1
+ ...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-06-09 22:54:15
|
User: cmicali
Date: 06/06/09 15:54:14
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Log:
- Fixed build break
- Updated readme and setup binary
Revision Changes Path
No revision
No revision
No revision
No revision
1.9 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs
Index: WizardSolutionProcessor.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- WizardSolutionProcessor.cs 9 Jun 2006 22:27:23 -0000 1.8
+++ WizardSolutionProcessor.cs 9 Jun 2006 22:54:12 -0000 1.9
@@ -213,7 +213,7 @@
{
// Update existing web.config file
System.Configuration.Configuration webconfig = OpenWebConfig(webConfigDstFile);
- config.AppSettings.Settings["nhibernate.config"].Value = "~/nhibernate.config";
+ webconfig.AppSettings.Settings["nhibernate.config"].Value = "~/nhibernate.config";
}
else
{
No revision
No revision
No revision
No revision
|
User: cmicali
Date: 06/06/09 15:27:24
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AndroMDA.VS80AddIn.csproj Resource1.Designer.cs
Resource1.resx WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
AddInCommandBase.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AboutOptionsPage.cs MDAProjectSetupControl.cs
MDAProjectSetupControl.designer.cs
MDASolutionWizard.cs MDASolutionWizard.designer.cs
MDASolutionWizard.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml
empty.model.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
AddInUtils.cs
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web
web.config.membershipsection web.config.rolesection
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml
empty.model.membership.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership
DomainMembershipProvider.cs DomainMembershipUser.cs
DomainRoleProvider.cs MembershipServiceImpl.cs
UserDaoImpl.cs
Log:
- Added membership support to solution wizard processor
- Redesigned and cleaned up the solution wizard UI
Revision Changes Path
1.13 +9 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj
Index: AndroMDA.VS80AddIn.csproj
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- AndroMDA.VS80AddIn.csproj 30 May 2006 17:36:21 -0000 1.12
+++ AndroMDA.VS80AddIn.csproj 9 Jun 2006 22:27:23 -0000 1.13
@@ -39,6 +39,7 @@
<Reference Include="Microsoft.VisualStudio.VCProject, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="System" />
+ <Reference Include="System.configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
@@ -111,6 +112,11 @@
<Compile Include="MavenProxy.cs" />
<Compile Include="MDAProject.cs" />
<Compile Include="MDASolutionManager.cs" />
+ <None Include="Resources\Membership\DomainMembershipProvider.cs" />
+ <None Include="Resources\Membership\DomainMembershipUser.cs" />
+ <None Include="Resources\Membership\DomainRoleProvider.cs" />
+ <None Include="Resources\Membership\MembershipServiceImpl.cs" />
+ <None Include="Resources\Membership\UserDaoImpl.cs" />
<Compile Include="Utils\CodeModelUtils.cs" />
<Compile Include="WizardSolutionProcessor.cs" />
<Compile Include="AddInSettings.cs" />
@@ -276,6 +282,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="AddIn.ico" />
+ <Content Include="Resources\mda\src\uml\empty.model.membership.xml" />
<None Include="Resources\Common\cvsignore" />
<None Include="Resources\Core\cvsignore" />
<None Include="Resources\cvsignore" />
@@ -305,9 +312,11 @@
<None Include="Resources\Lib\NHibernate.dll" />
<None Include="Resources\Lib\NHibernate.Nullables2.dll" />
<None Include="Resources\Web\Bin\cvsignore" />
+ <None Include="Resources\Web\web.config.membershipsection" />
<None Include="Resources\Web\cvsignore" />
<None Include="Resources\Web\web.config" />
<None Include="Resources\Web\web.config.nhibernate" />
+ <None Include="Resources\Web\web.config.rolesection" />
</ItemGroup>
<ItemGroup>
<Folder Include="MavenProxy\" />
1.6 +234 -4 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.Designer.cs
Index: Resource1.Designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.Designer.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- Resource1.Designer.cs 28 May 2006 19:32:27 -0000 1.5
+++ Resource1.Designer.cs 9 Jun 2006 22:27:23 -0000 1.6
@@ -320,6 +320,26 @@
/// <summary>
/// Looks up a localized string similar to <?xml version='1.0' encoding='UTF-8'?>
///<!-- <!DOCTYPE XMI SYSTEM "uml14xmi12.dtd"> -->
+ ///<!-- This xmi file is optimized for MagicDraw UML. Some references are not saved. -->
+ ///<!-- Change MagicDraw UML environment options property General->.Save Rich XMI -->
+ ///
+ ///<XMI xmi.version='1.2' timestamp='Fri Jun 09 17:43:05 EDT 2006' xmlns:UML='omg.org/UML/1.4'>
+ /// <XMI.header>
+ /// <XMI.documentation>
+ /// <XMI.exporter>MagicDraw UML</XMI.exporter>
+ /// <XMI.exporterVersion>9.5</XMI.exporterVersion>
+ /// </XMI.documentation>
+ /// <XMI. [rest of string was truncated]";.
+ /// </summary>
+ internal static string mda_src_uml_empty_model_membership_xml {
+ get {
+ return ResourceManager.GetString("mda_src_uml_empty_model_membership_xml", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to <?xml version='1.0' encoding='UTF-8'?>
+ ///<!-- <!DOCTYPE XMI SYSTEM "uml14xmi12.dtd"> -->
///
///<XMI xmi.version='1.2' timestamp='Mon Aug 29 07:45:39 MDT 2005' xmlns:UML='omg.org/UML/1.4'>
/// <XMI.header>
@@ -330,7 +350,7 @@
/// <XMI.metamodel xmi.name='UML' xmi.version='1.4'/>
/// </XMI.header>
/// <XMI.content>
- /// <UML:Model xmi.id='eee_1045467100313_135436_1' name='Data' isRoot='false' isLeaf [rest of string was truncated]";.
+ /// <UML:Model xmi.id='eee_1045467100313_135436_1' name='Data' isRoot='false' isLeaf='false' isA [rest of string was truncated]";.
/// </summary>
internal static string mda_src_uml_empty_model_xml {
get {
@@ -339,6 +359,157 @@
}
/// <summary>
+ /// Looks up a localized string similar to //
+ ///// DomainMembershipProvider
+ /////
+ ///
+ ///#region Using statements
+ ///
+ ///using System;
+ ///using System.Web;
+ ///using System.Web.Hosting;
+ ///using System.Web.Security;
+ ///using System.Web.Configuration;
+ ///using System.Security.Principal;
+ ///using System.Security.Permissions;
+ ///using System.Globalization;
+ ///using System.Runtime.Serialization;
+ ///using System.Collections;
+ ///using System.Collections.Specialized;
+ ///using System.Security.Cryptography;
+ ///using System.Text;
+ ///using System.Text.RegularExpressions;
+ ///using System.Configuratio [rest of string was truncated]";.
+ /// </summary>
+ internal static string Membership_DomainMembershipProvider_cs {
+ get {
+ return ResourceManager.GetString("Membership_DomainMembershipProvider_cs", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to //
+ ///// DomainMembershipUser
+ /////
+ ///
+ ///#region Using statements
+ ///
+ ///using System;
+ ///using System.Data;
+ ///using System.Data.SqlClient;
+ ///using System.Configuration;
+ ///using System.Web;
+ ///using System.Web.Configuration;
+ ///using System.Web.Security;
+ ///using System.Web.UI;
+ ///using System.Web.UI.WebControls;
+ ///using System.Web.UI.WebControls.WebParts;
+ ///using System.Web.UI.HtmlControls;
+ ///
+ ///#endregion
+ ///
+ ///using ${wizard.solution.name}.VO;
+ ///
+ ///namespace ${wizard.projects.web.common.name}
+ ///{
+ /// [Serializable]
+ /// public class DomainMe [rest of string was truncated]";.
+ /// </summary>
+ internal static string Membership_DomainMembershipUser_cs {
+ get {
+ return ResourceManager.GetString("Membership_DomainMembershipUser_cs", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to //
+ ///// DomainRoleProvider
+ /////
+ ///
+ ///#region Using statements
+ ///
+ ///using System;
+ ///using System.Web;
+ ///using System.Web.Configuration;
+ ///using System.Web.Security;
+ ///using System.Security.Principal;
+ ///using System.Security.Permissions;
+ ///using System.Globalization;
+ ///using System.Runtime.Serialization;
+ ///using System.Collections;
+ ///using System.Collections.Specialized;
+ ///using System.Text;
+ ///using System.Configuration.Provider;
+ ///using System.Configuration;
+ ///using System.Web.DataAccess;
+ ///using System.Web.Hosting;
+ ///using Syst [rest of string was truncated]";.
+ /// </summary>
+ internal static string Membership_DomainRoleProvider_cs {
+ get {
+ return ResourceManager.GetString("Membership_DomainRoleProvider_cs", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to // Name: MembershipServiceImpl.cs
+ ///// license-header cs merge-point
+ /////
+ ///// This is only generated once! It will never be overwritten.
+ ///// You can (and have to!) safely modify it by hand.
+ ///
+ ///using System;
+ ///using System.Collections;
+ ///
+ ///using NHibernate;
+ ///using AndroMDA.NHibernateSupport;
+ ///
+ ///using ${wizard.solution.name}.VO;
+ ///using ${wizard.solution.name}.Domain;
+ ///
+ ///namespace ${wizard.solution.name}.Service
+ ///{
+ /// /// <summary>
+ /// /// @see MembershipExample.Service.MembershipService
+ /// /// </summary>
+ /// [rest of string was truncated]";.
+ /// </summary>
+ internal static string Membership_MembershipServiceImpl_cs {
+ get {
+ return ResourceManager.GetString("Membership_MembershipServiceImpl_cs", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to // Name: UserDaoImpl.cs
+ ///// license-header cs merge-point
+ /////
+ ///// This is only generated once! It will never be overwritten.
+ ///// You can (and have to!) safely modify it by hand.
+ ///
+ ///using System;
+ ///
+ ///using Iesi.Collections;
+ ///
+ ///using ${wizard.solution.name}.VO;
+ ///
+ ///namespace ${wizard.solution.name}.Domain
+ ///{
+ /// /// <summary>
+ /// /// @see MembershipExample.Domain.User
+ /// /// </summary>
+ /// public class UserDaoImpl : UserDaoBase
+ /// {
+ /// /// <summary>
+ /// /// @see MembershipExample.Domain.IUserD [rest of string was truncated]";.
+ /// </summary>
+ internal static string Membership_UserDaoImpl_cs {
+ get {
+ return ResourceManager.GetString("Membership_UserDaoImpl_cs", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
///<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
/// <session-factory name="nhibernator">
@@ -466,7 +637,7 @@
}
/// <summary>
- /// Looks up a localized string similar to App_WebReferences.
+ /// Looks up a localized string similar to .
/// </summary>
internal static string web_cvsignore {
get {
@@ -475,7 +646,21 @@
}
/// <summary>
- /// Looks up a localized string similar to .
+ /// Looks up a localized string similar to <?xml version="1.0"?>
+ ///<!--
+ /// Note: As an alternative to hand editing this file you can use the
+ /// web admin tool to configure settings for your application. Use
+ /// the Website->Asp.Net Configuration option in Visual Studio.
+ /// A full list of settings and comments can be found in
+ /// machine.config.comments usually located in
+ /// \Windows\Microsoft.Net\Framework\v2.x\Config
+ ///-->
+ ///<configuration>
+ ///
+ /// <appSettings>
+ /// <add key="nhibernate.config" value="~/nhibernate.config"/>
+ /// </appSettings>
+ /// [rest of string was truncated]";.
/// </summary>
internal static string web_web_config {
get {
@@ -484,12 +669,57 @@
}
/// <summary>
- /// Looks up a localized string similar to .
+ /// Looks up a localized string similar to <membership defaultProvider="DomainMembershipProvider">
+ /// <providers>
+ /// <clear/>
+ /// <add name="DomainMembershipProvider"
+ /// type="${wizard.projects.web.common.name}.DomainMembershipProvider, ${wizard.projects.web.common.name}"
+ /// enablePasswordRetrieval="false"
+ /// enablePasswordReset="false"
+ /// requiresUniqueEmail="true"
+ /// requiresQuestionAndAnswer="false"
+ /// minRequiredPasswordLength="1"
+ /// minRequiredNonalphanumericCharacters="0"
+ /// hashAlgorithmType="SHA1" passwordFormat="Hashed [rest of string was truncated]";.
+ /// </summary>
+ internal static string web_web_config_membershipsection {
+ get {
+ return ResourceManager.GetString("web_web_config_membershipsection", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to <?xml version="1.0"?>
+ ///<!--
+ /// Note: As an alternative to hand editing this file you can use the
+ /// web admin tool to configure settings for your application. Use
+ /// the Website->Asp.Net Configuration option in Visual Studio.
+ /// A full list of settings and comments can be found in
+ /// machine.config.comments usually located in
+ /// \Windows\Microsoft.Net\Framework\v2.x\Config
+ ///-->
+ ///<configuration>
+ ///
+ /// <configSections>
+ /// <section name="nhibernate" type="System.Configuration.NameValueSectionHan [rest of string was truncated]";.
/// </summary>
internal static string web_web_config_nhibernate {
get {
return ResourceManager.GetString("web_web_config_nhibernate", resourceCulture);
}
}
+
+ /// <summary>
+ /// Looks up a localized string similar to <roleManager enabled="true" cacheRolesInCookie="true" cookieName=".DRPRoles" defaultProvider="DomainRoleProvider">
+ /// <providers>
+ /// <add name="DomainRoleProvider" type="${wizard.projects.web.common.name}.DomainRoleProvider, ${wizard.projects.web.common.name}" />
+ /// </providers>
+ ///</roleManager>.
+ /// </summary>
+ internal static string web_web_config_rolesection {
+ get {
+ return ResourceManager.GetString("web_web_config_rolesection", resourceCulture);
+ }
+ }
}
}
1.6 +24 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.resx
Index: Resource1.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.resx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- Resource1.resx 28 May 2006 19:32:27 -0000 1.5
+++ Resource1.resx 9 Jun 2006 22:27:23 -0000 1.6
@@ -214,4 +214,28 @@
<data name="web_web_config_nhibernate" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\web.config.nhibernate;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name="Membership_DomainMembershipProvider_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\DomainMembershipProvider.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="Membership_DomainMembershipUser_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\DomainMembershipUser.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="Membership_DomainRoleProvider_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\DomainRoleProvider.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="Membership_MembershipServiceImpl_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\MembershipServiceImpl.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="Membership_UserDaoImpl_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Membership\UserDaoImpl.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="web_web_config_membershipsection" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\web.config.membershipsection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="web_web_config_rolesection" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\web.config.rolesection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="mda_src_uml_empty_model_membership_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\src\uml\empty.model.membership.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
</root>
\ No newline at end of file
1.8 +202 -26 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs
Index: WizardSolutionProcessor.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- WizardSolutionProcessor.cs 29 May 2006 14:56:13 -0000 1.7
+++ WizardSolutionProcessor.cs 9 Jun 2006 22:27:23 -0000 1.8
@@ -5,10 +5,12 @@
#region Using statements
using System;
+using System.Configuration;
using System.IO;
using System.Text;
using System.ComponentModel;
using System.Threading;
+using System.Xml;
using EnvDTE;
using EnvDTE80;
@@ -93,6 +95,7 @@
Project coreProject = null;
Project schemaExportProject = null;
Project webProject = null;
+ Project webCommonProject = null;
string versionControlType = m_configuration["application.versioncontrol"];
bool versionControl = versionControlType != "None";
@@ -102,11 +105,11 @@
case "CVS":
ignoreFile = ".cvsignore";
break;
- case "Subversion":
- ignoreFile = ".svnignore";
- break;
}
+ string emptyModelFileData = Resource1.mda_src_uml_empty_model_xml;
+
+ //////////////////////////////////
// Create/find the common project
if (m_configuration["projects.common.create"] == "true")
{
@@ -129,6 +132,8 @@
WriteFile(basePath + "\\" + m_configuration["projects.common.dir"] + "\\" + ignoreFile, ParseVariables(Resource1.common_cvsignore));
}
+
+ //////////////////////////////////
// Create/find the core project
if (m_configuration["projects.core.create"] == "true")
{
@@ -150,6 +155,7 @@
}
+ //////////////////////////////////
// Create the schema export project
if (m_configuration["projects.schemaexport.create"] == "true")
{
@@ -176,17 +182,45 @@
}
}
- // Create the web project
+
+ //////////////////////////////////
+ // Configure the web project
+ if (m_configuration["projects.web.configure"] == "true")
+ {
+
+ //////////////////////////////////
+ // Create/find the web project
if (m_configuration["projects.web.create"] == "true")
{
AddToStatus("Creating web project " + m_configuration["projects.web.name"] + "...");
webProject = VSSolutionUtils.AddWebProjectToSolution(m_configuration["projects.web.name"], (Solution2)m_applicationObject.Solution);
- VsWebSite.VSWebSite webSite = webProject.Object as VsWebSite.VSWebSite;
+ }
+ else
+ {
+ AddToStatus("Using existing web project " + m_configuration["projects.web.name"] + "...");
+ webProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.web.name"], m_applicationObject.Solution);
+ }
+
+ // Write the nhibernate.config if required
+ if (m_configuration["projects.web.usenhibernateconfig"] == "true")
+ {
+ WriteFile(webProject.Name + "nhibernate.config", ParseVariables(Resource1.nhibernate_config));
+ }
+
+ string webConfigDstFile = webProject.Name + "Web.config";
+ if (System.IO.File.Exists(webConfigDstFile))
+ {
+ // Update existing web.config file
+ System.Configuration.Configuration webconfig = OpenWebConfig(webConfigDstFile);
+ config.AppSettings.Settings["nhibernate.config"].Value = "~/nhibernate.config";
+ }
+ else
+ {
+ // Render web.config file
string webconfig;
if (m_configuration["projects.web.usenhibernateconfig"] == "true")
{
- WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\nhibernate.config", ParseVariables(Resource1.nhibernate_config));
webconfig = Resource1.web_web_config;
}
else
@@ -194,22 +228,100 @@
webconfig = Resource1.web_web_config_nhibernate;
}
- WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Web.config", ParseVariables(webconfig));
- webProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Web.config");
+ WriteFile(webConfigDstFile, ParseVariables(webconfig));
+ webProject.ProjectItems.AddFromFile(webConfigDstFile);
+ }
+
+ //Configuration webconfig = WebConfigurationManager.OpenWebConfiguration(webConfigDstFile);
- // TODO: Render Global.asax (if applicable)
// Write Web/cvsignore and Web\Bin\cvsignore
if (versionControl)
{
- WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\" + ignoreFile, ParseVariables(Resource1.web_cvsignore));
- CreateDirectory(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Bin");
- WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Bin\\" + ignoreFile, ParseVariables(Resource1.web_bin_cvsignore));
+ WriteFile(webProject.Name + ignoreFile, ParseVariables(Resource1.web_cvsignore));
+ CreateDirectory(webProject.Name + "Bin");
+ WriteFile(webProject.Name + "Bin\\" + ignoreFile, ParseVariables(Resource1.web_bin_cvsignore));
+ }
+
+
+ if (m_configuration["projects.web.common.configure"] == "true")
+ {
+ // Create/find the core project
+ if (m_configuration["projects.web.common.create"] == "true")
+ {
+ AddToStatus("Creating web common project " + m_configuration["projects.web.common.name"] + "...");
+ webCommonProject = VSSolutionUtils.AddClassLibraryProjectToSolution(m_configuration["projects.web.common.name"], (Solution2)m_applicationObject.Solution);
+ }
+ else
+ {
+ AddToStatus("Using existing web common project " + m_configuration["projects.web.common.name"] + "...");
+ webCommonProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.web.common.name"], m_applicationObject.Solution);
}
+ }
+
+ // Get the web site object
+ VsWebSite.VSWebSite webSite = webProject.Object as VsWebSite.VSWebSite;
+
// Refresh folder view
webSite.Refresh();
+ // Add Membership support
+ if (m_configuration["projects.web.addmembership"] == "true")
+ {
+ AddToStatus("Adding membership support...");
+
+ string file;
+ ProjectItem membershipFolder = webCommonProject.ProjectItems.AddFolder("Membership", Constants.vsProjectItemKindPhysicalFolder);
+
+ // Render DomainMembershipProvider.cs
+ file = basePath + "\\" + m_configuration["projects.web.common.dir"] + "\\Membership\\DomainMembershipProvider.cs";
+ WriteFile(file, ParseVariables(Resource1.Membership_DomainMembershipProvider_cs));
+ membershipFolder.ProjectItems.AddFromFile(file);
+
+ // Render DomainRoleProvider.cs
+ file = basePath + "\\" + m_configuration["projects.web.common.dir"] + "\\Membership\\DomainRoleProvider.cs";
+ WriteFile(file, ParseVariables(Resource1.Membership_DomainRoleProvider_cs));
+ membershipFolder.ProjectItems.AddFromFile(file);
+
+ // Render DomainMembershipUser.cs
+ file = basePath + "\\" + m_configuration["projects.web.common.dir"] + "\\Membership\\DomainMembershipUser.cs";
+ WriteFile(file, ParseVariables(Resource1.Membership_DomainMembershipUser_cs));
+ membershipFolder.ProjectItems.AddFromFile(file);
+
+ // Create core/src/* folder tree from namespace
+ string solutionName = m_configuration["solution.name"];
+ string[] namespaces = solutionName.Split('.');
+ file = basePath + "\\" + m_configuration["projects.core.dir"] + "\\src\\";
+ foreach (string folder in namespaces)
+ {
+ file = file + folder;
+ CreateDirectory(file);
+ file = file + "\\";
+ }
+ CreateDirectory(file + "Domain");
+ CreateDirectory(file + "Service");
+
+ // Render UserDaoImpl.cs
+ WriteFile(file + "Domain\\UserDaoImpl.cs", ParseVariables(Resource1.Membership_UserDaoImpl_cs));
+ coreProject.ProjectItems.AddFromFile(file + "Domain\\UserDaoImpl.cs");
+
+ // Render MembershipServiceImpl.cs
+ WriteFile(file + "Service\\MembershipServiceImpl.cs", ParseVariables(Resource1.Membership_MembershipServiceImpl_cs));
+ coreProject.ProjectItems.AddFromFile(file + "Service\\MembershipServiceImpl.cs");
+
+ // Add membership to web.config
+ System.Configuration.Configuration webconfig = OpenWebConfig(webConfigDstFile);
+
+ ConfigurationSectionGroup systemweb = webconfig.SectionGroups["system.web"];
+ systemweb.Sections["membership"].SectionInformation.SetRawXml(ParseVariables(Resource1.web_web_config_membershipsection));
+ systemweb.Sections["roleManager"].SectionInformation.SetRawXml(ParseVariables(Resource1.web_web_config_rolesection));
+ systemweb.Sections["membership"].SectionInformation.ForceSave = true;
+ systemweb.Sections["roleManager"].SectionInformation.ForceSave = true;
+ webconfig.Save();
+ }
+
+
}
AddToStatus("Creating AndroMDA configuration files...");
@@ -258,8 +370,16 @@
System.IO.Directory.CreateDirectory(basePath + "\\mda\\src");
// Create mda/uml directory
System.IO.Directory.CreateDirectory(basePath + "\\mda\\src\\uml");
+
+ string modelPackageXML = "<UML:Model xmi.id='_9_5_1_874026a_1149883877463_480535_0' name='" + m_configuration["solution.name"] + "'><UML:Namespace.ownedElement>";
+ string xmiIdBase = "_9_5_1_874026a_" + DateTime.Now.Ticks.ToString();
+ modelPackageXML += GetXMI(m_configuration["solution.name"].Split('.'), xmiIdBase);
+ modelPackageXML += "</UML:Namespace.ownedElement></UML:Model>";
+
+ emptyModelFileData = emptyModelFileData.Replace("${wizard.model.packagestructure.xml}", modelPackageXML);
+
// Create the empty model file
- WriteCompressedFile(m_configuration["application.model.filename.unzipped"], basePath + "\\mda\\src\\uml\\" + m_configuration["application.model.filename"], Resource1.mda_src_uml_empty_model_xml);
+ WriteCompressedFile(m_configuration["application.model.filename.unzipped"], basePath + "\\mda\\src\\uml\\" + m_configuration["application.model.filename"], emptyModelFileData);
// Create the lib directory
CreateDirectory(basePath + "\\Lib");
@@ -307,12 +427,51 @@
proj.References.AddFromProject(commonProject);
proj.References.AddFromProject(coreProject);
+ if (webCommonProject != null)
+ {
+ proj.References.AddFromProject(webCommonProject);
+ }
+ }
+
+ if (webCommonProject != null)
+ {
+ AddToStatus("Adding project references to web common project...");
+ VSProject proj = webCommonProject.Object as VSProject;
+ proj.References.AddProject(commonProject);
+ proj.References.AddProject(coreProject);
+ proj.References.Add("System.Configuration");
+ proj.References.Add("System.Web");
}
}
#region Helper methods
+ private string GetXMI(string[] namespaces, string xmlIdBase)
+ {
+ return GetXMI(namespaces, xmlIdBase, 0);
+ }
+
+ private string GetXMI(string[] namespaces, string xmlIdBase, int index)
+ {
+ string name = namespaces[index];
+ if (index == namespaces.Length - 1)
+ {
+ if (m_configuration["projects.web.addmembership"] == "true")
+ {
+ return "<UML:Package xmi.id='" + xmlIdBase + "_" + index + "' name='" + name + "'><UML:Namespace.ownedElement>\n" + Resource1.mda_src_uml_empty_model_membership_xml + "\n</UML:Namespace.ownedElement></UML:Package>";
+ }
+ else
+ {
+ return "<UML:Package xmi.id='" + xmlIdBase + "_" + index + "' name='" + name + "'/>";
+ }
+ }
+ else
+ {
+ return "<UML:Package xmi.id='" + xmlIdBase + "_" + index + "' name='" + name + "'><UML:Namespace.ownedElement>" + GetXMI(namespaces, xmlIdBase, index + 1) + "</UML:Namespace.ownedElement></UML:Package>";
+ }
+ }
+
/// <summary>
/// Adds a line of text to the status window
/// </summary>
@@ -435,19 +594,19 @@
zip.SetLevel(6);
System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
- byte[] modelData = encoding.GetBytes(Resource1.mda_src_uml_empty_model_xml);
+ byte[] fileData = encoding.GetBytes(fileContent);
ZipEntry entry = new ZipEntry(fileNameInZip);
entry.DateTime = DateTime.Now;
- entry.Size = modelData.Length;
+ entry.Size = fileData.Length;
Crc32 crc = new Crc32();
crc.Reset();
- crc.Update(modelData);
+ crc.Update(fileData);
entry.Crc = crc.Value;
zip.PutNextEntry(entry);
- zip.Write(modelData, 0, modelData.Length);
+ zip.Write(fileData, 0, fileData.Length);
zip.Finish();
zip.Close();
@@ -473,6 +632,23 @@
fs.Close();
}
+ private System.Configuration.Configuration OpenWebConfig(string path)
+ {
+ string filename = FileUtils.GetFilename(path);
+ path = FileUtils.GetPathFromFilename(path);
+
+ string currentDirectory = System.IO.Directory.GetCurrentDirectory();
+ System.IO.Directory.SetCurrentDirectory(path);
+
+ ExeConfigurationFileMap map = new ExeConfigurationFileMap();
+ map.ExeConfigFilename = filename;
+ System.Configuration.Configuration config = System.Configuration.ConfigurationManager.OpenMappedExeConfiguration(map, ConfigurationUserLevel.None);
+
+ System.IO.Directory.SetCurrentDirectory(currentDirectory);
+
+ return config;
+ }
+
#endregion
}
1.7 +7 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AddInCommandBase.cs
Index: AddInCommandBase.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AddInCommandBase.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- AddInCommandBase.cs 30 May 2006 17:36:21 -0000 1.6
+++ AddInCommandBase.cs 9 Jun 2006 22:27:23 -0000 1.7
@@ -135,6 +135,13 @@
{
_CommandBars cmdBars = (_CommandBars)m_application.CommandBars;
CommandBar cmdBar = cmdBars["Code Window"];
+ foreach(CommandBarControl c in cmdBar.Controls)
+ {
+ if (c.Caption == m_buttonText)
+ {
+ return;
+ }
+ }
m_command.AddControl(cmdBar, 1);
}
}
1.6 +6 -27 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- AboutOptionsPage.cs 4 Jun 2006 02:06:01 -0000 1.5
+++ AboutOptionsPage.cs 9 Jun 2006 22:27:23 -0000 1.6
@@ -38,7 +38,7 @@
{
set
{
- InsertListViewItem(listViewStatus, "Solution Is Using MDA", value, "AndroMDA");
+ AddInUtils.InsertListViewItem(listViewStatus, "Solution Is Using MDA", value, "AndroMDA");
}
}
@@ -46,7 +46,7 @@
{
set
{
- InsertListViewItem(listViewStatus, "Model File", value, "AndroMDA");
+ AddInUtils.InsertListViewItem(listViewStatus, "Model File", value, "AndroMDA");
}
}
@@ -54,7 +54,7 @@
{
set
{
- InsertListViewItem(listViewStatus, "Last Generated", value, "AndroMDA");
+ AddInUtils.InsertListViewItem(listViewStatus, "Last Generated", value, "AndroMDA");
}
}
@@ -62,7 +62,7 @@
{
set
{
- InsertListViewItem(listViewStatus, "Core Project", value, "Projects");
+ AddInUtils.InsertListViewItem(listViewStatus, "Core Project", value, "Projects");
}
}
@@ -70,7 +70,7 @@
{
set
{
- InsertListViewItem(listViewStatus, "Common Project", value, "Projects");
+ AddInUtils.InsertListViewItem(listViewStatus, "Common Project", value, "Projects");
}
}
@@ -78,7 +78,7 @@
{
set
{
- InsertListViewItem(listViewStatus, "Schema Export Project", value, "Projects");
+ AddInUtils.InsertListViewItem(listViewStatus, "Schema Export Project", value, "Projects");
}
}
@@ -92,27 +92,6 @@
return lvi;
}
- 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()
{
listViewStatus.Items.Clear();
1.3 +48 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDAProjectSetupControl.cs
Index: MDAProjectSetupControl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDAProjectSetupControl.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MDAProjectSetupControl.cs 27 May 2006 22:31:46 -0000 1.2
+++ MDAProjectSetupControl.cs 9 Jun 2006 22:27:23 -0000 1.3
@@ -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;
@@ -13,6 +13,7 @@
using System.Windows.Forms;
using EnvDTE;
+using VSLangProj;
#endregion
@@ -47,6 +48,45 @@
set { lblDescription.Text = value; }
}
*/
+
+ private bool m_webProjectMode = false;
+
+ [Category("Behavior")]
+ [LocalizableAttribute(true)]
+ [BindableAttribute(true)]
+ [DefaultValue(false)]
+ public bool WebProjectMode
+ {
+ get { return m_webProjectMode; }
+ set
+ {
+ /*
+ rbDontAddSupport.Enabled = rbDontAddSupport.Visible = value;
+ int baseY = value ? 23 : 0;
+ rbCreate.Top = baseY + 0;
+ txtNewProject.Top = baseY + 20;
+ rbExisting.Top = baseY + 45;
+ ddlExistingProject.Top = baseY + 66;
+ */
+ m_webProjectMode = value;
+ if (m_webProjectMode)
+ {
+ rbExisting.Text = "Use existing web site";
+ rbCreate.Text = "Create new web site";
+ }
+ else
+ {
+ rbExisting.Text = "Use existing project";
+ rbCreate.Text = "Create new project";
+ }
+ }
+ }
+
+ public bool DontAddSupport
+ {
+ get { return rbDontAddSupport.Checked; }
+ }
+
public bool CreateNewProject
{
get { return rbCreate.Checked; }
@@ -87,8 +127,14 @@
ddlExistingProject.Items.Clear();
foreach (Project p in applicationObject.Solution.Projects)
{
+ if (
+ (m_webProjectMode && p.Kind == "{E24C65DC-7377-472b-9ABA-BC803B73C61A}") ||
+ (!m_webProjectMode && p.Kind != "{E24C65DC-7377-472b-9ABA-BC803B73C61A}")
+ )
+ {
ddlExistingProject.Items.Add(p.Name);
}
+ }
if (ddlExistingProject.Items.Count > 0)
{
ddlExistingProject.SelectedIndex = 0;
1.3 +31 -13 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDAProjectSetupControl.designer.cs
Index: MDAProjectSetupControl.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDAProjectSetupControl.designer.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MDAProjectSetupControl.designer.cs 27 May 2006 22:31:46 -0000 1.2
+++ MDAProjectSetupControl.designer.cs 9 Jun 2006 22:27:23 -0000 1.3
@@ -32,6 +32,7 @@
this.txtNewProject = new System.Windows.Forms.TextBox();
this.rbExisting = new System.Windows.Forms.RadioButton();
this.rbCreate = new System.Windows.Forms.RadioButton();
+ this.rbDontAddSupport = new System.Windows.Forms.RadioButton();
this.SuspendLayout();
//
// ddlExistingProject
@@ -39,26 +40,26 @@
this.ddlExistingProject.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.ddlExistingProject.Enabled = false;
this.ddlExistingProject.FormattingEnabled = true;
- this.ddlExistingProject.Location = new System.Drawing.Point(18, 66);
+ this.ddlExistingProject.Location = new System.Drawing.Point(18, 72);
this.ddlExistingProject.Name = "ddlExistingProject";
- this.ddlExistingProject.Size = new System.Drawing.Size(320, 21);
- this.ddlExistingProject.TabIndex = 6;
+ this.ddlExistingProject.Size = new System.Drawing.Size(394, 21);
+ this.ddlExistingProject.TabIndex = 16;
//
// txtNewProject
//
- this.txtNewProject.Location = new System.Drawing.Point(18, 20);
+ this.txtNewProject.Location = new System.Drawing.Point(18, 23);
this.txtNewProject.Name = "txtNewProject";
- this.txtNewProject.Size = new System.Drawing.Size(320, 20);
- this.txtNewProject.TabIndex = 4;
+ this.txtNewProject.Size = new System.Drawing.Size(394, 20);
+ this.txtNewProject.TabIndex = 13;
//
// rbExisting
//
this.rbExisting.AutoSize = true;
this.rbExisting.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
- this.rbExisting.Location = new System.Drawing.Point(0, 45);
+ this.rbExisting.Location = new System.Drawing.Point(0, 49);
this.rbExisting.Name = "rbExisting";
this.rbExisting.Size = new System.Drawing.Size(138, 17);
- this.rbExisting.TabIndex = 5;
+ this.rbExisting.TabIndex = 15;
this.rbExisting.Text = "Use existing project";
this.rbExisting.UseVisualStyleBackColor = true;
this.rbExisting.CheckedChanged += new System.EventHandler(this.checkChanged);
@@ -71,12 +72,25 @@
this.rbCreate.Location = new System.Drawing.Point(0, 0);
this.rbCreate.Name = "rbCreate";
this.rbCreate.Size = new System.Drawing.Size(133, 17);
- this.rbCreate.TabIndex = 3;
+ this.rbCreate.TabIndex = 12;
this.rbCreate.TabStop = true;
this.rbCreate.Text = "Create new project";
this.rbCreate.UseVisualStyleBackColor = true;
this.rbCreate.CheckedChanged += new System.EventHandler(this.checkChanged);
//
+ // rbDontAddSupport
+ //
+ this.rbDontAddSupport.AutoSize = true;
+ this.rbDontAddSupport.Enabled = false;
+ this.rbDontAddSupport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
+ this.rbDontAddSupport.Location = new System.Drawing.Point(0, 0);
+ this.rbDontAddSupport.Name = "rbDontAddSupport";
+ this.rbDontAddSupport.Size = new System.Drawing.Size(203, 17);
+ this.rbDontAddSupport.TabIndex = 14;
+ this.rbDontAddSupport.Text = "Do not add web project support";
+ this.rbDontAddSupport.UseVisualStyleBackColor = true;
+ this.rbDontAddSupport.Visible = false;
+ //
// MDAProjectSetupControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -85,8 +99,9 @@
this.Controls.Add(this.txtNewProject);
this.Controls.Add(this.rbExisting);
this.Controls.Add(this.rbCreate);
+ this.Controls.Add(this.rbDontAddSupport);
this.Name = "MDAProjectSetupControl";
- this.Size = new System.Drawing.Size(369, 99);
+ this.Size = new System.Drawing.Size(434, 138);
this.ResumeLayout(false);
this.PerformLayout();
@@ -98,5 +113,8 @@
private System.Windows.Forms.TextBox txtNewProject;
private System.Windows.Forms.RadioButton rbExisting;
private System.Windows.Forms.RadioButton rbCreate;
+ private System.Windows.Forms.RadioButton rbDontAddSupport;
+
+
}
}
1.8 +92 -35 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs
Index: MDASolutionWizard.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- MDASolutionWizard.cs 29 May 2006 14:56:12 -0000 1.7
+++ MDASolutionWizard.cs 9 Jun 2006 22:27:23 -0000 1.8
@@ -75,11 +75,13 @@
usrCommonProject.ProjectName = solutionName + ".Common";
usrCoreProject.ProjectName = solutionName + ".Core";
txtSchemaExportProject.Text = solutionName + ".SchemaExport";
- txtWebProject.Text = solutionName + ".Web";
+ usrWebProject.ProjectName = solutionName + ".Web";
+ usrWebCommonProject.ProjectName = solutionName + ".Web.Common";
cbCreateSchemaExport.Checked = true;
- cbCreateWebProject.Checked = false;
- rbNHibernateConfig.Enabled = cbCreateWebProject.Checked;
- rbWebConfig.Enabled = cbCreateWebProject.Checked;
+ cbConfigureWebProject.Checked = true;
+ cbConfigureWebProject.Checked = false;
+ cbConfigureWebCommonProject.Checked = true;
+ cbConfigureWebCommonProject.Checked = false;
// Give the wizard a reference to this form so it can
// set this.AcceptButton to the Next button
@@ -99,9 +101,31 @@
private void cbCreateWebProject_CheckedChanged(object sender, EventArgs e)
{
- txtWebProject.Enabled = cbCreateWebProject.Checked;
- rbNHibernateConfig.Enabled = cbCreateWebProject.Checked;
- rbWebConfig.Enabled = cbCreateWebProject.Checked;
+ //txtWebProject.Enabled = cbCreateWebProject.Checked;
+ //rbNHibernateConfig.Enabled = cbCreateWebProject.Checked;
+ //rbWebConfig.Enabled = cbCreateWebProject.Checked;
+ }
+
+ private void cbAddWebProjectSupport_CheckedChanged(object sender, EventArgs e)
+ {
+ usrWebProject.Enabled = cbConfigureWebProject.Checked;
+ rbNHibernateConfig.Enabled = cbConfigureWebProject.Checked;
+ rbWebConfig.Enabled = cbConfigureWebProject.Checked;
+ cbAddMembershipSupport.Enabled = cbConfigureWebProject.Checked;
+ lblAddMembershipSupportText.Enabled = cbConfigureWebProject.Checked;
+ }
+
+ private void cbEnableWebCommonProject_CheckedChanged(object sender, EventArgs e)
+ {
+ usrWebCommonProject.Enabled = cbConfigureWebCommonProject.Checked;
+ }
+
+ private void cbAddMembershipSupport_CheckedChanged(object sender, EventArgs e)
+ {
+ lblMembershipSelected.Visible = cbAddMembershipSupport.Checked;
+ lblMembershipSelectedImage.Visible = cbAddMembershipSupport.Checked;
+ cbConfigureWebCommonProject.Checked = cbAddMembershipSupport.Checked;
+ cbConfigureWebCommonProject.Enabled = !cbAddMembershipSupport.Checked;
}
/// <summary>
@@ -111,30 +135,32 @@
/// <param name="e">The <see cref="T:System.EventArgs"/> instance containing the event data.</param>
private void wizardPageConfirmChoices_ShowFromNext(object sender, EventArgs e)
{
- lblApplicationName.Text = txtApplicationName.Text;
- lblDatabaseType.Text = ddlDatabaseType.SelectedItem.ToString();
- lblCommonProject.Text = usrCommonProject.ProjectName;
- lblCoreProject.Text = usrCoreProject.ProjectName;
+ lstChoiceOverview.Items.Clear();
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Application Name", txtApplicationName.Text, "General Settings");
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Database Type", ddlDatabaseType.SelectedItem.ToString(), "General Settings");
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Common Project", usrCommonProject.ProjectName, "Project Settings");
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Core Project", usrCoreProject.ProjectName, "Project Settings");
+
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Generate Schema Export Project", cbCreateSchemaExport.Checked ? "Yes" : "No", "Project Settings");
if (cbCreateSchemaExport.Checked)
{
- lblGenerateSchemaExportProject.Text = "Yes";
- lblSchemaExportProject.Text = txtSchemaExportProject.Text;
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Schema Export Project", txtSchemaExportProject.Text, "Project Settings");
}
- else
+
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Configure Web Project", cbConfigureWebProject.Checked ? "Yes" : "No", "Web Settings");
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Configure Web Common Project", cbConfigureWebCommonProject.Checked ? "Yes" : "No", "Web Settings");
+ if (cbConfigureWebProject.Checked)
{
- lblGenerateSchemaExportProject.Text = "No";
- lblSchemaExportProject.Text = "n/a";
- }
- if (cbCreateWebProject.Checked)
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Web Project", usrWebProject.ProjectName, "Web Settings");
+ if (cbConfigureWebCommonProject.Checked)
{
- lblGenerateWebProject.Text = "Yes";
- lblWebProject.Text = txtWebProject.Text;
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Web Common Project", usrWebCommonProject.ProjectName, "Web Settings");
}
- else
- {
- lblGenerateWebProject.Text = "No";
- lblWebProject.Text = "n/a";
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "NHibernate Configuration", rbNHibernateConfig.Checked ? "Stored in nhibernate.config" : "Stored in web.config", "Web Settings");
+ AddInUtils.InsertListViewItem(lstChoiceOverview, "Membership Support", cbAddMembershipSupport.Checked ? "Yes" : "No", "Web Settings");
}
+
+
}
/// <summary>
@@ -270,9 +296,9 @@
private void wizardPageWebProject_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e)
{
bool v1 = true;
- if (cbCreateWebProject.Checked)
+ if (cbConfigureWebProject.Checked)
{
- v1 = ValidationUtils.ValidateRequiredTextBox(txtWebProject);
+ v1 = usrWebProject.ValidateControl();
}
bool pageValid = v1;
if (!pageValid)
@@ -288,16 +314,40 @@
/// <param name="e">The <see cref="T:System.EventArgs"/> instance containing the event data.</param>
private void wizardPageWebProject_ShowFromNext(object sender, EventArgs e)
{
- if (cbCreateWebProject.Checked)
+ usrWebProject.OnEnter(sender, e, m_applicationObject);
+ if (cbConfigureWebProject.Checked == false)
+ {
+ cbConfigureWebProject.Focus();
+ }
+ }
+
+
+ private void wizardPageWebCommonProject_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e)
+ {
+ }
+
+ private void wizardPageWebCommonProject_ShowFromBack(object sender, EventArgs e)
+ {
+ if (cbConfigureWebProject.Checked)
{
- txtWebProject.Focus();
}
else
{
- cbCreateWebProject.Focus();
+ wizard1.Back();
}
}
+ private void wizardPageWebCommonProject_ShowFromNext(object sender, EventArgs e)
+ {
+ if (cbConfigureWebProject.Checked)
+ {
+ usrWebCommonProject.OnEnter(sender, e, m_applicationObject);
+ }
+ else
+ {
+ wizard1.Next();
+ }
+ }
/// <summary>
/// Handles the ShowFromNext event of the wizardPageSolutionInfo control.
@@ -344,10 +394,17 @@
config["projects.schemaexport.dir"] = txtSchemaExportProject.Text;
config["projects.schemaexport.create"] = cbCreateSchemaExport.Checked ? "true" : "false";
- config["projects.web.name"] = txtWebProject.Text;
- config["projects.web.dir"] = txtWebProject.Text;
- config["projects.web.create"] = cbCreateWebProject.Checked ? "true" : "false";
+ config["projects.web.configure"] = cbConfigureWebProject.Checked ? "true" : "false";
+ config["projects.web.name"] = usrWebProject.ProjectName;
+ config["projects.web.dir"] = usrWebProject.ProjectName;
+ config["projects.web.create"] = usrWebProject.CreateNewProject ? "true" : "false";
config["projects.web.usenhibernateconfig"] = rbNHibernateConfig.Checked ? "true" : "false";
+ config["projects.web.addmembership"] = cbAddMembershipSupport.Checked ? "true" : "false";
+
+ config["projects.web.common.configure"] = cbConfigureWebCommonProject.Checked ? "true" : "false";
+ config["projects.web.common.name"] = usrWebCommonProject.ProjectName;
+ config["projects.web.common.dir"] = usrWebCommonProject.ProjectName;
+ config["projects.web.common.create"] = cbConfigureWebCommonProject.Checked ? "true" : "false";
config["database.name"] = txtApplicationName.Text.Replace(" ", string.Empty).Replace(".", string.Empty);
1.6 +390 -416 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs
Index: MDASolutionWizard.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- MDASolutionWizard.designer.cs 29 May 2006 14:56:12 -0000 1.5
+++ MDASolutionWizard.designer.cs 9 Jun 2006 22:27:23 -0000 1.6
@@ -33,40 +33,24 @@
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.wizard1 = new Gui.Wizard.Wizard();
this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
- this.lblWebProject = new System.Windows.Forms.Label();
- this.lblSchemaExportProject = new System.Windows.Forms.Label();
- this.lblGenerateWebProject = new System.Windows.Forms.Label();
- this.lblGenerateSchemaExportProject = new System.Windows.Forms.Label();
- this.lblDatabaseType = new System.Windows.Forms.Label();
- this.lblCoreProject = new System.Windows.Forms.Label();
- this.lblApplicationName = new System.Windows.Forms.Label();
- this.lblCommonProject = new System.Windows.Forms.Label();
- this.label20 = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.label18 = new System.Windows.Forms.Label();
- this.label19 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.label15 = new System.Windows.Forms.Label();
- this.label4 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
+ this.lstChoiceOverview = new System.Windows.Forms.ListView();
+ this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
+ this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
this.header4 = new Gui.Wizard.Header();
+ this.wizardPageWebCommonProject = new Gui.Wizard.WizardPage();
+ this.lblMembershipSelectedImage = new System.Windows.Forms.Label();
+ this.lblMembershipSelected = new System.Windows.Forms.Label();
+ this.cbConfigureWebCommonProject = new System.Windows.Forms.CheckBox();
+ this.usrWebCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
+ this.header8 = new Gui.Wizard.Header();
this.wizardPageWebProject = new Gui.Wizard.WizardPage();
+ this.cbConfigureWebProject = new System.Windows.Forms.CheckBox();
+ this.usrWebProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
+ this.lblAddMembershipSupportText = new System.Windows.Forms.Label();
this.rbWebConfig = new System.Windows.Forms.RadioButton();
this.rbNHibernateConfig = new System.Windows.Forms.RadioButton();
- this.cbCreateWebProject = new System.Windows.Forms.CheckBox();
- this.txtWebProject = new System.Windows.Forms.TextBox();
+ this.cbAddMembershipSupport = new System.Windows.Forms.CheckBox();
this.header7 = new Gui.Wizard.Header();
- this.wizardPageProcessing = new Gui.Wizard.WizardPage();
- this.lstStatus = new System.Windows.Forms.ListBox();
- this.label7 = new System.Windows.Forms.Label();
- this.header5 = new Gui.Wizard.Header();
- this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
- this.wizardPageComplete = new Gui.Wizard.WizardPage();
- this.lblFinishPageTitle = new System.Windows.Forms.Label();
- this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
- this.lblFinishPageDescription = new System.Windows.Forms.Label();
- this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
- this.txtErrorMessage = new System.Windows.Forms.TextBox();
this.wizardPageSchemaExportProject = new Gui.Wizard.WizardPage();
this.cbCreateSchemaExport = new System.Windows.Forms.CheckBox();
this.txtSchemaExportProject = new System.Windows.Forms.TextBox();
@@ -87,23 +71,37 @@
this.label12 = new System.Windows.Forms.Label();
this.header6 = new Gui.Wizard.Header();
this.wizardPageWelcome = new Gui.Wizard.WizardPage();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label9 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
+ this.wizardPageComplete = new Gui.Wizard.WizardPage();
+ this.lblFinishPageTitle = new System.Windows.Forms.Label();
+ this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
+ this.lblFinishPageDescription = new System.Windows.Forms.Label();
+ this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
+ this.txtErrorMessage = new System.Windows.Forms.TextBox();
+ this.wizardPageProcessing = new Gui.Wizard.WizardPage();
+ this.lstStatus = new System.Windows.Forms.ListBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this....
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-06-09 19:53:44
|
User: cmicali Date: 06/06/09 12:53:31 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership - New directory |
|
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">
|
|
From: Vance K. <va...@us...> - 2006-06-03 15:39:43
|
User: vancek
Date: 06/06/03 08:39:42
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionBeanBase.vsl MessageDrivenListener.vsl
Interceptor.vsl SessionListener.vsl
andromda-ejb3/src/changes changes.xml
Log:
updated interceptor related class package names to javax.interceptor.
javax.annotation.EJB moved to javax.ejb.EJB.
updates for EJB 3.0 FR (JBoss 4.0.4-GA with RC8).
Revision Changes Path
1.5 +2 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanBase.vsl
Index: SessionBeanBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanBase.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- SessionBeanBase.vsl 29 May 2006 01:41:19 -0000 1.4
+++ SessionBeanBase.vsl 3 Jun 2006 15:39:42 -0000 1.5
@@ -114,7 +114,7 @@
/**
* Inject session EJB ${reference.name}
*/
- @javax.annotation.EJB
+ @javax.ejb.EJB
protected ${reference.fullyQualifiedServiceRemoteInterfaceName} $stringUtils.uncapitalize(${reference.name});
#**##end
#end
@@ -128,7 +128,7 @@
/**
* Inject DAO ${daoReference.daoName}
*/
- @javax.annotation.EJB
+ @javax.ejb.EJB
private ${daoReference.fullyQualifiedDaoName} $stringUtils.uncapitalize(${daoReference.daoName});
#**##end
#end
1.6 +2 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenListener.vsl
Index: MessageDrivenListener.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenListener.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- MessageDrivenListener.vsl 29 May 2006 01:41:19 -0000 1.5
+++ MessageDrivenListener.vsl 3 Jun 2006 15:39:42 -0000 1.6
@@ -20,7 +20,7 @@
}
@javax.annotation.PostConstruct
- public void postConstruct(javax.ejb.InvocationContext ctx)
+ public void postConstruct(javax.interceptor.InvocationContext ctx)
{
try
{
@@ -34,7 +34,7 @@
}
@javax.annotation.PreDestroy
- public void preDestroy(javax.ejb.InvocationContext ctx)
+ public void preDestroy(javax.interceptor.InvocationContext ctx)
{
try
{
1.4 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Interceptor.vsl
Index: Interceptor.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Interceptor.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Interceptor.vsl 29 May 2006 01:41:19 -0000 1.3
+++ Interceptor.vsl 3 Jun 2006 15:39:42 -0000 1.4
@@ -16,7 +16,7 @@
* @return
*/
@javax.interceptor.AroundInvoke
- public Object execute(javax.ejb.InvocationContext ctx)
+ public Object execute(javax.interceptor.InvocationContext ctx)
throws Exception
{
// Add implementation
1.7 +4 -4 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionListener.vsl
Index: SessionListener.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionListener.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- SessionListener.vsl 11 Apr 2006 15:44:24 -0000 1.6
+++ SessionListener.vsl 3 Jun 2006 15:39:42 -0000 1.7
@@ -20,7 +20,7 @@
}
@javax.annotation.PostConstruct
- public void postConstruct(javax.ejb.InvocationContext ctx)
+ public void postConstruct(javax.interceptor.InvocationContext ctx)
{
try
{
@@ -34,7 +34,7 @@
}
@javax.annotation.PreDestroy
- public void preDestroy(javax.ejb.InvocationContext ctx)
+ public void preDestroy(javax.interceptor.InvocationContext ctx)
{
try
{
@@ -49,7 +49,7 @@
#if ($service.stateful)
@javax.ejb.PostActivate
- public void postActivate(javax.ejb.InvocationContext ctx)
+ public void postActivate(javax.interceptor.InvocationContext ctx)
{
try
{
@@ -63,7 +63,7 @@
}
@javax.ejb.PrePassivate
- public void prePassivate(javax.ejb.InvocationContext ctx)
+ public void prePassivate(javax.interceptor.InvocationContext ctx)
{
try
{
1.3 +25 -0 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- changes.xml 29 May 2006 06:39:00 -0000 1.2
+++ changes.xml 3 Jun 2006 15:39:42 -0000 1.3
@@ -44,6 +44,31 @@
<action dev="vancek" type="add">
Added installation howto.
</action>
+ <action dev="tlu" type="add">
+ Added equals, hashCode and toString methods to entities.
+ </action>
+ <action dev="vancek" type="update">
+ Updates to bring up to date with EJB 3.0 FR.
+ Now require JBoss 4.0.4-GA with EJB 3.0 RC8-PFD update.
+ Update include
+ @javax.annotation.EJB --> @javax.ejb.EJB
+ Interceptor related classes and annotations moved to javax.interceptor package.
+ </action>
+ <action dev="vancek" type="fix">
+ MDB base class must implement javax.jms.MessageListener to avoid the following error message
+ on deployment:
+ java.lang.RuntimeException: unable to determine messagingType interface for MDB
+ </action>
+ <action dev="vancek" type="delete">
+ Removed container configuration option via tagged value on message driven beans since it
+ is no longer supported.
+ </action>
+ <action dev="vancek" type="add">
+ Added minimumPoolSize (@andromda.ejb.mdb.pool.size.min) and maximumPoolSize
+ (@andromda.ejb.mdb.pool.size.min) tagged value options for message
+ driven beans i.e. to allow singleton message driven beans. These are added as
+ activation config properties to the ejb-jar.xml.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-03 15:36:50
|
User: vancek
Date: 06/06/03 08:36:48
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3
EJB3Profile.java
andromda-ejb3/src/main/resources/templates/ejb3
MessageDrivenBean.vsl
andromda-ejb3/src/main/resources/templates/ejb3/config
ejb-jar.xml.vsl
andromda-ejb3/src/main/resources/META-INF/andromda
profile.xml
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3MessageDrivenFacadeLogicImpl.java
andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip
andromda-ejb3/src/main/resources/templates/ejb3/config/jboss
jboss.xml.vsl
Log:
Removed container configuration option for MDB.
Added minimumPoolSize and maximumPoolSize (EJB3MessageDrivenFacade) using tagged values on MDB.
MDB implements MessageListener.
Revision Changes Path
1.24 +7 -3 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Profile.java
Index: EJB3Profile.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Profile.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- EJB3Profile.java 17 Apr 2006 02:00:31 -0000 1.23
+++ EJB3Profile.java 3 Jun 2006 15:36:47 -0000 1.24
@@ -460,10 +460,14 @@
public static final String TAGGEDVALUE_EJB_SESSION_JNDI_NAME_Local = profile.get("SERVICE_JNDI_NAME_LOCAL");
/**
- * The tagged value indicating the MDB or session bean
- * container configuration name specific to JBoss.
+ * The tagged value indicating the bean minimum pool size
*/
- public static final String TAGGEDVALUE_EJB_CONTAINER_CONFIGURATION = profile.get("CONTAINER_CONFIGURATION");
+ public static final String TAGGEDVALUE_EJB_MDB_MINIMUM_POOL_SIZE = profile.get("MDB_MINIMUM_POOL_SIZE");
+
+ /**
+ * The tagged value indicating the bean maximum pool size
+ */
+ public static final String TAGGEDVALUE_EJB_MDB_MAXIMUM_POOL_SIZE = profile.get("MDB_MAXIMUM_POOL_SIZE");
/**
* Defines the association collection type
1.14 +4 -3 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl
Index: MessageDrivenBean.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/MessageDrivenBean.vsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- MessageDrivenBean.vsl 29 May 2006 01:42:33 -0000 1.13
+++ MessageDrivenBean.vsl 3 Jun 2006 15:36:47 -0000 1.14
@@ -42,10 +42,10 @@
#* *##set ($lifecycleCallback = "")
#**##end
// Lifecycle callback listeners and interceptors are defined in ejb-jar.xml
-// javax.ejb.Interceptors({$transform.getInterceptorsAsList(${interceptors}, ${lifecycleCallback})})
+// javax.interceptor.Interceptors({$transform.getInterceptorsAsList(${interceptors}, ${lifecycleCallback})})
#end
#if ($service.excludeDefaultInterceptors)
-// @javax.ejb.ExcludeDefaultInterceptors
+// @javax.interceptor.ExcludeDefaultInterceptors
#end
#if ($mdb.transactionManagement)
@@ -60,6 +60,7 @@
@javax.annotation.security.RunAs("${mdb.runAs}")
#end
public abstract class ${mdb.messageDrivenName}
+ implements javax.jms.MessageListener
{
// ------ Message Driven Context Injection ------
@@ -91,7 +92,7 @@
/**
* Inject session EJB ${reference.name};
*/
- @javax.annotation.EJB
+ @javax.ejb.EJB
protected ${reference.fullyQualifiedServiceRemoteInterfaceName} $stringUtils.uncapitalize(${reference.name});
#**##end
1.5 +14 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl
Index: ejb-jar.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- ejb-jar.xml.vsl 24 Apr 2006 02:33:20 -0000 1.4
+++ ejb-jar.xml.vsl 3 Jun 2006 15:36:47 -0000 1.5
@@ -79,7 +79,7 @@
<ejb-class>${mdb.fullyQualifiedMessageDrivenImplementationName}</ejb-class>
<transaction-type>Container</transaction-type>
<message-destination-type>${mdb.destinationType}</message-destination-type>
-#**##if ($mdb.transactionManagementBean || $stringUtils.isNotBlank($mdb.messageSelector) || $mdb.destinationTypeTopic)
+#**##if ($mdb.transactionManagementBean || $stringUtils.isNotBlank($mdb.messageSelector) || $mdb.destinationTypeTopic || $mdb.minimumPoolSize > 0 || $mdb.maximumPoolSize > 0)
<activation-config>
#* *##if ($mdb.transactionManagementBean)
<activation-config-property>
@@ -99,6 +99,18 @@
<activation-config-property-value>${mdb.subscriptionDurability}</activation-config-property-value>
</activation-config-property>
#* *##end
+#* *##if ($mdb.minimumPoolSize > 0)
+ <activation-config-property>
+ <activation-config-property-name>minPoolSize</activation-config-property-name>
+ <activation-config-property-value>${mdb.minimumPoolSize}</activation-config-property-value>
+ </activation-config-property>
+#* *##end
+#* *##if ($mdb.maximumPoolSize > 0)
+ <activation-config-property>
+ <activation-config-property-name>maxPoolSize</activation-config-property-name>
+ <activation-config-property-value>${mdb.maximumPoolSize}</activation-config-property-value>
+ </activation-config-property>
+#* *##end
</activation-config>
#**##end
#**##if ($stringUtils.isNotBlank($mdb.runAs))
@@ -116,6 +128,7 @@
</env-entry>
#**##end
</message-driven>
+
#end
</enterprise-beans>
1.29 +17 -6 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/profile.xml
Index: profile.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/profile.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- profile.xml 13 May 2006 02:57:17 -0000 1.28
+++ profile.xml 3 Jun 2006 15:36:47 -0000 1.29
@@ -1251,14 +1251,25 @@
<value>@andromda.ejb.mdb.subscription.durability</value>
<appliedOnElement>Message Driven Bean</appliedOnElement>
</element>
- <element name="CONTAINER_CONFIGURATION">
+ <element name="MDB_MINIMUM_POOL_SIZE">
<documentation>
- Defines the container configuration name set in
- jboss.xml to configure the container for a
- session bean or MDB.
+ Defines the bean's minimum pool size.
+ Must be an integer and greater than 0, otherwise
+ will not be set.
</documentation>
- <value>@andromda.ejb.container.configuration</value>
- <appliedOnElement>Message Driven or Session Bean</appliedOnElement>
+ <value>@andromda.ejb.mdb.pool.size.min</value>
+ <appliedOnElement>Message Driven</appliedOnElement>
+ </element>
+ <element name="MDB_MAXIMUM_POOL_SIZE">
+ <documentation>
+ Defines the bean's maximum pool size.
+ Can be used to define singleton message driven
+ beans.
+ Must be an integer and greater than 0, otherwise
+ will not be set.
+ </documentation>
+ <value>@andromda.ejb.mdb.pool.size.max</value>
+ <appliedOnElement>Message Driven</appliedOnElement>
</element>
<element name="ENTITY_CACHE">
<documentation>
1.7 +24 -3 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MessageDrivenFacadeLogicImpl.java
Index: EJB3MessageDrivenFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MessageDrivenFacadeLogicImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- EJB3MessageDrivenFacadeLogicImpl.java 9 Mar 2006 04:43:38 -0000 1.6
+++ EJB3MessageDrivenFacadeLogicImpl.java 3 Jun 2006 15:36:48 -0000 1.7
@@ -18,6 +18,7 @@
import org.apache.commons.collections.Transformer;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
/**
@@ -334,11 +335,31 @@
}
/**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacadeLogic#handleGetContainerConfiguration()
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacadeLogic#handleGetMinimumPoolSize()
*/
- protected String handleGetContainerConfiguration()
+ protected int handleGetMinimumPoolSize()
{
- return (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_CONTAINER_CONFIGURATION);
+ int minPoolSize = 0;
+ String minPoolSizeStr = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_MDB_MINIMUM_POOL_SIZE);
+ if (StringUtils.isNotBlank(minPoolSizeStr) && NumberUtils.isDigits(minPoolSizeStr))
+ {
+ minPoolSize = Integer.parseInt(minPoolSizeStr);
+ }
+ return minPoolSize;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenFacadeLogic#handleGetMaximumPoolSize()
+ */
+ protected int handleGetMaximumPoolSize()
+ {
+ int maxPoolSize = 0;
+ String maxPoolSizeStr = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_MDB_MAXIMUM_POOL_SIZE);
+ if (StringUtils.isNotBlank(maxPoolSizeStr) && NumberUtils.isDigits(maxPoolSizeStr))
+ {
+ maxPoolSize = Integer.parseInt(maxPoolSizeStr);
+ }
+ return maxPoolSize;
}
/**
1.39 +208 -210 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip
<<Binary file>>
1.4 +0 -3 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/jboss.xml.vsl
Index: jboss.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/jboss/jboss.xml.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- jboss.xml.vsl 24 Apr 2006 02:34:41 -0000 1.3
+++ jboss.xml.vsl 3 Jun 2006 15:36:48 -0000 1.4
@@ -47,9 +47,6 @@
#foreach ($mdb in $mdbs)
<message-driven>
<ejb-name>${mdb.messageDrivenName}</ejb-name>
-#**##if ($stringUtils.isNotBlank($mdb.containerConfiguration))
- <configuration-name>${mdb.containerConfiguration}</configuration-name>
-#**##end
<destination-jndi-name>${mdb.destination}</destination-jndi-name>
</message-driven>
|
|
From: Vance K. <va...@us...> - 2006-06-01 14:40:52
|
User: vancek
Date: 06/06/01 07:40:47
Modified: andromda-ejb3/src/main/resources/templates/ejb3
GlobalMacros.vm EntityEmbeddable.vsl
Log:
added equals, hashCode and toString to entities
Revision Changes Path
1.2 +67 -30 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/GlobalMacros.vm
Index: GlobalMacros.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/GlobalMacros.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- GlobalMacros.vm 24 Apr 2006 02:28:00 -0000 1.1
+++ GlobalMacros.vm 1 Jun 2006 14:40:46 -0000 1.2
@@ -3,12 +3,15 @@
## If an entity is rendered, the attributeSet consists of the identifiers,
## if an value type is renderer, the attributeSet consists of all attributes
##
+## If an entity contains a composite primary key consisting of more than 1
+## identifier, must call accessor on PK object.
+##
#macro (renderEqualsMethod $class $className $attributeSet)
public boolean equals(Object object)
{
-#if ($attributeSet.empty)
+#**##if ($attributeSet.empty)
return super.equals(object);
-#else
+#**##else
if (this == object)
{
return true;
@@ -18,27 +21,27 @@
return false;
}
final $className that = ($className)object;
-#foreach ($attribute in $attributeSet)
-#set ($idType = $attribute.type)
-#if ($idType.primitive)
- if (this.$attribute.name != that.${attribute.getterName}())
+#* *##foreach ($attribute in $attributeSet)
+#* *##set ($idType = $attribute.type)
+#* *##if ($idType.primitive)
+ if (this.#if ($class.compositePrimaryKeyPresent)getPk().#end${attribute.getterName}() != that.#if ($class.compositePrimaryKeyPresent)getPk().#end${attribute.getterName}())
{
return false;
}
-#elseif ($idType.arrayType)
- if (!java.util.Arrays.equals(this.$attribute.name, that.${attribute.getterName}()))
+#* *##elseif ($idType.arrayType)
+ if (!java.util.Arrays.equals(this.#if ($class.compositePrimaryKeyPresent)getPk().#end${attribute.getterName}(), that.#if ($class.compositePrimaryKeyPresent)getPk().#end${attribute.getterName}()))
{
return false;
}
-#else
- if (this.$attribute.name == null || that.${attribute.getterName}() == null || !this.${attribute.name}.equals(that.${attribute.getterName}()))
+#* *##else
+ if (this.#if ($class.compositePrimaryKeyPresent)getPk().#end${attribute.getterName}() == null || that.#if ($class.compositePrimaryKeyPresent)getPk().#end${attribute.getterName}() == null || !this.#if ($class.compositePrimaryKeyPresent)getPk().#end${attribute.getterName}().equals(that.#if ($class.compositePrimaryKeyPresent)getPk().#end${attribute.getterName}()))
{
return false;
}
-#end
-#end
+#* *##end
+#* *##end
return true;
-#end
+#**##end
}
#end
##
@@ -46,31 +49,65 @@
## If an entity is rendered, the attributeSet consists of the identifiers,
## if an value type is renderer, the attributeSet consists of all attributes
##
+## If an entity contains a composite primary key consisting of more than 1
+## identifier, must call accessor on PK object.
+##
#macro (renderHashCodeMethod $class $attributeSet)
public int hashCode()
{
-#if ($attributeSet.empty)
+#**##if ($attributeSet.empty)
return super.hashCode();
-#else
-#if ($class.generalization)
+#**##else
+#* *##if ($class.generalization)
int hashCode = super.hashCode();
-#else
+#* *##else
int hashCode = 0;
-#end
-#foreach ($attribute in $attributeSet)
-#set ($attrType = $attribute.type)
-#if ($attribute.getterSetterTypeName == "boolean")
- hashCode = 29 * hashCode + (${attribute.name} ? 1 : 0);
-#elseif ($attrType.arrayType)
+#* *##end
+#* *##foreach ($attribute in $attributeSet)
+#* *##set ($attrType = $attribute.type)
+#* *##if ($attribute.getterSetterTypeName == "boolean")
+ hashCode = 29 * hashCode + (#if ($class.compositePrimaryKeyPresent)this.getPk().#end${attribute.getterName}() ? 1 : 0);
+#* *##elseif ($attrType.arrayType)
// arrays are not part of the hashCode calculation
-#elseif ($attrType.primitive)
- hashCode = 29 * hashCode + (int)${attribute.name};
-#else
- hashCode = 29 * hashCode + (${attribute.name} == null ? 0 : ${attribute.name}.hashCode());
-#end## if
-#end## foreach
+#* *##elseif ($attrType.primitive)
+ hashCode = 29 * hashCode + (int)#if ($class.compositePrimaryKeyPresent)this.getPk().#end${attribute.getterName}();
+#* *##else
+ hashCode = 29 * hashCode + (#if ($class.compositePrimaryKeyPresent)this.getPk().#end${attribute.getterName}() == null ? 0 : #if ($class.compositePrimaryKeyPresent)this.getPk().#end${attribute.getterName}().hashCode());
+#* *##end## if
+#* *##end## foreach
return hashCode;
-#end## $attributeSet.empty
+#**##end## $attributeSet.empty
+ }
+#end
+##
+## This macro will render the toString() method
+## If an entity is rendered, the attributeSet consists of the identifiers,
+## if an value type is renderer, the attributeSet consists of all attributes
+##
+## If an entity contains a composite primary key consisting of more than 1
+## identifier, must call accessor on PK object.
+##
+#macro (renderToStringMethod $class $className $attributeSet)
+ public String toString()
+ {
+#**##if ($attributeSet.empty)
+ return super.toString();
+#**##else
+ StringBuilder sb = new StringBuilder();
+ sb.append("${className}(=");
+#* *##if ($class.generalization)
+ sb.append(super.toString());
+#* *##end
+#* *##set( $sep = "" )
+#* *##foreach ($attribute in $attributeSet)
+#* *##set ($attrType = $attribute.type)
+ sb.append("${sep}#if ($class.compositePrimaryKeyPresent && $attribute.identifier)pk.#end${attribute.name}: ");
+ sb.append(#if ($class.compositePrimaryKeyPresent && $attribute.identifier)this.getPk().#end${attribute.getterName}());
+#* *##set( $sep = ", " )
+#* *##end## foreach
+ sb.append(")");
+ return sb.toString();
+#**##end## $attributeSet.empty
}
#end
1.30 +29 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -r1.29 -r1.30
--- EntityEmbeddable.vsl 29 May 2006 01:37:57 -0000 1.29
+++ EntityEmbeddable.vsl 1 Jun 2006 14:40:47 -0000 1.30
@@ -715,4 +715,33 @@
#* *##end
#**##end
#end
+ // -------- Common Methods -----------
+
+#if ($entity.entityImplementationRequired || $entity.embeddableSuperclass)
+#**##set ($entityName = $entity.entityEmbeddableName)
+#else
+#**##set ($entityName = $entity.entityName)
+#end
+ /**
+ * Indicates if the argument is of the same type and all values are equal.
+ *
+ * @param object The target object to compare with
+ * @return boolean True if both objects a 'equal'
+ */
+#renderEqualsMethod($entity $entityName $entity.identifiers)
+
+ /**
+ * Returns a hash code value for the object
+ *
+ * @return int The hash code value
+ */
+#renderHashCodeMethod($entity $entity.identifiers)
+
+ /**
+ * Returns a String representation of the object
+ *
+ * @return String Textual representation of the object displaying name/value pairs for all attributes
+ */
+#renderToStringMethod($entity $entityName $entity.attributes)
+
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-01 14:40:21
|
User: vancek Date: 06/06/01 07:40:05 Modified: andromda-ejb3/src/site/resources HowToModel.xmi Log: update howtomodel for mapped superclass example Revision Changes Path 1.2 +1023 -1000cartridges/andromda-ejb3/src/site/resources/HowToModel.xmi Index: HowToModel.xmi =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/resources/HowToModel.xmi,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- HowToModel.xmi 15 May 2006 12:34:48 -0000 1.1 +++ HowToModel.xmi 1 Jun 2006 14:40:04 -0000 1.2 @@ -3,7 +3,7 @@ <!-- This xmi file is optimized for MagicDraw UML. Some references are not saved. --> <!-- Change MagicDraw UML environment options property General->.Save Rich XMI --> -<XMI xmi.version='1.2' timestamp='Mon May 15 15:32:40 WST 2006' xmlns:UML='omg.org/UML/1.4'> +<XMI xmi.version='1.2' timestamp='Thu Jun 01 22:19:25 WST 2006' xmlns:UML='omg.org/UML/1.4'> <XMI.header> <XMI.documentation> <XMI.exporter>MagicDraw UML</XMI.exporter> @@ -3626,7 +3626,29 @@ </UML:Stereotype> </UML:ModelElement.stereotype> <UML:Classifier.feature> + <UML:Attribute xmi.id='_9_5_1_192d044b_1149171561903_725649_0' name='id'> + <UML:Attribute.initialValue> + <UML:Expression xmi.id='_9_5_1_192d044b_1149171565684_850006_2'/> + </UML:Attribute.initialValue> + <UML:ModelElement.stereotype> + <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_176418_96'> + <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> + <referentPath xmi.value='org.andromda.profile::persistence::Identifier'/> + </XMI.extension> + </UML:Stereotype> + </UML:ModelElement.stereotype> + <UML:StructuralFeature.type> + <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_227130_59'> + <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> + <referentPath xmi.value='datatype::Long'/> + </XMI.extension> + </UML:Classifier> + </UML:StructuralFeature.type> + </UML:Attribute> <UML:Attribute xmi.id='_9_5_1_192d044b_1140746003015_865390_797' name='make' visibility='public'> + <UML:Attribute.initialValue> + <UML:Expression xmi.id='_9_5_1_192d044b_1149171565684_833875_3'/> + </UML:Attribute.initialValue> <UML:StructuralFeature.type> <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'> <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> @@ -3636,6 +3658,9 @@ </UML:StructuralFeature.type> </UML:Attribute> <UML:Attribute xmi.id='_9_5_1_192d044b_1140746003015_214013_798' name='model' visibility='public'> + <UML:Attribute.initialValue> + <UML:Expression xmi.id='_9_5_1_192d044b_1149171565684_884465_4'/> + </UML:Attribute.initialValue> <UML:StructuralFeature.type> <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'> <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> @@ -3652,6 +3677,9 @@ </UML:Multiplicity.range> </UML:Multiplicity> </UML:StructuralFeature.multiplicity> + <UML:Attribute.initialValue> + <UML:Expression xmi.id='_9_5_1_192d044b_1149171565684_493711_5'/> + </UML:Attribute.initialValue> <UML:StructuralFeature.type> <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_766613_34'> <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> @@ -5902,47 +5930,51 @@ </XMI.content> <XMI.extensions xmi.extender='MagicDraw UML 9.5'> <mdOwnedDiagrams> - <mdElement elementClass='DiagramData' xmi.id='_9_5_1_192d044b_1141397075281_255246_56' name='howto11a'> + <mdElement elementClass='DiagramData' xmi.id='_9_5_1_192d044b_1140711976604_664572_9' name='howto9a'> <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> <ignoredInModule xmi.value='true'/> </XMI.extension> - <parentID xmi.idref='_9_5_1_192d044b_1141397068437_498326_46'/> + <parentID xmi.idref='_9_5_1_192d044b_1140710769761_75617_64'/> <type>Class Diagram</type> <umlType>Class Diagram</umlType> - <mdElement elementClass='DiagramView' xmi.id='_9_5_1_192d044b_1141397433781_377403_1004'> - <elementID xmi.idref='_9_5_1_192d044b_1141397075281_255246_56'/> + <mdElement elementClass='DiagramView' xmi.id='_9_5_1_192d044b_1140712105651_154395_349'> + <elementID xmi.idref='_9_5_1_192d044b_1140711976604_664572_9'/> <zoomFactor xmi.value='1.0'/> <diagramOpened xmi.value='true'/> <diagramWindowBounds>0, 0, 954, 875</diagramWindowBounds> <diagramScrollPositionX xmi.value='0'/> <diagramScrollPositionY xmi.value='0'/> <maximized xmi.value='true'/> - <active xmi.value='false'/> + <active xmi.value='true'/> <mdOwnedViews> - <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1141397108953_778307_632'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_216352_610'/> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1140745775968_953840_441'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_186758_390'/> <properties> <mdElement elementClass='ColorProperty'> <propertyID>FILL_COLOR</propertyID> <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> - <value xmi.value='-6684775'/> + <value xmi.value='-52'/> </mdElement> </properties> - <geometry>40, 290, 385, 150</geometry> + <geometry>70, 60, 255, 91</geometry> </mdElement> - <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1141397110671_205971_698'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_489349_585'/> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1140745778296_943401_488'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_169124_391'/> + <geometry>510, 50, 148, 62</geometry> + </mdElement> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1140745781437_55143_533'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_888873_419'/> <properties> <mdElement elementClass='ColorProperty'> <propertyID>FILL_COLOR</propertyID> <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> - <value xmi.value='-2763307'/> + <value xmi.value='-6684775'/> </mdElement> </properties> - <geometry>170, 480, 245, 106</geometry> + <geometry>10, 420, 385, 150</geometry> </mdElement> - <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1141397112906_804750_761'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_540079_598'/> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1140745782890_916870_584'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_428190_403'/> <properties> <mdElement elementClass='ColorProperty'> <propertyID>FILL_COLOR</propertyID> @@ -5950,121 +5982,71 @@ <value xmi.value='-6684775'/> </mdElement> </properties> - <geometry>570, 290, 208, 150</geometry> - </mdElement> - <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1141397114781_482027_811'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_226371_586'/> - <geometry>500, 40, 148, 62</geometry> + <geometry>520, 420, 363, 135</geometry> </mdElement> - <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1141397116437_153869_871'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_275615_581'/> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1140745785156_523452_664'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_538524_407'/> <properties> <mdElement elementClass='ColorProperty'> <propertyID>FILL_COLOR</propertyID> <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> - <value xmi.value='-52'/> - </mdElement> - </properties> - <geometry>50, 50, 282, 120</geometry> - </mdElement> - <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1141397174468_825202_918'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_819486_612'/> - <properties> - <mdElement elementClass='ChoiceProperty'> - <propertyID>LINK_LINE_STYLE</propertyID> - <propertyDescriptionID>LINK_LINE_STYLE_DESCRIPTION</propertyDescriptionID> - <value>RECTILINEAR</value> - <choice xmi.value='RECTILINEAR^OBLIQUE^BEZIER'/> - <index xmi.value='0'/> + <value xmi.value='-2763307'/> </mdElement> </properties> - <linkFirstEndID xmi.idref='_9_5_1_192d044b_1141397112906_804750_761'/> - <linkSecondEndID xmi.idref='_9_5_1_192d044b_1141397116437_153869_871'/> - <geometry>637, 290; 637, 145; 332, 145; </geometry> - <linkNameID xmi.idref='_9_5_1_192d044b_1141397174468_856681_919'/> - <nameVisible xmi.value='true'/> - <mdOwnedViews> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174468_856681_919'> - <visible xmi.value='false'/> - <geometry>542, 130, 30, 15</geometry> - </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174468_896265_921'> - <editable xmi.value='false'/> - <visible xmi.value='false'/> - <geometry>542, 130, 30, 15</geometry> - </mdElement> - <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174468_840038_923'> - <editable xmi.value='false'/> - <visible xmi.value='false'/> - <geometry>557, 160, 30, 15</geometry> - </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174468_924173_926'> - <editable xmi.value='false'/> - <visible xmi.value='false'/> - <geometry>558, 166, 30, 15</geometry> - <text><html> -<body> -<p></p> -</body> -</html></text> - </mdElement> - </mdOwnedViews> - <linkConstraintID xmi.idref='_9_5_1_192d044b_1141397174468_896265_921'/> - <linkStereotypeID xmi.idref='_9_5_1_192d044b_1141397174468_840038_923'/> - <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174468_924173_926'/> + <geometry>120, 600, 245, 106</geometry> </mdElement> - <mdElement elementClass='AssociationView' xmi.id='_9_5_1_192d044b_1141397174484_71295_928'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_869535_615'/> - <linkFirstEndID xmi.idref='_9_5_1_192d044b_1141397108953_778307_632'/> - <linkSecondEndID xmi.idref='_9_5_1_192d044b_1141397112906_804750_761'/> - <geometry>425, 368; 570, 368; </geometry> - <linkNameID xmi.idref='_9_5_1_192d044b_1141397174484_284315_964'/> + <mdElement elementClass='AssociationView' xmi.id='_9_5_1_192d044b_1140745795625_367160_712'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_671722_424'/> + <linkFirstEndID xmi.idref='_9_5_1_192d044b_1140745781437_55143_533'/> + <linkSecondEndID xmi.idref='_9_5_1_192d044b_1140745782890_916870_584'/> + <geometry>395, 496; 520, 496; </geometry> + <linkNameID xmi.idref='_9_5_1_192d044b_1140745795625_277785_748'/> <nameVisible xmi.value='true'/> <mdOwnedViews> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_350941_929'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_345527_713'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>482, 338, 30, 15</geometry> + <geometry>442, 466, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174484_815853_931'> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1140745795625_568056_715'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>482, 383, 30, 15</geometry> + <geometry>457, 511, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_302225_934'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_292696_718'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>483, 397, 30, 15</geometry> + <geometry>443, 524, 30, 15</geometry> <text><html> <body> <p></p> </body> </html></text> </mdElement> - <mdElement elementClass='RoleView' xmi.id='_9_5_1_192d044b_1141397174484_183895_936'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_795297_613'/> - <geometry>425, 368, 10, 10</geometry> + <mdElement elementClass='RoleView' xmi.id='_9_5_1_192d044b_1140745795625_753244_720'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_158122_422'/> + <geometry>395, 496, 10, 10</geometry> <mdOwnedViews> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_757415_937'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_734617_721'> <visible xmi.value='false'/> - <geometry>425, 358, 30, 15</geometry> + <geometry>395, 486, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_794006_939'> - <geometry>430, 348, 30, 15</geometry> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_777109_723'> + <geometry>400, 476, 30, 15</geometry> <text>0..*</text> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_189650_941'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_929564_725'> <visible xmi.value='false'/> - <geometry>425, 358, 30, 15</geometry> + <geometry>395, 486, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174484_153869_943'> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1140745795625_140700_727'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>443, 383, 30, 15</geometry> + <geometry>413, 511, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_837179_946'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_725282_730'> <visible xmi.value='false'/> - <geometry>425, 358, 30, 15</geometry> + <geometry>395, 486, 30, 15</geometry> <text><html> <body> <p></p> @@ -6072,36 +6054,36 @@ </html></text> </mdElement> </mdOwnedViews> - <roleNameID xmi.idref='_9_5_1_192d044b_1141397174484_757415_937'/> - <roleMultiplicityID xmi.idref='_9_5_1_192d044b_1141397174484_794006_939'/> - <roleConstraintsID xmi.idref='_9_5_1_192d044b_1141397174484_189650_941'/> - <roleStereotypeID xmi.idref='_9_5_1_192d044b_1141397174484_153869_943'/> - <roleTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174484_837179_946'/> + <roleNameID xmi.idref='_9_5_1_192d044b_1140745795625_734617_721'/> + <roleMultiplicityID xmi.idref='_9_5_1_192d044b_1140745795625_777109_723'/> + <roleConstraintsID xmi.idref='_9_5_1_192d044b_1140745795625_929564_725'/> + <roleStereotypeID xmi.idref='_9_5_1_192d044b_1140745795625_140700_727'/> + <roleTaggedValuesID xmi.idref='_9_5_1_192d044b_1140745795625_725282_730'/> </mdElement> - <mdElement elementClass='RoleView' xmi.id='_9_5_1_192d044b_1141397174484_906936_950'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_667969_614'/> - <geometry>570, 368, 10, 10</geometry> + <mdElement elementClass='RoleView' xmi.id='_9_5_1_192d044b_1140745795625_147046_734'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_823546_423'/> + <geometry>520, 496, 10, 10</geometry> <mdOwnedViews> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_425551_951'> - <geometry>513, 348, 42, 15</geometry> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_378893_735'> + <geometry>463, 476, 42, 15</geometry> <text>+owner</text> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_199857_953'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_487428_737'> <visible xmi.value='false'/> - <geometry>550, 358, 30, 15</geometry> + <geometry>500, 486, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_47106_955'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_431998_739'> <visible xmi.value='false'/> - <geometry>550, 358, 30, 15</geometry> + <geometry>500, 486, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174484_607963_957'> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1140745795625_358510_741'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>550, 398, 30, 15</geometry> + <geometry>500, 526, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_748016_960'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_205196_744'> <visible xmi.value='false'/> - <geometry>550, 358, 30, 15</geometry> + <geometry>500, 486, 30, 15</geometry> <text><html> <body> <p></p> @@ -6109,25 +6091,25 @@ </html></text> </mdElement> </mdOwnedViews> - <roleNameID xmi.idref='_9_5_1_192d044b_1141397174484_425551_951'/> - <roleMultiplicityID xmi.idref='_9_5_1_192d044b_1141397174484_199857_953'/> - <roleConstraintsID xmi.idref='_9_5_1_192d044b_1141397174484_47106_955'/> - <roleStereotypeID xmi.idref='_9_5_1_192d044b_1141397174484_607963_957'/> - <roleTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174484_748016_960'/> + <roleNameID xmi.idref='_9_5_1_192d044b_1140745795625_378893_735'/> + <roleMultiplicityID xmi.idref='_9_5_1_192d044b_1140745795625_487428_737'/> + <roleConstraintsID xmi.idref='_9_5_1_192d044b_1140745795625_431998_739'/> + <roleStereotypeID xmi.idref='_9_5_1_192d044b_1140745795625_358510_741'/> + <roleTaggedValuesID xmi.idref='_9_5_1_192d044b_1140745795625_205196_744'/> </mdElement> - <mdElement elementClass='AssociationTextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_284315_964'> + <mdElement elementClass='AssociationTextBoxView' xmi.id='_9_5_1_192d044b_1140745795625_277785_748'> <visible xmi.value='false'/> - <geometry>475, 353, 45, 15</geometry> + <geometry>435, 481, 45, 15</geometry> </mdElement> </mdOwnedViews> - <linkConstraintID xmi.idref='_9_5_1_192d044b_1141397174484_350941_929'/> - <linkStereotypeID xmi.idref='_9_5_1_192d044b_1141397174484_815853_931'/> - <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174484_302225_934'/> - <associationFirstEndID xmi.idref='_9_5_1_192d044b_1141397174484_183895_936'/> - <associationSecondEndID xmi.idref='_9_5_1_192d044b_1141397174484_906936_950'/> + <linkConstraintID xmi.idref='_9_5_1_192d044b_1140745795625_345527_713'/> + <linkStereotypeID xmi.idref='_9_5_1_192d044b_1140745795625_568056_715'/> + <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1140745795625_292696_718'/> + <associationFirstEndID xmi.idref='_9_5_1_192d044b_1140745795625_753244_720'/> + <associationSecondEndID xmi.idref='_9_5_1_192d044b_1140745795625_147046_734'/> </mdElement> - <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1141397174484_896469_967'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_568652_616'/> + <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1140745795640_275620_751'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_475477_425'/> <properties> <mdElement elementClass='ChoiceProperty'> <propertyID>LINK_LINE_STYLE</propertyID> @@ -6137,30 +6119,30 @@ <index xmi.value='0'/> </mdElement> </properties> - <linkFirstEndID xmi.idref='_9_5_1_192d044b_1141397108953_778307_632'/> - <linkSecondEndID xmi.idref='_9_5_1_192d044b_1141397116437_153869_871'/> - <geometry>215, 290; 215, 170; </geometry> - <linkNameID xmi.idref='_9_5_1_192d044b_1141397174484_818928_968'/> + <linkFirstEndID xmi.idref='_9_5_1_192d044b_1140745781437_55143_533'/> + <linkSecondEndID xmi.idref='_9_5_1_192d044b_1140745775968_953840_441'/> + <geometry>275, 420; 275, 151; </geometry> + <linkNameID xmi.idref='_9_5_1_192d044b_1140745795640_461395_752'/> <nameVisible xmi.value='true'/> <mdOwnedViews> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_818928_968'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795640_461395_752'> <visible xmi.value='false'/> - <geometry>200, 215, 30, 15</geometry> + <geometry>260, 270, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_785242_970'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795640_290610_754'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>200, 215, 30, 15</geometry> + <geometry>260, 270, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174484_422785_972'> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1140745795640_750168_756'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>200, 245, 30, 15</geometry> + <geometry>275, 300, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_540444_975'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795640_728109_759'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>198, 240, 30, 15</geometry> + <geometry>264, 315, 30, 15</geometry> <text><html> <body> <p></p> @@ -6168,12 +6150,12 @@ </html></text> </mdElement> </mdOwnedViews> - <linkConstraintID xmi.idref='_9_5_1_192d044b_1141397174484_785242_970'/> - <linkStereotypeID xmi.idref='_9_5_1_192d044b_1141397174484_422785_972'/> - <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174484_540444_975'/> + <linkConstraintID xmi.idref='_9_5_1_192d044b_1140745795640_290610_754'/> + <linkStereotypeID xmi.idref='_9_5_1_192d044b_1140745795640_750168_756'/> + <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1140745795640_728109_759'/> </mdElement> - <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1141397174484_885811_977'> - <elementID xmi.idref='_9_5_1_192d044b_1141397103343_922514_611'/> + <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1140745795640_256745_761'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_97452_421'/> <properties> <mdElement elementClass='ChoiceProperty'> <propertyID>LINK_LINE_STYLE</propertyID> @@ -6183,30 +6165,30 @@ <index xmi.value='0'/> </mdElement> </properties> - <linkFirstEndID xmi.idref='_9_5_1_192d044b_1141397114781_482027_811'/> - <linkSecondEndID xmi.idref='_9_5_1_192d044b_1141397116437_153869_871'/> - <geometry>500, 70; 332, 70; </geometry> - <linkNameID xmi.idref='_9_5_1_192d044b_1141397174484_516058_978'/> + <linkFirstEndID xmi.idref='_9_5_1_192d044b_1140745782890_916870_584'/> + <linkSecondEndID xmi.idref='_9_5_1_192d044b_1140745775968_953840_441'/> + <geometry>617, 420; 617, 140; 325, 140; </geometry> + <linkNameID xmi.idref='_9_5_1_192d044b_1140745795640_927344_762'/> <nameVisible xmi.value='true'/> <mdOwnedViews> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_516058_978'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795640_927344_762'> <visible xmi.value='false'/> - <geometry>401, 55, 30, 15</geometry> + <geometry>596, 125, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_683570_980'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795640_756317_764'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>401, 55, 30, 15</geometry> + <geometry>596, 125, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174484_292812_982'> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1140745795640_679299_766'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>401, 85, 30, 15</geometry> + <geometry>596, 155, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_215194_985'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795640_578736_769'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>400, 98, 30, 15</geometry> + <geometry>595, 137, 30, 15</geometry> <text><html> <body> <p></p> @@ -6214,69 +6196,12 @@ </html></text> </mdElement> </mdOwnedViews> - <linkConstraintID xmi.idref='_9_5_1_192d044b_1141397174484_683570_980'/> - <linkStereotypeID xmi.idref='_9_5_1_192d044b_1141397174484_292812_982'/> - <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174484_215194_985'/> - </mdElement> - </mdOwnedViews> - </mdElement> - </mdElement> - <mdElement elementClass='DiagramData' xmi.id='_9_5_1_192d044b_1147678297140_371296_142' name='howto18a'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <ignoredInModule xmi.value='true'/> - </XMI.extension> - <parentID xmi.idref='_9_5_1_192d044b_1147678250375_296880_46'/> - <type>Class Diagram</type> - <umlType>Class Diagram</umlType> - <mdElement elementClass='DiagramView' xmi.id='_9_5_1_192d044b_1147678360453_208620_446'> - <elementID xmi.idref='_9_5_1_192d044b_1147678297140_371296_142'/> - <zoomFactor xmi.value='1.0'/> - <diagramOpened xmi.value='true'/> - <diagramWindowBounds>0, 0, 954, 875</diagramWindowBounds> - <diagramScrollPositionX xmi.value='0'/> - <diagramScrollPositionY xmi.value='0'/> - <maximized xmi.value='true'/> - <active xmi.value='true'/> - <mdOwnedViews> - <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1147678299937_894896_173'> - <elementID xmi.idref='_9_5_1_192d044b_1147678288843_502496_141'/> - <properties> - <mdElement elementClass='ColorProperty'> - <propertyID>FILL_COLOR</propertyID> - <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> - <value xmi.value='-6684775'/> - </mdElement> - </properties> - <geometry>250, 430, 401, 76</geometry> - </mdElement> - <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1147678303093_999728_234'> - <elementID xmi.idref='_9_5_1_192d044b_1147678288843_580344_138'/> - <properties> - <mdElement elementClass='ColorProperty'> - <propertyID>FILL_COLOR</propertyID> - <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> - <value xmi.value='-52'/> - </mdElement> - </properties> - <geometry>587, 36, 326, 91</geometry> - </mdElement> - <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1147678305281_778178_311'> - <elementID xmi.idref='_9_5_1_192d044b_1147678288843_974392_130'/> - <properties> - <mdElement elementClass='ColorProperty'> - <propertyID>FILL_COLOR</propertyID> - <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> - <value xmi.value='-52'/> - </mdElement> - </properties> - <geometry>15, 35, 488, 121</geometry> - </mdElement> - <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1147678309359_201297_374'> - <elementID xmi.idref='_9_5_1_192d044b_1147678288843_618362_131'/> - <geometry>400, 270, 148, 62</geometry> + <linkConstraintID xmi.idref='_9_5_1_192d044b_1140745795640_756317_764'/> + <linkStereotypeID xmi.idref='_9_5_1_192d044b_1140745795640_679299_766'/> + <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1140745795640_578736_769'/> </mdElement> - <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1147678319968_183451_404'> - <elementID xmi.idref='_9_5_1_192d044b_1147678288843_914596_120'/> + <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1140745795640_676335_771'> + <elementID xmi.idref='_9_5_1_192d044b_1140745770765_659562_420'/> <properties> <mdElement elementClass='ChoiceProperty'> <propertyID>LINK_LINE_STYLE</propertyID> @@ -6286,30 +6211,30 @@ <index xmi.value='0'/> </mdElement> </properties> - <linkFirstEndID xmi.idref='_9_5_1_192d044b_1147678299937_894896_173'/> - <linkSecondEndID xmi.idref='_9_5_1_192d044b_1147678303093_999728_234'/> - <geometry>651, 460; 750, 460; 750, 127; </geometry> - <linkNameID xmi.idref='_9_5_1_192d044b_1147678319968_652539_405'/> + <linkFirstEndID xmi.idref='_9_5_1_192d044b_1140745778296_943401_488'/> + <linkSecondEndID xmi.idref='_9_5_1_192d044b_1140745775968_953840_441'/> + <geometry>510, 80; 325, 80; </geometry> + <linkNameID xmi.idref='_9_5_1_192d044b_1140745795640_526279_772'/> <nameVisible xmi.value='true'/> <mdOwnedViews> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1147678319968_652539_405'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795640_526279_772'> <visible xmi.value='false'/> - <geometry>732, 330, 30, 15</geometry> + <geometry>402, 65, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1147678319968_746595_407'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795656_759056_774'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>732, 330, 30, 15</geometry> + <geometry>402, 65, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1147678319968_895238_409'> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1140745795656_817665_776'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>746, 355, 30, 15</geometry> + <geometry>417, 95, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1147678319968_633732_412'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140745795656_86262_779'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>755, 369, 30, 15</geometry> + <geometry>400, 109, 30, 15</geometry> <text><html> <body> <p></p> @@ -6317,45 +6242,47 @@ </html></text> </mdElement> </mdOwnedViews> - <linkConstraintID xmi.idref='_9_5_1_192d044b_1147678319968_746595_407'/> - <linkStereotypeID xmi.idref='_9_5_1_192d044b_1147678319968_895238_409'/> - <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1147678319968_633732_412'/> + <linkConstraintID xmi.idref='_9_5_1_192d044b_1140745795656_759056_774'/> + <linkStereotypeID xmi.idref='_9_5_1_192d044b_1140745795656_817665_776'/> + <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1140745795656_86262_779'/> </mdElement> - <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1147678319984_808208_414'> - <elementID xmi.idref='_9_5_1_192d044b_1147678288843_998563_118'/> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1140745935984_490449_782'> + <elementID xmi.idref='_9_5_1_192d044b_1140745935984_314971_781'/> <properties> - <mdElement elementClass='ChoiceProperty'> - <propertyID>LINK_LINE_STYLE</propertyID> - <propertyDescriptionID>LINK_LINE_STYLE_DESCRIPTION</propertyDescriptionID> - <value>RECTILINEAR</value> - <choice xmi.value='RECTILINEAR^OBLIQUE^BEZIER'/> - <index xmi.value='0'/> + <mdElement elementClass='ColorProperty'> + <propertyID>FILL_COLOR</propertyID> + <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> + <value xmi.value='-6684775'/> </mdElement> </properties> - <linkFirstEndID xmi.idref='_9_5_1_192d044b_1147678309359_201297_374'/> - <linkSecondEndID xmi.idref='_9_5_1_192d044b_1147678303093_999728_234'/> - <geometry>548, 306; 600, 306; 600, 127; </geometry> - <linkNameID xmi.idref='_9_5_1_192d044b_1147678319984_545409_415'/> + <geometry>60, 200, 157, 136</geometry> + </mdElement> + <mdElement elementClass='GeneralizationView' xmi.id='_9_5_1_192d044b_1140746018078_113510_804'> + <elementID xmi.idref='_9_5_1_192d044b_1140746018078_898487_803'/> + <linkFirstEndID xmi.idref='_9_5_1_192d044b_1140745935984_490449_782'/> + <linkSecondEndID xmi.idref='_9_5_1_192d044b_1140745781437_55143_533'/> + <geometry>135, 336; 135, 420; </geometry> + <linkNameID xmi.idref='_9_5_1_192d044b_1140746018078_686706_805'/> <nameVisible xmi.value='true'/> <mdOwnedViews> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1147678319984_545409_415'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140746018078_686706_805'> <visible xmi.value='false'/> - <geometry>585, 223, 30, 15</geometry> + <geometry>120, 364, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1147678319984_407542_417'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140746018078_143268_807'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>585, 223, 30, 15</geometry> + <geometry>120, 364, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1147678319984_903689_419'> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1140746018078_611062_809'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>588, 221, 30, 15</geometry> + <geometry>134, 389, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1147678319984_145883_422'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1140746018078_388026_812'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>595, 205, 30, 15</geometry> + <geometry>30, 250, 30, 15</geometry> <text><html> <body> <p></p> @@ -6363,12 +6290,75 @@ </html></text> </mdElement> </mdOwnedViews> - <linkConstraintID xmi.idref='_9_5_1_192d044b_1147678319984_407542_417'/> - <linkStereotypeID xmi.idref='_9_5_1_192d044b_1147678319984_903689_419'/> - <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1147678319984_145883_422'/> + <linkConstraintID xmi.idref='_9_5_1_192d044b_1140746018078_143268_807'/> + <linkStereotypeID xmi.idref='_9_5_1_192d044b_1140746018078_611062_809'/> + <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1140746018078_388026_812'/> </mdElement> - <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1147678319984_15854_424'> - <elementID xmi.idref='_9_5_1_192d044b_1147678288843_767323_117'/> + </mdOwnedViews> + </mdElement> + </mdElement> + <mdElement elementClass='DiagramData' xmi.id='_9_5_1_192d044b_1141397075281_255246_56' name='howto11a'> + <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> + <ignoredInModule xmi.value='true'/> + </XMI.extension> + <parentID xmi.idref='_9_5_1_192d044b_1141397068437_498326_46'/> + <type>Class Diagram</type> + <umlType>Class Diagram</umlType> + <mdElement elementClass='DiagramView' xmi.id='_9_5_1_192d044b_1141397433781_377403_1004'> + <elementID xmi.idref='_9_5_1_192d044b_1141397075281_255246_56'/> + <zoomFactor xmi.value='1.0'/> + <diagramOpened xmi.value='false'/> + <mdOwnedViews> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1141397108953_778307_632'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_216352_610'/> + <properties> + <mdElement elementClass='ColorProperty'> + <propertyID>FILL_COLOR</propertyID> + <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> + <value xmi.value='-6684775'/> + </mdElement> + </properties> + <geometry>40, 290, 385, 150</geometry> + </mdElement> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1141397110671_205971_698'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_489349_585'/> + <properties> + <mdElement elementClass='ColorProperty'> + <propertyID>FILL_COLOR</propertyID> + <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> + <value xmi.value='-2763307'/> + </mdElement> + </properties> + <geometry>170, 480, 245, 106</geometry> + </mdElement> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1141397112906_804750_761'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_540079_598'/> + <properties> + <mdElement elementClass='ColorProperty'> + <propertyID>FILL_COLOR</propertyID> + <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> + <value xmi.value='-6684775'/> + </mdElement> + </properties> + <geometry>570, 290, 208, 150</geometry> + </mdElement> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1141397114781_482027_811'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_226371_586'/> + <geometry>500, 40, 148, 62</geometry> + </mdElement> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1141397116437_153869_871'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_275615_581'/> + <properties> + <mdElement elementClass='ColorProperty'> + <propertyID>FILL_COLOR</propertyID> + <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> + <value xmi.value='-52'/> + </mdElement> + </properties> + <geometry>50, 50, 282, 120</geometry> + </mdElement> + <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1141397174468_825202_918'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_819486_612'/> <properties> <mdElement elementClass='ChoiceProperty'> <propertyID>LINK_LINE_STYLE</propertyID> @@ -6378,30 +6368,30 @@ <index xmi.value='0'/> </mdElement> </properties> - <linkFirstEndID xmi.idref='_9_5_1_192d044b_1147678309359_201297_374'/> - <linkSecondEndID xmi.idref='_9_5_1_192d044b_1147678305281_778178_311'/> - <geometry>455, 270; 455, 156; </geometry> - <linkNameID xmi.idref='_9_5_1_192d044b_1147678319984_621523_425'/> + <linkFirstEndID xmi.idref='_9_5_1_192d044b_1141397112906_804750_761'/> + <linkSecondEndID xmi.idref='_9_5_1_192d044b_1141397116437_153869_871'/> + <geometry>637, 290; 637, 145; 332, 145; </geometry> + <linkNameID xmi.idref='_9_5_1_192d044b_1141397174468_856681_919'/> <nameVisible xmi.value='true'/> <mdOwnedViews> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1147678319984_621523_425'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174468_856681_919'> <visible xmi.value='false'/> - <geometry>444, 199, 30, 15</geometry> + <geometry>542, 130, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1147678319984_481434_427'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174468_896265_921'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>444, 199, 30, 15</geometry> + <geometry>542, 130, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1147678319984_139863_429'> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174468_840038_923'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>425, 224, 30, 15</geometry> + <geometry>557, 160, 30, 15</geometry> </mdElement> - <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1147678319984_627278_432'> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174468_924173_926'> <editable xmi.value='false'/> <visible xmi.value='false'/> - <geometry>414, 236, 30, 15</geometry> + <geometry>558, 166, 30, 15</geometry> <text><html> <body> <p></p> @@ -6409,10 +6399,405 @@ </html></text> </mdElement> </mdOwnedViews> - <linkConstraintID xmi.idref='_9_5_1_192d044b_1147678319984_481434_427'/> - <linkStereotypeID xmi.idref='_9_5_1_192d044b_1147678319984_139863_429'/> - <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1147678319984_627278_432'/> - </mdElement> + <linkConstraintID xmi.idref='_9_5_1_192d044b_1141397174468_896265_921'/> + <linkStereotypeID xmi.idref='_9_5_1_192d044b_1141397174468_840038_923'/> + <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174468_924173_926'/> + </mdElement> + <mdElement elementClass='AssociationView' xmi.id='_9_5_1_192d044b_1141397174484_71295_928'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_869535_615'/> + <linkFirstEndID xmi.idref='_9_5_1_192d044b_1141397108953_778307_632'/> + <linkSecondEndID xmi.idref='_9_5_1_192d044b_1141397112906_804750_761'/> + <geometry>425, 368; 570, 368; </geometry> + <linkNameID xmi.idref='_9_5_1_192d044b_1141397174484_284315_964'/> + <nameVisible xmi.value='true'/> + <mdOwnedViews> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_350941_929'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>482, 338, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174484_815853_931'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>482, 383, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_302225_934'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>483, 397, 30, 15</geometry> + <text><html> +<body> +<p></p> +</body> +</html></text> + </mdElement> + <mdElement elementClass='RoleView' xmi.id='_9_5_1_192d044b_1141397174484_183895_936'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_795297_613'/> + <geometry>425, 368, 10, 10</geometry> + <mdOwnedViews> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_757415_937'> + <visible xmi.value='false'/> + <geometry>425, 358, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_794006_939'> + <geometry>430, 348, 30, 15</geometry> + <text>0..*</text> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_189650_941'> + <visible xmi.value='false'/> + <geometry>425, 358, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174484_153869_943'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>443, 383, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_837179_946'> + <visible xmi.value='false'/> + <geometry>425, 358, 30, 15</geometry> + <text><html> +<body> +<p></p> +</body> +</html></text> + </mdElement> + </mdOwnedViews> + <roleNameID xmi.idref='_9_5_1_192d044b_1141397174484_757415_937'/> + <roleMultiplicityID xmi.idref='_9_5_1_192d044b_1141397174484_794006_939'/> + <roleConstraintsID xmi.idref='_9_5_1_192d044b_1141397174484_189650_941'/> + <roleStereotypeID xmi.idref='_9_5_1_192d044b_1141397174484_153869_943'/> + <roleTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174484_837179_946'/> + </mdElement> + <mdElement elementClass='RoleView' xmi.id='_9_5_1_192d044b_1141397174484_906936_950'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_667969_614'/> + <geometry>570, 368, 10, 10</geometry> + <mdOwnedViews> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_425551_951'> + <geometry>513, 348, 42, 15</geometry> + <text>+owner</text> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_199857_953'> + <visible xmi.value='false'/> + <geometry>550, 358, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_47106_955'> + <visible xmi.value='false'/> + <geometry>550, 358, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174484_607963_957'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>550, 398, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_748016_960'> + <visible xmi.value='false'/> + <geometry>550, 358, 30, 15</geometry> + <text><html> +<body> +<p></p> +</body> +</html></text> + </mdElement> + </mdOwnedViews> + <roleNameID xmi.idref='_9_5_1_192d044b_1141397174484_425551_951'/> + <roleMultiplicityID xmi.idref='_9_5_1_192d044b_1141397174484_199857_953'/> + <roleConstraintsID xmi.idref='_9_5_1_192d044b_1141397174484_47106_955'/> + <roleStereotypeID xmi.idref='_9_5_1_192d044b_1141397174484_607963_957'/> + <roleTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174484_748016_960'/> + </mdElement> + <mdElement elementClass='AssociationTextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_284315_964'> + <visible xmi.value='false'/> + <geometry>475, 353, 45, 15</geometry> + </mdElement> + </mdOwnedViews> + <linkConstraintID xmi.idref='_9_5_1_192d044b_1141397174484_350941_929'/> + <linkStereotypeID xmi.idref='_9_5_1_192d044b_1141397174484_815853_931'/> + <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174484_302225_934'/> + <associationFirstEndID xmi.idref='_9_5_1_192d044b_1141397174484_183895_936'/> + <associationSecondEndID xmi.idref='_9_5_1_192d044b_1141397174484_906936_950'/> + </mdElement> + <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1141397174484_896469_967'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_568652_616'/> + <properties> + <mdElement elementClass='ChoiceProperty'> + <propertyID>LINK_LINE_STYLE</propertyID> + <propertyDescriptionID>LINK_LINE_STYLE_DESCRIPTION</propertyDescriptionID> + <value>RECTILINEAR</value> + <choice xmi.value='RECTILINEAR^OBLIQUE^BEZIER'/> + <index xmi.value='0'/> + </mdElement> + </properties> + <linkFirstEndID xmi.idref='_9_5_1_192d044b_1141397108953_778307_632'/> + <linkSecondEndID xmi.idref='_9_5_1_192d044b_1141397116437_153869_871'/> + <geometry>215, 290; 215, 170; </geometry> + <linkNameID xmi.idref='_9_5_1_192d044b_1141397174484_818928_968'/> + <nameVisible xmi.value='true'/> + <mdOwnedViews> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_818928_968'> + <visible xmi.value='false'/> + <geometry>200, 215, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_785242_970'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>200, 215, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174484_422785_972'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>200, 245, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_540444_975'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>198, 240, 30, 15</geometry> + <text><html> +<body> +<p></p> +</body> +</html></text> + </mdElement> + </mdOwnedViews> + <linkConstraintID xmi.idref='_9_5_1_192d044b_1141397174484_785242_970'/> + <linkStereotypeID xmi.idref='_9_5_1_192d044b_1141397174484_422785_972'/> + <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174484_540444_975'/> + </mdElement> + <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1141397174484_885811_977'> + <elementID xmi.idref='_9_5_1_192d044b_1141397103343_922514_611'/> + <properties> + <mdElement elementClass='ChoiceProperty'> + <propertyID>LINK_LINE_STYLE</propertyID> + <propertyDescriptionID>LINK_LINE_STYLE_DESCRIPTION</propertyDescriptionID> + <value>RECTILINEAR</value> + <choice xmi.value='RECTILINEAR^OBLIQUE^BEZIER'/> + <index xmi.value='0'/> + </mdElement> + </properties> + <linkFirstEndID xmi.idref='_9_5_1_192d044b_1141397114781_482027_811'/> + <linkSecondEndID xmi.idref='_9_5_1_192d044b_1141397116437_153869_871'/> + <geometry>500, 70; 332, 70; </geometry> + <linkNameID xmi.idref='_9_5_1_192d044b_1141397174484_516058_978'/> + <nameVisible xmi.value='true'/> + <mdOwnedViews> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_516058_978'> + <visible xmi.value='false'/> + <geometry>401, 55, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_683570_980'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>401, 55, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxWithIconView' xmi.id='_9_5_1_192d044b_1141397174484_292812_982'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>401, 85, 30, 15</geometry> + </mdElement> + <mdElement elementClass='TextBoxView' xmi.id='_9_5_1_192d044b_1141397174484_215194_985'> + <editable xmi.value='false'/> + <visible xmi.value='false'/> + <geometry>400, 98, 30, 15</geometry> + <text><html> +<body> +<p></p> +</body> +</html></text> + </mdElement> + </mdOwnedViews> + <linkConstraintID xmi.idref='_9_5_1_192d044b_1141397174484_683570_980'/> + <linkStereotypeID xmi.idref='_9_5_1_192d044b_1141397174484_292812_982'/> + <linkTaggedValuesID xmi.idref='_9_5_1_192d044b_1141397174484_215194_985'/> + </mdElement> + </mdOwnedViews> + </mdElement> + </mdElement> + <mdElement elementClass='DiagramData' xmi.id='_9_5_1_192d044b_1147678297140_371296_142' name='howto18a'> + <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> + <ignoredInModule xmi.value='true'/> + </XMI.extension> + <parentID xmi.idref='_9_5_1_192d044b_1147678250375_296880_46'/> + <type>Class Diagram</type> + <umlType>Class Diagram</umlType> + <mdElement elementClass='DiagramView' xmi.id='_9_5_1_192d044b_1147678360453_208620_446'> + <elementID xmi.idref='_9_5_1_192d044b_1147678297140_371296_142'/> + <zoomFactor xmi.value='1.0'/> + <diagramOpened xmi.value='false'/> + <mdOwnedViews> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1147678299937_894896_173'> + <elementID xmi.idref='_9_5_1_192d044b_1147678288843_502496_141'/> + <properties> + <mdElement elementClass='ColorProperty'> + <propertyID>FILL_COLOR</propertyID> + <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> + <value xmi.value='-6684775'/> + </mdElement> + </properties> + <geometry>250, 430, 401, 76</geometry> + </mdElement> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1147678303093_999728_234'> + <elementID xmi.idref='_9_5_1_192d044b_1147678288843_580344_138'/> + <properties> + <mdElement elementClass='ColorProperty'> + <propertyID>FILL_COLOR</propertyID> + <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> + <value xmi.value='-52'/> + </mdElement> + </properties> + <geometry>587, 36, 326, 91</geometry> + </mdElement> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1147678305281_778178_311'> + <elementID xmi.idref='_9_5_1_192d044b_1147678288843_974392_130'/> + <properties> + <mdElement elementClass='ColorProperty'> + <propertyID>FILL_COLOR</propertyID> + <propertyDescriptionID>FILL_COLOR_DESCRIPTION</propertyDescriptionID> + <value xmi.value='-52'/> + </mdElement> + </properties> + <geometry>15, 35, 488, 121</geometry> + </mdElement> + <mdElement elementClass='ClassView' xmi.id='_9_5_1_192d044b_1147678309359_201297_374'> + <elementID xmi.idref='_9_5_1_192d044b_1147678288843_618362_131'/> + <geometry>400, 270, 148, 62</geometry> + </mdElement> + <mdElement elementClass='DependencyView' xmi.id='_9_5_1_192d044b_1147678319968_183451_404'> + <elementID xmi.idref='_9_5_1_192d044b_1147678288843_914596_120'/> + <properties> + <mdElement elementClass='ChoiceProperty'> + <propertyID>LINK_LINE_STYLE</propertyID> + <propertyDescriptionID>LINK_LINE_STYLE_DESCRIPTION</propertyDescriptionID> + <value>RECTILINEAR</value> + <choice xmi.value='RECTILINEAR^OBLIQUE^BEZIER'/> + <index xmi.value='0'/> + </mdElement> + </properties> + <linkFirstEndID xmi.idref='_9_5_1_192d044b_1147678299937_894896_173'/> + <linkSecondEndID xmi.idref='_9_5_1_192d044b_1147678303093_999728_234'/> + <geometry>651, 460; 750, 460; 750, 127; </geo... [truncated message content] |
|
From: Vance K. <va...@us...> - 2006-06-01 14:38:48
|
User: vancek
Date: 06/06/01 07:38:27
Modified: andromda-ejb3/src/site/xdoc howto9.xml
andromda-ejb3/src/site/resources/images/org/andromda/test/9/a
uml.gif
Log:
fixed docs for defining entity identifiers with inheritance and explicityly defined mapped superclass
Revision Changes Path
1.4 +9 -3 cartridges/andromda-ejb3/src/site/xdoc/howto9.xml
Index: howto9.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto9.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- howto9.xml 29 May 2006 01:53:36 -0000 1.3
+++ howto9.xml 1 Jun 2006 14:38:26 -0000 1.4
@@ -46,9 +46,15 @@
<subsection name="Mapped Superclasses">
<p>
To explicity defined an entity as a mapped superclass, model the
- <![CDATA[<<MappedSuperclass>>]]> stereotype on the root entity. Define the subclass entities
- <b>without</b> primary keys and generalizing the root entity. The following is an example of this
- type of inheritance.
+ <![CDATA[<<MappedSuperclass>>]]> stereotype on the root entity.
+ </p>
+ <p class="highlight">
+ You must explicity define your identifiers either in the mapped superclass or in the inheriting
+ subclass entities.
+ </p>
+ <p>
+ The following is an example of this type of inheritance where the <code>Vehicle</code> mapped
+ superclass contains the identifier which is automatically used by the <code>Car</code> entity.
</p>
<p>
<img src="images/org/andromda/test/9/a/uml.gif"/>
1.2 +148 -113 cartridges/andromda-ejb3/src/site/resources/images/org/andromda/test/9/a/uml.gif
<<Binary file>>
|
|
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-05-30 19:18:11
|
User: cmicali
Date: 06/05/30 12:18:05
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Log:
- Updated release date in readme
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 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 17:36:34
|
User: cmicali
Date: 06/05/30 10:36:22
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AndroMDA.VS80AddIn.AddIn AndroMDA.VS80AddIn.csproj
VS80AddIn.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
AboutCommand.cs AddInCommandBase.cs
AndroMDALogoCommand.cs GenerateCodeCommand.cs
OpenModelCommand.cs ReloadMDAConfigCommand.cs
ResyncCommand.cs RunSchemaExportCommand.cs
RunSolutionWizardCommand.cs StopCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
CreateEntityVOConvertorCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
CodeModelUtils.cs
Log:
- Refactored a few properties of AddInCommandBase
- Added option to code window context menu to generate entity/vo conversion code
Revision Changes Path
No revision
No revision
No revision
No revision
1.3 +4 -4 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.AddIn
Index: AndroMDA.VS80AddIn.AddIn
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.AddIn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- AndroMDA.VS80AddIn.AddIn 18 Apr 2006 17:18:50 -0000 1.2
+++ AndroMDA.VS80AddIn.AddIn 30 May 2006 17:36:21 -0000 1.3
@@ -18,14 +18,14 @@
<ToolsOptionsPage>
<Category Name="AndroMDA" >
- <SubCategory Name="External Tools">
- <Assembly>AndroMDA.VS80AddIn.dll</Assembly>
- <FullClassName>AndroMDA.VS80AddIn.Dialogs.ExternalToolsOptionsPage</FullClassName>
- </SubCategory>
<SubCategory Name="General">
<Assembly>AndroMDA.VS80AddIn.dll</Assembly>
<FullClassName>AndroMDA.VS80AddIn.Dialogs.GeneralOptionsPage</FullClassName>
</SubCategory>
+ <SubCategory Name="External Tools">
+ <Assembly>AndroMDA.VS80AddIn.dll</Assembly>
+ <FullClassName>AndroMDA.VS80AddIn.Dialogs.ExternalToolsOptionsPage</FullClassName>
+ </SubCategory>
</Category>
</ToolsOptionsPage>
1.12 +3 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj
Index: AndroMDA.VS80AddIn.csproj
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- AndroMDA.VS80AddIn.csproj 28 May 2006 19:32:27 -0000 1.11
+++ AndroMDA.VS80AddIn.csproj 30 May 2006 17:36:21 -0000 1.12
@@ -42,6 +42,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
+ <Reference Include="System.Management" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -54,6 +55,7 @@
<Compile Include="Commands\AboutCommand.cs" />
<Compile Include="Commands\AddInCommandBase.cs" />
<Compile Include="Commands\AndroMDALogoCommand.cs" />
+ <Compile Include="Commands\CreateEntityVOConvertorCommand.cs" />
<Compile Include="Commands\RunSchemaExportCommand.cs" />
<Compile Include="Commands\ReloadMDAConfigCommand.cs" />
<Compile Include="Commands\OpenModelCommand.cs" />
@@ -109,6 +111,7 @@
<Compile Include="MavenProxy.cs" />
<Compile Include="MDAProject.cs" />
<Compile Include="MDASolutionManager.cs" />
+ <Compile Include="Utils\CodeModelUtils.cs" />
<Compile Include="WizardSolutionProcessor.cs" />
<Compile Include="AddInSettings.cs" />
<Compile Include="Resource1.Designer.cs">
1.8 +2 -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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- VS80AddIn.cs 27 May 2006 15:05:58 -0000 1.7
+++ VS80AddIn.cs 30 May 2006 17:36:21 -0000 1.8
@@ -88,6 +88,7 @@
m_commands.Add(new RunSchemaExportCommand());
m_commands.Add(new OpenModelCommand());
m_commands.Add(new AboutCommand());
+ m_commands.Add(new CreateEntityVOConvertorCommand());
// Set the context for each command
foreach (AddInCommandBase cmd in m_commands)
{
@@ -230,7 +231,7 @@
// Add the buttons to the toolbar
foreach (AddInCommandBase cmd in m_commands)
{
- cmd.AddToToolbar(m_toolBar);
+ cmd.InitToolbars(m_toolBar);
}
}
1.5 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AboutCommand.cs
Index: AboutCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AboutCommand.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- AboutCommand.cs 16 May 2006 15:46:44 -0000 1.4
+++ AboutCommand.cs 30 May 2006 17:36:21 -0000 1.5
@@ -18,7 +18,7 @@
{
public AboutCommand()
{
- Init("About", "About", "About AndroMDA Add-In", 487, AddInCommandType.AlwaysEnabled);
+ Init("About", "About", "About AndroMDA Add-In", 487, VisibilityType.AlwaysEnabled);
m_isStartOfGroup = true;
}
1.6 +51 -15 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AddInCommandBase.cs
Index: AddInCommandBase.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AddInCommandBase.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- AddInCommandBase.cs 16 May 2006 15:46:44 -0000 1.5
+++ AddInCommandBase.cs 30 May 2006 17:36:21 -0000 1.6
@@ -20,13 +20,15 @@
#region Enumerations
- public enum AddInCommandType { AlwaysEnabled, AlwaysDisabled, EnabledWhenMdaInactive, EnabledWhenMdaActiveButDisabled, EnabledWhenMdaActive, EnabledWhenMdaActiveAndMavenNotRunning, EnabledWhenMdaActiveAndMavenRunning }
+ public enum VisibilityType { AlwaysEnabled, AlwaysDisabled, EnabledWhenMdaInactive, EnabledWhenMdaActiveButDisabled, EnabledWhenMdaActive, EnabledWhenMdaActiveAndMavenNotRunning, EnabledWhenMdaActiveAndMavenRunning }
#endregion
#region Member variables
protected bool m_isStartOfGroup = false;
+ protected bool m_autoAddToToolbar = true;
+ protected bool m_autoAddToCodeContextMenu = false;
protected string m_name = string.Empty;
protected string m_fullName = string.Empty;
protected string m_buttonText = string.Empty;
@@ -41,7 +43,7 @@
protected Command m_command = null;
protected CommandBarButton m_commandBarButton = null;
- protected AddInCommandType m_commandType = AddInCommandType.AlwaysEnabled;
+ protected VisibilityType m_visibilityType = VisibilityType.AlwaysEnabled;
protected vsCommandStatus m_lastStatus = vsCommandStatus.vsCommandStatusUnsupported;
@@ -74,24 +76,36 @@
}
}
+ public bool AutoAddToToolbar
+ {
+ get { return m_autoAddToToolbar; }
+ set { m_autoAddToToolbar = value; }
+ }
+
+ public bool AutoAddToCodeWindowContextMenu
+ {
+ get { return m_autoAddToCodeContextMenu; }
+ set { m_autoAddToCodeContextMenu = value; }
+ }
+
#endregion
public AddInCommandBase()
{
}
- public AddInCommandBase(string name, string buttonText, string toolTip, int bitmapNumber, AddInCommandType commandType)
+ public AddInCommandBase(string name, string buttonText, string toolTip, int bitmapNumber, VisibilityType commandType)
{
Init(name, buttonText, toolTip, bitmapNumber, commandType);
}
- public void Init(string name, string buttonText, string toolTip, int bitmapNumber, AddInCommandType commandType)
+ public void Init(string name, string buttonText, string toolTip, int bitmapNumber, VisibilityType commandType)
{
m_name = name;
m_buttonText = buttonText;
m_toolTip = toolTip;
m_bitmapNumber = bitmapNumber;
- m_commandType = commandType;
+ m_visibilityType = commandType;
m_fullName = "AndroMDA.VS80AddIn.Connect." + name;
}
@@ -103,6 +117,28 @@
m_addInSettings = addInSettings;
}
+ public void InitToolbars(CommandBar toolBar)
+ {
+ if (this.AutoAddToToolbar)
+ {
+ AddToToolbar(toolBar);
+ }
+ if (this.AutoAddToCodeWindowContextMenu)
+ {
+ AddToCodeWindowContextMenu();
+ }
+ }
+
+ public void AddToCodeWindowContextMenu()
+ {
+ if (m_command != null)
+ {
+ _CommandBars cmdBars = (_CommandBars)m_application.CommandBars;
+ CommandBar cmdBar = cmdBars["Code Window"];
+ m_command.AddControl(cmdBar, 1);
+ }
+ }
+
public void AddToToolbar(CommandBar toolbar)
{
AddToToolbar(toolbar, toolbar.Controls.Count + 1);
@@ -165,16 +201,16 @@
if (commandName == m_fullName && neededText == vsCommandStatusTextWanted.vsCommandStatusTextWantedNone)
{
- switch (m_commandType)
+ switch (m_visibilityType)
{
- case AddInCommandType.AlwaysDisabled:
+ case VisibilityType.AlwaysDisabled:
status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;
break;
- case AddInCommandType.AlwaysEnabled:
+ case VisibilityType.AlwaysEnabled:
status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
break;
- case AddInCommandType.EnabledWhenMdaActiveButDisabled:
+ case VisibilityType.EnabledWhenMdaActiveButDisabled:
if (!m_solutionManager.IsEnabled && m_solutionManager.IsSolutionUsingMDA && m_application.Solution.IsOpen)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -184,7 +220,7 @@
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusInvisible;
}
break;
- case AddInCommandType.EnabledWhenMdaInactive:
+ case VisibilityType.EnabledWhenMdaInactive:
if (!m_solutionManager.IsEnabled && !m_solutionManager.IsSolutionUsingMDA && m_application.Solution.IsOpen)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -195,7 +231,7 @@
}
break;
- case AddInCommandType.EnabledWhenMdaActive:
+ case VisibilityType.EnabledWhenMdaActive:
if (m_solutionManager.IsEnabled && m_application.Solution.IsOpen)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -206,7 +242,7 @@
}
break;
- case AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning:
+ case VisibilityType.EnabledWhenMdaActiveAndMavenNotRunning:
if (m_solutionManager.IsEnabled && m_application.Solution.IsOpen && !m_solutionManager.IsMavenRunning)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -221,7 +257,7 @@
}
break;
- case AddInCommandType.EnabledWhenMdaActiveAndMavenRunning:
+ case VisibilityType.EnabledWhenMdaActiveAndMavenRunning:
if (m_solutionManager.IsEnabled && m_application.Solution.IsOpen && m_solutionManager.IsMavenRunning)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AndroMDALogoCommand.cs
Index: AndroMDALogoCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AndroMDALogoCommand.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- AndroMDALogoCommand.cs 16 May 2006 15:46:44 -0000 1.2
+++ AndroMDALogoCommand.cs 30 May 2006 17:36:21 -0000 1.3
@@ -34,7 +34,7 @@
public AndroMDALogoCommand()
{
- Init("AndroMDALogo", "AndroMDA", "AndroMDA", -1, AddInCommandType.AlwaysDisabled);
+ Init("AndroMDALogo", "AndroMDA", "AndroMDA", -1, VisibilityType.AlwaysDisabled);
m_isStartOfGroup = true;
}
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/GenerateCodeCommand.cs
Index: GenerateCodeCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/GenerateCodeCommand.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- GenerateCodeCommand.cs 16 May 2006 15:46:44 -0000 1.2
+++ GenerateCodeCommand.cs 30 May 2006 17:36:21 -0000 1.3
@@ -17,7 +17,7 @@
{
public RunMavenCommand()
{
- Init("GenerateCode", "Generate", "Generate Code From Model", 2138, AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning);
+ Init("GenerateCode", "Generate", "Generate Code From Model", 2138, VisibilityType.EnabledWhenMdaActiveAndMavenNotRunning);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.7 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs
Index: OpenModelCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- OpenModelCommand.cs 27 May 2006 15:05:59 -0000 1.6
+++ OpenModelCommand.cs 30 May 2006 17:36:21 -0000 1.7
@@ -19,7 +19,7 @@
{
public OpenModelCommand()
{
- Init("OpenModel", "Open Model", "Open Model", 589, AddInCommandType.EnabledWhenMdaActive);
+ Init("OpenModel", "Open Model", "Open Model", 589, VisibilityType.EnabledWhenMdaActive);
m_isStartOfGroup = true;
}
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/ReloadMDAConfigCommand.cs
Index: ReloadMDAConfigCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/ReloadMDAConfigCommand.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ReloadMDAConfigCommand.cs 16 May 2006 15:46:44 -0000 1.2
+++ ReloadMDAConfigCommand.cs 30 May 2006 17:36:21 -0000 1.3
@@ -17,7 +17,7 @@
{
public ReloadMDAConfigCommand()
{
- Init("ReloadMDAConfig", "Reload MDA Config", "Reload MDA Config", 1020, AddInCommandType.EnabledWhenMdaActiveButDisabled);
+ Init("ReloadMDAConfig", "Reload MDA Config", "Reload MDA Config", 1020, VisibilityType.EnabledWhenMdaActiveButDisabled);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.4 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/ResyncCommand.cs
Index: ResyncCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/ResyncCommand.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- ResyncCommand.cs 16 May 2006 15:46:44 -0000 1.3
+++ ResyncCommand.cs 30 May 2006 17:36:21 -0000 1.4
@@ -17,7 +17,7 @@
{
public ResyncCommand()
{
- Init("ResyncFiles", "Resync", "Resync Generated Files", 37, AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning);
+ Init("ResyncFiles", "Resync", "Resync Generated Files", 37, VisibilityType.EnabledWhenMdaActiveAndMavenNotRunning);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.5 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSchemaExportCommand.cs
Index: RunSchemaExportCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSchemaExportCommand.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- RunSchemaExportCommand.cs 16 May 2006 15:46:44 -0000 1.4
+++ RunSchemaExportCommand.cs 30 May 2006 17:36:21 -0000 1.5
@@ -20,7 +20,7 @@
{
public RunSchemaExportCommand()
{
- Init("ExportSchema", "Export Schema", "Export Database Schema", 4005, AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning);
+ Init("ExportSchema", "Export Schema", "Export Database Schema", 4005, VisibilityType.EnabledWhenMdaActiveAndMavenNotRunning);
m_isStartOfGroup = true;
}
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSolutionWizardCommand.cs
Index: RunSolutionWizardCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSolutionWizardCommand.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- RunSolutionWizardCommand.cs 16 May 2006 15:46:44 -0000 1.2
+++ RunSolutionWizardCommand.cs 30 May 2006 17:36:21 -0000 1.3
@@ -17,7 +17,7 @@
{
public RunSolutionWizardCommand()
{
- Init("RunSolutionWizard", "Run MDA Solution Wizard", "Run MDA Solution Wizard", 2138, AddInCommandType.EnabledWhenMdaInactive);
+ Init("RunSolutionWizard", "Run MDA Solution Wizard", "Run MDA Solution Wizard", 2138, VisibilityType.EnabledWhenMdaInactive);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.4 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/StopCommand.cs
Index: StopCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/StopCommand.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- StopCommand.cs 16 May 2006 15:46:44 -0000 1.3
+++ StopCommand.cs 30 May 2006 17:36:21 -0000 1.4
@@ -18,7 +18,7 @@
public StopCommand()
{
- Init("StopGeneration", "Stop", "Stop Code Generation", 1670, AddInCommandType.EnabledWhenMdaActiveAndMavenRunning);
+ Init("StopGeneration", "Stop", "Stop Code Generation", 1670, VisibilityType.EnabledWhenMdaActiveAndMavenRunning);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/CreateEntityVOConvertorCommand.cs
Index: CreateEntityVOConvertorCommand.cs
===================================================================
// AndroMDA Visual Studio 2005 Add-In
// (c)2006 Sapient Corporation
#region Using statements
using System;
using System.Collections;
using Microsoft.VisualStudio.CommandBars;
using EnvDTE;
using EnvDTE80;
#endregion
namespace AndroMDA.VS80AddIn
{
public class CreateEntityVOConvertorCommand : AddInCommandBase
{
public CreateEntityVOConvertorCommand()
{
Init("CreateEntityVOConvertor", "Insert Entity/VO Conversion Code", "Insert code to convert between an entity and it's VO", 240, VisibilityType.AlwaysEnabled);
m_isStartOfGroup = true;
m_autoAddToCodeContextMenu = true;
m_autoAddToToolbar = false;
}
public override void QueryStatus(string commandName, vsCommandStatusTextWanted neededText, ref vsCommandStatus status, ref object commandText)
{
if (m_application.ActiveDocument.Name.Contains("DaoImpl"))
{
status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported;
if (IsCommandAvailable(false))
{
status = status | vsCommandStatus.vsCommandStatusEnabled;
}
}
else
{
status = (vsCommandStatus)(vsCommandStatus.vsCommandStatusInvisible | vsCommandStatus.vsCommandStatusUnsupported);
}
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
{
CodeFunction2 currentMethod = CodeModelUtils.GetCurrentMethod(m_application);
if (IsCommandAvailable(currentMethod))
{
CodeParameter2 param = currentMethod.Parameters.Item(1) as CodeParameter2;
CodeClass2 containingClass = currentMethod.Parent as CodeClass2;
bool isEntity = false;
string returnType = currentMethod.Type.AsFullName;
string paramType = currentMethod.Type.AsFullName;
string returnVariableName = string.Empty;
string codeToInsert = string.Empty;
// Search for a Factory property in the return type to see if
// we are converting from entity to vo or vo to entity
foreach (CodeElement2 prop in currentMethod.Type.CodeType.Members)
{
if (prop.Kind == vsCMElement.vsCMElementClass &&
prop.Name == "Factory"
)
{
isEntity = true;
break;
}
}
// If we are converting to an entity
if (isEntity)
{
returnVariableName = "entity";
codeToInsert += "// VO to entity conversion\n";
// Add code to create a new entity with the Factory.newInstance() method
codeToInsert += returnType + " " + returnVariableName + " = " + returnType + ".Factory.newInstance();\n\n";
}
else
{
returnVariableName = "valueObject";
codeToInsert += "// Entity to VO conversion\n\n";
// Add code to create a new VO with a new statement
codeToInsert += returnType + " " + returnVariableName + " = new " + returnType + "();\n\n";
}
ArrayList uncopiedProperties = new ArrayList();
ArrayList unmatchedProperties = new ArrayList();
// Iterate through each property of the return type
foreach (CodeElement2 dstProp in currentMethod.Type.CodeType.Members)
{
if (dstProp.Kind == vsCMElement.vsCMElementProperty)
{
bool propertyExists = false;
bool propertyCopied = false;
// Iterate through each property of the parameter type to find a match
foreach (CodeElement2 srcProp in param.Type.CodeType.Members)
{
// If we found a property of the same name
if (dstProp.Kind == vsCMElement.vsCMElementProperty &&
dstProp.Name == srcProp.Name)
{
// Mark that we found the property
propertyExists = true;
CodeProperty srcProperty = srcProp as CodeProperty;
CodeProperty dstProperty = dstProp as CodeProperty;
if (dstProperty.Type.AsString == srcProperty.Type.AsString)
{
// Insert simple copy code
codeToInsert += returnVariableName + "." + dstProp.Name + " = " + param.Name + "." + dstProp.Name + ";\n";
// Mark that we have copied the property
propertyCopied = true;
}
}
}
// If the property exists in both the entity and the vo
// but the types differ
if (propertyExists && !propertyCopied)
{
// Add it to the uncopied properties list
uncopiedProperties.Add(dstProp.Name);
}
else if (!propertyExists)
{
unmatchedProperties.Add(dstProp.Name);
}
}
}
foreach (string uncopiedProperty in uncopiedProperties)
{
codeToInsert += "// " + returnVariableName + "." + uncopiedProperty + " = " + param.Name + "." + uncopiedProperty + ";\n";
}
foreach (string unmatchedProperty in unmatchedProperties)
{
codeToInsert += "// " + returnVariableName + "." + unmatchedProperty + "\n";
}
// Add the return statement
codeToInsert += "\nreturn " + returnVariableName + ";\n\n";
// Batch insert the new code so it can be undone in 1 call to undo
EditPoint pnt = currentMethod.GetStartPoint(vsCMPart.vsCMPartBody).CreateEditPoint();
pnt.Insert(codeToInsert);
// Format the code (indent it properly)
pnt.SmartFormat(currentMethod.GetStartPoint(vsCMPart.vsCMPartBody));
m_application.StatusBar.Text = "AndroMDA: Code inserted";
}
else
{
m_application.StatusBar.Text = "AndroMDA: Unable to insert code";
}
}
#region IsCommandAvailable Implementation
private bool IsCommandAvailable(CodeFunction2 currentMethod, bool fullCheck)
{
if (
// Ensure we found the current method
currentMethod != null &&
// That it has one parameter
currentMethod.Parameters.Count == 1 &&
// That it is an override
currentMethod.OverrideKind == vsCMOverrideKind.vsCMOverrideKindOverride &&
// That it is function (method)
currentMethod.FunctionKind == vsCMFunction.vsCMFunctionFunction &&
// That it exists inside a project
currentMethod.InfoLocation == vsCMInfoLocation.vsCMInfoLocationProject &&
// It's return type is not void
currentMethod.Type.AsFullName != "void" &&
// The return type does not equal the parameter type
currentMethod.Parameters.Item(1).FullName != currentMethod.Type.AsFullName &&
// And it's name is either ends with ToEntity or begins with To
(currentMethod.Name.EndsWith("ToEntity") || currentMethod.Name.StartsWith("To"))
)
{
if (!fullCheck) return true;
CodeParameter2 param = currentMethod.Parameters.Item(1) as CodeParameter2;
CodeClass2 containingClass = currentMethod.Parent as CodeClass2;
if (// Ensure we found the parameter and the parent class
param != null &&
containingClass != null &&
// Ensure we are in a DaoImpl class
containingClass.Name.Contains("DaoImpl")
)
{
return true;
}
}
return false;
}
private bool IsCommandAvailable()
{
CodeFunction2 currentMethod = CodeModelUtils.GetCurrentMethod(m_application);
return IsCommandAvailable(currentMethod);
}
private bool IsCommandAvailable(bool fullCheck)
{
CodeFunction2 currentMethod = CodeModelUtils.GetCurrentMethod(m_application);
return IsCommandAvailable(currentMethod, fullCheck);
}
private bool IsCommandAvailable(CodeFunction2 currentMethod)
{
return IsCommandAvailable(currentMethod, true);
}
#endregion
}
}
No revision
No revision
No revision
No revision
1.1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/CodeModelUtils.cs
Index: CodeModelUtils.cs
===================================================================
// AndroMDA Visual Studio 2005 Add-In
// (c)2006 Sapient Corporation
#region Using statements
using System;
using System.Collections.Generic;
using System.Text;
using System.Management;
using Microsoft.VisualStudio.VCCodeModel;
using EnvDTE;
using EnvDTE80;
#endregion
namespace AndroMDA.VS80AddIn
{
public class CodeModelUtils
{
public static CodeFunction2 GetCurrentMethod(DTE dte)
{
vsCMElement[] searchScopes = {
vsCMElement.vsCMElementFunction,
};
return GetCodeElement(dte, searchScopes) as CodeFunction2;
}
public static CodeElement GetCodeElement(DTE dte)
{
vsCMElement[] searchScopes = {
vsCMElement.vsCMElementFunction,
vsCMElement.vsCMElementProperty,
vsCMElement.vsCMElementVariable,
vsCMElement.vsCMElementEvent,
vsCMElement.vsCMElementClass,
vsCMElement.vsCMElementInterface,
vsCMElement.vsCMElementStruct,
vsCMElement.vsCMElementEnum
};
return GetCodeElement(dte, searchScopes);
}
public static CodeElement GetCodeElement(DTE dte, vsCMElement[] searchScopes)
{
if (dte.ActiveDocument == null) return null;
if (dte.ActiveDocument.ProjectItem == null) return null;
if (dte.ActiveDocument.ProjectItem.FileCodeModel == null) return null;
TextSelection selection = (TextSelection)dte.ActiveWindow.Selection;
if (selection == null || selection.ActivePoint == null) return null;
EditPoint selPoint = selection.ActivePoint.CreateEditPoint();
CodeLanguage currentLang = CodeLanguage.CSharp;
selPoint.StartOfLine();
while (true)
{
string BlockText = selPoint.GetText(selPoint.LineLength).Trim();
// *** Skip over any XML Doc comments and Attributes
if (currentLang == CodeLanguage.CSharp && BlockText.StartsWith("/// ") ||
currentLang == CodeLanguage.CSharp && BlockText.StartsWith("[") ||
currentLang == CodeLanguage.VB && BlockText.StartsWith("''' ") ||
currentLang == CodeLanguage.VB && BlockText.StartsWith("<"))
{
selPoint.LineDown(1);
selPoint.StartOfLine();
}
else
break;
}
// *** Make sure the cursor is placed inside of the definition always
// *** Especially required for single line methods/fields/events etc.
selPoint.EndOfLine();
selPoint.CharLeft(1); // Force into the text
string xBlockText = selPoint.GetText(selPoint.LineLength).Trim();
// get the element under the cursor
CodeElement element = null;
FileCodeModel2 CodeModel = dte.ActiveDocument.ProjectItem.FileCodeModel as FileCodeModel2;
// *** Supported scopes - set up here in the right parsing order
// *** from lowest level to highest level
// *** NOTE: Must be adjusted to match any CodeElements supported
foreach (vsCMElement scope in searchScopes)
{
try
{
element = CodeModel.CodeElementFromPoint(selPoint, scope);
if (element != null)
break; // if no exception - break
}
catch { ; }
}
if (element == null)
return null;
return element;
}
}
}
|
|
From: Chris M. <cm...@us...> - 2006-05-29 14:56:18
|
User: cmicali
Date: 06/05/29 07:56:13
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
MDASolutionWizard.cs MDASolutionWizard.designer.cs
MDASolutionWizard.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
VSSolutionUtils.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
WizardSolutionProcessor.cs
Log:
- Clean up on the solution wizard UI
- Removed version number input field from the solution wizard UI
Revision Changes Path
1.7 +2 -5 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs
Index: MDASolutionWizard.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- MDASolutionWizard.cs 28 May 2006 15:49:55 -0000 1.6
+++ MDASolutionWizard.cs 29 May 2006 14:56:12 -0000 1.7
@@ -71,7 +71,6 @@
// Set sensible defaults
string solutionName = VSSolutionUtils.GetSolutionName(m_applicationObject.Solution);
txtApplicationName.Text = solutionName;
- txtApplicationVersion.Text = "1.0";
ddlVersionControl.SelectedIndex = 0;
usrCommonProject.ProjectName = solutionName + ".Common";
usrCoreProject.ProjectName = solutionName + ".Core";
@@ -113,7 +112,6 @@
private void wizardPageConfirmChoices_ShowFromNext(object sender, EventArgs e)
{
lblApplicationName.Text = txtApplicationName.Text;
- lblApplicationVersion.Text = txtApplicationVersion.Text;
lblDatabaseType.Text = ddlDatabaseType.SelectedItem.ToString();
lblCommonProject.Text = usrCommonProject.ProjectName;
lblCoreProject.Text = usrCoreProject.ProjectName;
@@ -191,8 +189,7 @@
private void wizardPageSolutionInfo_CloseFromNext(object sender, Gui.Wizard.PageEventArgs e)
{
bool v1 = ValidationUtils.ValidateRequiredTextBox(txtApplicationName);
- bool v2 = ValidationUtils.ValidateRequiredTextBox(txtApplicationVersion);
- bool pageValid = v1 && v2;
+ bool pageValid = v1;
if (!pageValid)
{
e.Page = wizardPageSolutionInfo;
@@ -329,7 +326,7 @@
config["application.name"] = txtApplicationName.Text;
config["application.name.nospaces"] = txtApplicationName.Text.Replace(" ", string.Empty);
- config["application.version"] = txtApplicationVersion.Text;
+ config["application.version"] = "1.0";
config["application.versioncontrol"] = ddlVersionControl.SelectedItem.ToString();
config["application.model.filename"] = config["application.name.nospaces"] + ".Model.xml.zip";
1.5 +395 -442 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs
Index: MDASolutionWizard.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MDASolutionWizard.designer.cs 28 May 2006 15:49:55 -0000 1.4
+++ MDASolutionWizard.designer.cs 29 May 2006 14:56:12 -0000 1.5
@@ -32,45 +32,18 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard));
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.wizard1 = new Gui.Wizard.Wizard();
- this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
- this.ddlVersionControl = new System.Windows.Forms.ComboBox();
- this.ddlDatabaseType = new System.Windows.Forms.ComboBox();
- this.label1 = new System.Windows.Forms.Label();
- this.txtApplicationVersion = new System.Windows.Forms.TextBox();
- this.label17 = new System.Windows.Forms.Label();
- this.label14 = new System.Windows.Forms.Label();
- this.txtApplicationName = new System.Windows.Forms.TextBox();
- this.label12 = new System.Windows.Forms.Label();
- this.header6 = new Gui.Wizard.Header();
- this.wizardPageWelcome = new Gui.Wizard.WizardPage();
- this.label9 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
- this.wizardPageComplete = new Gui.Wizard.WizardPage();
- this.lblFinishPageTitle = new System.Windows.Forms.Label();
- this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
- this.lblFinishPageDescription = new System.Windows.Forms.Label();
- this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
- this.txtErrorMessage = new System.Windows.Forms.TextBox();
- this.wizardPageProcessing = new Gui.Wizard.WizardPage();
- this.lstStatus = new System.Windows.Forms.ListBox();
- this.label7 = new System.Windows.Forms.Label();
- this.header5 = new Gui.Wizard.Header();
- this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
this.lblWebProject = new System.Windows.Forms.Label();
this.lblSchemaExportProject = new System.Windows.Forms.Label();
this.lblGenerateWebProject = new System.Windows.Forms.Label();
this.lblGenerateSchemaExportProject = new System.Windows.Forms.Label();
this.lblDatabaseType = new System.Windows.Forms.Label();
- this.lblApplicationVersion = new System.Windows.Forms.Label();
this.lblCoreProject = new System.Windows.Forms.Label();
this.lblApplicationName = new System.Windows.Forms.Label();
this.lblCommonProject = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
- this.label16 = new System.Windows.Forms.Label();
this.label19 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
@@ -78,9 +51,22 @@
this.label3 = new System.Windows.Forms.Label();
this.header4 = new Gui.Wizard.Header();
this.wizardPageWebProject = new Gui.Wizard.WizardPage();
+ this.rbWebConfig = new System.Windows.Forms.RadioButton();
+ this.rbNHibernateConfig = new System.Windows.Forms.RadioButton();
this.cbCreateWebProject = new System.Windows.Forms.CheckBox();
this.txtWebProject = new System.Windows.Forms.TextBox();
this.header7 = new Gui.Wizard.Header();
+ this.wizardPageProcessing = new Gui.Wizard.WizardPage();
+ this.lstStatus = new System.Windows.Forms.ListBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.header5 = new Gui.Wizard.Header();
+ this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
+ this.wizardPageComplete = new Gui.Wizard.WizardPage();
+ this.lblFinishPageTitle = new System.Windows.Forms.Label();
+ this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
+ this.lblFinishPageDescription = new System.Windows.Forms.Label();
+ this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
+ this.txtErrorMessage = new System.Windows.Forms.TextBox();
this.wizardPageSchemaExportProject = new Gui.Wizard.WizardPage();
this.cbCreateSchemaExport = new System.Windows.Forms.CheckBox();
this.txtSchemaExportProject = new System.Windows.Forms.TextBox();
@@ -92,22 +78,32 @@
this.wizardPageCommonProject = new Gui.Wizard.WizardPage();
this.usrCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
this.header1 = new Gui.Wizard.Header();
- this.rbNHibernateConfig = new System.Windows.Forms.RadioButton();
- this.rbWebConfig = new System.Windows.Forms.RadioButton();
+ this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
+ this.ddlVersionControl = new System.Windows.Forms.ComboBox();
+ this.ddlDatabaseType = new System.Windows.Forms.ComboBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.txtApplicationName = new System.Windows.Forms.TextBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.header6 = new Gui.Wizard.Header();
+ this.wizardPageWelcome = new Gui.Wizard.WizardPage();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
this.wizard1.SuspendLayout();
- this.wizardPageSolutionInfo.SuspendLayout();
- this.wizardPageWelcome.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
- this.wizardPageComplete.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
+ this.wizardPageConfirmChoices.SuspendLayout();
+ this.wizardPageWebProject.SuspendLayout();
this.wizardPageProcessing.SuspendLayout();
this.header5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
- this.wizardPageConfirmChoices.SuspendLayout();
- this.wizardPageWebProject.SuspendLayout();
+ this.wizardPageComplete.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
this.wizardPageSchemaExportProject.SuspendLayout();
this.wizardPageCoreProject.SuspendLayout();
this.wizardPageCommonProject.SuspendLayout();
+ this.wizardPageSolutionInfo.SuspendLayout();
+ this.wizardPageWelcome.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
this.SuspendLayout();
//
// imageList1
@@ -120,6 +116,7 @@
// wizard1
//
this.wizard1.ContainingForm = null;
+ this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
this.wizard1.Controls.Add(this.wizardPageWebProject);
this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
this.wizard1.Controls.Add(this.wizardPageCoreProject);
@@ -128,7 +125,6 @@
this.wizard1.Controls.Add(this.wizardPageWelcome);
this.wizard1.Controls.Add(this.wizardPageComplete);
this.wizard1.Controls.Add(this.wizardPageProcessing);
- this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
this.wizard1.Dock = System.Windows.Forms.DockStyle.Fill;
this.wizard1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.wizard1.Location = new System.Drawing.Point(0, 0);
@@ -147,289 +143,6 @@
this.wizard1.TabIndex = 0;
this.wizard1.Load += new System.EventHandler(this.wizard1_Load);
//
- // wizardPageSolutionInfo
- //
- this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl);
- this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType);
- this.wizardPageSolutionInfo.Controls.Add(this.label1);
- this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationVersion);
- this.wizardPageSolutionInfo.Controls.Add(this.label17);
- this.wizardPageSolutionInfo.Controls.Add(this.label14);
- this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationName);
- this.wizardPageSolutionInfo.Controls.Add(this.label12);
- this.wizardPageSolutionInfo.Controls.Add(this.header6);
- this.wizardPageSolutionInfo.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageSolutionInfo.IsFinishPage = false;
- this.wizardPageSolutionInfo.Location = new System.Drawing.Point(0, 0);
- this.wizardPageSolutionInfo.Name = "wizardPageSolutionInfo";
- this.wizardPageSolutionInfo.Size = new System.Drawing.Size(525, 297);
- this.wizardPageSolutionInfo.TabIndex = 8;
- this.wizardPageSolutionInfo.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSolutionInfo_CloseFromNext);
- this.wizardPageSolutionInfo.ShowFromBack += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
- this.wizardPageSolutionInfo.ShowFromNext += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
- //
- // ddlVersionControl
- //
- this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ddlVersionControl.FormattingEnabled = true;
- this.ddlVersionControl.Items.AddRange(new object[] {
- "None",
- "CVS",
- "Subversion"});
- this.ddlVersionControl.Location = new System.Drawing.Point(15, 234);
- this.ddlVersionControl.Name = "ddlVersionControl";
- this.ddlVersionControl.Size = new System.Drawing.Size(335, 21);
- this.ddlVersionControl.TabIndex = 7;
- //
- // ddlDatabaseType
- //
- this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ddlDatabaseType.FormattingEnabled = true;
- this.ddlDatabaseType.Items.AddRange(new object[] {
- "Microsoft SQL Server",
- "MySQL",
- "Oracle 9i",
- "Hypersonic"});
- this.ddlDatabaseType.Location = new System.Drawing.Point(15, 189);
- this.ddlDatabaseType.Name = "ddlDatabaseType";
- this.ddlDatabaseType.Size = new System.Drawing.Size(335, 21);
- this.ddlDatabaseType.TabIndex = 5;
- //
- // label1
- //
- this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.Location = new System.Drawing.Point(12, 214);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(507, 16);
- this.label1.TabIndex = 6;
- this.label1.Text = "Which version control system will you be using, if any?";
- //
- // txtApplicationVersion
- //
- this.txtApplicationVersion.Location = new System.Drawing.Point(15, 144);
- this.txtApplicationVersion.Name = "txtApplicationVersion";
- this.txtApplicationVersion.Size = new System.Drawing.Size(335, 21);
- this.txtApplicationVersion.TabIndex = 3;
- //
- // label17
- //
- this.label17.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label17.Location = new System.Drawing.Point(12, 169);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(507, 16);
- this.label17.TabIndex = 4;
- this.label17.Text = "Which database server will your application use?";
- //
- // label14
- //
- this.label14.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label14.Location = new System.Drawing.Point(12, 124);
- this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(507, 16);
- this.label14.TabIndex = 2;
- this.label14.Text = "What is the version number of your application? (Example: 1.1-Release)";
- //
- // txtApplicationName
- //
- this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window;
- this.txtApplicationName.Location = new System.Drawing.Point(15, 99);
- this.txtApplicationName.Name = "txtApplicationName";
- this.txtApplicationName.Size = new System.Drawing.Size(335, 21);
- this.txtApplicationName.TabIndex = 1;
- //
- // label12
- //
- this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label12.Location = new System.Drawing.Point(12, 79);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(507, 16);
- this.label12.TabIndex = 0;
- this.label12.Text = "What is the name of your application? (Example: Time Tracker)";
- //
- // header6
- //
- this.header6.BackColor = System.Drawing.SystemColors.Control;
- this.header6.CausesValidation = false;
- this.header6.Description = "Please enter the following general information about your applicaiton.";
- this.header6.Dock = System.Windows.Forms.DockStyle.Top;
- this.header6.Image = ((System.Drawing.Image)(resources.GetObject("header6.Image")));
- this.header6.Location = new System.Drawing.Point(0, 0);
- this.header6.Name = "header6";
- this.header6.Size = new System.Drawing.Size(525, 65);
- this.header6.TabIndex = 26;
- this.header6.Title = "Application Information";
- //
- // wizardPageWelcome
- //
- this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
- this.wizardPageWelcome.Controls.Add(this.label9);
- this.wizardPageWelcome.Controls.Add(this.label8);
- this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome);
- this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageWelcome.IsFinishPage = false;
- this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0);
- this.wizardPageWelcome.Name = "wizardPageWelcome";
- this.wizardPageWelcome.Size = new System.Drawing.Size(525, 297);
- this.wizardPageWelcome.TabIndex = 1;
- //
- // label9
- //
- this.label9.Location = new System.Drawing.Point(174, 61);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(339, 220);
- this.label9.TabIndex = 9;
- this.label9.Text = resources.GetString("label9.Text");
- //
- // label8
- //
- this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label8.Location = new System.Drawing.Point(170, 9);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(304, 48);
- this.label8.TabIndex = 8;
- this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
- //
- // pictureBoxWelcome
- //
- this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
- this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxWelcome.Name = "pictureBoxWelcome";
- this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
- this.pictureBoxWelcome.TabIndex = 1;
- this.pictureBoxWelcome.TabStop = false;
- //
- // wizardPageComplete
- //
- this.wizardPageComplete.BackColor = System.Drawing.Color.White;
- this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
- this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
- this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
- this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
- this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
- this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageComplete.IsFinishPage = true;
- this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
- this.wizardPageComplete.Name = "wizardPageComplete";
- this.wizardPageComplete.Size = new System.Drawing.Size(525, 297);
- this.wizardPageComplete.TabIndex = 7;
- this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
- //
- // lblFinishPageTitle
- //
- this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
- this.lblFinishPageTitle.Name = "lblFinishPageTitle";
- this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
- this.lblFinishPageTitle.TabIndex = 15;
- this.lblFinishPageTitle.Text = "Solution Update Complete";
- this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // pictureBoxComplete
- //
- this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
- this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxComplete.Name = "pictureBoxComplete";
- this.pictureBoxComplete.Size = new System.Drawing.Size(164, 297);
- this.pictureBoxComplete.TabIndex = 13;
- this.pictureBoxComplete.TabStop = false;
- //
- // lblFinishPageDescription
- //
- this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
- this.lblFinishPageDescription.Name = "lblFinishPageDescription";
- this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 72);
- this.lblFinishPageDescription.TabIndex = 12;
- this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
- "tion. You can now add classes to the solution model file and generate code base" +
- "d on the model.\r\n";
- //
- // lblFinishPageTitleImage
- //
- this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblFinishPageTitleImage.ImageIndex = 0;
- this.lblFinishPageTitleImage.ImageList = this.imageList1;
- this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
- this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
- this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
- this.lblFinishPageTitleImage.TabIndex = 11;
- this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // txtErrorMessage
- //
- this.txtErrorMessage.BackColor = System.Drawing.Color.White;
- this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
- this.txtErrorMessage.Multiline = true;
- this.txtErrorMessage.Name = "txtErrorMessage";
- this.txtErrorMessage.ReadOnly = true;
- this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
- this.txtErrorMessage.TabIndex = 14;
- //
- // wizardPageProcessing
- //
- this.wizardPageProcessing.Controls.Add(this.lstStatus);
- this.wizardPageProcessing.Controls.Add(this.label7);
- this.wizardPageProcessing.Controls.Add(this.header5);
- this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageProcessing.IsFinishPage = false;
- this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
- this.wizardPageProcessing.Name = "wizardPageProcessing";
- this.wizardPageProcessing.Size = new System.Drawing.Size(525, 297);
- this.wizardPageProcessing.TabIndex = 6;
- this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
- //
- // lstStatus
- //
- this.lstStatus.FormattingEnabled = true;
- this.lstStatus.Location = new System.Drawing.Point(12, 100);
- this.lstStatus.Name = "lstStatus";
- this.lstStatus.Size = new System.Drawing.Size(501, 186);
- this.lstStatus.TabIndex = 9;
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(12, 77);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(273, 13);
- this.label7.TabIndex = 8;
- this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
- //
- // header5
- //
- this.header5.BackColor = System.Drawing.SystemColors.Control;
- this.header5.CausesValidation = false;
- this.header5.Controls.Add(this.pictureBoxThrobber);
- this.header5.Description = "Please wait...";
- this.header5.Dock = System.Windows.Forms.DockStyle.Top;
- this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
- this.header5.Location = new System.Drawing.Point(0, 0);
- this.header5.Name = "header5";
- this.header5.Size = new System.Drawing.Size(525, 65);
- this.header5.TabIndex = 6;
- this.header5.Title = "Processing Solution";
- //
- // pictureBoxThrobber
- //
- this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
- this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
- this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
- this.pictureBoxThrobber.Name = "pictureBoxThrobber";
- this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
- this.pictureBoxThrobber.TabIndex = 10;
- this.pictureBoxThrobber.TabStop = false;
- //
// wizardPageConfirmChoices
//
this.wizardPageConfirmChoices.Controls.Add(this.lblWebProject);
@@ -437,14 +150,12 @@
this.wizardPageConfirmChoices.Controls.Add(this.lblGenerateWebProject);
this.wizardPageConfirmChoices.Controls.Add(this.lblGenerateSchemaExportProject);
this.wizardPageConfirmChoices.Controls.Add(this.lblDatabaseType);
- this.wizardPageConfirmChoices.Controls.Add(this.lblApplicationVersion);
this.wizardPageConfirmChoices.Controls.Add(this.lblCoreProject);
this.wizardPageConfirmChoices.Controls.Add(this.lblApplicationName);
this.wizardPageConfirmChoices.Controls.Add(this.lblCommonProject);
this.wizardPageConfirmChoices.Controls.Add(this.label20);
this.wizardPageConfirmChoices.Controls.Add(this.label6);
this.wizardPageConfirmChoices.Controls.Add(this.label18);
- this.wizardPageConfirmChoices.Controls.Add(this.label16);
this.wizardPageConfirmChoices.Controls.Add(this.label19);
this.wizardPageConfirmChoices.Controls.Add(this.label5);
this.wizardPageConfirmChoices.Controls.Add(this.label15);
@@ -462,7 +173,7 @@
// lblWebProject
//
this.lblWebProject.AutoSize = true;
- this.lblWebProject.Location = new System.Drawing.Point(245, 223);
+ this.lblWebProject.Location = new System.Drawing.Point(244, 233);
this.lblWebProject.Name = "lblWebProject";
this.lblWebProject.Size = new System.Drawing.Size(23, 13);
this.lblWebProject.TabIndex = 26;
@@ -471,7 +182,7 @@
// lblSchemaExportProject
//
this.lblSchemaExportProject.AutoSize = true;
- this.lblSchemaExportProject.Location = new System.Drawing.Point(245, 187);
+ this.lblSchemaExportProject.Location = new System.Drawing.Point(245, 189);
this.lblSchemaExportProject.Name = "lblSchemaExportProject";
this.lblSchemaExportProject.Size = new System.Drawing.Size(23, 13);
this.lblSchemaExportProject.TabIndex = 26;
@@ -480,7 +191,7 @@
// lblGenerateWebProject
//
this.lblGenerateWebProject.AutoSize = true;
- this.lblGenerateWebProject.Location = new System.Drawing.Point(245, 205);
+ this.lblGenerateWebProject.Location = new System.Drawing.Point(245, 211);
this.lblGenerateWebProject.Name = "lblGenerateWebProject";
this.lblGenerateWebProject.Size = new System.Drawing.Size(20, 13);
this.lblGenerateWebProject.TabIndex = 26;
@@ -489,7 +200,7 @@
// lblGenerateSchemaExportProject
//
this.lblGenerateSchemaExportProject.AutoSize = true;
- this.lblGenerateSchemaExportProject.Location = new System.Drawing.Point(245, 169);
+ this.lblGenerateSchemaExportProject.Location = new System.Drawing.Point(245, 167);
this.lblGenerateSchemaExportProject.Name = "lblGenerateSchemaExportProject";
this.lblGenerateSchemaExportProject.Size = new System.Drawing.Size(20, 13);
this.lblGenerateSchemaExportProject.TabIndex = 26;
@@ -498,25 +209,16 @@
// lblDatabaseType
//
this.lblDatabaseType.AutoSize = true;
- this.lblDatabaseType.Location = new System.Drawing.Point(245, 115);
+ this.lblDatabaseType.Location = new System.Drawing.Point(245, 101);
this.lblDatabaseType.Name = "lblDatabaseType";
this.lblDatabaseType.Size = new System.Drawing.Size(50, 13);
this.lblDatabaseType.TabIndex = 26;
this.lblDatabaseType.Text = "unknown";
//
- // lblApplicationVersion
- //
- this.lblApplicationVersion.AutoSize = true;
- this.lblApplicationVersion.Location = new System.Drawing.Point(245, 97);
- this.lblApplicationVersion.Name = "lblApplicationVersion";
- this.lblApplicationVersion.Size = new System.Drawing.Size(50, 13);
- this.lblApplicationVersion.TabIndex = 26;
- this.lblApplicationVersion.Text = "unknown";
- //
// lblCoreProject
//
this.lblCoreProject.AutoSize = true;
- this.lblCoreProject.Location = new System.Drawing.Point(245, 151);
+ this.lblCoreProject.Location = new System.Drawing.Point(245, 145);
this.lblCoreProject.Name = "lblCoreProject";
this.lblCoreProject.Size = new System.Drawing.Size(28, 13);
this.lblCoreProject.TabIndex = 26;
@@ -534,7 +236,7 @@
// lblCommonProject
//
this.lblCommonProject.AutoSize = true;
- this.lblCommonProject.Location = new System.Drawing.Point(245, 133);
+ this.lblCommonProject.Location = new System.Drawing.Point(245, 123);
this.lblCommonProject.Name = "lblCommonProject";
this.lblCommonProject.Size = new System.Drawing.Size(46, 13);
this.lblCommonProject.TabIndex = 26;
@@ -544,7 +246,7 @@
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label20.Location = new System.Drawing.Point(160, 223);
+ this.label20.Location = new System.Drawing.Point(159, 233);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(79, 13);
this.label20.TabIndex = 25;
@@ -554,7 +256,7 @@
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label6.Location = new System.Drawing.Point(100, 187);
+ this.label6.Location = new System.Drawing.Point(100, 189);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(139, 13);
this.label6.TabIndex = 25;
@@ -564,27 +266,17 @@
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label18.Location = new System.Drawing.Point(144, 115);
+ this.label18.Location = new System.Drawing.Point(144, 101);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(95, 13);
this.label18.TabIndex = 25;
this.label18.Text = "Database Type:";
//
- // label16
- //
- this.label16.AutoSize = true;
- this.label16.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label16.Location = new System.Drawing.Point(121, 97);
- this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(118, 13);
- this.label16.TabIndex = 25;
- this.label16.Text = "Application Version:";
- //
// label19
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label19.Location = new System.Drawing.Point(104, 205);
+ this.label19.Location = new System.Drawing.Point(104, 211);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(135, 13);
this.label19.TabIndex = 25;
@@ -594,7 +286,7 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label5.Location = new System.Drawing.Point(44, 169);
+ this.label5.Location = new System.Drawing.Point(44, 167);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(195, 13);
this.label5.TabIndex = 25;
@@ -614,7 +306,7 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label4.Location = new System.Drawing.Point(159, 151);
+ this.label4.Location = new System.Drawing.Point(159, 145);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(80, 13);
this.label4.TabIndex = 25;
@@ -624,7 +316,7 @@
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label3.Location = new System.Drawing.Point(135, 133);
+ this.label3.Location = new System.Drawing.Point(135, 123);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(104, 13);
this.label3.TabIndex = 25;
@@ -644,56 +336,206 @@
this.header4.TabIndex = 5;
this.header4.Title = "Confirm Choices";
//
- // wizardPageWebProject
+ // wizardPageWebProject
+ //
+ this.wizardPageWebProject.Controls.Add(this.rbWebConfig);
+ this.wizardPageWebProject.Controls.Add(this.rbNHibernateConfig);
+ this.wizardPageWebProject.Controls.Add(this.cbCreateWebProject);
+ this.wizardPageWebProject.Controls.Add(this.txtWebProject);
+ this.wizardPageWebProject.Controls.Add(this.header7);
+ this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWebProject.IsFinishPage = false;
+ this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWebProject.Name = "wizardPageWebProject";
+ this.wizardPageWebProject.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageWebProject.TabIndex = 9;
+ this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
+ this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
+ //
+ // rbWebConfig
+ //
+ this.rbWebConfig.AutoSize = true;
+ this.rbWebConfig.Location = new System.Drawing.Point(30, 149);
+ this.rbWebConfig.Name = "rbWebConfig";
+ this.rbWebConfig.Size = new System.Drawing.Size(217, 17);
+ this.rbWebConfig.TabIndex = 29;
+ this.rbWebConfig.Text = "Store persistance settings in web.config";
+ this.rbWebConfig.UseVisualStyleBackColor = true;
+ //
+ // rbNHibernateConfig
+ //
+ this.rbNHibernateConfig.AutoSize = true;
+ this.rbNHibernateConfig.Checked = true;
+ this.rbNHibernateConfig.Location = new System.Drawing.Point(30, 126);
+ this.rbNHibernateConfig.Name = "rbNHibernateConfig";
+ this.rbNHibernateConfig.Size = new System.Drawing.Size(249, 17);
+ this.rbNHibernateConfig.TabIndex = 28;
+ this.rbNHibernateConfig.TabStop = true;
+ this.rbNHibernateConfig.Text = "Store persistance settings in nhibernate.config";
+ this.rbNHibernateConfig.UseVisualStyleBackColor = true;
+ //
+ // cbCreateWebProject
+ //
+ this.cbCreateWebProject.AutoSize = true;
+ this.cbCreateWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbCreateWebProject.Location = new System.Drawing.Point(11, 79);
+ this.cbCreateWebProject.Name = "cbCreateWebProject";
+ this.cbCreateWebProject.Size = new System.Drawing.Size(134, 17);
+ this.cbCreateWebProject.TabIndex = 25;
+ this.cbCreateWebProject.Text = "Create web project";
+ this.cbCreateWebProject.UseVisualStyleBackColor = true;
+ this.cbCreateWebProject.CheckedChanged += new System.EventHandler(this.cbCreateWebProject_CheckedChanged);
+ //
+ // txtWebProject
+ //
+ this.txtWebProject.Enabled = false;
+ this.txtWebProject.Location = new System.Drawing.Point(30, 99);
+ this.txtWebProject.Name = "txtWebProject";
+ this.txtWebProject.Size = new System.Drawing.Size(320, 21);
+ this.txtWebProject.TabIndex = 26;
+ this.txtWebProject.Text = "Web";
+ //
+ // header7
+ //
+ this.header7.BackColor = System.Drawing.SystemColors.Control;
+ this.header7.CausesValidation = false;
+ this.header7.Description = "Check the box below if you would like to create a web site project that is config" +
+ "ured to work with NHibernate and your generated objects.";
+ this.header7.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header7.Image = ((System.Drawing.Image)(resources.GetObject("header7.Image")));
+ this.header7.Location = new System.Drawing.Point(0, 0);
+ this.header7.Name = "header7";
+ this.header7.Size = new System.Drawing.Size(525, 65);
+ this.header7.TabIndex = 27;
+ this.header7.Title = "Web Project";
+ //
+ // wizardPageProcessing
+ //
+ this.wizardPageProcessing.Controls.Add(this.lstStatus);
+ this.wizardPageProcessing.Controls.Add(this.label7);
+ this.wizardPageProcessing.Controls.Add(this.header5);
+ this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageProcessing.IsFinishPage = false;
+ this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageProcessing.Name = "wizardPageProcessing";
+ this.wizardPageProcessing.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageProcessing.TabIndex = 6;
+ this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
+ //
+ // lstStatus
+ //
+ this.lstStatus.FormattingEnabled = true;
+ this.lstStatus.Location = new System.Drawing.Point(12, 100);
+ this.lstStatus.Name = "lstStatus";
+ this.lstStatus.Size = new System.Drawing.Size(501, 186);
+ this.lstStatus.TabIndex = 9;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(12, 77);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(273, 13);
+ this.label7.TabIndex = 8;
+ this.label7.Text = "Updating solution to support AndroMDA. Please wait...";
+ //
+ // header5
+ //
+ this.header5.BackColor = System.Drawing.SystemColors.Control;
+ this.header5.CausesValidation = false;
+ this.header5.Controls.Add(this.pictureBoxThrobber);
+ this.header5.Description = "Please wait...";
+ this.header5.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
+ this.header5.Location = new System.Drawing.Point(0, 0);
+ this.header5.Name = "header5";
+ this.header5.Size = new System.Drawing.Size(525, 65);
+ this.header5.TabIndex = 6;
+ this.header5.Title = "Processing Solution";
+ //
+ // pictureBoxThrobber
+ //
+ this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
+ this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
+ this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
+ this.pictureBoxThrobber.Name = "pictureBoxThrobber";
+ this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
+ this.pictureBoxThrobber.TabIndex = 10;
+ this.pictureBoxThrobber.TabStop = false;
+ //
+ // wizardPageComplete
+ //
+ this.wizardPageComplete.BackColor = System.Drawing.Color.White;
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
+ this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
+ this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
+ this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageComplete.IsFinishPage = true;
+ this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageComplete.Name = "wizardPageComplete";
+ this.wizardPageComplete.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageComplete.TabIndex = 7;
+ this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
+ //
+ // lblFinishPageTitle
+ //
+ this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
+ this.lblFinishPageTitle.Name = "lblFinishPageTitle";
+ this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
+ this.lblFinishPageTitle.TabIndex = 15;
+ this.lblFinishPageTitle.Text = "Solution Update Complete";
+ this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // pictureBoxComplete
//
- this.wizardPageWebProject.Controls.Add(this.rbWebConfig);
- this.wizardPageWebProject.Controls.Add(this.rbNHibernateConfig);
- this.wizardPageWebProject.Controls.Add(this.cbCreateWebProject);
- this.wizardPageWebProject.Controls.Add(this.txtWebProject);
- this.wizardPageWebProject.Controls.Add(this.header7);
- this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageWebProject.IsFinishPage = false;
- this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageWebProject.Name = "wizardPageWebProject";
- this.wizardPageWebProject.Size = new System.Drawing.Size(525, 297);
- this.wizardPageWebProject.TabIndex = 9;
- this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
- this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
+ this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
+ this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxComplete.Name = "pictureBoxComplete";
+ this.pictureBoxComplete.Size = new System.Drawing.Size(164, 297);
+ this.pictureBoxComplete.TabIndex = 13;
+ this.pictureBoxComplete.TabStop = false;
//
- // cbCreateWebProject
+ // lblFinishPageDescription
//
- this.cbCreateWebProject.AutoSize = true;
- this.cbCreateWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbCreateWebProject.Location = new System.Drawing.Point(11, 79);
- this.cbCreateWebProject.Name = "cbCreateWebProject";
- this.cbCreateWebProject.Size = new System.Drawing.Size(134, 17);
- this.cbCreateWebProject.TabIndex = 25;
- this.cbCreateWebProject.Text = "Create web project";
- this.cbCreateWebProject.UseVisualStyleBackColor = true;
- this.cbCreateWebProject.CheckedChanged += new System.EventHandler(this.cbCreateWebProject_CheckedChanged);
+ this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
+ this.lblFinishPageDescription.Name = "lblFinishPageDescription";
+ this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 72);
+ this.lblFinishPageDescription.TabIndex = 12;
+ this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
+ "tion. You can now add classes to the solution model file and generate code base" +
+ "d on the model.\r\n";
//
- // txtWebProject
+ // lblFinishPageTitleImage
//
- this.txtWebProject.Enabled = false;
- this.txtWebProject.Location = new System.Drawing.Point(30, 99);
- this.txtWebProject.Name = "txtWebProject";
- this.txtWebProject.Size = new System.Drawing.Size(320, 21);
- this.txtWebProject.TabIndex = 26;
- this.txtWebProject.Text = "Web";
+ this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblFinishPageTitleImage.ImageIndex = 0;
+ this.lblFinishPageTitleImage.ImageList = this.imageList1;
+ this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
+ this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
+ this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
+ this.lblFinishPageTitleImage.TabIndex = 11;
+ this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // header7
+ // txtErrorMessage
//
- this.header7.BackColor = System.Drawing.SystemColors.Control;
- this.header7.CausesValidation = false;
- this.header7.Description = "Check the box below if you would like to create a web site project that is config" +
- "ured to work with NHibernate and your generated objects.";
- this.header7.Dock = System.Windows.Forms.DockStyle.Top;
- this.header7.Image = ((System.Drawing.Image)(resources.GetObject("header7.Image")));
- this.header7.Location = new System.Drawing.Point(0, 0);
- this.header7.Name = "header7";
- this.header7.Size = new System.Drawing.Size(525, 65);
- this.header7.TabIndex = 27;
- this.header7.Title = "Web Project";
+ this.txtErrorMessage.BackColor = System.Drawing.Color.White;
+ this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
+ this.txtErrorMessage.Multiline = true;
+ this.txtErrorMessage.Name = "txtErrorMessage";
+ this.txtErrorMessage.ReadOnly = true;
+ this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+ this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
+ this.txtErrorMessage.TabIndex = 14;
//
// wizardPageSchemaExportProject
//
@@ -823,27 +665,142 @@
this.header1.TabIndex = 0;
this.header1.Title = "Common Project";
//
- // rbNHibernateConfig
+ // wizardPageSolutionInfo
//
- this.rbNHibernateConfig.AutoSize = true;
- this.rbNHibernateConfig.Checked = true;
- this.rbNHibernateConfig.Location = new System.Drawing.Point(30, 126);
- this.rbNHibernateConfig.Name = "rbNHibernateConfig";
- this.rbNHibernateConfig.Size = new System.Drawing.Size(249, 17);
- this.rbNHibernateConfig.TabIndex = 28;
- this.rbNHibernateConfig.TabStop = true;
- this.rbNHibernateConfig.Text = "Store persistance settings in nhibernate.config";
- this.rbNHibernateConfig.UseVisualStyleBackColor = true;
+ this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl);
+ this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType);
+ this.wizardPageSolutionInfo.Controls.Add(this.label1);
+ this.wizardPageSolutionInfo.Controls.Add(this.label17);
+ this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationName);
+ this.wizardPageSolutionInfo.Controls.Add(this.label12);
+ this.wizardPageSolutionInfo.Controls.Add(this.header6);
+ this.wizardPageSolutionInfo.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageSolutionInfo.IsFinishPage = false;
+ this.wizardPageSolutionInfo.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageSolutionInfo.Name = "wizardPageSolutionInfo";
+ this.wizardPageSolutionInfo.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageSolutionInfo.TabIndex = 8;
+ this.wizardPageSolutionInfo.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSolutionInfo_CloseFromNext);
+ this.wizardPageSolutionInfo.ShowFromBack += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
+ this.wizardPageSolutionInfo.ShowFromNext += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
//
- // rbWebConfig
+ // ddlVersionControl
//
- this.rbWebConfig.AutoSize = true;
- this.rbWebConfig.Location = new System.Drawing.Point(30, 149);
- this.rbWebConfig.Name = "rbWebConfig";
- this.rbWebConfig.Size = new System.Drawing.Size(217, 17);
- this.rbWebConfig.TabIndex = 29;
- this.rbWebConfig.Text = "Store persistance settings in web.config";
- this.rbWebConfig.UseVisualStyleBackColor = true;
+ this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.ddlVersionControl.FormattingEnabled = true;
+ this.ddlVersionControl.Items.AddRange(new object[] {
+ "None",
+ "CVS",
+ "Subversion"});
+ this.ddlVersionControl.Location = new System.Drawing.Point(12, 226);
+ this.ddlVersionControl.Name = "ddlVersionControl";
+ this.ddlVersionControl.Size = new System.Drawing.Size(335, 21);
+ this.ddlVersionControl.TabIndex = 7;
+ //
+ // ddlDatabaseType
+ //
+ this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.ddlDatabaseType.FormattingEnabled = true;
+ this.ddlDatabaseType.Items.AddRange(new object[] {
+ "Microsoft SQL Server",
+ "MySQL",
+ "Oracle 9i",
+ "Hypersonic"});
+ this.ddlDatabaseType.Location = new System.Drawing.Point(12, 167);
+ this.ddlDatabaseType.Name = "ddlDatabaseType";
+ this.ddlDatabaseType.Size = new System.Drawing.Size(335, 21);
+ this.ddlDatabaseType.TabIndex = 5;
+ //
+ // label1
+ //
+ this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Location = new System.Drawing.Point(9, 199);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(507, 16);
+ this.label1.TabIndex = 6;
+ this.label1.Text = "Which version control system will you be using, if any?";
+ //
+ // label17
+ //
+ this.label17.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label17.Location = new System.Drawing.Point(9, 140);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(507, 16);
+ this.label17.TabIndex = 4;
+ this.label17.Text = "Which database server will your application use?";
+ //
+ // txtApplicationName
+ //
+ this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window;
+ this.txtApplicationName.Location = new System.Drawing.Point(12, 108);
+ this.txtApplicationName.Name = "txtApplicationName";
+ this.txtApplicationName.Size = new System.Drawing.Size(335, 21);
+ this.txtApplicationName.TabIndex = 1;
+ //
+ // label12
+ //
+ this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label12.Location = new System.Drawing.Point(9, 81);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(507, 16);
+ this.label12.TabIndex = 0;
+ this.label12.Text = "What is the name of your application? (Example: Time Tracker)";
+ //
+ // header6
+ //
+ this.header6.BackColor = System.Drawing.SystemColors.Control;
+ this.header6.CausesValidation = false;
+ this.header6.Description = "Please enter the following general information about your applicaiton.";
+ this.header6.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header6.Image = ((System.Drawing.Image)(resources.GetObject("header6.Image")));
+ this.header6.Location = new System.Drawing.Point(0, 0);
+ this.header6.Name = "header6";
+ this.header6.Size = new System.Drawing.Size(525, 65);
+ this.header6.TabIndex = 26;
+ this.header6.Title = "Application Information";
+ //
+ // wizardPageWelcome
+ //
+ this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
+ this.wizardPageWelcome.Controls.Add(this.label9);
+ this.wizardPageWelcome.Controls.Add(this.label8);
+ this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome);
+ this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWelcome.IsFinishPage = false;
+ this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWelcome.Name = "wizardPageWelcome";
+ this.wizardPageWelcome.Size = new System.Drawing.Size(525, 297);
+ this.wizardPageWelcome.TabIndex = 1;
+ //
+ // label9
+ //
+ this.label9.Location = new System.Drawing.Point(174, 61);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(339, 220);
+ this.label9.TabIndex = 9;
+ this.label9.Text = resources.GetString("label9.Text");
+ //
+ // label8
+ //
+ this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label8.Location = new System.Drawing.Point(170, 9);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(304, 48);
+ this.label8.TabIndex = 8;
+ this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
+ //
+ // pictureBoxWelcome
+ //
+ this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
+ this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxWelcome.Name = "pictureBoxWelcome";
+ this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
+ this.pictureBoxWelcome.TabIndex = 1;
+ this.pictureBoxWelcome.TabStop = false;
//
// MDASolutionWizard
//
@@ -860,25 +817,25 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "AndroMDA Solution Wizard";
this.wizard1.ResumeLayout(false);
- this.wizardPageSolutionInfo.ResumeLayout(false);
- this.wizardPageSolutionInfo.PerformLayout();
- this.wizardPageWelcome.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
- this.wizardPageComplete.ResumeLayout(false);
- this.wizardPageComplete.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).EndInit();
- this.wizardPageProcessing.ResumeLayout(false);
- this.wizardPageProcessing.PerformLayout();
- this.header5.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).EndInit();
this.wizardPageConfirmChoices.ResumeLayout(false);
this.wizardPageConfirmChoices.PerformLayout();
this.wizardPageWebProject.ResumeLayout(false);
this.wizardPageWebProject.PerformLayout();
+ this.wizardPageProcessing.ResumeLayout(false);
+ this.wizardPageProcessing.PerformLayout();
+ this.header5.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).EndInit();
+ this.wizardPageComplete.ResumeLayout(false);
+ this.wizardPageComplete.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).EndInit();
this.wizardPageSchemaExportProject.ResumeLayout(false);
this.wizardPageSchemaExportProject.PerformLayout();
this.wizardPageCoreProject.ResumeLayout(false);
this.wizardPageCommonProject.ResumeLayout(false);
+ this.wizardPageSolutionInfo.ResumeLayout(false);
+ this.wizardPageSolutionInfo.PerformLayout();
+ this.wizardPageWelcome.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
this.ResumeLayout(false);
}
@@ -922,11 +879,7 @@
private System.Windows.Forms.TextBox txtApplicationName;
private System.Windows.Forms.Label label12;
private Gui.Wizard.Header header6;
- private System.Windows.Forms.TextBox txtApplicationVersion;
- private System.Windows.Forms.Label label14;
- private System.Windows.Forms.Label lblApplicationVersion;
private System.Windows.Forms.Label lblApplicationName;
- private System.Windows.Forms.Label label16;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.ComboBox ddlDatabaseType;
private System.Windows.Forms.Label label17;
1.5 +442 -442 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.resx
Index: MDASolutionWizard.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.resx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MDASolutionWizard.resx 28 May 2006 15:49:55 -0000 1.4
+++ MDASolutionWizard.resx 29 May 2006 14:56:12 -0000 1.5
@@ -261,7 +261,7 @@
</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="header7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="header4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAgEASABIAAD/4QadRXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAcAAAAcgEyAA...
[truncated message content] |
|
From: Vance K. <va...@us...> - 2006-05-29 06:40:18
|
User: vancek Date: 06/05/28 23:40:16 Added: andromda-ejb3/src/site/resources HowToModel-src.zip Log: howto model example source references archive Revision Changes Path 1.1 cartridges/andromda-ejb3/src/site/resources/HowToModel-src.zip <<Binary file>> |
|
From: Vance K. <va...@us...> - 2006-05-29 06:39:05
|
User: vancek
Date: 06/05/28 23:39:00
Modified: andromda-ejb3/src/site/xdoc howto.xml
andromda-ejb3/src/changes changes.xml
Added: andromda-ejb3/src/site/xdoc installation.xml
Log:
added installation howto
Revision Changes Path
1.19 +12 -1 cartridges/andromda-ejb3/src/site/xdoc/howto.xml
Index: howto.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- howto.xml 29 May 2006 01:53:36 -0000 1.18
+++ howto.xml 29 May 2006 06:39:00 -0000 1.19
@@ -25,6 +25,17 @@
<ul>
<li>
<p>
+ <a href="installation.html">Installation & Configuration</a>
+ <ul>
+ <li><p><a href="installation.html#Requirements">Requirements</a></p></li>
+ <li><p><a href="installation.html#Getting_the_Cartridge">Getting the Cartridge</a></p></li>
+ <li><p><a href="installation.html#Building_the_Cartridge">Building the Cartridge</a></p></li>
+ <li><p><a href="installation.html#Building_Reports">Building Reports</a></p></li>
+ </ul>
+ </p>
+ </li>
+ <li>
+ <p>
<a href="howto1.html">Entities</a>
<ul>
<li><p><a href="howto1.html#Entity_Operations">Entity Operations</a></p></li>
@@ -236,7 +247,7 @@
<a href="HowToModel.xmi">here</a>.
</p>
<p>
- In order to start the tutorial click <a href="howto1.html">here</a>.
+ In order to start the tutorial click <a href="installation.html">here</a>.
</p>
</section>
</body>
1.1 cartridges/andromda-ejb3/src/site/xdoc/installation.xml
Index: installation.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<document>
<properties>
<author email="va...@us...">Vance Karimi</author>
<title>AndroMDA - EJB3 - Installation & Configuration</title>
</properties>
<body>
<section name="Installation">
<p>
Since the EJB3 cartridge is not part of the base AndroMDA package, you need to know a
few things to get started with the cartridge. This installation and configuration
guide should provide enough information to get you started.
</p>
<a name="Requirements"/>
<subsection name="Requirements">
<p>
You must have the latest Maven (currently 2.0.4) installed and configured.
You can install Maven
<a href="http://maven.apache.org/download.html#Installation">here</a>.
</p>
<p>
You need to have an instance of AndroMDA 3.2. At the time of writing this, 3.2 RC1
was released. Alternatively, you can get the latest 3.2-SNAPSHOT from CVS and build it.
</p>
</subsection>
<a name="Getting_the_Cartridge"/>
<subsection name="Getting the Cartridge">
<p>
The first thing you need to do is checkout the latest EJB3 cartridge from
CVS. Follow the anonymous CVS access at
<a href="http://sourceforge.net/cvs/?group_id=154568">andromdaplugins project</a>
on SourceForge to checkout the latest <b>andromda-ejb</b> module.
</p>
</subsection>
<a name="Building_the_Cartridge"/>
<subsection name="Building the Cartridge">
<p>
Once you have checked out the andromda-ejb3 cartridge, you can simply build it by
going to the root folder of the project and running <i>mvn</i>.
</p>
</subsection>
<a name="Building_Reports"/>
<subsection name="Building Reports">
<p>
To build the EJB3 cartridge site documentation requires a few extra Maven 2 plugins
to be downloaded from the Maven 2 sandbox in SVN. The
<a href="http://maven.apache.org/guides/development/guide-building-m2.html">Maven build</a>
documentation will give you some information on how to access their SVN.
</p>
<p>
You will need to check out the following plugins from Maven <b>sandbox</b>.
<ul>
<li><p>maven-changes-plugin</p></li>
<li><p>maven-changelog-plugin</p></li>
</ul>
Once you have built them (mvn install), these plugins will reside in your local repo.
</p>
<p>
In adopting the existing AndroMDA site format for the documentation, the Maven Doxia
plugin needs a patch to be applied. You can check out <b>doxia-1.0-alpha-8</b>
from Maven SVN and apply the patch <a href="http://jira.codehaus.org/browse/MNG-545">here</a>.
It is not critical to apply this patch, but if it's not applied, the generated XHTML will
not be formated correctly but still acceptable.
</p>
<p>
All other require plugins will be downloaded to your local repo if they don't already
exist.
</p>
<p>
You can download the source examples used in the howto for all sections
<a href="HowToModel-src.zip">here</a> and extract to the target/site folder of the
andromda-ejb3 plugin.
</p>
</subsection>
</section>
<section name="Next">
<p>
To start with EJB 3.0 entity POJOs click <a href="howto1.html">next</a>.
</p>
</section>
</body>
</document>
1.2 +3 -0 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- changes.xml 29 May 2006 01:46:08 -0000 1.1
+++ changes.xml 29 May 2006 06:39:00 -0000 1.2
@@ -41,6 +41,9 @@
NamedQuery definition to pick up firstResult and maxResult arguments modelled with these
stereotypes and NOT include then in where clause.
</action>
+ <action dev="vancek" type="add">
+ Added installation howto.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-05-29 02:38:10
|
User: vancek
Date: 06/05/28 19:38:09
Added: andromda-ejb3 .cvsignore
andromda-ejb3/src/site/resources .cvsignore
Log:
fix .cvsignore
Revision Changes Path
1.1 cartridges/andromda-ejb3/.cvsignore
Index: .cvsignore
===================================================================
target
*.log
1.1 cartridges/andromda-ejb3/src/site/resources/.cvsignore
Index: .cvsignore
===================================================================
src
target
*.log
|
|
From: Vance K. <va...@us...> - 2006-05-29 02:29:19
|
User: vancek
Date: 06/05/28 19:29:18
Removed: andromda-ejb3/src/site/resources/css maven-base.css
maven-andromda.css printer.css
andromda-ejb3/src/site/resources/images gen-file.gif
impl-file.gif newwindow.gif printer.gif flash.gif
warning.gif external.gif forbidden.gif
triangledown.gif square.gif triangleright.gif
redirect.gif banner.jpg changed-file.gif check.gif
pdf.gif
Log:
removed css & images from resources
|
|
From: Vance K. <va...@us...> - 2006-05-29 01:53:37
|
User: vancek
Date: 06/05/28 18:53:36
Modified: andromda-ejb3/src/site/xdoc howto.xml howto16.xml howto9.xml
howto17.xml howto15.xml howto4.xml howto12.xml
howto7.xml howto11.xml howto10.xml howto1.xml
index.xml howto6.xml howto18.xml howto3.xml
howto2.xml howto8.xml howto20.xml howto19.xml
howto13.xml howto5.xml
Log:
fixed howtos for the new andromda-site-plugin
NOTE: must have a paragraph <p> following every list item <li>
This is expected from the doxia plugin.
Revision Changes Path
1.18 +202 -169 cartridges/andromda-ejb3/src/site/xdoc/howto.xml
Index: howto.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- howto.xml 15 May 2006 12:39:16 -0000 1.17
+++ howto.xml 29 May 2006 01:53:36 -0000 1.18
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-
<document>
-
<properties>
<author email="va...@us...">Vance Karimi</author>
<title>AndroMDA - EJB3 - HowTo</title>
</properties>
-
<body>
<section name="Modeling example">
<p class="highlight">
@@ -27,174 +24,210 @@
In this how-to we will cover the following topics:
<ul>
<li>
+ <p>
<a href="howto1.html">Entities</a>
<ul>
- <li><a href="howto1.html#Entity_Operations">Entity Operations</a></li>
- <li><a href="howto1.html#Entity_Relation_Table">Entity Relation Table</a></li>
- <li><a href="howto1.html#Primary_Key_Identifiers">Primary Key Identifier</a></li>
- <li><a href="howto1.html#Unique_Attributes">Unique Attributes</a></li>
- <li><a href="howto1.html#Attribute_Fetch_Type">Attribute Fetch Type</a></li>
- <li><a href="howto1.html#Transient_Attribute">Transient Attribute</a></li>
- <li><a href="howto1.html#Insertable_Attribute">Insertable Attribute</a></li>
- <li><a href="howto1.html#Updatable_Attribute">Updatable Attribute</a></li>
- <li><a href="howto1.html#Version_Attribute">Version Attribute</a></li>
- <li><a href="howto1.html#Attribute_Multiplicity">Attribute Multiplicity</a></li>
- <li><a href="howto1.html#Constant_Attribute">Constant Attribute</a></li>
- <li><a href="howto1.html#Nullable_Parameters">Nullable Parameters</a></li>
- <li><a href="howto1.html#LOB_Attribute">LOB BLOB/CLOB Attributes</a></li>
- <li><a href="howto1.html#Column_Specifics">Column Specifics</a></li>
- <li><a href="howto1.html#Listener_Callback">Listener Callback</a></li>
+ <li><p><a href="howto1.html#Entity_Operations">Entity Operations</a></p></li>
+ <li><p><a href="howto1.html#Entity_Relation_Table">Entity Relation Table</a></p></li>
+ <li><p><a href="howto1.html#Primary_Key_Identifiers">Primary Key Identifier</a></p></li>
+ <li><p><a href="howto1.html#Unique_Attributes">Unique Attributes</a></p></li>
+ <li><p><a href="howto1.html#Attribute_Fetch_Type">Attribute Fetch Type</a></p></li>
+ <li><p><a href="howto1.html#Transient_Attribute">Transient Attribute</a></p></li>
+ <li><p><a href="howto1.html#Insertable_Attribute">Insertable Attribute</a></p></li>
+ <li><p><a href="howto1.html#Updatable_Attribute">Updatable Attribute</a></p></li>
+ <li><p><a href="howto1.html#Version_Attribute">Version Attribute</a></p></li>
+ <li><p><a href="howto1.html#Attribute_Multiplicity">Attribute Multiplicity</a></p></li>
+ <li><p><a href="howto1.html#Constant_Attribute">Constant Attribute</a></p></li>
+ <li><p><a href="howto1.html#Nullable_Parameters">Nullable Parameters</a></p></li>
+ <li><p><a href="howto1.html#LOB_Attribute">LOB BLOB/CLOB Attributes</a></p></li>
+ <li><p><a href="howto1.html#Column_Specifics">Column Specifics</a></p></li>
+ <li><p><a href="howto1.html#Listener_Callback">Listener Callback</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto19.html">Data Access Objects</a>
<ul>
- <li><a href="howto19.html#Queries">Queries</a></li>
- <li><a href="howto19.html#View_Interface">View_Interface</a></li>
- <li><a href="howto19.html#Transactions">Transactions</a></li>
- <li><a href="howto19.html#Security">Security</a></li>
+ <li><p><a href="howto19.html#Queries">Queries</a></p></li>
+ <li><p><a href="howto19.html#View_Interface">View Interface</a></p></li>
+ <li><p><a href="howto19.html#Transactions">Transactions</a></p></li>
+ <li><p><a href="howto19.html#Security">Security</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto2.html">Relationships</a>
<ul>
- <li><a href="howto2.html#Cascading">Cascading</a></li>
- <li><a href="howto2.html#Fetch_Type">Fetch Type</a></li>
- <li><a href="howto2.html#Ordering_Collection_Valued_Association">Ordering Collection Valued Association</a></li>
- <li><a href="howto2.html#Join_Table_Many_To_Many">Join Table for Many-To-Many Relationship</a></li>
- <li><a href="howto2.html#Aggregation_Composition">Aggregation and Composition</a></li>
- <li><a href="howto2.html#Transient_Relationships">Transient Relationships</a></li>
- <li><a href="howto2.html#Tips">Tips</a></li>
+ <li><p><a href="howto2.html#Cascading">Cascading</a></p></li>
+ <li><p><a href="howto2.html#Fetch_Type">Fetch Type</a></p></li>
+ <li><p><a href="howto2.html#Ordering_Collection_Valued_Association">Ordering Collection Valued Association</a></p></li>
+ <li><p><a href="howto2.html#Join_Table_Many_To_Many">Join Table for Many-To-Many Relationship</a></p></li>
+ <li><p><a href="howto2.html#Aggregation_Composition">Aggregation and Composition</a></p></li>
+ <li><p><a href="howto2.html#Transient_Relationships">Transient Relationships</a></p></li>
+ <li><p><a href="howto2.html#Tips">Tips</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto3.html">Services</a>
<ul>
- <li><a href="howto3.html#Session_Type">Session Type</a></li>
- <li><a href="howto3.html#View_Interface">View Interfaces</a></li>
- <li><a href="howto3.html#Transactions">Transactions</a></li>
- <li><a href="howto3.html#Security">Security</a></li>
- <li><a href="howto3.html#Environment_Entry_Injection">Environment Entry Injections</a></li>
- <li><a href="howto3.html#Nullable_Parameter">Nullable Parameters</a></li>
- <li><a href="howto3.html#Session_Delegate">Session Delegate</a></li>
- <li><a href="howto3.html#Listener_Callback">Listener Callback</a></li>
- <li><a href="howto3.html#Interceptors">Interceptors</a></li>
- <li><a href="howto3.html#JNDI_Bindings">JNDI Bindings</a></li>
- <li><a href="howto3.html#Persistence_Context_Entity_Manager">Persistence Context Entity Manager</a></li>
- <li><a href="howto3.html#EJB_Injections">EJB Injections</a></li>
- <li><a href="howto3.html#JMS_Injections">JMS Injections</a></li>
- <li><a href="howto3.html#EJB_Timer_Service">EJB Timer Service</a></li>
+ <li><p><a href="howto3.html#Session_Type">Session Type</a></p></li>
+ <li><p><a href="howto3.html#View_Interface">View Interfaces</a></p></li>
+ <li><p><a href="howto3.html#Transactions">Transactions</a></p></li>
+ <li><p><a href="howto3.html#Security">Security</a></p></li>
+ <li><p><a href="howto3.html#Environment_Entry_Injection">Environment Entry Injections</a></p></li>
+ <li><p><a href="howto3.html#Nullable_Parameter">Nullable Parameters</a></p></li>
+ <li><p><a href="howto3.html#Session_Delegate">Session Delegate</a></p></li>
+ <li><p><a href="howto3.html#Listener_Callback">Listener Callback</a></p></li>
+ <li><p><a href="howto3.html#Interceptors">Interceptors</a></p></li>
+ <li><p><a href="howto3.html#JNDI_Bindings">JNDI Bindings</a></p></li>
+ <li><p><a href="howto3.html#Persistence_Context_Entity_Manager">Persistence Context Entity Manager</a></p></li>
+ <li><p><a href="howto3.html#EJB_Injections">EJB Injections</a></p></li>
+ <li><p><a href="howto3.html#JMS_Injections">JMS Injections</a></p></li>
+ <li><p><a href="howto3.html#EJB_Timer_Service">EJB Timer Service</a></p></li>
</ul>
+ </p>
+ </li>
+ <li>
+ <p><a href="howto4.html">Composite Primary Key</a></p>
</li>
- <li><a href="howto4.html">Composite Primary Key</a></li>
<li>
+ <p>
<a href="howto5.html">Non-Persistent Type-Safe Enumerations</a>
<ul>
- <li><a href="howto5.html#Literals">Literals</a></li>
- <li><a href="howto5.html#Enumeration_Types">Enumeration Types</a></li>
+ <li><p><a href="howto5.html#Literals">Literals</a></p></li>
+ <li><p><a href="howto5.html#Enumeration_Types">Enumeration Types</a></p></li>
</ul>
+ </p>
+ </li>
+ <li>
+ <p><a href="howto6.html">Queries & Finder Methods</a></p>
</li>
- <li><a href="howto6.html">Queries & Finder Methods</a></li>
- <li><a href="howto7.html">Exception Handling</a></li>
<li>
+ <p><a href="howto7.html">Exception Handling</a></p>
+ </li>
+ <li>
+ <p>
<a href="howto8.html">Security</a>
<ul>
- <li><a href="howto8.html#Configuration">Configuration</a></li>
- <li><a href="howto8.html#Modelling">Modelling</a></li>
+ <li><p><a href="howto8.html#Configuration">Configuration</a></p></li>
+ <li><p><a href="howto8.html#Modelling">Modelling</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto9.html">Inheritance</a>
<ul>
- <li><a href="howto9.html#Non_Inheriting_Entities">Non Inheriting Entities</a></li>
- <li><a href="howto9.html#Mapped_Superclasses">Mapped Superclass</a></li>
- <li><a href="howto9.html#Single_Table_Strategy">Single Table Strategy</a></li>
- <li><a href="howto9.html#Discriminator_Components">Discriminator Components</a></li>
- <li><a href="howto9.html#Table_Per_Class_Strategy">Table Per Class Strategy</a></li>
- <li><a href="howto9.html#Table_Join_Strategy">Table Join Strategy</a></li>
- <li><a href="howto9.html#Helpful_Hints">Helpful Hints</a></li>
+ <li><p><a href="howto9.html#Non_Inheriting_Entities">Non Inheriting Entities</a></p></li>
+ <li><p><a href="howto9.html#Mapped_Superclasses">Mapped Superclass</a></p></li>
+ <li><p><a href="howto9.html#Single_Table_Strategy">Single Table Strategy</a></p></li>
+ <li><p><a href="howto9.html#Discriminator_Components">Discriminator Components</a></p></li>
+ <li><p><a href="howto9.html#Table_Per_Class_Strategy">Table Per Class Strategy</a></p></li>
+ <li><p><a href="howto9.html#Table_Join_Strategy">Table Join Strategy</a></p></li>
+ <li><p><a href="howto9.html#Helpful_Hints">Helpful Hints</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto10.html">Message-Driven Beans</a>
<ul>
- <li><a href="howto10.html#Destination_Type">Destination Type</a></li>
- <li><a href="howto10.html#Destination">Destination</a></li>
- <li><a href="howto10.html#Acknowledge_Mode">Acknowledge Mode</a></li>
- <li><a href="howto10.html#Message_Selector">Message Selector</a></li>
- <li><a href="howto10.html#Subscription_Durability">Subscription Durability</a></li>
- <li><a href="howto10.html#Listener_Interceptor">Listener Interceptor</a></li>
- <li><a href="howto10.html#Transaction_Context">Transaction Context</a></li>
- <li><a href="howto10.html#Security">Security</a></li>
- <li><a href="howto10.html#Message_Driven_Context">Message Driven Context</a></li>
- <li><a href="howto10.html#Session_Bean_Injection">Session Bean Injection</a></li>
- <li><a href="howto10.html#Resource_Injection">Resource Injections</a></li>
+ <li><p><a href="howto10.html#Destination_Type">Destination Type</a></p></li>
+ <li><p><a href="howto10.html#Destination">Destination</a></p></li>
+ <li><p><a href="howto10.html#Acknowledge_Mode">Acknowledge Mode</a></p></li>
+ <li><p><a href="howto10.html#Message_Selector">Message Selector</a></p></li>
+ <li><p><a href="howto10.html#Subscription_Durability">Subscription Durability</a></p></li>
+ <li><p><a href="howto10.html#Listener_Interceptor">Listener Interceptor</a></p></li>
+ <li><p><a href="howto10.html#Transaction_Context">Transaction Context</a></p></li>
+ <li><p><a href="howto10.html#Security">Security</a></p></li>
+ <li><p><a href="howto10.html#Message_Driven_Context">Message Driven Context</a></p></li>
+ <li><p><a href="howto10.html#Session_Bean_Injection">Session Bean Injection</a></p></li>
+ <li><p><a href="howto10.html#Resource_Injection">Resource Injections</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto11.html">Injection</a>
<ul>
- <li><a href="howto11.html#Dependency_Injection">Dependency Injection</a></li>
- <li><a href="howto11.html#Simple_Environment_Entry_Injection">Simple Environment Entry Injection</a></li>
+ <li><p><a href="howto11.html#Dependency_Injection">Dependency Injection</a></p></li>
+ <li><p><a href="howto11.html#Simple_Environment_Entry_Injection">Simple Environment Entry Injection</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto12.html">Service Patterns</a>
<ul>
- <li><a href="howto12.html#Service_Locator">Service Locator</a></li>
- <li><a href="howto12.html#Service_Delegate">Service Delegate</a></li>
- <li><a href="howto12.html#Further_Reading">Further Reading</a></li>
+ <li><p><a href="howto12.html#Service_Locator">Service Locator</a></p></li>
+ <li><p><a href="howto12.html#Service_Delegate">Service Delegate</a></p></li>
+ <li><p><a href="howto12.html#Further_Reading">Further Reading</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto13.html">Interceptors</a>
<ul>
- <li><a href="howto13.html#Default_Interceptors">Default Interceptors</a></li>
- <li><a href="howto13.html#Class_Level_Interceptor">Class Level Interceptor</a></li>
- <li><a href="howto13.html#Method_Level_Interceptor">Method Level Interceptor</a></li>
- <li><a href="howto13.html#Interceptor_Ordering">Interceptor Ordering</a></li>
- <li><a href="howto13.html#Interceptor_Exclusion">Interceptor Exclusion</a></li>
- <li><a href="howto13.html#Interceptor_Tips">Interceptor Tips</a></li>
+ <li><p><a href="howto13.html#Default_Interceptors">Default Interceptors</a></p></li>
+ <li><p><a href="howto13.html#Class_Level_Interceptor">Class Level Interceptor</a></p></li>
+ <li><p><a href="howto13.html#Method_Level_Interceptor">Method Level Interceptor</a></p></li>
+ <li><p><a href="howto13.html#Interceptor_Ordering">Interceptor Ordering</a></p></li>
+ <li><p><a href="howto13.html#Interceptor_Exclusion">Interceptor Exclusion</a></p></li>
+ <li><p><a href="howto13.html#Interceptor_Tips">Interceptor Tips</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto14.html">Lifecycle Callbacks</a>
<ul>
- <li><a href="howto14.html#Entity_Bean_Callbacks">Entity Bean Callbacks</a></li>
- <li><a href="howto14.html#Session_Bean_Callbacks">Session Bean Callbacks</a></li>
- <li><a href="howto14.html#Message_Driven_Bean_Callbacks">Message Driven Bean Callbacks</a></li>
+ <li><p><a href="howto14.html#Entity_Bean_Callbacks">Entity Bean Callbacks</a></p></li>
+ <li><p><a href="howto14.html#Session_Bean_Callbacks">Session Bean Callbacks</a></p></li>
+ <li><p><a href="howto14.html#Message_Driven_Bean_Callbacks">Message Driven Bean Callbacks</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto15.html">Transactions</a>
<ul>
- <li><a href="howto15.html#Transaction_Type">Transaction Type</a></li>
- <li><a href="howto15.html#Transaction_Demarcation">Transaction Demarcation</a></li>
+ <li><p><a href="howto15.html#Transaction_Type">Transaction Type</a></p></li>
+ <li><p><a href="howto15.html#Transaction_Demarcation">Transaction Demarcation</a></p></li>
</ul>
+ </p>
</li>
<li>
- <a href="howto16.html">Manageable Entities</a>
+ <p><a href="howto16.html">Manageable Entities</a></p>
</li>
<li>
+ <p>
<a href="howto17.html">Caching and Clustering</a>
<ul>
- <li><a href="howto17.html#Cache_Config">Cache Configuration</a></li>
- <li><a href="howto17.html#Entity_Cache">Entity Caching</a></li>
- <li><a href="howto17.html#Association_Cache">Association Caching</a></li>
- <li><a href="howto17.html#Query_Cache">Query Caching</a></li>
- <li><a href="howto17.html#Clustering">Clustering Session Beans</a></li>
- <li><a href="howto17.html#Further_Reading">Further Reading</a></li>
+ <li><p><a href="howto17.html#Cache_Config">Cache Configuration</a></p></li>
+ <li><p><a href="howto17.html#Entity_Cache">Entity Caching</a></p></li>
+ <li><p><a href="howto17.html#Association_Cache">Association Caching</a></p></li>
+ <li><p><a href="howto17.html#Query_Cache">Query Caching</a></p></li>
+ <li><p><a href="howto17.html#Clustering">Clustering Session Beans</a></p></li>
+ <li><p><a href="howto17.html#Further_Reading">Further Reading</a></p></li>
</ul>
+ </p>
</li>
<li>
+ <p>
<a href="howto18.html">WebService</a>
<ul>
- <li><a href="howto18.html#WebService_Client">WebService Client</a></li>
- <li><a href="howto18.html#Helpful_Hints">Helpful Hints</a></li>
+ <li><p><a href="howto18.html#WebService_Client">WebService Client</a></p></li>
+ <li><p><a href="howto18.html#Helpful_Hints">Helpful Hints</a></p></li>
</ul>
+ </p>
</li>
<li>
- <a href="howto20.html">Embeddable Value Objects</a>
+ <p><a href="howto20.html">Embeddable Value Objects</a></p>
</li>
</ul>
</p>
1.4 +45 -45 cartridges/andromda-ejb3/src/site/xdoc/howto16.xml
Index: howto16.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto16.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- howto16.xml 15 May 2006 12:26:04 -0000 1.3
+++ howto16.xml 29 May 2006 01:53:36 -0000 1.4
@@ -25,9 +25,9 @@
</p>
<p>
<ul>
- <li class="gen">Auto-generated source that does not need manual editing</li>
- <li class="impl">Auto-generated source that should be edited manually</li>
- <li class="changed">File that is affected by the modifications applied in this section</li>
+ <li class="gen"><p>Auto-generated source that does not need manual editing</p></li>
+ <li class="impl"><p>Auto-generated source that should be edited manually</p></li>
+ <li class="changed"><p>File that is affected by the modifications applied in this section</p></li>
</ul>
</p>
<p>
@@ -39,28 +39,28 @@
</p>
<p>
<ul>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto16/a/Car.java"><code>Car.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/CarType.java"><code>CarType.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/CarDao.java"><code>CarDao.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/CarDaoBase.java"><code>CarDaoBase.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto16/a/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/CarDaoException.java"><code>CarDaoException.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/Person.java"><code>Person.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/PersonDao.java"><code>PersonDao.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto16/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto16/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/RentalException.java"><code>RentalException.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/ServiceLocator.java"><code>ServiceLocator.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/ManageableServiceLocator.java"><code>ManageableServiceLocator.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/ejb-jar.xml"><code>ejb-jar.xml</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto16/a/jboss.xml"><code>jboss.xml</code></a></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></p></li>
+ <li class="impl"><p><a href="src/org/andromda/test/howto16/a/Car.java"><code>Car.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/CarType.java"><code>CarType.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/CarDao.java"><code>CarDao.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/CarDaoBase.java"><code>CarDaoBase.java</code></a></p></li>
+ <li class="impl"><p><a href="src/org/andromda/test/howto16/a/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/CarDaoException.java"><code>CarDaoException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/Person.java"><code>Person.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/PersonDao.java"><code>PersonDao.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></p></li>
+ <li class="impl"><p><a href="src/org/andromda/test/howto16/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
+ <li class="impl"><p><a href="src/org/andromda/test/howto16/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/RentalException.java"><code>RentalException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/ServiceLocator.java"><code>ServiceLocator.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/ManageableServiceLocator.java"><code>ManageableServiceLocator.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/ejb-jar.xml"><code>ejb-jar.xml</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/jboss.xml"><code>jboss.xml</code></a></p></li>
</ul>
</p>
<p>
@@ -72,26 +72,26 @@
</p>
<p>
<ul>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarCreateManageableException.java.txt"><code>CarCreateManageableException.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarDeleteManageableException.java.txt"><code>CarDeleteManageableException.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarReadManageableException.java.txt"><code>CarReadManageableException.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarUpdateManageableException.java.txt"><code>CarUpdateManageableException.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarManageableService.java.txt"><code>CarManageableService.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarManageableServiceBase.java.txt"><code>CarManageableServiceBase.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarForm.java.txt"><code>CarForm.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/ManageCar.java.txt"><code>ManageCar.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/car_help.jsp.txt"><code>car_help.jsp</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/car_crud.jsp.txt"><code>car_crud.jsp</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonCreateManageableException.java.txt"><code>PersonCreateManageableException.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonDeleteManageableException.java.txt"><code>PersonDeleteManageableException.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonReadManageableException.java.txt"><code>PersonReadManageableException.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonUpdateManageableException.java.txt"><code>PersonUpdateManageableException.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonManageableService.java.txt"><code>PersonManageableService.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonManageableServiceBase.java.txt"><code>PersonManageableServiceBase.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonForm.java.txt"><code>PersonForm.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/ManagePerson.java.txt"><code>ManagePerson.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/person_help.jsp.txt"><code>person_help.jsp</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto16/a/crud/person_crud.jsp.txt"><code>person_crud.jsp</code></a></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarCreateManageableException.java.txt"><code>CarCreateManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarDeleteManageableException.java.txt"><code>CarDeleteManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarReadManageableException.java.txt"><code>CarReadManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarUpdateManageableException.java.txt"><code>CarUpdateManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarManageableService.java.txt"><code>CarManageableService.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarManageableServiceBase.java.txt"><code>CarManageableServiceBase.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarForm.java.txt"><code>CarForm.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/ManageCar.java.txt"><code>ManageCar.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/car_help.jsp.txt"><code>car_help.jsp</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/car_crud.jsp.txt"><code>car_crud.jsp</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonCreateManageableException.java.txt"><code>PersonCreateManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonDeleteManageableException.java.txt"><code>PersonDeleteManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonReadManageableException.java.txt"><code>PersonReadManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonUpdateManageableException.java.txt"><code>PersonUpdateManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonManageableService.java.txt"><code>PersonManageableService.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonManageableServiceBase.java.txt"><code>PersonManageableServiceBase.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonForm.java.txt"><code>PersonForm.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/ManagePerson.java.txt"><code>ManagePerson.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/person_help.jsp.txt"><code>person_help.jsp</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/person_crud.jsp.txt"><code>person_crud.jsp</code></a></p></li>
</ul>
</p>
<p>
1.3 +51 -51 cartridges/andromda-ejb3/src/site/xdoc/howto9.xml
Index: howto9.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto9.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- howto9.xml 13 May 2006 02:43:20 -0000 1.2
+++ howto9.xml 29 May 2006 01:53:36 -0000 1.3
@@ -55,32 +55,32 @@
</p>
<p>
<ul>
- <li class="gen">Auto-generated source that does not need manual editing</li>
- <li class="impl">Auto-generated source that should be edited manually</li>
- <li class="changed">File that is affected by the modifications applied in this section</li>
+ <li class="gen"><p>Auto-generated source that does not need manual editing</p></li>
+ <li class="impl"><p>Auto-generated source that should be edited manually</p></li>
+ <li class="changed"><p>File that is affected by the modifications applied in this section</p></li>
</ul>
</p>
<p>
<ul>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto9/a/Vehicle.java"><code>Vehicle.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto9/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></li>
- <li class="impl"><a class="changed" href="src/org/andromda/test/howto9/a/Car.java"><code>Car.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/CarType.java"><code>CarType.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/CarDao.java"><code>CarDao.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto9/a/CarDaoBase.java"><code>CarDaoBase.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto9/a/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/CarDaoException.java"><code>CarDaoException.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/Person.java"><code>Person.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/PersonDao.java"><code>PersonDao.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto9/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto9/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto9/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/a/RentalException.java"><code>RentalException.java</code></a></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto9/a/Vehicle.java"><code>Vehicle.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto9/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></p></li>
+ <li class="impl"><p><a class="changed" href="src/org/andromda/test/howto9/a/Car.java"><code>Car.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/CarType.java"><code>CarType.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/CarDao.java"><code>CarDao.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto9/a/CarDaoBase.java"><code>CarDaoBase.java</code></a></p></li>
+ <li class="impl"><p><a href="src/org/andromda/test/howto9/a/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/CarDaoException.java"><code>CarDaoException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/Person.java"><code>Person.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/PersonDao.java"><code>PersonDao.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></p></li>
+ <li class="impl"><p><a href="src/org/andromda/test/howto9/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
+ <li class="impl"><p><a href="src/org/andromda/test/howto9/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto9/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/RentalException.java"><code>RentalException.java</code></a></p></li>
</ul>
</p>
<p>
@@ -128,36 +128,36 @@
</p>
<p>
<ul>
- <li class="gen">Auto-generated source that does not need manual editing</li>
- <li class="impl">Auto-generated source that should be edited manually</li>
- <li class="changed">File that is affected by the modifications applied in this section</li>
+ <li class="gen"><p>Auto-generated source that does not need manual editing</p></li>
+ <li class="impl"><p>Auto-generated source that should be edited manually</p></li>
+ <li class="changed"><p>File that is affected by the modifications applied in this section</p></li>
</ul>
</p>
<p>
<ul>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto9/b/Vehicle.java"><code>Vehicle.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/VehicleDao.java"><code>VehicleDao.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/VehicleDaoBase.java"><code>VehicleDaoBase.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/VehicleDaoImpl.java"><code>VehicleDaoImpl.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/VehicleDaoException.java"><code>VehicleDaoException.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto9/b/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></li>
- <li class="impl"><a class="changed" href="src/org/andromda/test/howto9/b/Car.java"><code>Car.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/CarType.java"><code>CarType.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/CarDao.java"><code>CarDao.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto9/b/CarDaoBase.java"><code>CarDaoBase.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto9/b/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/CarDaoException.java"><code>CarDaoException.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/Person.java"><code>Person.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/PersonDao.java"><code>PersonDao.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto9/b/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/PersonDaoException.java"><code>PersonDaoException.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto9/b/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto9/b/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/RentalServiceException.java"><code>RentalServiceException.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto9/b/RentalException.java"><code>RentalException.java</code></a></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto9/b/Vehicle.java"><code>Vehicle.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/VehicleDao.java"><code>VehicleDao.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/VehicleDaoBase.java"><code>VehicleDaoBase.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/VehicleDaoImpl.java"><code>VehicleDaoImpl.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/VehicleDaoException.java"><code>VehicleDaoException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto9/b/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></p></li>
+ <li class="impl"><p><a class="changed" href="src/org/andromda/test/howto9/b/Car.java"><code>Car.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/CarType.java"><code>CarType.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/CarDao.java"><code>CarDao.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto9/b/CarDaoBase.java"><code>CarDaoBase.java</code></a></p></li>
+ <li class="impl"><p><a href="src/org/andromda/test/howto9/b/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/CarDaoException.java"><code>CarDaoException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/Person.java"><code>Person.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/PersonDao.java"><code>PersonDao.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></p></li>
+ <li class="impl"><p><a href="src/org/andromda/test/howto9/b/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
+ <li class="impl"><p><a href="src/org/andromda/test/howto9/b/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto9/b/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/RentalException.java"><code>RentalException.java</code></a></p></li>
</ul>
</p>
<p>
@@ -183,9 +183,9 @@
<code>@andromda.persistence.discriminator.type</code> tagged value on the root class. Your column
type options are:
<ul>
- <li>STRING</li>
- <li>INTEGER</li>
- <li>CHAR</li>
+ <li><p>STRING</p></li>
+ <li><p>INTEGER</p></li>
+ <li><p>CHAR</p></li>
</ul>
</p>
<p>
1.4 +49 -43 cartridges/andromda-ejb3/src/site/xdoc/howto17.xml
Index: howto17.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto17.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- howto17.xml 15 May 2006 12:26:04 -0000 1.3
+++ howto17.xml 29 May 2006 01:53:36 -0000 1.4
@@ -22,23 +22,29 @@
<p>
<ul>
<li>
+ <p>
<b>Entity Cache</b> - caching database objects like entity POJOs and query results.
<ul>
- <li>POJOs are cached in-memory.</li>
- <li>Reduces round trips to the database server.</li>
+ <li><p>POJOs are cached in-memory.</p></li>
+ <li><p>Reduces round trips to the database server.</p></li>
<li>
+ <p>
Access by one node in the cluster makes the POJO available to all nodes via the
distributed entity cache.
+ </p>
</li>
</ul>
+ </p>
</li>
<li>
+ <p>
<b>State Cache</b> - stores application state information.
<ul>
- <li>HTTP session state can be cached and accessed across all nodes.</li>
- <li>Caching includes stateful session beans.</li>
- <li>Can cache <i>transient</i> properties across nodes.</li>
+ <li><p>HTTP session state can be cached and accessed across all nodes.</p></li>
+ <li><p>Caching includes stateful session beans.</p></li>
+ <li><p>Can cache <i>transient</i> properties across nodes.</p></li>
</ul>
+ </p>
</li>
</ul>
</p>
@@ -51,36 +57,36 @@
</p>
<p>
<ul>
- <li class="gen">Auto-generated source that does not need manual editing</li>
- <li class="impl">Auto-generated source that should be edited manually</li>
- <li class="changed">File that is affected by the modifications applied in this section</li>
+ <li class="gen"><p>Auto-generated source that does not need manual editing</p></li>
+ <li class="impl"><p>Auto-generated source that should be edited manually</p></li>
+ <li class="changed"><p>File that is affected by the modifications applied in this section</p></li>
</ul>
</p>
<p>
<ul>
- <li class="gen"><a href="src/org/andromda/test/howto17/a/CarEmbeddable.java"><code>CarEmbeddable.java</code></a></li>
- <li class="impl"><a class="changed" href="src/org/andromda/test/howto17/a/Car.java"><code>Car.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto17/a/CarType.java"><code>CarType.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto17/a/CarDao.java"><code>CarDao.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto17/a/CarDaoBase.java"><code>CarDaoBase.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto17/a/CarDaoImpl.java"><code>CarDaoImpl.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto17/a/CarDaoException.java"><code>CarDaoException.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto17/a/Person.java"><code>Person.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto17/a/PersonDao.java"><code>PersonDao.java</code></a></li>
- <li class="gen"><a class="changed" href="src/org/andromda/test/howto17/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto17/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto17/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></li>
- <li class="impl"><a href="src/org/andromda/test/howto17/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></li>
- <li class="gen"><a href="src/org/andromda/test/howto17/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></...
[truncated message content] |
|
From: Vance K. <va...@us...> - 2006-05-29 01:50:49
|
User: vancek
Date: 06/05/28 18:50:49
Modified: andromda-ejb3/src/site site.xml
Log:
added skin support
refactored overview menu
added model menu
Revision Changes Path
1.14 +13 -3 cartridges/andromda-ejb3/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/site.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- site.xml 16 May 2006 14:45:53 -0000 1.13
+++ site.xml 29 May 2006 01:50:49 -0000 1.14
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="EJB3 Cartridge Plugin">
- <title>EJB3 Cartridge</title>
- <publishDate format="dd MMM yyyy hh:mm"/>
+ <skin>
+ <groupId>org.andromda.maven.site</groupId>
+ <artifactId>andromda-site-skin</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ </skin>
+ <bannerLeft>
+ <name></name>
+ </bannerLeft>
+ <publishDate format="dd MMM yyyy hh:mm zzz"/>
<body>
<links>
<item name="EJB3" href="index.html"/>
@@ -9,6 +16,10 @@
<item name="AndroMDA" href="../index.html"/>
</links>
<menu name="Overview">
+ <item name="About EJB3 Cartridge" href="index.html"/>
+ <item name="Installation" href="installation.html"/>
+ </menu>
+ <menu name="Model">
<item name="Profile" href="profile.html"/>
<item name="Namespace" href="namespace.html"/>
</menu>
@@ -36,7 +47,6 @@
<item name="Embeddable Value Objects" href="howto20.html"/>
<item name="Tips & Tricks" href="tips.html"/>
</menu>
-
${reports}
</body>
</project>
|
|
From: Vance K. <va...@us...> - 2006-05-29 01:49:33
|
User: vancek
Date: 06/05/28 18:49:31
Modified: andromda-ejb3 pom.xml
Log:
added issue management specific to the EJB JIRA project
added extra reporting plugins;
maven-project-info-reports
maven-javadoc-plugin
maven-surefire-report-plugin
maven-jxr-plugin
maven-pmd-plugin
maven-checkstyle-plugin
maven-changes-plugin
maven-changelog-plugin
Revision Changes Path
1.5 +74 -8 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- pom.xml 16 May 2006 08:12:54 -0000 1.4
+++ pom.xml 29 May 2006 01:49:31 -0000 1.5
@@ -11,6 +11,11 @@
<packaging>andromda-cartridge</packaging>
<name>AndroMDA EJB3 Cartridge</name>
<description>Produces EJB 3.0 persistence layer from a model.</description>
+ <inceptionYear>2006</inceptionYear>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://galaxy.andromda.org/jira/BrowseProject.jspa?id=10011</url>
+ </issueManagement>
<developers>
<developer>
<id>vancek</id>
@@ -58,10 +63,6 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-site-plugin</artifactId>
<version>3.2-SNAPSHOT</version>
@@ -80,17 +81,82 @@
</execution>
</executions>
</plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<locales>en</locales>
- <templateDirectory>file:${user.home}/.m2/repository/org/andromda/maven/plugins/andromda-site-plugin/3.2-SNAPSHOT/andromda-site-plugin-3.2-SNAPSHOT.jar</templateDirectory>
- <template>META-INF/template/andromda-site.vm</template>
+ <outputEncoding>UTF-8</outputEncoding>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512</maxmemory>
+ <sourcepath>src/main/java;target/src</sourcepath>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>All Reports</id>
+ <configuration>
+ <type>range</type>
+ <range>90</range>
+ </configuration>
+ <reports>
+ <report>changelog</report>
+ <report>file-activity</report>
+ <report>dev-activity</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
- </build>
+ </reporting>
<properties>
<maven.test.skip>true</maven.test.skip>
<model.uri>jar:file:${pom.basedir}/src/main/uml/EJB3MetafacadeModel.xml.zip!/EJB3MetafacadeModel.xml</model.uri>
|
|
From: Vance K. <va...@us...> - 2006-05-29 01:46:09
|
User: vancek
Date: 06/05/28 18:46:08
Added: andromda-ejb3/src/changes changes.xml
Log:
added changes xml used for maven-changes-plugin
Revision Changes Path
1.1 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
<document>
<properties>
<title>EJB3 Cartridge Plugin Project</title>
<author email="va...@an...">Vance Karimi</author>
</properties>
<body>
<release version="1.0-SNAPSHOT" date="2006-06-01" desc="Changes for 1.0-SNAPSHOT">
<action dev="vancek" type="add">
Introduced changes.xml and report.
</action>
<action dev="vancek" type="add">
Added manageable entity support.
</action>
<action dev="vancek" type="add">
Added JBoss cache support.
</action>
<action dev="vancek" type="update">
Set default discriminator value consisting of first character of entity name if one isn't
explicitly specified.
</action>
<action dev="vancek" type="add">
Added DAO support for every entity POJO.
</action>
<action dev="vancek" type="update">
Refactored javax.ejb package for interceptor related annotations to javax.annotation.
NOTE: These annotations are NOT used anyway since interceptor components are configured
via XML descriptor.
</action>
<action dev="vancek" type="update">
Added Maven reporting facilities to site generation. Using new AndroMDA site skin for site
generation. To run these reports, the following Maven report plugins need to be installed.
Some may only exist on the Maven sandox. maven-site-plugin, maven-project-info-reports-plugin,
maven-javadoc-plugin, maven-surefire-report-plugin, maven-jxr-plugin, maven-pmd-plugin,
maven-checkstyle-plugin, maven-changes-plugin and maven-changelog-plugin. The maven-changelog-plugin
will require you to have cvs.exe (if on windows platform) in your path.
</action>
<action dev="vancek" type="fix">
Many-to-Many association owning side JoinTable - JoinColumn name property fixed. JIRA EJB-25
</action>
<action dev="vancek" type="fix">
NamedQuery definition to pick up firstResult and maxResult arguments modelled with these
stereotypes and NOT include then in where clause.
</action>
</release>
</body>
</document>
|
|
From: Vance K. <va...@us...> - 2006-05-29 01:46:05
|
User: vancek Date: 06/05/28 18:46:04 cartridges/andromda-ejb3/src/changes - New directory |
|
From: Vance K. <va...@us...> - 2006-05-29 01:45:36
|
User: vancek Date: 06/05/28 18:45:32 Modified: andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip Log: added method getForeignKeyConstraintName to EJB3AssociationEndFacade Revision Changes Path 1.38 +209 -210 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip <<Binary file>> |
