Changeset 1425


Ignore:
Timestamp:
03/26/09 10:42:56 (10 years ago)
Author:
epitzer
Message:

Use version invariant assembly qualified name and update plug-in assembly name. (#506)

Location:
branches/New Persistence Exploration/Persistence
Files:
1 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • branches/New Persistence Exploration/Persistence/HeuristicLab.Persistence.GUI/HeuristicLab.Persistence.GUI.csproj

    r1373 r1425  
    4242  -->
    4343  <ItemGroup>
    44     <ProjectReference Include="..\Persistence\HeuristicLab.Persistence.csproj">
     44    <ProjectReference Include="..\Persistence\HeuristicLab.Persistence-3.3.csproj">
    4545      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    46       <Name>HeuristicLab.Persistence</Name>
     46      <Name>HeuristicLab.Persistence-3.3</Name>
    4747    </ProjectReference>
    4848  </ItemGroup>
  • branches/New Persistence Exploration/Persistence/HeuristicLab.Persistence.GUI/PersistenceConfigurationForm.cs

    r1414 r1425  
    3737          } else {
    3838            foreach (var pair in formatterTable) {
    39               if (pair.Value.GetType().FullName == formatter.GetType().FullName) {
     39              if (pair.Value.GetType().VersionInvariantName() == formatter.GetType().VersionInvariantName()) {
    4040                row.Cells["Formatter"].Value = pair.Key;
    4141                row.Cells["Active"].Value = true;
     
    5252      var availableDecomposers = new Dictionary<string, IDecomposer>();
    5353      foreach (IDecomposer d in ConfigurationService.Instance.Decomposers) {       
    54         availableDecomposers.Add(d.GetType().FullName, d);
     54        availableDecomposers.Add(d.GetType().VersionInvariantName(), d);
    5555      }     
    5656      foreach (IDecomposer decomposer in config.Decomposers) {       
     
    5858        item.Checked = true;
    5959        item.Tag = decomposer;
    60         availableDecomposers.Remove(decomposer.GetType().FullName);
     60        availableDecomposers.Remove(decomposer.GetType().VersionInvariantName());
    6161      }     
    6262      foreach (KeyValuePair<string, IDecomposer> pair in availableDecomposers) {
     
    211211          formatterTable.Remove(formatterName);
    212212          reverseFormatterTable.Remove(otherFormatter);
    213           formatterTable.Add(otherFormatter.GetType().FullName, otherFormatter);
    214           reverseFormatterTable.Add(otherFormatter, otherFormatter.GetType().FullName);
    215           formatterName = formatter.GetType().FullName;
     213          formatterTable.Add(otherFormatter.GetType().VersionInvariantName(), otherFormatter);
     214          reverseFormatterTable.Add(otherFormatter, otherFormatter.GetType().VersionInvariantName());
     215          formatterName = formatter.GetType().VersionInvariantName();
    216216        }
    217217        formatterTable.Add(formatterName, formatter);
     
    226226            typeNameTable.Remove(typeName);
    227227            reverseTypeNameTable.Remove(otherType);
    228             typeNameTable.Add(otherType.FullName, otherType);
    229             reverseTypeNameTable.Add(otherType, otherType.FullName);
    230             typeName = formatter.Type.FullName;
     228            typeNameTable.Add(otherType.VersionInvariantName(), otherType);
     229            reverseTypeNameTable.Add(otherType, otherType.VersionInvariantName());
     230            typeName = formatter.Type.VersionInvariantName();
    231231            typeNameTable.Add(typeName, formatter.Type);
    232232            reverseTypeNameTable.Add(formatter.Type, typeName);
     
    249249
    250250    private void decomposerList_DragEnter(object sender, DragEventArgs e) {     
    251       if ( e.Data.GetDataPresent(typeof(ListView.SelectedListViewItemCollection).FullName)) {
     251      if ( e.Data.GetDataPresent(typeof(ListView.SelectedListViewItemCollection).VersionInvariantName())) {
    252252        e.Effect = DragDropEffects.Move;
    253253      }
  • branches/New Persistence Exploration/Persistence/Persistence.sln

    r1373 r1425  
    22Microsoft Visual Studio Solution File, Format Version 10.00
    33# Visual Studio 2008
    4 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence", "Persistence\HeuristicLab.Persistence.csproj", "{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}"
     4Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence-3.3", "Persistence\HeuristicLab.Persistence-3.3.csproj", "{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}"
    55EndProject
    66Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.Test", "Test\HeuristicLab.Persistence.Test.csproj", "{E2245078-6F40-449E-A370-01A97A7C5E6A}"
  • branches/New Persistence Exploration/Persistence/Persistence/Core/ConfigurationService.cs

    r1418 r1425  
    9797            Formatters[formatter.Format].Add(formatter);
    9898          } catch (MissingMethodException) {
    99             Console.WriteLine("WARNING: Could not instantiate {0}", t.FullName);
     99            Console.WriteLine("WARNING: Could not instantiate {0}", t.VersionInvariantName());
    100100          }         
    101101        }
     
    104104            Decomposers.Add((IDecomposer) Activator.CreateInstance(t, true));
    105105          } catch (MissingMethodException) {
    106             Console.WriteLine("WARNING: Could not instantiate {0}", t.FullName);
     106            Console.WriteLine("WARNING: Could not instantiate {0}", t.VersionInvariantName());
    107107          }
    108108        }
  • branches/New Persistence Exploration/Persistence/Persistence/Core/DeSerializer.cs

    r1420 r1425  
    8989        throw new ApplicationException(String.Format(
    9090          "No suitable method for deserialization of type \"{0}\" found.",
    91           type.FullName));
     91          type.VersionInvariantName()));
    9292      }
    9393      if ( start.Id != null )
     
    111111        throw new ApplicationException(String.Format(
    112112          "No suitable method for deserialization of type \"{0}\" found.",
    113           type.FullName));
     113          type.VersionInvariantName()));
    114114      }
    115115    }
  • branches/New Persistence Exploration/Persistence/Persistence/Core/Serializer.cs

    r1420 r1425  
    3838          IFormatter f = configuration.GetFormatter(pair.Key);
    3939          if (f != null) {
    40             serializer = f.GetType().AssemblyQualifiedName;
     40            serializer = f.GetType().VersionInvariantName();
    4141          } else {
    4242            IDecomposer d = configuration.GetDecomposer(pair.Key);
    4343            if (d != null)
    44               serializer = d.GetType().AssemblyQualifiedName;
     44              serializer = d.GetType().VersionInvariantName();
    4545          }
    46           result.Add(new TypeMapping(pair.Value, pair.Key.AssemblyQualifiedName, serializer));
     46          result.Add(new TypeMapping(pair.Value, pair.Key.VersionInvariantName(), serializer));
    4747        }
    4848        return result;                                     
     
    9696          String.Format(
    9797          "No suitable method for serializing values of type \"{0}\" found.",
    98           value.GetType().FullName));     
     98          value.GetType().VersionInvariantName()));     
    9999    }
    100100
  • branches/New Persistence Exploration/Persistence/Persistence/Default/Decomposers/TypeDecomposer.cs

    r1421 r1425  
    1010    public bool CanDecompose(Type type) {
    1111      return type == typeof (Type) ||
    12              type.FullName == "System.RuntimeType";
     12             type.VersionInvariantName() == "System.RuntimeType, mscorlib";
    1313    }
    1414
    1515    public IEnumerable<Tag> DeCompose(object obj) {
    1616      Type t = (Type) obj;
    17       yield return new Tag("AssemblyQualifiedName", t.AssemblyQualifiedName);
     17      yield return new Tag("VersionInvariantName", t.VersionInvariantName());
    1818    }
    1919
  • branches/New Persistence Exploration/Persistence/Test/HeuristicLab.Persistence.Test.csproj

    r1357 r1425  
    4141  -->
    4242  <ItemGroup>
    43     <ProjectReference Include="..\Persistence\HeuristicLab.Persistence.csproj">
     43    <ProjectReference Include="..\Persistence\HeuristicLab.Persistence-3.3.csproj">
    4444      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    45       <Name>HeuristicLab.Persistence</Name>
     45      <Name>HeuristicLab.Persistence-3.3</Name>
    4646    </ProjectReference>
    4747  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.