Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA VS2005 Add-In Setup.exe
|
From: Chris M. <cm...@us...> - 2006-05-16 15:46:49
|
User: cmicali
Date: 06/05/16 08:46:44
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
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/AndroMDA.VS80AddIn
MDASolutionManager.cs VS80AddIn.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Log:
- Updated version number
- Updated readme
- Updated AddInCommandType enumeration to be more clear
Revision Changes Path
No revision
No revision
No revision
No revision
1.4 +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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AboutCommand.cs 2 May 2006 21:33:43 -0000 1.3
+++ AboutCommand.cs 16 May 2006 15:46:44 -0000 1.4
@@ -18,7 +18,7 @@
{
public AboutCommand()
{
- Init("About", "About", "About AndroMDA Add-In", 487, AddInCommandBase.AddInCommandType.AlwaysEnabled);
+ Init("About", "About", "About AndroMDA Add-In", 487, AddInCommandType.AlwaysEnabled);
m_isStartOfGroup = true;
}
1.5 +9 -9 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- AddInCommandBase.cs 2 May 2006 21:33:43 -0000 1.4
+++ AddInCommandBase.cs 16 May 2006 15:46:44 -0000 1.5
@@ -20,7 +20,7 @@
#region Enumerations
- public enum AddInCommandType { AlwaysEnabled, AlwaysDisabled, NoMDAAlwaysEnabled, MDADisabled, MDAAlwaysEnabled, MDAEnabledWhileMavenNotRunning, MDAEnabledWhileMavenRunning }
+ public enum AddInCommandType { AlwaysEnabled, AlwaysDisabled, EnabledWhenMdaInactive, EnabledWhenMdaActiveButDisabled, EnabledWhenMdaActive, EnabledWhenMdaActiveAndMavenNotRunning, EnabledWhenMdaActiveAndMavenRunning }
#endregion
@@ -174,7 +174,7 @@
case AddInCommandType.AlwaysEnabled:
status = (vsCommandStatus)vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
break;
- case AddInCommandType.MDADisabled:
+ case AddInCommandType.EnabledWhenMdaActiveButDisabled:
if (!m_solutionManager.IsEnabled && m_solutionManager.IsSolutionUsingMDA && m_application.Solution.IsOpen)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -184,7 +184,7 @@
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusInvisible;
}
break;
- case AddInCommandType.NoMDAAlwaysEnabled:
+ case AddInCommandType.EnabledWhenMdaInactive:
if (!m_solutionManager.IsEnabled && !m_solutionManager.IsSolutionUsingMDA && m_application.Solution.IsOpen)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -195,7 +195,7 @@
}
break;
- case AddInCommandType.MDAAlwaysEnabled:
+ case AddInCommandType.EnabledWhenMdaActive:
if (m_solutionManager.IsEnabled && m_application.Solution.IsOpen)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -206,7 +206,7 @@
}
break;
- case AddInCommandType.MDAEnabledWhileMavenNotRunning:
+ case AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning:
if (m_solutionManager.IsEnabled && m_application.Solution.IsOpen && !m_solutionManager.IsMavenRunning)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
@@ -221,7 +221,7 @@
}
break;
- case AddInCommandType.MDAEnabledWhileMavenRunning:
+ case AddInCommandType.EnabledWhenMdaActiveAndMavenRunning:
if (m_solutionManager.IsEnabled && m_application.Solution.IsOpen && m_solutionManager.IsMavenRunning)
{
status = vsCommandStatus.vsCommandStatusSupported | vsCommandStatus.vsCommandStatusEnabled;
1.2 +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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- AndroMDALogoCommand.cs 2 May 2006 21:33:43 -0000 1.1
+++ AndroMDALogoCommand.cs 16 May 2006 15:46:44 -0000 1.2
@@ -34,7 +34,7 @@
public AndroMDALogoCommand()
{
- Init("AndroMDALogo", "AndroMDA", "AndroMDA", -1, AddInCommandBase.AddInCommandType.AlwaysDisabled);
+ Init("AndroMDALogo", "AndroMDA", "AndroMDA", -1, AddInCommandType.AlwaysDisabled);
m_isStartOfGroup = true;
}
1.2 +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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- GenerateCodeCommand.cs 2 May 2006 21:33:43 -0000 1.1
+++ GenerateCodeCommand.cs 16 May 2006 15:46:44 -0000 1.2
@@ -17,7 +17,7 @@
{
public RunMavenCommand()
{
- Init("GenerateCode", "Generate", "Generate Code From Model", 2138, AddInCommandBase.AddInCommandType.MDAEnabledWhileMavenNotRunning);
+ Init("GenerateCode", "Generate", "Generate Code From Model", 2138, AddInCommandType.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/OpenModelCommand.cs
Index: OpenModelCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- OpenModelCommand.cs 2 May 2006 21:33:43 -0000 1.4
+++ OpenModelCommand.cs 16 May 2006 15:46:44 -0000 1.5
@@ -19,7 +19,7 @@
{
public OpenModelCommand()
{
- Init("OpenModel", "Open Model", "Open Model", 589, AddInCommandBase.AddInCommandType.MDAAlwaysEnabled);
+ Init("OpenModel", "Open Model", "Open Model", 589, AddInCommandType.EnabledWhenMdaActive);
m_isStartOfGroup = true;
}
1.2 +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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ReloadMDAConfigCommand.cs 28 Apr 2006 04:41:17 -0000 1.1
+++ ReloadMDAConfigCommand.cs 16 May 2006 15:46:44 -0000 1.2
@@ -17,7 +17,7 @@
{
public ReloadMDAConfigCommand()
{
- Init("ReloadMDAConfig", "Reload MDA Config", "Reload MDA Config", 1020, AddInCommandBase.AddInCommandType.MDADisabled);
+ Init("ReloadMDAConfig", "Reload MDA Config", "Reload MDA Config", 1020, AddInCommandType.EnabledWhenMdaActiveButDisabled);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.3 +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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ResyncCommand.cs 2 May 2006 21:33:43 -0000 1.2
+++ ResyncCommand.cs 16 May 2006 15:46:44 -0000 1.3
@@ -17,7 +17,7 @@
{
public ResyncCommand()
{
- Init("ResyncFiles", "Resync", "Resync Generated Files", 37, AddInCommandBase.AddInCommandType.MDAEnabledWhileMavenNotRunning);
+ Init("ResyncFiles", "Resync", "Resync Generated Files", 37, AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning);
}
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/RunSchemaExportCommand.cs
Index: RunSchemaExportCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/RunSchemaExportCommand.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- RunSchemaExportCommand.cs 3 May 2006 20:23:05 -0000 1.3
+++ RunSchemaExportCommand.cs 16 May 2006 15:46:44 -0000 1.4
@@ -20,7 +20,7 @@
{
public RunSchemaExportCommand()
{
- Init("ExportSchema", "Export Schema", "Export Database Schema", 4005, AddInCommandBase.AddInCommandType.MDAEnabledWhileMavenNotRunning);
+ Init("ExportSchema", "Export Schema", "Export Database Schema", 4005, AddInCommandType.EnabledWhenMdaActiveAndMavenNotRunning);
m_isStartOfGroup = true;
}
1.2 +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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- RunSolutionWizardCommand.cs 18 Apr 2006 16:14:44 -0000 1.1
+++ RunSolutionWizardCommand.cs 16 May 2006 15:46:44 -0000 1.2
@@ -17,7 +17,7 @@
{
public RunSolutionWizardCommand()
{
- Init("RunSolutionWizard", "Run MDA Solution Wizard", "Run MDA Solution Wizard", 2138, AddInCommandBase.AddInCommandType.NoMDAAlwaysEnabled);
+ Init("RunSolutionWizard", "Run MDA Solution Wizard", "Run MDA Solution Wizard", 2138, AddInCommandType.EnabledWhenMdaInactive);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.3 +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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- StopCommand.cs 2 May 2006 21:33:43 -0000 1.2
+++ StopCommand.cs 16 May 2006 15:46:44 -0000 1.3
@@ -18,7 +18,7 @@
public StopCommand()
{
- Init("StopGeneration", "Stop", "Stop Code Generation", 1670, AddInCommandBase.AddInCommandType.MDAEnabledWhileMavenRunning);
+ Init("StopGeneration", "Stop", "Stop Code Generation", 1670, AddInCommandType.EnabledWhenMdaActiveAndMavenRunning);
}
public override void Exec(vsCommandExecOption executeOption, ref object varIn, ref object varOut)
1.8 +30 -24 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- MDASolutionManager.cs 4 May 2006 21:13:24 -0000 1.7
+++ MDASolutionManager.cs 16 May 2006 15:46:44 -0000 1.8
@@ -269,7 +269,15 @@
//BuildEvents
public void OnBuildBegin(EnvDTE.vsBuildScope scope, EnvDTE.vsBuildAction action)
{
- if (IsEnabled && action != vsBuildAction.vsBuildActionClean)
+ if (IsEnabled)
+ {
+ if (this.IsMavenRunning)
+ {
+ m_applicationObject.ExecuteCommand("Build.Cancel", string.Empty);
+ m_applicationObject.StatusBar.Highlight(true);
+ m_applicationObject.StatusBar.Text = "Build canceled. Please stop AndroMDA before building.";
+ }
+ else if (action != vsBuildAction.vsBuildActionClean)
{
if (!AreGeneratedFilesUpToDate)
{
@@ -287,12 +295,10 @@
}
}
}
+ }
public void OnBuildDone(EnvDTE.vsBuildScope Scope, EnvDTE.vsBuildAction Action)
{
- if (IsEnabled)
- {
- }
}
public void OnBuildProjConfigBegin(string project, string projectConfig, string platform, string solutionConfig)
@@ -501,8 +507,8 @@
CollapseProject(uiCommonProject);
UpdateResyncProgressBar("Getting file list for " + projectName + "/" + item.Name);
- ArrayList newFiles = GetFiles(folderPath);
-
+ ArrayList newFiles = GetFileListFromFilesystem(folderPath);
+ //ArrayList existingFiles = GetFileListFromProjectTree(item);
int filesHash = GetArrayListHashCode(newFiles);
if (filesHash == fileListHashCode)
{
@@ -560,7 +566,7 @@
return hashCode;
}
- private ArrayList GetFiles(string directory)
+ private ArrayList GetFileListFromFilesystem(string directory)
{
if (System.IO.Directory.Exists(directory))
{
@@ -578,7 +584,7 @@
{
if (!m_addInSettings.IsInIgnoreList(dir))
{
- ArrayList newFiles = GetFiles(dir);
+ ArrayList newFiles = GetFileListFromFilesystem(dir);
foreach(string n in newFiles) { filesList.Add(n); }
}
}
1.6 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/VS80AddIn.cs
Index: VS80AddIn.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/VS80AddIn.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- VS80AddIn.cs 2 May 2006 21:33:42 -0000 1.5
+++ VS80AddIn.cs 16 May 2006 15:46:44 -0000 1.6
@@ -20,7 +20,7 @@
public class VS80AddIn
{
- public const string ADD_IN_VERSION = "1.0.2";
+ public const string ADD_IN_VERSION = "1.1";
#region Constants
No revision
No revision
No revision
No revision
|
