Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS Setup.nsi AndroMDA VS2005 Add-In Setup.exe AndroMDA VS2005 Add-In Setup.nsi
|
From: Chris M. <cm...@us...> - 2006-07-28 20:35:30
|
User: cmicali
Date: 06/07/26 19:11:58
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
MDASolutionManager.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Lib
AndroMDA.NHibernateSupport.dll
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
AddInUtils.cs ConfigFile.cs
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn Android VS
License.rtf Android VS Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS
Setup.nsi
Removed: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In License.rtf AndroMDA VS2005 Add-In
Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe AndroMDA VS2005 Add-In
Setup.nsi
Log:
- Renamed files to Android VS
- Updated nhibernatesupport.dll to v1.0.4.0
Revision Changes Path
1.16 +5 -5 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.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- MDASolutionManager.cs 25 Jul 2006 13:09:28 -0000 1.15
+++ MDASolutionManager.cs 27 Jul 2006 02:11:54 -0000 1.16
@@ -280,16 +280,16 @@
// Show an error message if either the core or common projects could not be found
if (m_coreProject == null || m_commonProject == null)
{
- string errorMessage = "The open solution appears to be using AndroMDA, but the ";
+ string errorMessage = "The AndroMDA configuration was loaded, but the ";
if (m_coreProject == null)
{
- errorMessage += "core ";
+ errorMessage += "core (" + m_projectProperties["maven.andromda.core.assembly.name"] + ") ";
if (m_commonProject == null) { errorMessage += "and "; }
}
- if (m_commonProject == null) { errorMessage += "common "; }
+ if (m_commonProject == null) { errorMessage += "common (" + m_projectProperties["maven.andromda.common.assembly.name"] + ") "; }
errorMessage += "project";
if (m_commonProject == null && m_coreProject == null) errorMessage += "s";
- 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.";
+ errorMessage += " could not be found in the solution.";
throw new Exception(errorMessage);
}
m_solutionSettings = new ConfigFile(solutionPath + "\\mda\\android.user.properties");
@@ -300,7 +300,7 @@
catch (Exception e)
{
m_enabled = false;
- AddInUtils.ShowWarning(e.Message);
+ AddInUtils.ShowWarning("An error occured while trying to load the AndroMDA configuration. When you fix the problem click the 'Reload MDA Config' button.\n\n" + e.Message);
}
}
}
1.5 +217 -207 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Lib/AndroMDA.NHibernateSupport.dll
<<Binary file>>
1.7 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/AddInUtils.cs
Index: AddInUtils.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/AddInUtils.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- AddInUtils.cs 25 Jul 2006 13:09:32 -0000 1.6
+++ AddInUtils.cs 27 Jul 2006 02:11:54 -0000 1.7
@@ -25,7 +25,7 @@
public static void ShowWarning(string errorMessage)
{
- System.Windows.Forms.MessageBox.Show(errorMessage, "Android/VS", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Warning);
+ System.Windows.Forms.MessageBox.Show(errorMessage, "Android/VS Warning", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Warning);
}
public static void InsertListViewItem(ListView listView, string name, string value, string groupName)
1.2 +51 -37 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/ConfigFile.cs
Index: ConfigFile.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/ConfigFile.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ConfigFile.cs 25 Jul 2006 13:09:32 -0000 1.1
+++ ConfigFile.cs 27 Jul 2006 02:11:54 -0000 1.2
@@ -138,6 +138,8 @@
public void LoadFromFile(string filename, bool clearConfig)
{
+ try
+ {
if (clearConfig)
{
Clear();
@@ -166,6 +168,11 @@
}
m_fileName = filename;
}
+ catch (Exception e)
+ {
+ throw new Exception("Error while trying to load " + filename + ": " + e.Message, e);
+ }
+ }
public void LoadFromXML(string filename)
{
@@ -179,6 +186,8 @@
public void LoadFromXML(string filename, string namePrefixToAdd, bool clearConfig)
{
+ try
+ {
if (clearConfig)
{
Clear();
@@ -209,6 +218,11 @@
}
m_fileName = filename;
}
+ catch (Exception e)
+ {
+ throw new Exception("Error while trying to load " + filename + ": " + e.Message, e);
+ }
+ }
public void Save()
{
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
|
