Menu
▾
▴
SF.net SVN: orm:[1357] trunk/ORMModel/ObjectModel
|
From: <mcu...@us...> - 2009-02-06 20:18:21
|
Revision: 1357
http://orm.svn.sourceforge.net/orm/?rev=1357&view=rev
Author: mcurland
Date: 2009-02-06 20:18:17 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Make 'occurs in population' snippets more specific for unary and spanning uniqueness constraints. fixes #384
Modified Paths:
--------------
trunk/ORMModel/ObjectModel/VerbalizationCoreSnippets/VerbalizationCoreSnippets.xml
trunk/ORMModel/ObjectModel/VerbalizationCoreSnippets/VerbalizationCoreSnippets.xsd
trunk/ORMModel/ObjectModel/VerbalizationGenerator.cs
Modified: trunk/ORMModel/ObjectModel/VerbalizationCoreSnippets/VerbalizationCoreSnippets.xml
===================================================================
--- trunk/ORMModel/ObjectModel/VerbalizationCoreSnippets/VerbalizationCoreSnippets.xml 2009-02-05 20:37:06 UTC (rev 1356)
+++ trunk/ORMModel/ObjectModel/VerbalizationCoreSnippets/VerbalizationCoreSnippets.xml 2009-02-06 20:18:17 UTC (rev 1357)
@@ -63,8 +63,8 @@
<Snippet type="OneQuantifier" sign="negative"><![CDATA[<span class="quantifier">more than one</span> {0}]]></Snippet>
- <Snippet type="OccursInPopulation" sign="positive"><![CDATA[{0} <span class="quantifier">occurs at most once in the population of</span> {1}]]></Snippet>
- <Snippet type="OccursInPopulation" sign="negative"><![CDATA[{0} <span class="quantifier">occurs more than once in the population of</span> {1}]]></Snippet>
+ <Snippet type="OccursInPopulation" sign="positive"><![CDATA[<span class="quantifier">in each population of</span> {1}<span class="quantifier">, </span>{0} <span class="quantifier">occurs at most once</span>]]></Snippet>
+ <Snippet type="OccursInPopulation" sign="negative"><![CDATA[{0} <span class="quantifier">occurs more than once in the same population of</span> {1}]]></Snippet>
<Snippet type="ModalPossibilityOperator" modality="alethic" sign="positive"><![CDATA[<span class="quantifier">it is possible that</span> {0}]]></Snippet>
<Snippet type="ModalPossibilityOperator" modality="deontic" sign="positive"><![CDATA[<span class="quantifier">it is permitted that</span> {0}]]></Snippet>
Modified: trunk/ORMModel/ObjectModel/VerbalizationCoreSnippets/VerbalizationCoreSnippets.xsd
===================================================================
--- trunk/ORMModel/ObjectModel/VerbalizationCoreSnippets/VerbalizationCoreSnippets.xsd 2009-02-05 20:37:06 UTC (rev 1356)
+++ trunk/ORMModel/ObjectModel/VerbalizationCoreSnippets/VerbalizationCoreSnippets.xsd 2009-02-06 20:18:17 UTC (rev 1357)
@@ -733,8 +733,8 @@
<xs:annotation>
<xs:documentation>
Description: Verbalizes that an object occurs at most once or more than once in a given population.
- Format positive: {0} occurs at most once in the population of {1}
- Format negative: {0} occurs more than once in the population of {1}
+ Format positive: in each population of {1}, {0} occurs at most once
+ Format negative: {0} occurs more than once in the same population of {1}
</xs:documentation>
</xs:annotation>
</xs:enumeration>
Modified: trunk/ORMModel/ObjectModel/VerbalizationGenerator.cs
===================================================================
--- trunk/ORMModel/ObjectModel/VerbalizationGenerator.cs 2009-02-05 20:37:06 UTC (rev 1356)
+++ trunk/ORMModel/ObjectModel/VerbalizationGenerator.cs 2009-02-06 20:18:17 UTC (rev 1357)
@@ -484,7 +484,7 @@
@"<span class=""listSeparator"">, </span>",
@"<span class=""objectTypeMissing"">Missing<sub>{0}</sub></span>",
@"<a class=""objectType"" href=""elementid:{1}"">{0}<sub>{2}</sub></a>",
- @"{0} <span class=""quantifier"">occurs at most once in the population of</span> {1}",
+ @"<span class=""quantifier"">in each population of</span> {1}<span class=""quantifier"">, </span>{0} <span class=""quantifier"">occurs at most once</span>",
@"<span class=""quantifier"">at most one</span> {0}",
@"{0}<span class=""listSeparator"">.</span>{1}",
@"<span class=""quantifier"">who</span> {0}",
@@ -675,7 +675,7 @@
@"<span class=""listSeparator"">, </span>",
@"<span class=""objectTypeMissing"">Missing<sub>{0}</sub></span>",
@"<a class=""objectType"" href=""elementid:{1}"">{0}<sub>{2}</sub></a>",
- @"{0} <span class=""quantifier"">occurs at most once in the population of</span> {1}",
+ @"<span class=""quantifier"">in each population of</span> {1}<span class=""quantifier"">, </span>{0} <span class=""quantifier"">occurs at most once</span>",
@"<span class=""quantifier"">at most one</span> {0}",
@"{0}<span class=""listSeparator"">.</span>{1}",
@"<span class=""quantifier"">who</span> {0}",
@@ -866,7 +866,7 @@
@"<span class=""listSeparator"">, </span>",
@"<span class=""objectTypeMissing"">Missing<sub>{0}</sub></span>",
@"<a class=""objectType"" href=""elementid:{1}"">{0}<sub>{2}</sub></a>",
- @"{0} <span class=""quantifier"">occurs more than once in the population of</span> {1}",
+ @"{0} <span class=""quantifier"">occurs more than once in the same population of</span> {1}",
@"<span class=""quantifier"">more than one</span> {0}",
@"{0}<span class=""listSeparator"">.</span>{1}",
@"<span class=""quantifier"">who</span> {0}",
@@ -1057,7 +1057,7 @@
@"<span class=""listSeparator"">, </span>",
@"<span class=""objectTypeMissing"">Missing<sub>{0}</sub></span>",
@"<a class=""objectType"" href=""elementid:{1}"">{0}<sub>{2}</sub></a>",
- @"{0} <span class=""quantifier"">occurs more than once in the population of</span> {1}",
+ @"{0} <span class=""quantifier"">occurs more than once in the same population of</span> {1}",
@"<span class=""quantifier"">more than one</span> {0}",
@"{0}<span class=""listSeparator"">.</span>{1}",
@"<span class=""quantifier"">who</span> {0}",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
