[commit] r1359 - in trunk/SDK/DotNet/CSharpComponentWizard: . DSMGenerators Templates Templates/CSharpAddon Templates/CSharpInterpreter

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Tue Jun 14 18:15:45 CDT 2011


Author: ksmyth
Date: Tue Jun 14 18:15:45 2011
New Revision: 1359

Log:
Use PIAs

Modified:
   trunk/SDK/DotNet/CSharpComponentWizard/   (props changed)
   trunk/SDK/DotNet/CSharpComponentWizard/CSharpComponentWizard.csproj
   trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Atom.cs
   trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Connection.cs
   trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/FCO.cs
   trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Folder.cs
   trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/GeneratorFacade.cs
   trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Model.cs
   trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Object.cs
   trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Reference.cs
   trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Set.cs
   trunk/SDK/DotNet/CSharpComponentWizard/MainWindow.xaml
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon.zip
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/ComponentConfig.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/GMEConsole.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/MyAddon.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/Registrar.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/classlibrary.csproj
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter.zip
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/ComponentConfig.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/GMEConsole.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/MgaGateway.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/MyInterpreter.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/Registrar.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/classlibrary.csproj

Modified: trunk/SDK/DotNet/CSharpComponentWizard/CSharpComponentWizard.csproj
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/CSharpComponentWizard.csproj	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/CSharpComponentWizard.csproj	Tue Jun 14 18:15:45 2011	(r1359)
@@ -78,6 +78,9 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="PresentationCore" />
     <Reference Include="WindowsBase" />
