Changeset 14711 for branches/PersistenceOverhaul/HeuristicLab.Persistence.GUI/3.3

Timestamp:

03/03/17 11:41:43 (8 years ago)

Author:

gkronber

Message:

#2520

• renamed StorableClass -> StorableType
• changed persistence to use GUIDs instead of type names

Location:

branches/PersistenceOverhaul/HeuristicLab.Persistence.GUI/3.3

Files:

• PersistenceAnalysis.cs (modified) (1 diff)
• PersistenceConfigurationForm.cs (modified) (4 diffs)
• PersistenceConfigurationForm.resx (modified) (2 diffs)
• app.config (modified) (2 diffs)

branches/PersistenceOverhaul/HeuristicLab.Persistence.GUI/3.3/PersistenceAnalysis.cs

@@ -87 +87 @@
     }
 
-    /* private static bool IsCorrectlyStorable(Type type) {
+    /* private static bool IsCorrectlyStorable(MemberSelection type) {
       if (StorableAttribute.GetStorableMembers(type).Count() > 0) {
-        if (!StorableClassAttribute.IsStorableType(type, true))
+        if (!StorableTypeAttribute.IsStorableType(type, true))
           return false;
-        if (type.GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public, null, Type.EmptyTypes, null) == null &&
+        if (type.GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public, null, MemberSelection.EmptyTypes, null) == null &&
           StorableConstructorAttribute.GetStorableConstructor(type) == null)
           return false;

branches/PersistenceOverhaul/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.cs

@@ -85 +85 @@
     private void UpdatePrimitiveSerializersGrid(DataGridView primitiveSerializersGrid, Configuration config) {
       foreach (DataGridViewRow row in primitiveSerializersGrid.Rows) {
-        if (row.Cells["Type"] != null) {
-          IPrimitiveSerializer primitiveSerializer = config.GetPrimitiveSerializer(typeNameTable[(string)row.Cells["Type"].Value]);
+        if (row.Cells["MemberSelection"] != null) {
+          IPrimitiveSerializer primitiveSerializer = config.GetPrimitiveSerializer(typeNameTable[(string)row.Cells["MemberSelection"].Value]);
           if (primitiveSerializer == null) {
             row.Cells["Active"].Value = false;
@@ -194 +194 @@
       gridView.CellValueChanged += gridView_CellValueChanged;
       gridView.Columns.Add(new DataGridViewTextBoxColumn {
-        Name = "Type", ReadOnly = true,
+        Name = "MemberSelection", ReadOnly = true,
         AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
       });
@@ -246 +246 @@
       foreach (var primitiveSerializersMapping in primitiveSerializersMap) {
         var row = gridView.Rows[gridView.Rows.Add()];
-        row.Cells["Type"].Value = primitiveSerializersMapping.Key;
-        row.Cells["Type"].ToolTipText = primitiveSerializersMapping.Key;
+        row.Cells["MemberSelection"].Value = primitiveSerializersMapping.Key;
+        row.Cells["MemberSelection"].ToolTipText = primitiveSerializersMapping.Key;
         row.Cells["Active"].Value = true;
         var comboBoxCell = (DataGridViewComboBoxCell)row.Cells["Primitive Serializer"];
@@ -406 +406 @@
       var primitiveSerializers = new List<IPrimitiveSerializer>();
       foreach (DataGridViewRow row in primitiveSerializersGrid.Rows) {
-        if (row.Cells["Type"].Value != null &&
+        if (row.Cells["MemberSelection"].Value != null &&
              row.Cells["Active"].Value != null &&
              row.Cells["Primitive Serializer"].Value != null &&

branches/PersistenceOverhaul/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.resx

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
@@ -63 +63 @@
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
+      <xsd:complexMemberSelection>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
-            <xsd:complexType>
+            <xsd:complexMemberSelection>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" memberSelection="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute name="name" use="required" memberSelection="xsd:string" />
+              <xsd:attribute name="memberSelection" memberSelection="xsd:string" />
+              <xsd:attribute name="mimememberSelection" memberSelection="xsd:string" />
               <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexMemberSelection>
           </xsd:element>
           <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
+            <xsd:complexMemberSelection>
+              <xsd:attribute name="alias" memberSelection="xsd:string" />
+              <xsd:attribute name="name" memberSelection="xsd:string" />
+            </xsd:complexMemberSelection>
           </xsd:element>
           <xsd:element name="data">
-            <xsd:complexType>
+            <xsd:complexMemberSelection>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" memberSelection="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" memberSelection="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute name="name" memberSelection="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="memberSelection" memberSelection="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimememberSelection" memberSelection="xsd:string" msdata:Ordinal="4" />
               <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
+            </xsd:complexMemberSelection>
           </xsd:element>
           <xsd:element name="resheader">
-            <xsd:complexType>
+            <xsd:complexMemberSelection>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" memberSelection="xsd:string" minOccurs="0" msdata:Ordinal="1" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
+              <xsd:attribute name="name" memberSelection="xsd:string" use="required" />
+            </xsd:complexMemberSelection>
           </xsd:element>
         </xsd:choice>
-      </xsd:complexType>
+      </xsd:complexMemberSelection>
     </xsd:element>
   </xsd:schema>

branches/PersistenceOverhaul/HeuristicLab.Persistence.GUI/3.3/app.config

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="HeuristicLab.Persistence.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+        <sectionGroup name="userSettings" memberSelection="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="HeuristicLab.Persistence.Properties.Settings" memberSelection="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
@@ -11 +11 @@
                 <value/>
             </setting>
-            <setting name="customConfigurationsTypeCache" serializeAs="String">
+            <setting name="customConfigurationsMemberSelectionCache" serializeAs="String">
                 <value/>
             </setting>