SF.net SVN: orm: [1106] trunk

[<mcu...@us...>]

Revision: 1106
          http://orm.svn.sourceforge.net/orm/?rev=1106&view=rev
Author:   mcurland
Date:     2007-08-30 10:58:08 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Fixed crash introduced in [1100] refs #334

Also updated install case missed in [1105]

Modified Paths:
--------------
    trunk/Oial/ORMOialBridge/Install.bat
    trunk/RelationalModel/OialDcilBridge/NameGeneration.cs

Modified: trunk/Oial/ORMOialBridge/Install.bat
===================================================================
--- trunk/Oial/ORMOialBridge/Install.bat	2007-08-30 17:36:21 UTC (rev 1105)
+++ trunk/Oial/ORMOialBridge/Install.bat	2007-08-30 17:58:08 UTC (rev 1106)
@@ -7,6 +7,7 @@
 
 XCOPY /Y /D /V /Q "%RootDir%\%BuildOutDir%\Neumont.Tools.ORMToORMAbstractionBridge.dll" "%NORMAExtensionsDir%\"
 XCOPY /Y /D /V /Q "%RootDir%\%BuildOutDir%\Neumont.Tools.ORMToORMAbstractionBridge.pdb" "%NORMAExtensionsDir%\"
+XCOPY /Y /D /V /Q "%RootDir%\%BuildOutDir%\Neumont.Tools.ORMToORMAbstractionBridge.xml" "%NORMAExtensionsDir%\"
 
 REG ADD "HKLM\%VSRegistryRoot%\Neumont\ORM Architect\Extensions\http://schemas.neumont.edu/ORM/Bridge/2007-06/ORMToORMAbstraction" /v "Class" /d "Neumont.Tools.ORMToORMAbstractionBridge.ORMToORMAbstractionBridgeDomainModel" /f 1>NUL
 REG ADD "HKLM\%VSRegistryRoot%\Neumont\ORM Architect\Extensions\http://schemas.neumont.edu/ORM/Bridge/2007-06/ORMToORMAbstraction" /v "CodeBase" /d "%NORMAExtensionsDir%\Neumont.Tools.ORMToORMAbstractionBridge.dll" /f 1>NUL

Modified: trunk/RelationalModel/OialDcilBridge/NameGeneration.cs
===================================================================
--- trunk/RelationalModel/OialDcilBridge/NameGeneration.cs	2007-08-30 17:36:21 UTC (rev 1105)
+++ trunk/RelationalModel/OialDcilBridge/NameGeneration.cs	2007-08-30 17:58:08 UTC (rev 1106)
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using Neumont.Tools.ORM.ObjectModel;
+using ORMCore = Neumont.Tools.ORM.ObjectModel;
 using Microsoft.VisualStudio.Modeling;
 using Neumont.Tools.ORMAbstraction;
 using Neumont.Tools.ORMToORMAbstractionBridge;
@@ -274,17 +275,16 @@
 						LinkedElementCollection<ConceptType> types = informationTypeFormat.ConceptTypeCollection;
 						if (types.Count == 1)
 						{
-							ObjectType preferredFor = ConceptTypeIsForObjectType.GetObjectType(types[0]);
-							LinkedElementCollection<Role> identifiers = preferredFor.ResolvedPreferredIdentifier.RoleCollection;
-							if (identifiers.Count == 1)
+							ObjectType preferredFor;
+							ORMCore.UniquenessConstraint preferredIdentifier;
+							LinkedElementCollection<Role> identifiers;
+							if (null != (preferredFor = ConceptTypeIsForObjectType.GetObjectType(types[0])) &&
+								null != (preferredIdentifier = preferredFor.ResolvedPreferredIdentifier) &&
+								1 == (identifiers = preferredIdentifier.RoleCollection).Count &&
+								identifiers[0].RolePlayer == InformationTypeFormatIsForValueType.GetValueType(informationTypeFormat) &&
+								!informationTypeFormat.Name.StartsWith(preferredFor.Name))
 							{
-								if (identifiers[0].RolePlayer.Id == InformationTypeFormatIsForValueType.GetValueType(informationTypeFormat).Id)
-								{
-									if (!informationTypeFormat.Name.StartsWith(preferredFor.Name))
-									{
-										valueTypeName = preferredFor.Name + "_";
-									}
-								}
+								valueTypeName = preferredFor.Name + "_";
 							}
 						}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.