Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources arrow_right.png arrow_right1.png link_add.png
|
From: Chris M. <cm...@us...> - 2006-07-07 22:32:19
|
User: cmicali
Date: 06/07/07 15:32:17
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs AndroMDA.VS80AddIn.AddIn
AndroMDA.VS80AddIn.csproj AssemblyInfo.cs
ConfigFile.cs Connect.cs MDAProject.cs
MDASolutionManager.cs MavenProxy.cs
Resource1.Designer.cs Resource1.resx
SettingsManager.cs VS80AddIn.cs
WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
AboutCommand.cs AddInCommandBase.cs
AndroMDALogoCommand.cs
CreateEntityVOConvertorCommand.cs
GenerateCodeCommand.cs OpenModelCommand.cs
ReloadMDAConfigCommand.cs ResyncCommand.cs
RunSchemaExportCommand.cs
RunSolutionWizardCommand.cs StopCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AboutDialog.cs AboutOptionsPage.cs AddInWelcome.cs
ExternalToolsOptionsPage.cs
GeneralOptionsPage.Designer.cs
GeneralOptionsPage.cs MDAOptionPageProperties.cs
MDAProjectSetupControl.cs MDASolutionWizard.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
AddInUtils.cs AsyncOperation.cs CodeModelUtils.cs
FileUtils.cs VSExternalToolEventArgs.cs
VSExternalToolProxy.cs VSSolutionUtils.cs
ValidationUtils.cs
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
PropertyMapperCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
PropertyMapperDialog.Designer.cs
PropertyMapperDialog.cs PropertyMapperDialog.resx
ScrollableListView.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
arrow_right.png arrow_right1.png link_add.png
Log:
- Copyright updates
- Added property mapper
- Updated options to use checkbox listview
- Fixed bug with unsatisified dependencies prompt
- Added more configuration around display and behavior
Revision Changes Path
No revision
No revision
No revision
No revision
1.9 +19 -1 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.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- AddInSettings.cs 15 Jun 2006 03:29:32 -0000 1.8
+++ AddInSettings.cs 7 Jul 2006 22:32:14 -0000 1.9
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
@@ -70,6 +70,18 @@
set { m_settings.SetBool("AMDAFirstRun", value); }
}
+ public bool PromptToGenerateOnBuildIfFilesOutOfDate
+ {
+ get { return m_settings.GetBool("AMDABdPrmptO", true); }
+ set { m_settings.SetBool("AMDABdPrmptO", value); }
+ }
+
+ public bool PromptToGenerateOnBuildIfSolutionNotSynched
+ {
+ get { return m_settings.GetBool("AMDABdPrmptS", false); }
+ set { m_settings.SetBool("AMDABdPrmptS", value); }
+ }
+
public int AddInBuild
{
get
@@ -103,6 +115,12 @@
set { m_settings.SetBool("AMDARIHdnFl", value); }
}
+ public bool ShowResyncButton
+ {
+ get { return m_settings.GetBool("AMDARShBtn", false); }
+ set { m_settings.SetBool("AMDARShBtn", value); }
+ }
+
#endregion
#region External tool settings
1.4 +1 -1 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AndroMDA.VS80AddIn.AddIn 30 May 2006 17:36:21 -0000 1.3
+++ AndroMDA.VS80AddIn.AddIn 7 Jul 2006 22:32:14 -0000 1.4
@@ -7,7 +7,7 @@
<Addin>
<FriendlyName>AndroMDA Visual Studio 2005 Add-In</FriendlyName>
<Description>Add-In for Visual Studio 2005 that makes working with AndroMDA easier.</Description>
- <AboutBoxDetails>For more information, see the AndroMDA web site at http://www.andromda.org/.</AboutBoxDetails>
+ <AboutBoxDetails>For more information see the AndroMDA web site at http://www.andromda.org/</AboutBoxDetails>
<AboutIconData>0000010006002020100000000000E8020000660000001010100000000000280100004E0300002020000001000800A8080000760400001010000001000800680500001E0D00002020000001002000A8100000861200001010000001002000680400002E2300002800000020000000400000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF001111111111111111111111111111111111111111111111111111111000001111111111111111111111111110ABA01111111111111111111111111110BAB01111111111111111111111111110ABA01111111111110000000000F00000BAB00000111111118888888888F0ABABABABABA0111111118F77777777F0BABABABABAB0111111118F77777777F0ABABABABABA0111111118F77777777F00000BAB00000110001118F77777777FFFFF0ABA01111108880118F777777777777F0BAB01111887788008F777777777777F0ABA011118FF770778F777777777777F0000011118FFF78088F777777777777FFFFFF111118FF70118F7777777777777777801111118881118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118FFFFFFFFFFFFFFFFF801111111111118888888888888888888011111111111111111870111118701111111111111111111118F0111118F011111111111111111111108011111080111111111111111111110808011108080111111111111111111877788018777880111111111111111118FF778018FF7780111111111111111118FFF78018FFF7801111111111111111118FF701118FF7011111111111111111111777111117771111111111111111111111111111111111111111FFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFF000000FF000000FF000000FF000000FF000000C700000F8300000F0000000F0000000F0000000F8300000FC700000FFF00000FFF00000FFF00000FFF00000FFF00000FFFF8F8FFFFF8F8FFFFF8F8FFFFF0707FFFE0203FFFE0203FFFE0203FFFF0707FFFF8F8FFFFFFFFFF2800000010000000200000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF0011111111111111111111111111100011111111111110A011111111111000B00011110000F0ABABA011118F88F000B00011118F77FFF0A01170718F7777F000110F008F7777FFFF1170718F777777801111118FFFFFFF801111118888888880111111111101111111111111170711111111111110F01111111111111707111111FFFF1111FFE37777FFE3ABABFF80ABA0F0001111F0007777F0030000100300000003011110037777F003FFF0F0031111FF7F8011FE3F7777FE3F77F0FE3F1111280000002000000040000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0C0CF50CF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0D3938350CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD303939380DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD11395D390CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD35353535356139393110310D30FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD39666162616161613939393811FDFDFDFDFDFDFDFDFDFD3231073231323132083D858A61666261616161393935FDFDFDFDFDFDFDFDFD5E080909820982838608398A8A8A856165626161613D35FDFDFDFDFDFDFDFD82B3AF08080808080808AB39393939398A86613935353535FDFDFDFDFDFDFDFD86D1F6AFAFAFAFAF08AF0808D408D4398A6586390886FDFDFD5A073632FDFDFD86B3F6F6F6AFF6AFAFAFAF08AB0808398A8A8A39D432FDFD8286D4825A35FDFD82FFF6AFF6F6AFF6AF08D1AF08AFD43D8A8A8A610831FDFD5EFFAF088232363286FFFFF6F6AFF6AFF6AFAF08AF08085D61613D5DD4F5FDFD82F6F6AF085A825E82FFFFFFFFF6D1F6AFF6AFF6AFAFAF080808D408D431FDFD86D4FFFF095EFDFD09FFFFFFFFFFF6B3F6F6AFAFD108AFAFAF08AB09860DFDFDFD08825E86FDFDFD82FFFFFFFFFFFFF6F6AFF6F6AFF6AF08D1AF08088232FDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFF6AFF6AFF6AFAF08AF088331FDFDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFFFF6F6AFF6AFAFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFD86828682825EF75E5E5E5A5E5A5A07360736FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5E31FDFDFDFDFDFD5E31FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8232FDFDFDFDFDFD8232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5A360732FDFDFDFD5A360732FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8286D4823607FDFD8286D4823607FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFAF088232FDFD5EFFAF088232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7D1FFAF0807FDFDF7D1FFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0808FFFF095EFDFD0808FFFF095EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0982F786FDFDFDFD0982F786FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FFC00000FF800000FF000000FF000003870000030300000300000003000000030300000387000003FF000003FF800007FFC0000FFFFCFCFFFFFCFCFFFFF8787FFFF0303FFFF0303FFFF0303FFFF0303FFFF8787FFFFFFFFFFFFFFFFF280000001000000020000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD353535FDFDFDFDFDFDFDFDFDFDFDFDFD356535FDFDFDFDFDFDFDFDFDFDFD39393985351111FDFDFDFDFDFDFDFDFD398A8A8A8A8935FDFDFDFDFDFD3131823D39398A393535FDFDFDFDFD32AF820808AB3DB239FDFDFDFDF5FDFD5AF6AFAFAF08393939FDFDFD5EFFF5F55EFFF6F6AFF6AF0886FDFDFDFD5EFDFD5EFFFFF6F6AFAFD4F5FDFDFDFDFDFDFDFDF75E5E5A5A0731FDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFDFDFFC7FDFDFFC7FDFDFF01FDFDFF01FD39F8016261F0076139B00738110007FDFDB007FDFDF80F3231FF7F3132FF7F083DFE3F6166FF7F6161FFFF39352800000020000000400000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002E5B35FC295231FF274F2FFF264D2EFF27502FFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306138FE329A4FFF2C9649FF259244FF2A5432FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000356A3DFC3FA259FF389D54FF319A4EFF2E5D36FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000397341FE4DAB66FF45A65FFF3DA158FF316439FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045874CFF43854BFF42824AFF407E47FF3F7C46FF5BB471FF53AF6AFF4BAA64FF356B3DFF34683CFF33673BFF326439FF306038FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000519F58FF85CF94FF7FCA8FFF77C689FF70C183FF69BD7DFF61B876FF59B370FF51AE6AFF49A963FF42A55CFF3B9F56FF387040FF00000000000000000000000000000000000000000000000000000000000000000000000089715F4689715FFF866E5BFF846B59FF816855FF7E6552FF7B624FFF79604CFF846E5CFFCAC1B9FF55A85DFF8FD59CFF8AD198FF84CD93FF7DCA8EFF76C688FF6EC082FF67BB7CFF5FB775FF58B26EFF50AD67FF48A861FF3E7A46FF000000000000000000000000000000000000000000000000000000000000000089715F46AE998AFFD2C0B6FFD0BDB3FFCEBBB1FFCCB9AEFFCBB6ABFFCAB4A9FFC7B2A6FFCCB8ADFFD4C4BCFF5AB061FF97DAA3FF93D8A0FF8ED49CFF88D097FF83CC92FF7BC98CFF75C487FF6DC081FF65BB7AFF5EB673FF56B16DFF43854AFF0000000000000000000000000000000000000000000000000000000000000000C3AFA2FFF3EFECFFE6DEDAFFE0D4CEFFDFD2CAFFDDCEC7FFDACCC3FFD8C9C1FFD6C6BDFFD8C8C1FFE1D6CFFF59AB60FF58AA5EFF56A75DFF55A65DFF57AA5EFF8DD39BFF87CF97FF81CC91FF4F9B57FF4B9352FF498D50FF478C4FFC46894DFC0000000000000000000000000000000000000000000000000000000000000000C4B0A3FFF7F3F1FFF5F0EEFFF2EDEBFFEFEAE7FFEEE6E3FFEBE3DFFFE8DFDBFFE6DCD6FFE4D8D2FFE1D4CEFFDED0CAFFDCCDC6FFD9C9C2FFD6C6BDFF57AB5EFF95D9A2FF91D69EFF8CD29AFF519E58FFDED2CBFFC4BAB2FF0000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000C5B1A4FFF9F7F5FFF7F4F3FFF5F2EFFFF3EEECFFF0EBE8FFEFE8E4FFEDE4E1FFEAE1DDFFE7DDD8FFE4DAD4FFE2D7D0FFDFD3CCFFDCCEC8FFDACBC3FF5AAE62FF99DBA5FF99DAA4FF94D8A2FF54A45BFFDFD4CEFF846E5EFF0000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000C5B2A4FFFBFAF9FFF9F8F6FFF8F5F3FFF6F3F0FFF4EFEEFFF2ECEAFFF0EAE6FFEEE6E2FFEBE3DEFFE8DFDAFFE5DBD6FFE3D8D2FFE0D4CDFFDDD0C9FF5DB564FF99DBA5FF99DBA5FF99DBA5FF69B570FFDDD1CAFF69503BFF0000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8866E5BFF846B59FFC6B2A5FFFDFDFDFFFCFAFAFFFBF9F8FFF9F6F5FFF7F3F2FFF5F0EEFFF2EEECFFF0EBE8FFEEE7E4FFECE4E0FFE9E1DCFFE6DDD7FFE4D9D4FFE2D6D0FF5DB263FF62BF69FF62BF69FF61BE68FF6AB671FFDED2CBFF6C523EFF0000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8C7B1A6FFB39A8AFFC6B3A5FFFFFFFFFFFFFDFEFFFDFBFBFFFBFAF9FFF9F8F6FFF7F5F3FFF5F2F0FFF3EFEDFFF1ECE9FFEFE9E5FFEDE6E2FFEBE3DEFFE8DFDAFFE6DBD5FFE2D8D2FFE0D4CDFFDDCFC9FFDFD1CBFFDED2CBFFDDCFC7FF6F5541FF0000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000C7B3A6FFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFDFFFCFBFAFFFAF9F8FFF8F6F5FFF7F3F2FFF5F0EFFFF2EDEAFFF0EAE7FFEEE7E3FFEBE4DFFFE9E0DCFFE6DDD7FFE4D9D3FFE1D5CFFFDFD1CBFFD0BDB4FFC5B0A4FF725945FF0000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000C7B5A7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFEFDFFFCFCFBFFFBFAF8FFFAF7F6FFF7F5F2FFF6F2EFFFF3EFEDFFF2ECE9FFEFE9E5FFECE5E1FFEAE2DDFFE7DED9FFE5DBD5FFE2D7D1FFD3C2BAFFC8B3A8FF755C49FF00000000000000000000000000000000000000000000000000000000000000000000000000000000C8B5A8CAFFFFFFDAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFCFFFCFBFAFFFAF8F8FFF8F6F4FFF6F3F1FFF5F0EEFFF2EDEAFFF0EAE6FFEDE6E3FFEBE4DFFFE9E0DBFFE6DCD7FFDCCFC8FFCBB7ABFF795F4CFF0000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2FFFFFFCDFFFFFFEAFFFFFFF4FFFFFFFFFFFFFFFFFFFFFFFFFEFDFDFFFDFCFBFFFBFAF9FFFAF6F5FFF7F4F3FFF5F2EFFFF3EEECFFF1EBE8FFEFE8E5FFECE5E1FFEAE1DDFFE4DAD5FF866E5CFF866E5C46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2C3AFA2D3C0AD9EE8BDA99CFFBBA698FFB7A495FFB5A091FFB19C8DFFAE9989FFAB9585FFA79281FFA48E7DFFA08A7AFF9C8675FF988271FF957E6DFF917A68FF8A7260FF866E5C460000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B39A8AFF846B59FF000000000000000000000000000000000000000000000000B39A8AFF846B59FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C082685531000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF80000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF80000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB3100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FF800000FF000000FF000000FF000003030000030300000300000003000000030300000303000003FF000003FF000003FF800007FFFCFCFFFFFCFCFFFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFFFFFFFFFFFFFFF2800000010000000200000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF4643854BFF407D47FF3B7643FFFFFFFF46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000488E50FF7BC88DFF3F7D47FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055A65CFF519E58FF4D9554FF8AD29AFF43854BFF407E47FF3C7643FF00000000000000000000000000000000000000000000000000000000000000000000000059AE60FFA4E3B2FF9FE0ADFF9ADCA8FF94D9A3FF8ED59FFF407E47FF000000000000000000000000000000000000000000000000755B46FF6E5541FFC0B5ACFF5CB463FF59AE60FF55A65CFFAAE7B7FF4C9653FF478D4FFF44854BFF00000000000000000000000000000000FFFFFF31856D5AFFEDE6E3FFBFA79AFFD5C6BDFFD7C8C0FFD3C5BCFF59AE60FFB9F0C3FF509E58FF0000000000000000000000006348333B634833FF6348333BFFFFFF6A97806FFFF6F2F1FFF2EDEAFFEDE6E3FFE8E0DCFFE4D9D3FF5DB464FF59AE60FF55A75CFF000000000000000000000000AE9A8BFFFFFFFFFF634833FF634833FFA99484FFFDFBFCFFF9F7F7FFF6F3F0FFF2EDEAFFEDE7E3FFEBE3E0FFD9CEC7FFC4BAB2FF0000000000000000000000006348333BAE9A8BFF6348333BFFFFFF79B29D8EFFFFFFFFFFFCFCFBFFFAF8F7FFF6F2F1FFF2EDEAFFE9E0DBFFDFD2CBFF694E3AFF000000000000000000000000000000000000000000000000FFFFFF4600000000B6A193FFAE9A8BFFA79181FF9F8979FF97806FFF876F5DFF785F4CFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000634833FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333F634833FF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000AE9A8BFFFFFFFFFF634833FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333FAE9A8BFF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFF0000FF830000FFC70000FF010000FF010000F8010000E0070000000700000007000000070000E80F0000FF7F0000FE3F0000FE3F0000FE3F0000FFFF0000</AboutIconData>
<Assembly>AndroMDA.VS80AddIn.dll</Assembly>
<FullClassName>AndroMDA.VS80AddIn.Connect</FullClassName>
1.15 +17 -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.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- AndroMDA.VS80AddIn.csproj 12 Jun 2006 00:11:18 -0000 1.14
+++ AndroMDA.VS80AddIn.csproj 7 Jul 2006 22:32:14 -0000 1.15
@@ -57,6 +57,7 @@
<Compile Include="Commands\AddInCommandBase.cs" />
<Compile Include="Commands\AndroMDALogoCommand.cs" />
<Compile Include="Commands\CreateEntityVOConvertorCommand.cs" />
+ <Compile Include="Commands\PropertyMapperCommand.cs" />
<Compile Include="Commands\RunSchemaExportCommand.cs" />
<Compile Include="Commands\ReloadMDAConfigCommand.cs" />
<Compile Include="Commands\OpenModelCommand.cs" />
@@ -109,6 +110,15 @@
<Compile Include="Dialogs\MDASolutionWizard.designer.cs">
<DependentUpon>MDASolutionWizard.cs</DependentUpon>
</Compile>
+ <Compile Include="Dialogs\PropertyMapperDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Dialogs\PropertyMapperDialog.Designer.cs">
+ <DependentUpon>PropertyMapperDialog.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Dialogs\ScrollableListView.cs">
+ <SubType>Component</SubType>
+ </Compile>
<Compile Include="MavenProxy.cs" />
<Compile Include="MDAProject.cs" />
<Compile Include="MDASolutionManager.cs" />
@@ -251,6 +261,10 @@
<DependentUpon>MDASolutionWizard.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Dialogs\PropertyMapperDialog.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>PropertyMapperDialog.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Resource1.resx">
<SubType>Designer</SubType>
<Generator>ResXFileCodeGenerator</Generator>
@@ -283,6 +297,9 @@
</Content>
<Content Include="AddIn.ico" />
<None Include="Resources\indicator_arrows.gif" />
+ <None Include="Resources\arrow_right1.png" />
+ <None Include="Resources\arrow_right.png" />
+ <None Include="Resources\link_add.png" />
<Content Include="Resources\mda\src\uml\empty.model.membership.xml" />
<None Include="Resources\rightbox.bmp" />
<None Include="Resources\orange.bmp" />
1.6 +2 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AssemblyInfo.cs
Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AssemblyInfo.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- AssemblyInfo.cs 28 Apr 2006 16:07:24 -0000 1.5
+++ AssemblyInfo.cs 7 Jul 2006 22:32:14 -0000 1.6
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
@@ -18,7 +18,7 @@
[assembly: AssemblyDescription("Add-In for Visual Stuio 2005 to integrate the AndroMDA toolchain.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("AndroMDA.org")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyProduct("AndroMDA")]
[assembly: AssemblyCopyright("(c) 2006 AndroMDA.org")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/ConfigFile.cs
Index: ConfigFile.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/ConfigFile.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ConfigFile.cs 18 Apr 2006 16:14:43 -0000 1.1
+++ ConfigFile.cs 7 Jul 2006 22:32:14 -0000 1.2
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Connect.cs
Index: Connect.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Connect.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Connect.cs 2 May 2006 21:33:42 -0000 1.2
+++ Connect.cs 7 Jul 2006 22:32:14 -0000 1.3
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.4 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDAProject.cs
Index: MDAProject.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDAProject.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MDAProject.cs 11 Jun 2006 15:35:24 -0000 1.3
+++ MDAProject.cs 7 Jul 2006 22:32:14 -0000 1.4
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.14 +150 -99 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.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- MDASolutionManager.cs 15 Jun 2006 03:29:32 -0000 1.13
+++ MDASolutionManager.cs 7 Jul 2006 22:32:14 -0000 1.14
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
@@ -131,6 +131,10 @@
{
return false;
}
+ if (m_addInSettings.PromptToGenerateOnBuildIfSolutionNotSynched)
+ {
+ return IsSolutionSynchronizedWithFileSystem();
+ }
return true;
}
}
@@ -164,6 +168,8 @@
#endregion
+ #region Constructors
+
public MDASolutionManager(DTE applicationObject, AddInSettings addInSettings)
{
m_applicationObject = applicationObject;
@@ -172,7 +178,11 @@
m_mavenProxy.Completed += new EventHandler(m_mavenProxy_Completed);
}
- public void OnSolutionOpened()
+ #endregion
+
+ #region Initialization
+
+ public void InitializeSolution()
{
m_solutionIsUsingMDA = MDAConfigFilesExist(m_applicationObject.Solution);
m_enabled = false;
@@ -250,7 +260,7 @@
if (m_commonProject == null) { errorMessage += "common "; }
errorMessage += "project";
if (m_commonProject == null && m_coreProject == null) errorMessage += "s";
- errorMessage += " could not be found.\nThe AndroMDA add-in is being disabled. Please reload the solution or click Reload MDA Config.";
+ errorMessage += " could not be found for some reason. AndroMDA add-in support is being temporarily disabled.\nPlease check the AndroMDA configuration files and reload the solution or click the Reload MDA Config button.";
throw new Exception(errorMessage);
}
m_solutionSettings = new ConfigFile(solutionPath + "\\mda\\vsmdaaddin.properties");
@@ -266,6 +276,10 @@
}
}
+ #endregion
+
+ #region Build events
+
//BuildEvents
public void OnBuildBegin(EnvDTE.vsBuildScope scope, EnvDTE.vsBuildAction action)
{
@@ -279,7 +293,7 @@
}
else if (action != vsBuildAction.vsBuildActionClean)
{
- if (!AreGeneratedFilesUpToDate)
+ if (!AreGeneratedFilesUpToDate && m_addInSettings.PromptToGenerateOnBuildIfFilesOutOfDate)
{
System.Windows.Forms.DialogResult result = System.Windows.Forms.MessageBox.Show("The UML model has been updated since the last time code was generated.\nWould you like to regenerate code from the model?", "AndroMDA Add-In", System.Windows.Forms.MessageBoxButtons.YesNoCancel, System.Windows.Forms.MessageBoxIcon.Question);
if (result == System.Windows.Forms.DialogResult.Yes)
@@ -309,6 +323,8 @@
{
}
+ #endregion
+
#region Run schema export methods
public void RunSchemaExport()
@@ -375,7 +391,7 @@
}
else
{
- System.Windows.Forms.MessageBox.Show("You must have an MDA-enabled solution loaded to run Maven.", "Error", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
+ AddInUtils.ShowError("You must have an MDA-enabled solution loaded to run Maven.");
}
}
@@ -422,7 +438,7 @@
{
try
{
- RefreshGeneratedFilesThreadStart();
+ DoRefreshGeneratedFiles();
}
catch (Exception e)
{
@@ -461,7 +477,7 @@
}
}
- public void RefreshGeneratedFilesThreadStart()
+ private void DoRefreshGeneratedFiles()
{
m_progress = 0;
UpdateResyncProgressBar();
@@ -484,21 +500,13 @@
private void ResyncFolder(ProjectItem item, string folderPath, string projectName)
{
- if (item == null)
- {
- return;
- }
-
- /*
- if (!System.IO.Directory.Exists(folderPath))
- {
- item.Remove();
- return 0;
- }
- */
+ if (item == null) return;
UpdateResyncProgressBar(projectName + "/" + item.Name);
- // Get the UI nodes so we can collapse the projects
+
+ // Get the UI nodes from the solution explorer
+ // so we can collapse the project trees and make it look neat
+ // when we are finished (it's faster when they are closed too)
UIHierarchy solutionExplorer = (UIHierarchy)m_applicationObject.Windows.Item(Constants.vsext_wk_SProjectWindow).Object;
UIHierarchyItem uiCommonProject = null;
UIHierarchyItem uiCoreProject = null;
@@ -518,16 +526,25 @@
CollapseProject(uiCommonProject);
UpdateResyncProgressBar("Getting file list for " + projectName + "/" + item.Name);
+
+ // Get the list of files in the filesystem
ArrayList filesystemFileList = GetFileListFromFilesystem(folderPath);
+ // Get the list of files in the solution tree
ArrayList solutionTreeFileList = GetFileListFromProjectTree(item);
+ // Generate a hash for the filesystem list
int filesHash = GetArrayListHashCode(filesystemFileList);
+ // Generate a hash for the solution tree list
int solutionHash = GetArrayListHashCode(solutionTreeFileList);
+
+ // If the hash codes are the same, we don't need to do a resync
if (filesHash == solutionHash)
{
UpdateResyncProgressBar("Files have not changed since last resync: " + projectName + "/" + item.Name);
return;
}
+ // The hash codes are different, so we need to sync the solution tree
+ // to the filesystem
UpdateResyncProgressBar("Removing all files from " + projectName + "/" + item.Name);
// Remove all files from the project
@@ -541,6 +558,7 @@
// Add the files from the filesystem into the solution
// The filesystemFileList has already been filtered for ignored items
+ // Also note that this list contains all files in all subdirectories
int fileNum = 0;
foreach (string file in filesystemFileList)
{
@@ -565,6 +583,38 @@
}
+ private bool IsSolutionSynchronizedWithFileSystem()
+ {
+ // Check common/src
+ if (!IsSolutionSynchronizedWithFileSystem(m_commonProject.ManualPathProjectItem, m_commonProject.ManualPath))
+ return false;
+ // Check common/target
+ if (!IsSolutionSynchronizedWithFileSystem(m_commonProject.GeneratedPathProjectItem, m_commonProject.GeneratedPath))
+ return false;
+ // Check core/src
+ if (!IsSolutionSynchronizedWithFileSystem(m_coreProject.ManualPathProjectItem, m_coreProject.ManualPath))
+ return false;
+ // Check core/target
+ if (!IsSolutionSynchronizedWithFileSystem(m_coreProject.GeneratedPathProjectItem, m_coreProject.GeneratedPath))
+ return false;
+ return true;
+ }
+
+ private bool IsSolutionSynchronizedWithFileSystem(ProjectItem item, string folderPath)
+ {
+ // Get the list of files in the filesystem
+ ArrayList filesystemFileList = GetFileListFromFilesystem(folderPath);
+ // Get the list of files in the solution tree
+ ArrayList solutionTreeFileList = GetFileListFromProjectTree(item);
+ // Generate a hash for the filesystem list
+ int filesHash = GetArrayListHashCode(filesystemFileList);
+ // Generate a hash for the solution tree list
+ int solutionHash = GetArrayListHashCode(solutionTreeFileList);
+
+ // If the hash codes are the same, we don't need to do a resync
+ return filesHash == solutionHash;
+ }
+
private int GetArrayListHashCode(ArrayList list)
{
int hashCode = 0;
@@ -632,6 +682,7 @@
private ArrayList GetFileListFromProjectTree(ProjectItem item)
{
ArrayList filesList = new ArrayList();
+ if (item == null) return filesList;
if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFile)
{
for (short i = 1; i <= item.FileCount; i++)
@@ -734,45 +785,13 @@
#region Statistics methods
- public class SolutionStatistic
- {
- public enum Group { CodeStatistics, FileStatistics };
- private string m_name;
- private string m_value;
- private Group m_group;
-
- public Group StatGroup
- {
- get { return m_group; }
- set { m_group = value; }
- }
-
- public string Value
- {
- get { return m_value; }
- set { m_value = value; }
- }
-
- public string Name
- {
- get { return m_name;}
- set { m_name = value;}
- }
- public SolutionStatistic(string name, string value, Group group)
- {
- m_name = name;
- m_value = value;
- m_group = group;
- }
- }
-
public ArrayList GetSolutionStatistics()
{
ArrayList stats = new ArrayList();
if (IsEnabled)
{
Hashtable files = CollectFiles(m_coreProject.GeneratedPathProjectItem);
- AddHashtable(files, CollectFiles(m_commonProject.GeneratedPathProjectItem));
+ MergeHashtable(files, CollectFiles(m_commonProject.GeneratedPathProjectItem));
stats.Add(new SolutionStatistic("Files Generated", files.Count.ToString("N0"), SolutionStatistic.Group.FileStatistics));
stats.Add(new SolutionStatistic("Lines of Code Generated", GetTotalLOC(files).ToString("N0"), SolutionStatistic.Group.FileStatistics));
@@ -888,12 +907,12 @@
}
foreach(ProjectItem subitem in item.ProjectItems)
{
- AddHashtable(list, CollectFiles(subitem));
+ MergeHashtable(list, CollectFiles(subitem));
}
return list;
}
- private void AddHashtable(Hashtable dst, Hashtable src)
+ private void MergeHashtable(Hashtable dst, Hashtable src)
{
foreach (string key in src.Keys)
{
@@ -917,6 +936,38 @@
public FileType type;
}
+ public class SolutionStatistic
+ {
+ public enum Group { CodeStatistics, FileStatistics };
+ private string m_name;
+ private string m_value;
+ private Group m_group;
+
+ public Group StatGroup
+ {
+ get { return m_group; }
+ set { m_group = value; }
+ }
+
+ public string Value
+ {
+ get { return m_value; }
+ set { m_value = value; }
+ }
+
+ public string Name
+ {
+ get { return m_name; }
+ set { m_name = value; }
+ }
+ public SolutionStatistic(string name, string value, Group group)
+ {
+ m_name = name;
+ m_value = value;
+ m_group = group;
+ }
+ }
+
#endregion
}
1.5 +2 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MavenProxy.cs
Index: MavenProxy.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MavenProxy.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MavenProxy.cs 15 Jun 2006 03:29:32 -0000 1.4
+++ MavenProxy.cs 7 Jul 2006 22:32:14 -0000 1.5
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
@@ -96,7 +96,7 @@
void MavenProxy_ProcessStdErr(ref string text, ref bool cancelOutput)
{
ProcessOutput(ref text, ref cancelOutput);
- if (text.Contains("The build cannot continue because of the following unsatisfied dependency"))
+ if (text.Contains("unsatisfied dependency") || text.Contains("unsatisfied dependencies"))
{
m_mavenStatus = MavenStatus.UnsatisfiedDependency;
}
1.8 +21 -0 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- Resource1.Designer.cs 12 Jun 2006 00:11:18 -0000 1.7
+++ Resource1.Designer.cs 7 Jul 2006 22:32:14 -0000 1.8
@@ -60,6 +60,20 @@
}
}
+ internal static System.Drawing.Bitmap arrow_right {
+ get {
+ object obj = ResourceManager.GetObject("arrow_right", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap arrow_right1 {
+ get {
+ object obj = ResourceManager.GetObject("arrow_right1", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to bin
///obj
@@ -212,6 +226,13 @@
}
}
+ internal static System.Drawing.Bitmap link_add {
+ get {
+ object obj = ResourceManager.GetObject("link_add", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to <project default="mda"
/// xmlns:ant="jelly:ant"
1.8 +25 -16 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- Resource1.resx 12 Jun 2006 00:11:18 -0000 1.7
+++ Resource1.resx 7 Jul 2006 22:32:14 -0000 1.8
@@ -133,8 +133,8 @@
<data name="lib_NHibernate_Caches_Prevalence_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\NHibernate.Caches.Prevalence.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="lib_Iesi_Collections_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\Iesi.Collections.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="SchemaExport_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\SchemaExport\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="nhibernate_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\nhibernate.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
@@ -145,9 +145,6 @@
<data name="lib_Bamboo_Prevalence_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\Bamboo.Prevalence.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</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>
<data name="lib_NHibernate_Nullables2_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\NHibernate.Nullables2.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -157,18 +154,27 @@
<data name="maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="SchemaExport_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\SchemaExport\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="orange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\orange.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="indicator_arrows" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\indicator_arrows.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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="arrow_right1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\arrow_right1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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_conf_andromda_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\conf\andromda.xml;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="web_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -181,6 +187,9 @@
<data name="cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
+ <data name="lib_Iesi_Collections_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\Iesi.Collections.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="lib_log4net_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\log4net.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -196,9 +205,6 @@
<data name="mda_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</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="lib_NHibernate_Caches_SysCache_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\NHibernate.Caches.SysCache.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -211,8 +217,8 @@
<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="mda_maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\mda\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <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>
<data name="web_bin_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\Bin\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -220,6 +226,9 @@
<data name="core_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Core\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="mda_maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
<data name="common_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Common\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
@@ -232,8 +241,8 @@
<data name="lib_NHibernate_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\NHibernate.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="orange" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\orange.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="arrow_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="lib_HashCodeProvider_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\HashCodeProvider.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -244,7 +253,7 @@
<data name="mda_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="indicator_arrows" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\indicator_arrows.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="link_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\link_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/SettingsManager.cs
Index: SettingsManager.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/SettingsManager.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SettingsManager.cs 18 Apr 2006 16:14:43 -0000 1.1
+++ SettingsManager.cs 7 Jul 2006 22:32:14 -0000 1.2
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.11 +5 -4 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.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- VS80AddIn.cs 15 Jun 2006 03:29:32 -0000 1.10
+++ VS80AddIn.cs 7 Jul 2006 22:32:14 -0000 1.11
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
@@ -20,7 +20,7 @@
public class VS80AddIn
{
- public const string ADD_IN_VERSION = "1.3.1";
+ public const string ADD_IN_VERSION = "1.4";
#region Constants
@@ -89,6 +89,7 @@
m_commands.Add(new OpenModelCommand());
m_commands.Add(new AboutCommand());
m_commands.Add(new CreateEntityVOConvertorCommand());
+ m_commands.Add(new PropertyMapperCommand());
// Set the context for each command
foreach (AddInCommandBase cmd in m_commands)
{
@@ -399,7 +400,7 @@
{
if (m_solutionManager != null)
{
- m_solutionManager.OnSolutionOpened();
+ m_solutionManager.InitializeSolution();
}
}
1.12 +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.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- WizardSolutionProcessor.cs 11 Jun 2006 22:20:28 -0000 1.11
+++ WizardSolutionProcessor.cs 7 Jul 2006 22:32:14 -0000 1.12
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.6 +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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- AboutCommand.cs 30 May 2006 17:36:21 -0000 1.5
+++ AboutCommand.cs 7 Jul 2006 22:32:15 -0000 1.6
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.8 ...
[truncated message content] |
