General clean-up

Using Type.Guid for component id
Added "hack" to deserialize when using the older component style

Author: sbaer

Component/ComponentIOMarshal.cs

@@ -11,13 +11,13 @@
 
 namespace GhPython.Component
 {
-  internal abstract class ComponentIOMarshal
+  abstract class ComponentIOMarshal
   {
     public abstract object GetInput(IGH_DataAccess DA, int i);
     public abstract void SetOutput(object o, IGH_DataAccess DA, int index);
   }
 
-  internal sealed class NewComponentIOMarshal : ComponentIOMarshal
+  sealed class NewComponentIOMarshal : ComponentIOMarshal
   {
     private readonly ZuiPythonComponent _component;
 
@@ -236,7 +236,7 @@ private IGH_DataTree GeometryTree<T>(DataTree<T> output)
   }
 
 
-  internal sealed class OldComponentIOMarshal : ComponentIOMarshal
+  sealed class OldComponentIOMarshal : ComponentIOMarshal
   {
     private readonly dynamic _document; //GrasshopperDocument-like object
     private readonly dynamic _objectTable; //CustomTable-like object

Component/PyUpgrader.cs

@@ -10,21 +10,25 @@ public IGH_DocumentObject Upgrade(IGH_DocumentObject target, GH_Document documen
     {
       PythonComponent_OBSOLETE component_OBSOLETE = target as PythonComponent_OBSOLETE;
       if (component_OBSOLETE == null)
-      {
         return null;
-      }
+
       ZuiPythonComponent component_new = new ZuiPythonComponent();
 
-      component_new.HideCodeInput = component_OBSOLETE.HideCodeInput;
-      if (component_new.HideCodeInput)
-        component_new.Params.Input.RemoveAt(0);
+      bool show_code_input = false;
+      if (component_OBSOLETE.CodeInputVisible)
+      {
+        // see if the "code" input on the old component really has anything
+        // hooked up to it.  If not, don't show the input
+        show_code_input = component_OBSOLETE.Params.Input[0].SourceCount > 0;
+      }
+      component_new.CodeInputVisible = show_code_input;
 
       component_new.HideCodeOutput = component_OBSOLETE.HideCodeOutput;
 
       if (component_new.HideCodeOutput)
         component_new.Params.Output.RemoveAt(0);
 
-      if (component_new.HideCodeInput)
+      if (!component_new.CodeInputVisible)
         component_new.CodeInput = component_OBSOLETE.CodeInput;
 
       component_OBSOLETE.Dispose();
@@ -36,37 +40,36 @@ public IGH_DocumentObject Upgrade(IGH_DocumentObject target, GH_Document documen
           foreach (var c in component_new.Params.Input)
           {
             var sc = c as Param_ScriptVariable;
-            if (sc != null)
-            {
-              IGH_TypeHint newHint;
+            if (sc == null) continue;
+            IGH_TypeHint newHint;
 
-              if (toRhinoScript)
-              {
-                if (PythonHints.ToNewRhinoscriptHint(sc.TypeHint, out newHint))
-                  sc.TypeHint = newHint;
-              }
-              else
-              {
-                if (PythonHints.ToNewRhinoCommonHint(sc.TypeHint, out newHint))
-                  sc.TypeHint = newHint;
-              }
+            if (toRhinoScript)
+            {
+              if (PythonHints.ToNewRhinoscriptHint(sc.TypeHint, out newHint))
+                sc.TypeHint = newHint;
+            }
+            else
+            {
+              if (PythonHints.ToNewRhinoCommonHint(sc.TypeHint, out newHint))
+                sc.TypeHint = newHint;
             }
           }
         }
 
+        component_new.CodeInputVisible = show_code_input;
         return component_new;
       }
       return null;
     }
 
     public Guid UpgradeFrom
     {
-      get { return new Guid(PythonComponent_OBSOLETE.Id); }
+      get { return typeof(PythonComponent_OBSOLETE).GUID; }
     }
 
     public Guid UpgradeTo
     {
-      get { return new Guid(ZuiPythonComponent.Id); }
+      get { return typeof(ZuiPythonComponent).GUID; }
     }
 
     public DateTime Version