+    <Reference Include="GME.MGA.Meta, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
+    <Reference Include="GME.MGA, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
+    <Reference Include="GME.MGA.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -174,35 +177,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="CORELib">
-      <Guid>{9E9AAACF-28B8-11D3-B36C-0060082DF884}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="METALib">
-      <Guid>{0ADEEC71-D83A-11D3-B36B-005004D38590}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="MGALib">
-      <Guid>{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
-  <ItemGroup>
     <Resource Include="CSharpComponentWizardIcon.ico" />
   </ItemGroup>
   <ItemGroup>

Modified: trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Atom.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Atom.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Atom.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -6,7 +6,7 @@
 {
     public class Atom : FCO
     {
-        public Atom(MGALib.IMgaAtom mgaObject)
+        public Atom(GME.MGA.IMgaAtom mgaObject)
             : base(mgaObject)
         {
             className = mgaObject.Name;

Modified: trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Connection.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Connection.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Connection.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -57,7 +57,7 @@
             #endregion
         }
 
-        public Connection(MGALib.IMgaAtom mgaObject)
+        public Connection(GME.MGA.IMgaAtom mgaObject)
             : base(mgaObject)
         {
             className = mgaObject.Name;
@@ -264,21 +264,21 @@
         {
             get
             {
-                foreach (MGALib.IMgaConnPoint conn in mgaObject.PartOfConns)
+                foreach (GME.MGA.IMgaConnPoint conn in mgaObject.PartOfConns)
                 {
                     if (conn.Owner.Meta.Name == "AssociationClass")
                     {
-                        foreach (MGALib.IMgaConnPoint connOther in conn.Owner.ConnPoints)
+                        foreach (GME.MGA.IMgaConnPoint connOther in conn.Owner.ConnPoints)
                         {
                             if (connOther.target.ID != mgaObject.ID)
                             {
                                 //connOther.target: Connector
                                 ConnEndPoints ends = new ConnEndPoints();
-                                foreach (MGALib.IMgaConnPoint conn2 in connOther.target.PartOfConns)
+                                foreach (GME.MGA.IMgaConnPoint conn2 in connOther.target.PartOfConns)
                                 {   
                                     if (conn2.Owner.Meta.Name == "SourceToConnector")
                                     {
-                                        foreach (MGALib.IMgaConnPoint connOther2 in conn2.Owner.ConnPoints)
+                                        foreach (GME.MGA.IMgaConnPoint connOther2 in conn2.Owner.ConnPoints)
                                         {
                                             if (connOther2.target.ID != connOther.target.ID)
                                             {
@@ -304,7 +304,7 @@
                                     }
                                     else if (conn2.Owner.Meta.Name == "ConnectorToDestination")
                                     {
-                                        foreach (MGALib.IMgaConnPoint connOther2 in conn2.Owner.ConnPoints)
+                                        foreach (GME.MGA.IMgaConnPoint connOther2 in conn2.Owner.ConnPoints)
                                         {
                                             if (connOther2.target.ID != connOther.target.ID)
                                             {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/FCO.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/FCO.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/FCO.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
-using MGALib;
+using GME.MGA;
 
 namespace DSM.Generators
 {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Folder.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Folder.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Folder.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -25,7 +25,7 @@
                 {{
                     if (this.mgaObject.ParentFolder ==MgaGateway.project.RootFolder)
                     {{
-                        return new RootFolder(MgaGateway.project as MGALib.IMgaFolder);
+                        return new RootFolder(MgaGateway.project as GME.MGA.IMgaFolder);
                     }}
                     else
                     {{
@@ -84,7 +84,7 @@
             #endregion
         }
 
-        public Folder(MGALib.IMgaAtom mgaObject)
+        public Folder(GME.MGA.IMgaAtom mgaObject)
         {            
             baseInterfaceName = "IFolder";
 
@@ -126,14 +126,14 @@
         {
             get
             {
-                foreach (MGALib.IMgaObject mgaObject in this.MgaObjects)
+                foreach (GME.MGA.IMgaObject mgaObject in this.MgaObjects)
                 {
-                    MGALib.IMgaFCO fco = mgaObject as MGALib.IMgaFCO;
-                    foreach (MGALib.IMgaConnPoint conn in fco.PartOfConns)
+                    GME.MGA.IMgaFCO fco = mgaObject as GME.MGA.IMgaFCO;
+                    foreach (GME.MGA.IMgaConnPoint conn in fco.PartOfConns)
                     {
                         if (conn.Owner.Meta.Name == "FolderContainment" && conn.ConnRole == "dst")
                         {
-                            foreach (MGALib.IMgaConnPoint connOther in conn.Owner.ConnPoints)
+                            foreach (GME.MGA.IMgaConnPoint connOther in conn.Owner.ConnPoints)
                             {
                                 if (connOther.ConnRole == "src")
                                 {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/GeneratorFacade.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/GeneratorFacade.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/GeneratorFacade.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Forms;
-using MGALib;
+using GME.MGA;
 using DSM.Generators;
 using System.Diagnostics;
 
@@ -30,20 +30,20 @@
                 bool ro_mode = true;
                 project.Open("MGA=" + projectPathFull, out ro_mode);
                 territory = project.BeginTransactionInNewTerr(transactiontype_enum.TRANSACTION_READ_ONLY);
-                MGALib.IMgaFolder root = project.RootFolder as MGALib.IMgaFolder;
+                GME.MGA.IMgaFolder root = project.RootFolder as GME.MGA.IMgaFolder;
 
                 Generator.ClassName = root.Name;
                 Generator.NamespaceName = namespaceName;
 
 
-                foreach (MGALib.IMgaFCO fco in root.ChildFCOs)
+                foreach (GME.MGA.IMgaFCO fco in root.ChildFCOs)
                 {
                     ProcessParadigmSheet(fco);
                 }
 
-                foreach (MGALib.IMgaFolder fol in root.ChildFolders)
+                foreach (GME.MGA.IMgaFolder fol in root.ChildFolders)
                 {
-                    foreach (MGALib.IMgaFCO fco in fol.ChildFCOs)
+                    foreach (GME.MGA.IMgaFCO fco in fol.ChildFCOs)
                     {
                         ProcessParadigmSheet(fco);
                     }
@@ -101,18 +101,18 @@
             Errors.Clear();
             generatedFiles.Clear();
         }
-        private static void ProcessParadigmSheet(MGALib.IMgaFCO fco)
+        private static void ProcessParadigmSheet(GME.MGA.IMgaFCO fco)
         {
             Debug.Assert(fco.Meta.Name == "ParadigmSheet");
-         
-            MGALib.IMgaModel model = fco as MGALib.IMgaModel;
 
-            foreach (MGALib.IMgaObject obj in model.ChildObjects)
+            GME.MGA.IMgaModel model = fco as GME.MGA.IMgaModel;
+
+            foreach (GME.MGA.IMgaObject obj in model.ChildObjects)
             {
                 DSM.Generators.Object object1;
-                if (obj is MGALib.IMgaAtom)
+                if (obj is GME.MGA.IMgaAtom)
                 {
-                    MGALib.IMgaAtom o = obj as MGALib.IMgaAtom;
+                    GME.MGA.IMgaAtom o = obj as GME.MGA.IMgaAtom;
                     switch (o.Meta.Name)
                     {
                         case "Folder":
@@ -146,7 +146,7 @@
                 {
                     if (obj.MetaBase.Name.Contains("Proxy"))
                     {
-                        MGALib.IMgaReference proxy = obj as MGALib.IMgaReference;
+                        GME.MGA.IMgaReference proxy = obj as GME.MGA.IMgaReference;
 
                         string referred = proxy.Referred.Name;
 

Modified: trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Model.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Model.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Model.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -36,7 +36,7 @@
 ";
         }
 
-        public Model(MGALib.IMgaAtom mgaObject)
+        public Model(GME.MGA.IMgaAtom mgaObject)
             : base(mgaObject)
         {
             className = mgaObject.Name;
@@ -51,14 +51,14 @@
         {
             get
             {
-                foreach (MGALib.IMgaObject mgaObject in this.MgaObjects)
+                foreach (GME.MGA.IMgaObject mgaObject in this.MgaObjects)
                 {
-                    MGALib.IMgaFCO fco = mgaObject as MGALib.IMgaFCO;
-                    foreach (MGALib.IMgaConnPoint conn in fco.PartOfConns)
+                    GME.MGA.IMgaFCO fco = mgaObject as GME.MGA.IMgaFCO;
+                    foreach (GME.MGA.IMgaConnPoint conn in fco.PartOfConns)
                     {
                         if (conn.Owner.Meta.Name == "Containment" && conn.ConnRole == "dst")
                         {
-                            foreach (MGALib.IMgaConnPoint connOther in conn.Owner.ConnPoints)
+                            foreach (GME.MGA.IMgaConnPoint connOther in conn.Owner.ConnPoints)
                             {
                                 if (connOther.ConnRole == "src")
                                 {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Object.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Object.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Object.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -61,8 +61,8 @@
 using System.Collections.Generic;
 using System.Text;
 
-using MGALib;
-using MGAMetaLib;
+using GME.MGA;
+using GME.MGA.Meta;
 ";
 
             public static readonly string Object =
@@ -144,10 +144,10 @@
         }
 
         public static Dictionary<string, string> ProxyCache = new Dictionary<string, string>();
-        public static Dictionary<string, MGALib.IMgaReference> ProxyObjects = new Dictionary<string, MGALib.IMgaReference>();
+        public static Dictionary<string, GME.MGA.IMgaReference> ProxyObjects = new Dictionary<string, GME.MGA.IMgaReference>();
         public static Dictionary<string, Object> ElementsByName = new Dictionary<string, Object>();
 
-        protected MGALib.IMgaAtom mgaObject;
+        protected GME.MGA.IMgaAtom mgaObject;
 
         protected string namespaceName = "GME.CSharp.SOMENAME";
         
@@ -195,7 +195,7 @@
         }
         #endregion
 
-        internal IEnumerable<MGALib.IMgaObject> MgaObjects
+        internal IEnumerable<GME.MGA.IMgaObject> MgaObjects
         {
             get
             {
@@ -217,12 +217,12 @@
         {
             get
             {
-                foreach (MGALib.IMgaConnPoint conn in mgaObject.PartOfConns)
+                foreach (GME.MGA.IMgaConnPoint conn in mgaObject.PartOfConns)
                 {
                     if ((conn.Owner.Meta.Name == "Containment" || conn.Owner.Meta.Name == "FolderContainment") && 
                         conn.ConnRole == "src")
                     {
-                        foreach (MGALib.IMgaConnPoint connOther in conn.Owner.ConnPoints)
+                        foreach (GME.MGA.IMgaConnPoint connOther in conn.Owner.ConnPoints)
                         {
                             if (connOther.ConnRole == "dst")
                             {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Reference.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Reference.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Reference.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -37,7 +37,7 @@
         }
 
 
-        public Reference(MGALib.IMgaAtom mgaObject)
+        public Reference(GME.MGA.IMgaAtom mgaObject)
             : base(mgaObject)
         {
             className = mgaObject.Name;
@@ -51,14 +51,14 @@
         {
             get
             {
-                foreach (MGALib.IMgaObject mgaObject in this.MgaObjects)
+                foreach (GME.MGA.IMgaObject mgaObject in this.MgaObjects)
                 {
-                    MGALib.IMgaFCO fco = mgaObject as MGALib.IMgaFCO;
-                    foreach (MGALib.IMgaConnPoint conn in fco.PartOfConns)
+                    GME.MGA.IMgaFCO fco = mgaObject as GME.MGA.IMgaFCO;
+                    foreach (GME.MGA.IMgaConnPoint conn in fco.PartOfConns)
                     {
                         if (conn.Owner.Meta.Name == "ReferTo" && conn.ConnRole == "src")
                         {
-                            foreach (MGALib.IMgaConnPoint connOther in conn.Owner.ConnPoints)
+                            foreach (GME.MGA.IMgaConnPoint connOther in conn.Owner.ConnPoints)
                             {
                                 if (connOther.ConnRole == "dst")
                                 {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Set.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Set.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/DSMGenerators/Set.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -39,7 +39,7 @@
 ";
         }
 
-        public Set(MGALib.IMgaAtom mgaObject)
+        public Set(GME.MGA.IMgaAtom mgaObject)
             : base(mgaObject)
         {
             className = mgaObject.Name;
@@ -54,14 +54,14 @@
         {
             get
             {
-                foreach (MGALib.IMgaObject mgaObject in this.MgaObjects)
+                foreach (GME.MGA.IMgaObject mgaObject in this.MgaObjects)
                 {
-                    MGALib.IMgaFCO fco = mgaObject as MGALib.IMgaFCO;
-                    foreach (MGALib.IMgaConnPoint conn in fco.PartOfConns)
+                    GME.MGA.IMgaFCO fco = mgaObject as GME.MGA.IMgaFCO;
+                    foreach (GME.MGA.IMgaConnPoint conn in fco.PartOfConns)
                     {
                         if (conn.Owner.Meta.Name == "SetMembership" && conn.ConnRole == "dst")
                         {
-                            foreach (MGALib.IMgaConnPoint connOther in conn.Owner.ConnPoints)
+                            foreach (GME.MGA.IMgaConnPoint connOther in conn.Owner.ConnPoints)
                             {
                                 if (connOther.ConnRole == "src")
                                 {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/MainWindow.xaml
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/MainWindow.xaml	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/MainWindow.xaml	Tue Jun 14 18:15:45 2011	(r1359)
@@ -202,7 +202,7 @@
                     <Label Content="Component name:" Height="28" HorizontalAlignment="Left" Margin="21,77,0,0" Name="lbl_ComponentName" VerticalAlignment="Top" FontSize="13" FontFamily="Segoe UI" />
                     <TextBox Height="23" HorizontalAlignment="Left" Margin="25,102,0,0" Name="txb_ComponentName" VerticalAlignment="Top" Width="264" Background="White" TextChanged="txb_ComponentName_TextChanged" />
                     <TextBlock Foreground="#FF9A9A9A" Height="23" Margin="313,102,0,0" TextWrapping="Wrap" VerticalAlignment="Top" FontStyle="Italic" FontFamily="Segoe UI" HorizontalAlignment="Left" Width="145">
-                        <Bold>You can use whitespaces</Bold>
+                        <Bold>You can use whitespace</Bold>
                     </TextBlock>
                     <Label Content="Icon path (32×32, *.ico):" FontFamily="Segoe UI" FontSize="13" Height="28" HorizontalAlignment="Left" Margin="21,173,0,0" Name="lbl_IconPath" VerticalAlignment="Top" />
                     <TextBox Height="23" IsEnabled="True" HorizontalAlignment="Left" Margin="25,198,0,0" Name="txb_IconPath" VerticalAlignment="Top" Width="264" TextChanged="txb_IconPath_TextChanged" />

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon.zip
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/ComponentConfig.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/ComponentConfig.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/ComponentConfig.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
-using MGAUtilLib;
-using MGALib;
+using GME.Util;
+using GME.MGA;
 
 namespace GME.CSharp
 {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/GMEConsole.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/GMEConsole.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/GMEConsole.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.IO;
-using GmeLib;
+using GME;
 
 namespace GME.CSharp
 {
@@ -87,7 +87,7 @@
         }
 
 
-        public static GMEConsole CreateFromProject(MGALib.MgaProject project)
+        public static GMEConsole CreateFromProject(GME.MGA.MgaProject project)
         {
             GMEConsole console = new GMEConsole();
             try

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/MyAddon.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/MyAddon.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/MyAddon.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -4,9 +4,9 @@
 using System.Runtime.InteropServices;
 using System.IO;
 using GME.CSharp;
-using MGALib;
-using GmeLib;
-using MGACoreLib;
+using GME.MGA;
+using GME;
+using GME.MGA.Core;
 
 namespace MyAddon
 {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/Registrar.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/Registrar.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/Registrar.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
-using MGAUtilLib;
-using MGALib;
-using GmeLib;
-using MGACoreLib;
+using GME.Util;
+using GME.MGA;
+using GME;
+using GME.MGA.Core;
 using Microsoft.Win32;
 
 namespace GME.CSharp

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/classlibrary.csproj
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/classlibrary.csproj	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/classlibrary.csproj	Tue Jun 14 18:15:45 2011	(r1359)
@@ -48,6 +48,11 @@
 	<Reference Include="Microsoft.CSharp"/>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="GME, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
+    <Reference Include="GME.Util, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
+    <Reference Include="GME.MGA, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
+    <Reference Include="GME.MGA.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
+    <Reference Include="GME.MGA.Meta, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ComponentConfig.cs" />
@@ -57,53 +62,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
 	<!--$ADDITIONALFILES$-->
   </ItemGroup>
-  <ItemGroup>
-	<COMReference Include="CORELib">
-      <Guid>{9E9AAACF-28B8-11D3-B36C-0060082DF884}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="GmeLib">
-      <Guid>{0ADEEC71-D83A-11D3-B36B-005004CC8592}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="METALib">
-      <Guid>{0ADEEC71-D83A-11D3-B36B-005004D38590}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="MGALib">
-      <Guid>{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="MGAUTILLib">
-      <Guid>{461F30AE-3BF0-11D4-B3F0-005004D38590}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <!--DELETE
   <ItemGroup>
     <None Include="AssemblySignature.snk" />

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter.zip
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/ComponentConfig.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/ComponentConfig.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/ComponentConfig.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
-using MGAUtilLib;
-using MGALib;
+using GME.Util;
+using GME.MGA;
 
 namespace GME.CSharp
 {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/GMEConsole.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/GMEConsole.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/GMEConsole.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.IO;
-using GmeLib;
+using GME;
 
 namespace GME.CSharp
 {
@@ -87,7 +87,7 @@
         }
 
 
-        public static GMEConsole CreateFromProject(MGALib.MgaProject project)
+        public static GMEConsole CreateFromProject(GME.MGA.MgaProject project)
         {
             GMEConsole console = new GMEConsole();
             try

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/MgaGateway.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/MgaGateway.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/MgaGateway.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using MGALib;
-using GmeLib;
-using MGAMetaLib;
-using MGACoreLib;
+using GME;
+using GME.Util;
+using GME.MGA;
+using GME.MGA.Meta;
 
 namespace GME.CSharp
 {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/MyInterpreter.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/MyInterpreter.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/MyInterpreter.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -3,10 +3,10 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
-using MGACoreLib;
 using GME.CSharp;
-using GmeLib;
-using MGALib;
+using GME;
+using GME.MGA;
+using GME.MGA.Core;
 
 namespace MyInterpreter
 {

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/Registrar.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/Registrar.cs	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/Registrar.cs	Tue Jun 14 18:15:45 2011	(r1359)
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Runtime.InteropServices;
-using MGAUtilLib;
-using MGALib;
-using GmeLib;
-using MGACoreLib;
+using GME;
+using GME.Util;
+using GME.MGA;
+using GME.MGA.Core;
 using Microsoft.Win32;
 
 namespace GME.CSharp

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/classlibrary.csproj
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/classlibrary.csproj	Tue Jun 14 17:40:26 2011	(r1358)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/classlibrary.csproj	Tue Jun 14 18:15:45 2011	(r1359)
@@ -48,6 +48,11 @@
 	<Reference Include="Microsoft.CSharp"/>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="GME, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
+    <Reference Include="GME.Util, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
+    <Reference Include="GME.MGA, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
+    <Reference Include="GME.MGA.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
+    <Reference Include="GME.MGA.Meta, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e, processorArchitecture=MSIL"/>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ComponentConfig.cs" />
@@ -63,53 +68,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-	<COMReference Include="CORELib">
-      <Guid>{9E9AAACF-28B8-11D3-B36C-0060082DF884}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="GmeLib">
-      <Guid>{0ADEEC71-D83A-11D3-B36B-005004CC8592}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="METALib">
-      <Guid>{0ADEEC71-D83A-11D3-B36B-005004D38590}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="MGALib">
-      <Guid>{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="MGAUTILLib">
-      <Guid>{461F30AE-3BF0-11D4-B3F0-005004D38590}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <!--DELETE
   <ItemGroup>
     <None Include="AssemblySignature.snk" />


More information about the gme-commit mailing list