SF.net SVN: orm:[1342] trunk/ORMModel

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

Revision: 1342
          http://orm.svn.sourceforge.net/orm/?rev=1342&view=rev
Author:   mcurland
Date:     2008-12-05 04:41:19 +0000 (Fri, 05 Dec 2008)

Log Message:
-----------
Fixed crash adding new diagram with [1341] when the 'Diagram Management' extension is not turned on. Also changed the display name of SaveDiagramPosition to SaveDiagramPositions to more accurately reflect its application to all diagrams, not just the selected one where the property is displayed. refs #379

Modified Paths:
--------------
    trunk/ORMModel/Framework/Shell/DiagramDisplay.dsl
    trunk/ORMModel/Framework/Shell/GeneratedCode/DomainModelResx.resx
    trunk/ORMModel/Framework/Shell/MultiDiagramDocView.cs
    trunk/ORMModel/Shell/ORMDocView.cs

Modified: trunk/ORMModel/Framework/Shell/DiagramDisplay.dsl
===================================================================
--- trunk/ORMModel/Framework/Shell/DiagramDisplay.dsl	2008-12-03 21:41:29 UTC (rev 1341)
+++ trunk/ORMModel/Framework/Shell/DiagramDisplay.dsl	2008-12-05 04:41:19 UTC (rev 1342)
@@ -35,7 +35,7 @@
 	<Classes>
 		<DomainClass Name="DiagramDisplay" Namespace="Neumont.Tools.Modeling.Shell" Id="14A6B724-7849-4D7D-A5C2-29910FFBB516" DisplayName="DiagramDisplay" InheritanceModifier="Sealed" Description="">
 			<Properties>
-				<DomainProperty Name="SaveDiagramPosition" DisplayName="SaveDiagramPosition" IsBrowsable="true" DefaultValue="true" Id="17AA2B64-3328-4420-8C68-34157D10DB77" Description="Save the most recent position and zoom information for each diagram in addition to diagram order.">
+				<DomainProperty Name="SaveDiagramPosition" DisplayName="SaveDiagramPositions" IsBrowsable="true" DefaultValue="true" Id="17AA2B64-3328-4420-8C68-34157D10DB77" Description="Save the most recent position and zoom information for each diagram in addition to diagram order.">
 					<Type>
 						<ExternalTypeMoniker Name="/System/Boolean"/>
 					</Type>

Modified: trunk/ORMModel/Framework/Shell/GeneratedCode/DomainModelResx.resx
===================================================================
--- trunk/ORMModel/Framework/Shell/GeneratedCode/DomainModelResx.resx	2008-12-03 21:41:29 UTC (rev 1341)
+++ trunk/ORMModel/Framework/Shell/GeneratedCode/DomainModelResx.resx	2008-12-05 04:41:19 UTC (rev 1342)
@@ -138,7 +138,7 @@
     <comment>Description for DomainProperty &apos;SaveDiagramPosition&apos; on DomainClass &apos;DiagramDisplay&apos;</comment>
   </data>
   <data name="Neumont.Tools.Modeling.Shell.DiagramDisplay/SaveDiagramPosition.DisplayName" xml:space="preserve">
-    <value>SaveDiagramPosition</value>
+    <value>SaveDiagramPositions</value>
     <comment>DisplayName for DomainProperty &apos;SaveDiagramPosition&apos; on DomainClass &apos;DiagramDisplay&apos;</comment>
   </data>
   <data name="Neumont.Tools.Modeling.Shell.DiagramPlaceHolder.Description" xml:space="preserve">

Modified: trunk/ORMModel/Framework/Shell/MultiDiagramDocView.cs
===================================================================
--- trunk/ORMModel/Framework/Shell/MultiDiagramDocView.cs	2008-12-03 21:41:29 UTC (rev 1341)
+++ trunk/ORMModel/Framework/Shell/MultiDiagramDocView.cs	2008-12-05 04:41:19 UTC (rev 1342)
@@ -557,7 +557,7 @@
 					{
 						DomainDataDirectory dataDirectory = store.DomainDataDirectory;
 						DomainClassInfo classInfo;
-						classInfo = dataDirectory.FindDomainClass(DiagramDisplayHasDiagramOrder.DomainClassId);
+						classInfo = dataDirectory.FindDomainRelationship(DiagramDisplayHasDiagramOrder.DomainClassId);
 						if (classInfo != null)
 						{
 							// DiagramDisplay is an optional domain model, it may not be loaded in the store

Modified: trunk/ORMModel/Shell/ORMDocView.cs
===================================================================
--- trunk/ORMModel/Shell/ORMDocView.cs	2008-12-03 21:41:29 UTC (rev 1341)
+++ trunk/ORMModel/Shell/ORMDocView.cs	2008-12-05 04:41:19 UTC (rev 1342)
@@ -413,6 +413,7 @@
 						LinkedElementCollection<Diagram> diagramOrder;
 						int selectedDiagramIndex;
 						if (null != (selectedDiagram = ContextMenuStrip.SelectedDiagram) &&
+							null != store.FindDomainModel(DiagramDisplayDomainModel.DomainModelId) &&
 							null != (displayContainer = DiagramDisplayHasDiagramOrder.GetDiagramDisplay(selectedDiagram)) &&
 							(selectedDiagramIndex = (diagramOrder = displayContainer.OrderedDiagramCollection).IndexOf(selectedDiagram)) < (diagramOrder.Count - 1))
 						{


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