From: Chris M. <cm...@us...> - 2006-07-27 05:45:11
|
User: cmicali Date: 06/07/26 20:55:48 Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership MembershipServiceImpl.cs UserDaoImpl.cs etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources pom.xml etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards MDASolutionWizard.designer.cs etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS Setup.nsi Log: - Reverted m2 solution wizard output to use v1.0-SNAPSHOT of the .NET cartridges - Fixed some alignment issues on the MDASolutionWizard - Fixed errors in the NSIS installer script Revision Changes Path 1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/MembershipServiceImpl.cs Index: MembershipServiceImpl.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/MembershipServiceImpl.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- MembershipServiceImpl.cs 25 Jul 2006 13:09:31 -0000 1.2 +++ MembershipServiceImpl.cs 27 Jul 2006 03:55:47 -0000 1.3 @@ -152,7 +152,7 @@ UserRole role = RoleIsInList(entity.Roles, rolestring); if (role == null) { - role = UserRole.Factory.NewInstance(); + role = UserRole.Factory.newInstance(); role.Role = (Role)Enum.Parse(typeof(Role), rolestring); role.User = entity; entity.Roles.Add(role); 1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/UserDaoImpl.cs Index: UserDaoImpl.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/UserDaoImpl.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- UserDaoImpl.cs 25 Jul 2006 13:09:31 -0000 1.2 +++ UserDaoImpl.cs 27 Jul 2006 03:55:47 -0000 1.3 @@ -46,7 +46,7 @@ { if (userVO == null) { return null; } // VO to entity conversion - User entity = User.Factory.NewInstance(); + User entity = User.Factory.newInstance(); entity.Id = userVO.Id; entity.UserName = userVO.UserName; 1.2 +3 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml Index: pom.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- pom.xml 25 Jul 2006 13:09:34 -0000 1.1 +++ pom.xml 27 Jul 2006 03:55:48 -0000 1.2 @@ -41,17 +41,17 @@ <dependency> <groupId>org.andromda.cartridges</groupId> <artifactId>andromda-nspring-cartridge</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.andromda.cartridges</groupId> <artifactId>andromda-nhibernate-cartridge</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.andromda.cartridges</groupId> <artifactId>andromda-cs-cartridge</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> </dependency> </dependencies> 1.3 +739 -739 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs Index: MDASolutionWizard.designer.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- MDASolutionWizard.designer.cs 25 Jul 2006 13:09:33 -0000 1.2 +++ MDASolutionWizard.designer.cs 27 Jul 2006 03:55:48 -0000 1.3 @@ -32,6 +32,38 @@ 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.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.lstLog = new System.Windows.Forms.ListBox(); + this.wizardPageProcessing = new Gui.Wizard.WizardPage(); + this.pictureBoxThrobber = new System.Windows.Forms.PictureBox(); + this.lstStatus = new System.Windows.Forms.ListBox(); + this.label7 = new System.Windows.Forms.Label(); + this.header5 = new Gui.Wizard.Header(); + this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage(); + 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.lblStoreSettingsInNHibernateConfigDescription = new System.Windows.Forms.Label(); + this.lblAddMembershipSupportText = new System.Windows.Forms.Label(); + this.cbUseNHibernateConfig = new System.Windows.Forms.CheckBox(); + this.cbAddMembershipSupport = new System.Windows.Forms.CheckBox(); + this.header7 = new Gui.Wizard.Header(); this.wizardPageUnitTestingProject = new Gui.Wizard.WizardPage(); this.cbConfigureUnitTestingProject = new System.Windows.Forms.CheckBox(); this.usrTestProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl(); @@ -72,39 +104,14 @@ 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.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.lstLog = new System.Windows.Forms.ListBox(); - this.wizardPageProcessing = new Gui.Wizard.WizardPage(); - this.pictureBoxThrobber = new System.Windows.Forms.PictureBox(); - this.lstStatus = new System.Windows.Forms.ListBox(); - this.label7 = new System.Windows.Forms.Label(); - this.header5 = new Gui.Wizard.Header(); - this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage(); - 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.lblStoreSettingsInNHibernateConfigDescription = new System.Windows.Forms.Label(); - this.lblAddMembershipSupportText = new System.Windows.Forms.Label(); - this.cbUseNHibernateConfig = new System.Windows.Forms.CheckBox(); - this.cbAddMembershipSupport = new System.Windows.Forms.CheckBox(); - this.header7 = new Gui.Wizard.Header(); this.wizard1.SuspendLayout(); + this.wizardPageComplete.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit(); + this.wizardPageProcessing.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit(); + this.wizardPageConfirmChoices.SuspendLayout(); + this.wizardPageWebCommonProject.SuspendLayout(); + this.wizardPageWebProject.SuspendLayout(); this.wizardPageUnitTestingProject.SuspendLayout(); this.wizardPageSchemaExportProject.SuspendLayout(); this.wizardPageCoreProject.SuspendLayout(); @@ -113,13 +120,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(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit(); - this.wizardPageConfirmChoices.SuspendLayout(); - this.wizardPageWebCommonProject.SuspendLayout(); - this.wizardPageWebProject.SuspendLayout(); this.SuspendLayout(); // // imageList1 @@ -165,834 +165,834 @@ this.wizard1.TabIndex = 0; this.wizard1.Load += new System.EventHandler(this.wizard1_Load); // - // wizardPageUnitTestingProject - // - this.wizardPageUnitTestingProject.Controls.Add(this.cbConfigureUnitTestingProject); - this.wizardPageUnitTestingProject.Controls.Add(this.usrTestProject); - this.wizardPageUnitTestingProject.Controls.Add(this.header10); - this.wizardPageUnitTestingProject.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageUnitTestingProject.IsFinishPage = false; - this.wizardPageUnitTestingProject.Location = new System.Drawing.Point(0, 0); - this.wizardPageUnitTestingProject.Name = "wizardPageUnitTestingProject"; - this.wizardPageUnitTestingProject.Size = new System.Drawing.Size(525, 312); - this.wizardPageUnitTestingProject.TabIndex = 12; - // - // cbConfigureUnitTestingProject + // wizardPageComplete // - this.cbConfigureUnitTestingProject.AutoSize = true; - this.cbConfigureUnitTestingProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbConfigureUnitTestingProject.Location = new System.Drawing.Point(12, 80); - this.cbConfigureUnitTestingProject.Name = "cbConfigureUnitTestingProject"; - this.cbConfigureUnitTestingProject.Size = new System.Drawing.Size(192, 17); - this.cbConfigureUnitTestingProject.TabIndex = 0; - this.cbConfigureUnitTestingProject.Text = "Configure unit testing project"; - this.cbConfigureUnitTestingProject.UseVisualStyleBackColor = true; - this.cbConfigureUnitTestingProject.CheckedChanged += new System.EventHandler(this.cbConfigureUnitTestingProject_CheckedChanged); + 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); // - // usrTestProject + // lnkViewLog // - this.usrTestProject.Location = new System.Drawing.Point(30, 102); - this.usrTestProject.Name = "usrTestProject"; - this.usrTestProject.ProjectName = ""; - this.usrTestProject.Size = new System.Drawing.Size(416, 93); - this.usrTestProject.TabIndex = 1; + 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); // - // header10 + // lblFinishPageTitle // - this.header10.BackColor = System.Drawing.SystemColors.Control; - this.header10.CausesValidation = false; - this.header10.Description = "You can have this wizard create or configure a project to contain unit tests for " + - "your business layer."; - this.header10.Dock = System.Windows.Forms.DockStyle.Top; - this.header10.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; - this.header10.Location = new System.Drawing.Point(0, 0); - this.header10.Name = "header10"; - this.header10.Size = new System.Drawing.Size(525, 65); - this.header10.TabIndex = 5; - this.header10.Title = "Testing Project"; + 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; // - // wizardPageSchemaExportProject + // pictureBoxComplete // - this.wizardPageSchemaExportProject.Controls.Add(this.cbCreateSchemaExport); - this.wizardPageSchemaExportProject.Controls.Add(this.txtSchemaExportProject); - this.wizardPageSchemaExportProject.Controls.Add(this.lblDescription); - this.wizardPageSchemaExportProject.Controls.Add(this.header3); - this.wizardPageSchemaExportProject.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageSchemaExportProject.IsFinishPage = false; - this.wizardPageSchemaExportProject.Location = new System.Drawing.Point(0, 0); - this.wizardPageSchemaExportProject.Name = "wizardPageSchemaExportProject"; - this.wizardPageSchemaExportProject.Size = new System.Drawing.Size(525, 312); - this.wizardPageSchemaExportProject.TabIndex = 4; - this.wizardPageSchemaExportProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSchemaExportProject_CloseFromNext); - this.wizardPageSchemaExportProject.ShowFromBack += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext); - this.wizardPageSchemaExportProject.ShowFromNext += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext); + this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBoxComplete.Image = global::AndroMDA.VS80AddIn.Resource1.orange; + 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; // - // cbCreateSchemaExport + // lblFinishPageDescription // - this.cbCreateSchemaExport.AutoSize = true; - this.cbCreateSchemaExport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbCreateSchemaExport.Location = new System.Drawing.Point(12, 80); - this.cbCreateSchemaExport.Name = "cbCreateSchemaExport"; - this.cbCreateSchemaExport.Size = new System.Drawing.Size(196, 17); - this.cbCreateSchemaExport.TabIndex = 0; - this.cbCreateSchemaExport.Text = "Create schema export project"; - this.cbCreateSchemaExport.UseVisualStyleBackColor = true; - this.cbCreateSchemaExport.CheckedChanged += new System.EventHandler(this.cbCreateSchemaExport_CheckedChanged); + 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"; // - // txtSchemaExportProject + // lblFinishPageTitleImage // - this.txtSchemaExportProject.Enabled = false; - this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 102); - this.txtSchemaExportProject.Name = "txtSchemaExportProject"; - this.txtSchemaExportProject.Size = new System.Drawing.Size(394, 21); - this.txtSchemaExportProject.TabIndex = 1; - this.txtSchemaExportProject.Text = "SchemaExport"; + 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; // - // lblDescription + // txtErrorMessage // - this.lblDescription.Location = new System.Drawing.Point(13, 92); - this.lblDescription.Name = "lblDescription"; - this.lblDescription.Size = new System.Drawing.Size(507, 26); - this.lblDescription.TabIndex = 24; + 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; // - // header3 + // lstLog // - this.header3.BackColor = System.Drawing.SystemColors.Control; - this.header3.CausesValidation = false; - this.header3.Description = "Check the box below if you would like to create a project that contains a console" + - " application that generates database schema from your model. "; - this.header3.Dock = System.Windows.Forms.DockStyle.Top; - this.header3.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; - this.header3.Location = new System.Drawing.Point(0, 0); - this.header3.Name = "header3"; - this.header3.Size = new System.Drawing.Size(525, 65); - this.header3.TabIndex = 4; - this.header3.Title = "Schema Export Project"; + 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; // - // wizardPageCoreProject + // wizardPageProcessing // - this.wizardPageCoreProject.Controls.Add(this.header2); - this.wizardPageCoreProject.Controls.Add(this.usrCoreProject); - this.wizardPageCoreProject.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageCoreProject.IsFinishPage = false; - this.wizardPageCoreProject.Location = new System.Drawing.Point(0, 0); - this.wizardPageCoreProject.Name = "wizardPageCoreProject"; - this.wizardPageCoreProject.Size = new System.Drawing.Size(525, 312); - this.wizardPageCoreProject.TabIndex = 3; - this.wizardPageCoreProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCoreProject_CloseFromNext); - this.wizardPageCoreProject.ShowFromNext += new System.EventHandler(this.wizardPageCoreProject_ShowFromNext); + this.wizardPageProcessing.Controls.Add(this.pictureBoxThrobber); + 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); // - // header2 + // pictureBoxThrobber // - this.header2.BackColor = System.Drawing.SystemColors.Control; - this.header2.CausesValidation = false; - this.header2.Description = "The core project, also known as the domain project, contains all entities and dat" + - "a access objects generated from your model."; - this.header2.Dock = System.Windows.Forms.DockStyle.Top; - this.header2.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; - this.header2.Location = new System.Drawing.Point(0, 0); - this.header2.Name = "header2"; - this.header2.Size = new System.Drawing.Size(525, 65); - this.header2.TabIndex = 3; - this.header2.Title = "Core Project"; + this.pictureBoxThrobber.BackColor = System.Drawing.Color.Transparent; + this.pictureBoxThrobber.Image = global::AndroMDA.VS80AddIn.Resource1.indicator_arrows; + this.pictureBoxThrobber.Location = new System.Drawing.Point(227, 77); + this.pictureBoxThrobber.Name = "pictureBoxThrobber"; + this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 17); + this.pictureBoxThrobber.TabIndex = 10; + this.pictureBoxThrobber.TabStop = false; // - // usrCoreProject + // lstStatus // - this.usrCoreProject.Location = new System.Drawing.Point(12, 79); - this.usrCoreProject.Name = "usrCoreProject"; - this.usrCoreProject.ProjectName = ""; - this.usrCoreProject.Size = new System.Drawing.Size(462, 100); - this.usrCoreProject.TabIndex = 0; + 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; // - // wizardPageCommonProject + // label7 // - this.wizardPageCommonProject.Controls.Add(this.usrCommonProject); - this.wizardPageCommonProject.Controls.Add(this.header1); - this.wizardPageCommonProject.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageCommonProject.IsFinishPage = false; - this.wizardPageCommonProject.Location = new System.Drawing.Point(0, 0); - this.wizardPageCommonProject.Name = "wizardPageCommonProject"; - this.wizardPageCommonProject.Size = new System.Drawing.Size(525, 312); - this.wizardPageCommonProject.TabIndex = 2; - this.wizardPageCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCommonProject_CloseFromNext); - this.wizardPageCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageCommonProject_ShowFromNext); + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(12, 77); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(209, 13); + this.label7.TabIndex = 8; + this.label7.Text = "Updating solution to support AndroMDA..."; // - // usrCommonProject + // header5 // - this.usrCommonProject.Location = new System.Drawing.Point(12, 79); - this.usrCommonProject.Name = "usrCommonProject"; - this.usrCommonProject.ProjectName = ""; - this.usrCommonProject.Size = new System.Drawing.Size(446, 98); - this.usrCommonProject.TabIndex = 0; + this.header5.BackColor = System.Drawing.SystemColors.Control; + this.header5.CausesValidation = false; + this.header5.Description = "Please wait..."; + this.header5.Dock = System.Windows.Forms.DockStyle.Top; + this.header5.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; + 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"; // - // header1 + // wizardPageConfirmChoices // - this.header1.BackColor = System.Drawing.SystemColors.Control; - this.header1.CausesValidation = false; - this.header1.Description = "The common project contains value objects, enumerations, and other non-entity cla" + - "sses that are generated from your model."; - this.header1.Dock = System.Windows.Forms.DockStyle.Top; - this.header1.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; - this.header1.Location = new System.Drawing.Point(0, 0); - this.header1.Name = "header1"; - this.header1.Size = new System.Drawing.Size(525, 65); - this.header1.TabIndex = 0; - this.header1.Title = "Common Project"; + this.wizardPageConfirmChoices.Controls.Add(this.lstChoiceOverview); + this.wizardPageConfirmChoices.Controls.Add(this.header4); + this.wizardPageConfirmChoices.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardPageConfirmChoices.IsFinishPage = false; + this.wizardPageConfirmChoices.Location = new System.Drawing.Point(0, 0); + this.wizardPageConfirmChoices.Name = "wizardPageConfirmChoices"; + this.wizardPageConfirmChoices.Size = new System.Drawing.Size(525, 312); + this.wizardPageConfirmChoices.TabIndex = 5; + this.wizardPageConfirmChoices.ShowFromNext += new System.EventHandler(this.wizardPageConfirmChoices_ShowFromNext); // - // wizardPageAdvancedSettings + // lstChoiceOverview // - this.wizardPageAdvancedSettings.Controls.Add(this.txtAndroMDAVersion); - this.wizardPageAdvancedSettings.Controls.Add(this.lblUseZippedModel); - this.wizardPageAdvancedSettings.Controls.Add(this.label6); - this.wizardPageAdvancedSettings.Controls.Add(this.ddlAndroMDABootstrap); - this.wizardPageAdvancedSettings.Controls.Add(this.label5); - this.wizardPageAdvancedSettings.Controls.Add(this.lblUseZippedModelDescription); - this.wizardPageAdvancedSettings.Controls.Add(this.cbUseZippedModel); - this.wizardPageAdvancedSettings.Controls.Add(this.header9); - this.wizardPageAdvancedSettings.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageAdvancedSettings.IsFinishPage = false; - this.wizardPageAdvancedSettings.Location = new System.Drawing.Point(0, 0); - this.wizardPageAdvancedSettings.Name = "wizardPageAdvancedSettings"; - this.wizardPageAdvancedSettings.Size = new System.Drawing.Size(525, 312); - this.wizardPageAdvancedSettings.TabIndex = 11; - this.wizardPageAdvancedSettings.ShowFromBack += new System.EventHandler(this.wizardPageAdvancedSettings_ShowFromBack); - this.wizardPageAdvancedSettings.ShowFromNext += new System.EventHandler(this.wizardPageAdvancedSettings_ShowFromNext); + this.lstChoiceOverview.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader1, + this.columnHeader2}); + this.lstChoiceOverview.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.lstChoiceOverview.Location = new System.Drawing.Point(12, 71); + this.lstChoiceOverview.Name = "lstChoiceOverview"; + this.lstChoiceOverview.Size = new System.Drawing.Size(501, 228); + this.lstChoiceOverview.TabIndex = 6; + this.lstChoiceOverview.UseCompatibleStateImageBehavior = false; + this.lstChoiceOverview.View = System.Windows.Forms.View.Details; // - // txtAndroMDAVersion + // columnHeader1 // - this.txtAndroMDAVersion.BackColor = System.Drawing.SystemColors.Window; - this.txtAndroMDAVersion.Location = new System.Drawing.Point(30, 151); - this.txtAndroMDAVersion.Name = "txtAndroMDAVersion"; - this.txtAndroMDAVersion.Size = new System.Drawing.Size(394, 21); - this.txtAndroMDAVersion.TabIndex = 1; - this.txtAndroMDAVersion.Text = "3.2-SNAPSHOT"; + this.columnHeader1.Text = "Feature"; + this.columnHeader1.Width = 236; // - // lblUseZippedModel + // columnHeader2 // - this.lblUseZippedModel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblUseZippedModel.Location = new System.Drawing.Point(9, 181); - this.lblUseZippedModel.Name = "lblUseZippedModel"; - this.lblUseZippedModel.Size = new System.Drawing.Size(507, 16); - this.lblUseZippedModel.TabIndex = 32; - this.lblUseZippedModel.Text = "Do you want to use a zipped model file?"; + this.columnHeader2.Text = "Value"; + this.columnHeader2.Width = 235; // - // label6 + // header4 // - 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(9, 130); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(507, 16); - this.label6.TabIndex = 32; - this.label6.Text = "What version of AndroMDA should your project use?"; + this.header4.BackColor = System.Drawing.SystemColors.Control; + this.header4.CausesValidation = false; + this.header4.Description = "Please confirm the choices you have selected. Click Next to begin processing you" + + "r solution."; + this.header4.Dock = System.Windows.Forms.DockStyle.Top; + this.header4.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; + this.header4.Location = new System.Drawing.Point(0, 0); + this.header4.Name = "header4"; + this.header4.Size = new System.Drawing.Size(525, 65); + this.header4.TabIndex = 5; + this.header4.Title = "Confirm Choices"; // - // ddlAndroMDABootstrap + // wizardPageWebCommonProject // - this.ddlAndroMDABootstrap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlAndroMDABootstrap.FormattingEnabled = true; - this.ddlAndroMDABootstrap.Items.AddRange(new object[] { - "Apache Maven 2.x", - "Apache Maven 1.x"}); - this.ddlAndroMDABootstrap.Location = new System.Drawing.Point(30, 102); - this.ddlAndroMDABootstrap.Name = "ddlAndroMDABootstrap"; - this.ddlAndroMDABootstrap.Size = new System.Drawing.Size(394, 21); - this.ddlAndroMDABootstrap.TabIndex = 0; - this.ddlAndroMDABootstrap.SelectedIndexChanged += new System.EventHandler(this.ddlAndroMDABootstrap_SelectedIndexChanged); + this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelectedImage); + this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelected); + this.wizardPageWebCommonProject.Controls.Add(this.cbConfigureWebCommonProject); + this.wizardPageWebCommonProject.Controls.Add(this.usrWebCommonProject); + this.wizardPageWebCommonProject.Controls.Add(this.header8); + this.wizardPageWebCommonProject.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardPageWebCommonProject.IsFinishPage = false; + this.wizardPageWebCommonProject.Location = new System.Drawing.Point(0, 0); + this.wizardPageWebCommonProject.Name = "wizardPageWebCommonProject"; + this.wizardPageWebCommonProject.Size = new System.Drawing.Size(525, 312); + this.wizardPageWebCommonProject.TabIndex = 10; + this.wizardPageWebCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebCommonProject_CloseFromNext); + this.wizardPageWebCommonProject.ShowFromBack += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromBack); + this.wizardPageWebCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromNext); // - // label5 + // lblMembershipSelectedImage // - 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(9, 81); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(507, 16); - this.label5.TabIndex = 30; - this.label5.Text = "Which program should your project use to launch AndroMDA?"; + this.lblMembershipSelectedImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.lblMembershipSelectedImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblMembershipSelectedImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft; + this.lblMembershipSelectedImage.ImageIndex = 0; + this.lblMembershipSelectedImage.ImageList = this.imageList1; + this.lblMembershipSelectedImage.Location = new System.Drawing.Point(48, 210); + this.lblMembershipSelectedImage.Name = "lblMembershipSelectedImage"; + this.lblMembershipSelectedImage.Size = new System.Drawing.Size(35, 36); + this.lblMembershipSelectedImage.TabIndex = 36; + this.lblMembershipSelectedImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.lblMembershipSelectedImage.Visible = false; // - // lblUseZippedModelDescription + // lblMembershipSelected // - this.lblUseZippedModelDescription.Location = new System.Drawing.Point(27, 220); - this.lblUseZippedModelDescription.Name = "lblUseZippedModelDescription"; - this.lblUseZippedModelDescription.Size = new System.Drawing.Size(428, 30); - this.lblUseZippedModelDescription.TabIndex = 29; - this.lblUseZippedModelDescription.Text = "This option will instruct the wizard to emit the empty model as an XMI file insid" + - "e a zip file, instead of plain XMI file"; + this.lblMembershipSelected.Location = new System.Drawing.Point(89, 210); + this.lblMembershipSelected.Name = "lblMembershipSelected"; + this.lblMembershipSelected.Size = new System.Drawing.Size(357, 47); + this.lblMembershipSelected.TabIndex = 35; + this.lblMembershipSelected.Text = "You selected membership support on the previous page which requires a web common " + + "project. Please enter the name of the new project or select an existing class l" + + "ibrary project."; + this.lblMembershipSelected.Visible = false; // - // cbUseZippedModel + // cbConfigureWebCommonProject // - this.cbUseZippedModel.AutoSize = true; - this.cbUseZippedModel.Enabled = false; - this.cbUseZippedModel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbUseZippedModel.Location = new System.Drawing.Point(30, 201); - this.cbUseZippedModel.Name = "cbUseZippedModel"; - this.cbUseZippedModel.Size = new System.Drawing.Size(126, 17); - this.cbUseZippedModel.TabIndex = 2; - this.cbUseZippedModel.Text = "Use zipped model file"; - this.cbUseZippedModel.UseVisualStyleBackColor = true; + this.cbConfigureWebCommonProject.AutoSize = true; + this.cbConfigureWebCommonProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbConfigureWebCommonProject.Location = new System.Drawing.Point(12, 80); + this.cbConfigureWebCommonProject.Name = "cbConfigureWebCommonProject"; + this.cbConfigureWebCommonProject.Size = new System.Drawing.Size(202, 17); + this.cbConfigureWebCommonProject.TabIndex = 0; + this.cbConfigureWebCommonProject.Text = "Configure web common project"; + this.cbConfigureWebCommonProject.UseVisualStyleBackColor = true; + this.cbConfigureWebCommonProject.CheckedChanged += new System.EventHandler(this.cbEnableWebCommonProject_CheckedChanged); // - // header9 + // usrWebCommonProject // - this.header9.BackColor = System.Drawing.SystemColors.Control; - this.header9.CausesValidation = false; - this.header9.Description = "You can fine tune the output of the solution wizard with these settings."; - this.header9.Dock = System.Windows.Forms.DockStyle.Top; - this.header9.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; - this.header9.Location = new System.Drawing.Point(0, 0); - this.header9.Name = "header9"; - this.header9.Size = new System.Drawing.Size(525, 65); - this.header9.TabIndex = 27; - this.header9.Title = "Advanced Settings"; + this.usrWebCommonProject.Location = new System.Drawing.Point(30, 102); + this.usrWebCommonProject.Name = "usrWebCommonProject"; + this.usrWebCommonProject.ProjectName = ""; + this.usrWebCommonProject.Size = new System.Drawing.Size(416, 93); + this.usrWebCommonProject.TabIndex = 1; // - // wizardPageSolutionInfo + // header8 // - this.wizardPageSolutionInfo.Controls.Add(this.cbShowAdvancedOptions); - this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl); - this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType); - this.wizardPageSolutionInfo.Controls.Add(this.label10); - 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, 312); - 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); + this.header8.BackColor = System.Drawing.SystemColors.Control; + this.header8.CausesValidation = false; + this.header8.Description = "The web common project is a class library that contains web site support classes." + + ""; + this.header8.Dock = System.Windows.Forms.DockStyle.Top; + this.header8.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; + this.header8.Location = new System.Drawing.Point(0, 0); + this.header8.Name = "header8"; + this.header8.Size = new System.Drawing.Size(525, 65); + this.header8.TabIndex = 28; + this.header8.Title = "Web Common Project"; // - // cbShowAdvancedOptions + // wizardPageWebProject // - this.cbShowAdvancedOptions.AutoSize = true; - this.cbShowAdvancedOptions.Location = new System.Drawing.Point(30, 250); - this.cbShowAdvancedOptions.Name = "cbShowAdvancedOptions"; - this.cbShowAdvancedOptions.Size = new System.Drawing.Size(140, 17); - this.cbShowAdvancedOptions.TabIndex = 3; - this.cbShowAdvancedOptions.Text = "Show advanced options"; - this.cbShowAdvancedOptions.UseVisualStyleBackColor = true; + this.wizardPageWebProject.Controls.Add(this.cbConfigureWebProject); + this.wizardPageWebProject.Controls.Add(this.usrWebProject); + this.wizardPageWebProject.Controls.Add(this.lblStoreSettingsInNHibernateConfigDescription); + this.wizardPageWebProject.Controls.Add(this.lblAddMembershipSupportText); + this.wizardPageWebProject.Controls.Add(this.cbUseNHibernateConfig); + this.wizardPageWebProject.Controls.Add(this.cbAddMembershipSupport); + 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, 312); + this.wizardPageWebProject.TabIndex = 9; + this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext); + this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext); // - // ddlVersionControl + // cbConfigureWebProject // - this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.ddlVersionControl.FormattingEnabled = true; - this.ddlVersionControl.Items.AddRange(new object[] { - "None", - "CVS"}); - this.ddlVersionControl.Location = new System.Drawing.Point(30, 201); - this.ddlVersionControl.Name = "ddlVersionControl"; - this.ddlVersionControl.Size = new System.Drawing.Size(394, 21); - this.ddlVersionControl.TabIndex = 2; + this.cbConfigureWebProject.AutoSize = true; + this.cbConfigureWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbConfigureWebProject.Location = new System.Drawing.Point(12, 80); + this.cbConfigureWebProject.Name = "cbConfigureWebProject"; + this.cbConfigureWebProject.Size = new System.Drawing.Size(150, 17); + this.cbConfigureWebProject.TabIndex = 0; + this.cbConfigureWebProject.Text = "Configure web project"; + this.cbConfigureWebProject.UseVisualStyleBackColor = true; + this.cbConfigureWebProject.CheckedChanged += new System.EventHandler(this.cbAddWebProjectSupport_CheckedChanged); // - // ddlDatabaseType + // usrWebProject // - 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(30, 152); - this.ddlDatabaseType.Name = "ddlDatabaseType"; - this.ddlDatabaseType.Size = new System.Drawing.Size(394, 21); - this.ddlDatabaseType.TabIndex = 1; + this.usrWebProject.Location = new System.Drawing.Point(30, 102); + this.usrWebProject.Name = "usrWebProject"; + this.usrWebProject.ProjectName = ""; + this.usrWebProject.Size = new System.Drawing.Size(431, 93); + this.usrWebProject.TabIndex = 1; + this.usrWebProject.WebProjectMode = true; // - // label10 + // lblStoreSettingsInNHibernateConfigDescription // - this.label10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.Location = new System.Drawing.Point(9, 230); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(507, 16); - this.label10.TabIndex = 6; - this.label10.Text = "Would you like to configure specific versions of Maven, AndroMDA, etc?"; + this.lblStoreSettingsInNHibernateConfigDescription.Location = new System.Drawing.Point(47, 221); + this.lblStoreSettingsInNHibernateConfigDescription.Name = "lblStoreSettingsInNHibernateConfigDescription"; + this.lblStoreSettingsInNHibernateConfigDescription.Size = new System.Drawing.Size(428, 30); + this.lblStoreSettingsInNHibernateConfigDescription.TabIndex = 3; + this.lblStoreSettingsInNHibernateConfigDescription.Text = "This options stores the database connection settings in nhibernate.config instead" + + " of the web.config"; + this.lblStoreSettingsInNHibernateConfigDescription.Click += new System.EventHandler(this.lblStoreSettingsInNHibernateConfigDescription_Click); // - // label1 + // lblAddMembershipSupportText // - 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, 179); - 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?"; + this.lblAddMembershipSupportText.Location = new System.Drawing.Point(47, 273); + this.lblAddMembershipSupportText.Name = "lblAddMembershipSupportText"; + this.lblAddMembershipSupportText.Size = new System.Drawing.Size(428, 30); + this.lblAddMembershipSupportText.TabIndex = 3; + this.lblAddMembershipSupportText.Text = "This options adds users and roles to the UML model and the DomainMembershipProvid" + + "er to the solution for ASP.NET Membership support."; // - // label17 + // cbUseNHibernateConfig // - 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, 130); - 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?"; + this.cbUseNHibernateConfig.AutoSize = true; + this.cbUseNHibernateConfig.Checked = true; + this.cbUseNHibernateConfig.CheckState = System.Windows.Forms.CheckState.Checked; + this.cbUseNHibernateConfig.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbUseNHibernateConfig.Location = new System.Drawing.Point(30, 204); + this.cbUseNHibernateConfig.Name = "cbUseNHibernateConfig"; + this.cbUseNHibernateConfig.Size = new System.Drawing.Size(221, 17); + this.cbUseNHibernateConfig.TabIndex = 2; + this.cbUseNHibernateConfig.Text = "Store settings in nhibernate.config"; + this.cbUseNHibernateConfig.UseVisualStyleBackColor = true; + this.cbUseNHibernateConfig.CheckedChanged += new System.EventHandler(this.cbAddMembershipSupport_CheckedChanged); // - // txtApplicationName + // cbAddMembershipSupport // - this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window; - this.txtApplicationName.Location = new System.Drawing.Point(30, 103); - this.txtApplicationName.Name = "txtApplicationName"; - this.txtApplicationName.Size = new System.Drawing.Size(394, 21); - this.txtApplicationName.TabIndex = 0; + this.cbAddMembershipSupport.AutoSize = true; + this.cbAddMembershipSupport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbAddMembershipSupport.Location = new System.Drawing.Point(30, 256); + this.cbAddMembershipSupport.Name = "cbAddMembershipSupport"; + this.cbAddMembershipSupport.Size = new System.Drawing.Size(169, 17); + this.cbAddMembershipSupport.TabIndex = 2; + this.cbAddMembershipSupport.Text = "Add membership support"; + this.cbAddMembershipSupport.UseVisualStyleBackColor = true; + this.cbAddMembershipSupport.CheckedChanged += new System.EventHandler(this.cbAddMembershipSupport_CheckedChanged); // - // label12 + // header7 // - 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)"; + this.header7.BackColor = System.Drawing.SystemColors.Control; + this.header7.CausesValidation = false; + this.header7.Description = "This wizard can either create or update a web site to support NHibernate"; + this.header7.Dock = System.Windows.Forms.DockStyle.Top; + this.header7.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; + 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"; // - // header6 + // wizardPageUnitTestingProject // - 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 = global::AndroMDA.VS80AddIn.Resource1.rightbox; - 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"; + this.wizardPageUnitTestingProject.Controls.Add(this.cbConfigureUnitTestingProject); + this.wizardPageUnitTestingProject.Controls.Add(this.usrTestProject); + this.wizardPageUnitTestingProject.Controls.Add(this.header10); + this.wizardPageUnitTestingProject.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardPageUnitTestingProject.IsFinishPage = false; + this.wizardPageUnitTestingProject.Location = new System.Drawing.Point(0, 0); + this.wizardPa... [truncated message content] |