Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/PersistenceOverhaul/HeuristicLab.Persistence.GUI/3.3/PersistenceAnalysis.cs

    r11172 r14711  
    8787    }
    8888
    89     /* private static bool IsCorrectlyStorable(Type type) {
     89    /* private static bool IsCorrectlyStorable(MemberSelection type) {
    9090      if (StorableAttribute.GetStorableMembers(type).Count() > 0) {
    91         if (!StorableClassAttribute.IsStorableType(type, true))
     91        if (!StorableTypeAttribute.IsStorableType(type, true))
    9292          return false;
    93         if (type.GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public, null, Type.EmptyTypes, null) == null &&
     93        if (type.GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public, null, MemberSelection.EmptyTypes, null) == null &&
    9494          StorableConstructorAttribute.GetStorableConstructor(type) == null)
    9595          return false;
  • branches/PersistenceOverhaul/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.cs

    r11172 r14711  
    8585    private void UpdatePrimitiveSerializersGrid(DataGridView primitiveSerializersGrid, Configuration config) {
    8686      foreach (DataGridViewRow row in primitiveSerializersGrid.Rows) {
    87         if (row.Cells["Type"] != null) {
    88           IPrimitiveSerializer primitiveSerializer = config.GetPrimitiveSerializer(typeNameTable[(string)row.Cells["Type"].Value]);
     87        if (row.Cells["MemberSelection"] != null) {
     88          IPrimitiveSerializer primitiveSerializer = config.GetPrimitiveSerializer(typeNameTable[(string)row.Cells["MemberSelection"].Value]);
    8989          if (primitiveSerializer == null) {
    9090            row.Cells["Active"].Value = false;
     
    194194      gridView.CellValueChanged += gridView_CellValueChanged;
    195195      gridView.Columns.Add(new DataGridViewTextBoxColumn {
    196         Name = "Type", ReadOnly = true,
     196        Name = "MemberSelection", ReadOnly = true,
    197197        AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
    198198      });
     
    246246      foreach (var primitiveSerializersMapping in primitiveSerializersMap) {
    247247        var row = gridView.Rows[gridView.Rows.Add()];
    248         row.Cells["Type"].Value = primitiveSerializersMapping.Key;
    249         row.Cells["Type"].ToolTipText = primitiveSerializersMapping.Key;
     248        row.Cells["MemberSelection"].Value = primitiveSerializersMapping.Key;
     249        row.Cells["MemberSelection"].ToolTipText = primitiveSerializersMapping.Key;
    250250        row.Cells["Active"].Value = true;
    251251        var comboBoxCell = (DataGridViewComboBoxCell)row.Cells["Primitive Serializer"];
     
    406406      var primitiveSerializers = new List<IPrimitiveSerializer>();
    407407      foreach (DataGridViewRow row in primitiveSerializersGrid.Rows) {
    408         if (row.Cells["Type"].Value != null &&
     408        if (row.Cells["MemberSelection"].Value != null &&
    409409             row.Cells["Active"].Value != null &&
    410410             row.Cells["Primitive Serializer"].Value != null &&
  • branches/PersistenceOverhaul/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.resx

    r4477 r14711  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<root>
    33  <!--
     
    6363    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    6464    <xsd:element name="root" msdata:IsDataSet="true">
    65       <xsd:complexType>
     65      <xsd:complexMemberSelection>
    6666        <xsd:choice maxOccurs="unbounded">
    6767          <xsd:element name="metadata">
    68             <xsd:complexType>
     68            <xsd:complexMemberSelection>
    6969              <xsd:sequence>
    70                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
     70                <xsd:element name="value" memberSelection="xsd:string" minOccurs="0" />
    7171              </xsd:sequence>
    72               <xsd:attribute name="name" use="required" type="xsd:string" />
    73               <xsd:attribute name="type" type="xsd:string" />
    74               <xsd:attribute name="mimetype" type="xsd:string" />
     72              <xsd:attribute name="name" use="required" memberSelection="xsd:string" />
     73              <xsd:attribute name="memberSelection" memberSelection="xsd:string" />
     74              <xsd:attribute name="mimememberSelection" memberSelection="xsd:string" />
    7575              <xsd:attribute ref="xml:space" />
    76             </xsd:complexType>
     76            </xsd:complexMemberSelection>
    7777          </xsd:element>
    7878          <xsd:element name="assembly">
    79             <xsd:complexType>
    80               <xsd:attribute name="alias" type="xsd:string" />
    81               <xsd:attribute name="name" type="xsd:string" />
    82             </xsd:complexType>
     79            <xsd:complexMemberSelection>
     80              <xsd:attribute name="alias" memberSelection="xsd:string" />
     81              <xsd:attribute name="name" memberSelection="xsd:string" />
     82            </xsd:complexMemberSelection>
    8383          </xsd:element>
    8484          <xsd:element name="data">
    85             <xsd:complexType>
     85            <xsd:complexMemberSelection>
    8686              <xsd:sequence>
    87                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
    88                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
     87                <xsd:element name="value" memberSelection="xsd:string" minOccurs="0" msdata:Ordinal="1" />
     88                <xsd:element name="comment" memberSelection="xsd:string" minOccurs="0" msdata:Ordinal="2" />
    8989              </xsd:sequence>
    90               <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
    91               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
    92               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
     90              <xsd:attribute name="name" memberSelection="xsd:string" use="required" msdata:Ordinal="1" />
     91              <xsd:attribute name="memberSelection" memberSelection="xsd:string" msdata:Ordinal="3" />
     92              <xsd:attribute name="mimememberSelection" memberSelection="xsd:string" msdata:Ordinal="4" />
    9393              <xsd:attribute ref="xml:space" />
    94             </xsd:complexType>
     94            </xsd:complexMemberSelection>
    9595          </xsd:element>
    9696          <xsd:element name="resheader">
    97             <xsd:complexType>
     97            <xsd:complexMemberSelection>
    9898              <xsd:sequence>
    99                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
     99                <xsd:element name="value" memberSelection="xsd:string" minOccurs="0" msdata:Ordinal="1" />
    100100              </xsd:sequence>
    101               <xsd:attribute name="name" type="xsd:string" use="required" />
    102             </xsd:complexType>
     101              <xsd:attribute name="name" memberSelection="xsd:string" use="required" />
     102            </xsd:complexMemberSelection>
    103103          </xsd:element>
    104104        </xsd:choice>
    105       </xsd:complexType>
     105      </xsd:complexMemberSelection>
    106106    </xsd:element>
    107107  </xsd:schema>
  • branches/PersistenceOverhaul/HeuristicLab.Persistence.GUI/3.3/app.config

    r11623 r14711  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<configuration>
    33    <configSections>
    4         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    5             <section name="HeuristicLab.Persistence.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     4        <sectionGroup name="userSettings" memberSelection="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5            <section name="HeuristicLab.Persistence.Properties.Settings" memberSelection="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
    66        </sectionGroup>
    77    </configSections>
     
    1111                <value/>
    1212            </setting>
    13             <setting name="customConfigurationsTypeCache" serializeAs="String">
     13            <setting name="customConfigurationsMemberSelectionCache" serializeAs="String">
    1414                <value/>
    1515            </setting>
Note: See TracChangeset for help on using the changeset viewer.