[commit] r2128 - in trunk/SDK/DotNet/DsmlGenerator: CSharpDsmlGenerator ISIS.GME.Common ISIS.GME.Common/Properties

[GMESRC Repository Notifications]

Author: lattmann
Date: Tue Dec 18 17:53:14 2012
New Revision: 2128

Log:
version 1.0.4.0 fix: create connection.

Modified:
   trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj
   trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs
   trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Utils.cs

Modified: trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj	Fri Dec 14 17:59:19 2012	(r2127)
+++ trunk/SDK/DotNet/DsmlGenerator/CSharpDsmlGenerator/CSharpDSMLGenerator.csproj	Tue Dec 18 17:53:14 2012	(r2128)
@@ -68,6 +68,10 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>
+    </ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />

Modified: trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs	Fri Dec 14 17:59:19 2012	(r2127)
+++ trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs	Tue Dec 18 17:53:14 2012	(r2128)
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.0.4.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]

Modified: trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Utils.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Utils.cs	Fri Dec 14 17:59:19 2012	(r2127)
+++ trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Utils.cs	Tue Dec 18 17:53:14 2012	(r2128)
@@ -283,11 +283,13 @@
             Interfaces.Reference dstRef = null,
             Interfaces.Container parent = null,
             string roleStr = null)
-            where T : Interfaces.Connection, new()
+            where T: Classes.Connection, new()
         {
             Contract.Requires(src != null);
             Contract.Requires(dst != null);
 
+            IMgaFCO connection = null;
+            
             T result = new T();
 
             if (parent == null)
@@ -364,7 +366,6 @@
             {
                 MgaModel model = parent.Impl as MgaModel;
                 MgaMetaRole role = null;
-                IMgaFCO connection = null;
 
                 try
                 {
@@ -493,7 +494,16 @@
                 throw new Exception("Parent could not be a folder.");
             }
 
-            return result;
+            result.Impl = connection;
+
+            if (result.Impl == null)
+            {
+                return null;
+            }
+            else
+            {
+                return result;
+            }
         }