Menu
▾
▴
SF.net SVN: orm:[1454] trunk
|
From: <mcu...@us...> - 2010-09-10 05:10:29
|
Revision: 1454
http://orm.svn.sourceforge.net/orm/?rev=1454&view=rev
Author: mcurland
Date: 2010-09-10 05:10:23 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Miscellaneous bug fixes:
* RMap fix: Moving an object type from an rmap-ineligible to an rmap-eligible state does reconsider implicitly or explicitly objectified fact types that use that object type in the preferred (usually internal) identifier.
* Role path rule verbalization: Path root references are not verbalizing as calculation inputs. refs #395
* Changed error message for frequency constraint error making 1..* frequency ranges invalid to use the positive 'always satisfied' form instead of 'never violated'.
* Fixed sample population editor crash on role order change of non-uniqueness set constraints.
Modified Paths:
--------------
trunk/ORMModel/Framework/Diagnostics/TransactionLogViewer.resx
trunk/ORMModel/ObjectModel/GeneratedCode/DomainModelResx.resx
trunk/ORMModel/ObjectModel/ORMCore.dsl
trunk/ORMModel/ObjectModel/ORMModel.resx
trunk/ORMModel/ObjectModel/Verbalization.cs
trunk/ORMModel/Shell/SamplePopulationEditor.cs
trunk/Oial/ORMOialBridge/ORMElementGateway.cs
Modified: trunk/ORMModel/Framework/Diagnostics/TransactionLogViewer.resx
===================================================================
--- trunk/ORMModel/Framework/Diagnostics/TransactionLogViewer.resx 2010-08-18 20:16:38 UTC (rev 1453)
+++ trunk/ORMModel/Framework/Diagnostics/TransactionLogViewer.resx 2010-09-10 05:10:23 UTC (rev 1454)
@@ -343,8 +343,8 @@
<value>100</value>
</data>
<data name="FilterLabel.ToolTip" xml:space="preserve">
- <value>Double-click on an item in the grid to apply a filter that includes only similar item.
-Multiple filters can be applied simultaneously with additional clicks on other fields.
+ <value>Double-click on an item in the grid to apply a filter that includes only similar items.
+Multiple filters can be applied simultaneously with additional double-clicks in other fields.
Press the Escape key to clear a current filter.</value>
</data>
Modified: trunk/ORMModel/ObjectModel/GeneratedCode/DomainModelResx.resx
===================================================================
--- trunk/ORMModel/ObjectModel/GeneratedCode/DomainModelResx.resx 2010-08-18 20:16:38 UTC (rev 1453)
+++ trunk/ORMModel/ObjectModel/GeneratedCode/DomainModelResx.resx 2010-09-10 05:10:23 UTC (rev 1454)
@@ -1715,7 +1715,7 @@
<comment>Description for DomainClass 'FrequencyConstraintNonRestrictiveRangeError'</comment>
</data>
<data name="ORMSolutions.ORMArchitect.Core.ObjectModel.FrequencyConstraintNonRestrictiveRangeError.DisplayName" xml:space="preserve">
- <value>One to Unbounded Frequency Range Never Violated</value>
+ <value>One to Unbounded Frequency Range Always Satisfied</value>
<comment>DisplayName for DomainClass 'FrequencyConstraintNonRestrictiveRangeError'</comment>
</data>
<data name="ORMSolutions.ORMArchitect.Core.ObjectModel.ReadingRequiresUserModificationError.Description" xml:space="preserve">
Modified: trunk/ORMModel/ObjectModel/ORMCore.dsl
===================================================================
--- trunk/ORMModel/ObjectModel/ORMCore.dsl 2010-08-18 20:16:38 UTC (rev 1453)
+++ trunk/ORMModel/ObjectModel/ORMCore.dsl 2010-09-10 05:10:23 UTC (rev 1454)
@@ -1541,7 +1541,7 @@
</BaseClass>
</DomainClass>
- <DomainClass Name="FrequencyConstraintNonRestrictiveRangeError" Namespace="ORMSolutions.ORMArchitect.Core.ObjectModel" Id="0F5D1CDC-DD98-41CF-9FA8-5328B6F7B8A6" DisplayName="One to Unbounded Frequency Range Never Violated" Description="">
+ <DomainClass Name="FrequencyConstraintNonRestrictiveRangeError" Namespace="ORMSolutions.ORMArchitect.Core.ObjectModel" Id="0F5D1CDC-DD98-41CF-9FA8-5328B6F7B8A6" DisplayName="One to Unbounded Frequency Range Always Satisfied" Description="">
<BaseClass>
<DomainClassMoniker Name="ModelError"/>
</BaseClass>
Modified: trunk/ORMModel/ObjectModel/ORMModel.resx
===================================================================
--- trunk/ORMModel/ObjectModel/ORMModel.resx 2010-08-18 20:16:38 UTC (rev 1453)
+++ trunk/ORMModel/ObjectModel/ORMModel.resx 2010-09-10 05:10:23 UTC (rev 1454)
@@ -309,7 +309,7 @@
<comment>The frequency constraint minimum must be less than or equal to the maximum. {0}=constraint name {1}=model name</comment>
</data>
<data name="ModelError.Constraint.FrequencyConstraintNonRestrictiveRangeError.Text" xml:space="preserve">
- <value>Constraint '{0}' in model '{1}' has an unbounded range with a minimum of one. This frequency pattern is never violated.</value>
+ <value>Constraint '{0}' in model '{1}' has an unbounded range with a minimum of one. This frequency pattern is always satisfied.</value>
<comment>A frequency constraint with a minimum of 1 and an unbounded maximum is always true and should not be specified. {0}=constraint name {1}=model name</comment>
</data>
<data name="ModelError.Constraint.FrequencyConstraintViolatedByUniquenessConstraintError.Text" xml:space="preserve">
Modified: trunk/ORMModel/ObjectModel/Verbalization.cs
===================================================================
--- trunk/ORMModel/ObjectModel/Verbalization.cs 2010-08-18 20:16:38 UTC (rev 1453)
+++ trunk/ORMModel/ObjectModel/Verbalization.cs 2010-09-10 05:10:23 UTC (rev 1454)
@@ -3880,12 +3880,17 @@
{
int restoreBuilder = builder.Length;
PathedRole sourceRole;
+ RolePathObjectTypeRoot sourceRoot;
CalculatedPathValue sourceCalculation;
PathConstant sourceConstant;
if (null != (sourceRole = calculatedValueInput.SourcePathedRole))
{
builder.Append(rendererContext.RenderAssociatedRolePlayer(sourceRole, null, RolePathRolePlayerRenderingOptions.None));
}
+ else if (null != (sourceRoot = calculatedValueInput.SourcePathRoot))
+ {
+ builder.Append(rendererContext.RenderAssociatedRolePlayer(sourceRoot, null, RolePathRolePlayerRenderingOptions.None));
+ }
else if (null != (sourceCalculation = calculatedValueInput.SourceCalculatedValue))
{
builder.Append(RenderCalculation(sourceCalculation, rendererContext, builder));
Modified: trunk/ORMModel/Shell/SamplePopulationEditor.cs
===================================================================
--- trunk/ORMModel/Shell/SamplePopulationEditor.cs 2010-08-18 20:16:38 UTC (rev 1453)
+++ trunk/ORMModel/Shell/SamplePopulationEditor.cs 2010-09-10 05:10:23 UTC (rev 1454)
@@ -1703,7 +1703,11 @@
{
return;
}
- TestRepopulateForIdentifierPart(((UniquenessConstraint)e.SourceElement).PreferredIdentifierFor);
+ UniquenessConstraint uniqueness;
+ if (null != (uniqueness = e.SourceElement as UniquenessConstraint))
+ {
+ TestRepopulateForIdentifierPart(uniqueness.PreferredIdentifierFor);
+ }
}
#endregion // Entity Type Instance Event Handlers
#region Misc Event Handlers
Modified: trunk/Oial/ORMOialBridge/ORMElementGateway.cs
===================================================================
--- trunk/Oial/ORMOialBridge/ORMElementGateway.cs 2010-08-18 20:16:38 UTC (rev 1453)
+++ trunk/Oial/ORMOialBridge/ORMElementGateway.cs 2010-09-10 05:10:23 UTC (rev 1454)
@@ -298,6 +298,15 @@
FilterModifiedObjectType(preferredFor);
}
}
+ Objectification objectification;
+ if (null != (objectification = factType.ImpliedByObjectification))
+ {
+ ObjectType objectifyingType = objectification.NestingType;
+ if (IsElementExcluded(objectifyingType))
+ {
+ FilterModifiedObjectType(objectifyingType);
+ }
+ }
}
}
else if (exclusionLink == null)
@@ -416,6 +425,11 @@
ExcludeObjectType(preferredFor, model, false, notifyExcluded);
}
}
+ Objectification objectification;
+ if (null != (objectification = factType.ImpliedByObjectification))
+ {
+ ExcludeObjectType(objectification.NestingType, model, false, notifyExcluded);
+ }
}
}
private static void ExcludeObjectType(ObjectType objectType)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
