SF.net SVN: orm: [1114] trunk/RelationalModel/OialDcilBridge

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

Revision: 1114
          http://orm.svn.sourceforge.net/orm/?rev=1114&view=rev
Author:   mcurland
Date:     2007-09-10 15:54:09 -0700 (Mon, 10 Sep 2007)

Log Message:
-----------
Stop offering absorb choice on ObjectType in some cases where choosing the absorb will throw. Also changed Absorbed to display as 'Absorbed (All Paths)' to emphasize that we are not absorbing over the primary path only. refs #334

Modified Paths:
--------------
    trunk/RelationalModel/OialDcilBridge/AssimilationMapping.cs
    trunk/RelationalModel/OialDcilBridge/MappingCustomizationModel.resx

Modified: trunk/RelationalModel/OialDcilBridge/AssimilationMapping.cs
===================================================================
--- trunk/RelationalModel/OialDcilBridge/AssimilationMapping.cs	2007-09-10 22:52:52 UTC (rev 1113)
+++ trunk/RelationalModel/OialDcilBridge/AssimilationMapping.cs	2007-09-10 22:54:09 UTC (rev 1114)
@@ -505,9 +505,9 @@
 							{
 								return canPartition ? PartitionablePartitionedChildValues : PartitionedChildValues;
 							}
-							if (customAbsorb || (!seenAbsorb && null != AssimilatorTracker.GetNearestAbsorbingAssimilatorConceptType(assimilations, true, null)))
+							if (customAbsorb || !seenAbsorb)
 							{
-								fullAbsorbAvailable = true;
+								fullAbsorbAvailable = null != AssimilatorTracker.GetNearestAbsorbingAssimilatorConceptType(assimilations, true, null);
 							}
 							else if (seenAbsorb)
 							{

Modified: trunk/RelationalModel/OialDcilBridge/MappingCustomizationModel.resx
===================================================================
--- trunk/RelationalModel/OialDcilBridge/MappingCustomizationModel.resx	2007-09-10 22:52:52 UTC (rev 1113)
+++ trunk/RelationalModel/OialDcilBridge/MappingCustomizationModel.resx	2007-09-10 22:54:09 UTC (rev 1114)
@@ -166,7 +166,7 @@
     <comment>The display name for the AbsorptionChoice property on an ObjectType. Displays as the name of a property in the Properties Window.</comment>
   </data>
   <data name="ObjectTypeAbsorptionChoice.Absorbed" xml:space="preserve">
-    <value>Absorbed</value>
+    <value>Absorbed (All Paths)</value>
     <comment>The ObjectType is absorbed through all paths.</comment>
   </data>
   <data name="ObjectTypeAbsorptionChoice.CustomAbsorbed" xml:space="preserve">


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