Changeset 1623

Timestamp:

04/22/09 14:41:27 (16 years ago)

Author:

epitzer

Message:

Namespace refactoring, visibility check (#548)

Location:

trunk/sources/HeuristicLab.Persistence/3.3

Files:

• Core/Configuration.cs (modified) (1 diff)
• Core/ConfigurationService.cs (modified) (2 diffs)
• Core/DataMemberAccessor.cs (deleted)
• Core/EmptyStorableClassAttribute.cs (deleted)
• Core/GeneratorBase.cs (modified) (3 diffs)
• Core/StorableAttribute.cs (deleted)
• Core/Tag.cs (modified) (1 diff)
• Core/TypeMapping.cs (modified) (3 diffs)
• Default/DebugString/Formatters/Bool2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Byte2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/DateTime2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Doubld2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Float2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Int2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Long2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/SByte2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Short2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/String2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/Type2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/UInt2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/ULong2DebugStringFormatter.cs (modified) (1 diff)
• Default/DebugString/Formatters/UShort2DebugStringFormatter.cs (modified) (1 diff)
• Default/Decomposers/ArrayDecomposer.cs (modified) (1 diff)
• Default/Decomposers/CompactNumberArray2StringDecomposer.cs (modified) (1 diff)
• Default/Decomposers/DictionaryDecomposer.cs (modified) (1 diff)
• Default/Decomposers/EnumDecomposer.cs (modified) (1 diff)
• Default/Decomposers/EnumerableDecomposer.cs (modified) (1 diff)
• Default/Decomposers/KeyValuePairDecomposer.cs (modified) (1 diff)
• Default/Decomposers/NumberEnumerable2StringDecomposer.cs (modified) (1 diff)
• Default/Decomposers/Storable (added)
• Default/Decomposers/Storable/DataMemberAccessor.cs (added)
• Default/Decomposers/Storable/EmptyStorableClassAttribute.cs (added)
• Default/Decomposers/Storable/StorableAttribute.cs (added)
• Default/Decomposers/Storable/StorableDecomposer.cs (added)
• Default/Decomposers/StorableDecomposer.cs (deleted)
• Default/Decomposers/TypeDecomposer.cs (modified) (1 diff)
• Default/Xml/Compact/DoubleList2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Compact/IntList2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/Bool2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/Byte2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/DateTime2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/Decimal2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/Double2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/Float2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/Int2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/Long2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/SByte2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/Short2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/String2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/UInt2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/ULong2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/Primitive/UShort2XmlFormatter.cs (modified) (1 diff)
• Default/Xml/XmlFormat.cs (modified) (1 diff)
• Default/Xml/XmlString.cs (modified) (1 diff)
• HeuristicLab.Persistence-3.3.csproj (modified) (4 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Core/Configuration.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Interfaces;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Core {

trunk/sources/HeuristicLab.Persistence/3.3/Core/ConfigurationService.cs

@@ -36 +36 @@
     }
 
-    public void LoadSettings() {
+    protected void LoadSettings() {
       try {
         if (String.IsNullOrEmpty(Properties.Settings.Default.CustomConfigurations) ||
@@ -58 +58 @@
     }
 
-    public void SaveSettings() {
+    protected void SaveSettings() {
       Serializer serializer = new Serializer(
         customConfigurations,

trunk/sources/HeuristicLab.Persistence/3.3/Core/GeneratorBase.cs

@@ -13 +13 @@
 
   public abstract class GeneratorBase<T> {
+
     public T Format(ISerializationToken token) {
       Type type = token.GetType();
@@ -31 +32 @@
       throw new ApplicationException("Invalid token of type " + type.FullName);
     }
+
     protected abstract T Format(BeginToken beginToken);
     protected abstract T Format(EndToken endToken);
@@ -38 +40 @@
     protected abstract T Format(MetaInfoBeginToken metaInfoBeginToken);
     protected abstract T Format(MetaInfoEndToken metaInfoEndToken);
+
   }
 }

trunk/sources/HeuristicLab.Persistence/3.3/Core/Tag.cs

@@ -11 +11 @@
       Value = value;
     }
+
     public Tag(object value) {
       Name = null;

trunk/sources/HeuristicLab.Persistence/3.3/Core/TypeMapping.cs

@@ -4 +4 @@
 
   public class TypeMapping {
+
     public readonly int Id;
     public readonly string TypeName;
     public readonly string Serializer;
+
     public TypeMapping(int id, string typeName, string serializer) {
       Id = id;
@@ -12 +14 @@
       Serializer = serializer;
     }
+
     public Dictionary<string, object> GetDict() {
       return new Dictionary<string, object> {
@@ -18 +21 @@
         {"serializer", Serializer}};
     }
+
   }
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Bool2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Byte2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/DateTime2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Doubld2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Float2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Int2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Long2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/SByte2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Short2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/String2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/Type2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/UInt2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/ULong2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/DebugString/Formatters/UShort2DebugStringFormatter.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Core.Tokens;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.DebugString.Formatters {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/ArrayDecomposer.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Interfaces;
 using System.Collections.Generic;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/CompactNumberArray2StringDecomposer.cs

@@ -6 +6 @@
 using System.Globalization;
 using System.Text;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/DictionaryDecomposer.cs

@@ -4 +4 @@
 using HeuristicLab.Persistence.Interfaces;
 using System.Collections.Generic;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/EnumDecomposer.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Interfaces;
 using System.Collections.Generic;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/EnumerableDecomposer.cs

@@ -5 +5 @@
 using HeuristicLab.Persistence.Interfaces;
 using System.Collections.Generic;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/KeyValuePairDecomposer.cs

@@ -5 +5 @@
 using HeuristicLab.Persistence.Interfaces;
 using System.Reflection;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/NumberEnumerable2StringDecomposer.cs

@@ -6 +6 @@
 using System.Globalization;
 using System.Text;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Decomposers/TypeDecomposer.cs

@@ -3 +3 @@
 using HeuristicLab.Persistence.Interfaces;
 using System.Collections.Generic;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Decomposers {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/DoubleList2XmlFormatter.cs

@@ -4 +4 @@
 using HeuristicLab.Persistence.Core;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Compact/IntList2XmlFormatter.cs

@@ -3 +3 @@
 using System;
 using HeuristicLab.Persistence.Core;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Compact {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Bool2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Byte2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/DateTime2XmlFormatter.cs

@@ -2 +2 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Interfaces;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Decimal2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Double2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Float2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Int2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Long2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/SByte2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/Short2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/String2XmlFormatter.cs

@@ -4 +4 @@
 using System.Text;
 using System.Text.RegularExpressions;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/UInt2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/ULong2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/Primitive/UShort2XmlFormatter.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Globalization;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml.Primitive {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlFormat.cs

@@ -1 +1 @@
 using HeuristicLab.Persistence.Interfaces;
 using HeuristicLab.Persistence.Core;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml {

trunk/sources/HeuristicLab.Persistence/3.3/Default/Xml/XmlString.cs

@@ -2 +2 @@
 using HeuristicLab.Persistence.Core;
 using System.Text;
+using HeuristicLab.Persistence.Default.Decomposers.Storable;
 
 namespace HeuristicLab.Persistence.Default.Xml {

trunk/sources/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj

@@ -94 +94 @@
   <ItemGroup>
     <Compile Include="Core\Configuration.cs" />
-    <Compile Include="Core\EmptyStorableClassAttribute.cs" />
+    <Compile Include="Default\Decomposers\Storable\EmptyStorableClassAttribute.cs" />
     <Compile Include="Core\FormatBase.cs" />
     <Compile Include="Core\FormatterBase.cs" />
@@ -126 +126 @@
     <Compile Include="Default\Decomposers\KeyValuePairDecomposer.cs" />
     <Compile Include="Default\Decomposers\DictionaryDecomposer.cs" />
-    <Compile Include="Default\Decomposers\StorableDecomposer.cs" />
+    <Compile Include="Default\Decomposers\Storable\StorableDecomposer.cs" />
     <Compile Include="Default\Decomposers\TypeDecomposer.cs" />
     <Compile Include="Default\Decomposers\NumberEnumerable2StringDecomposer.cs" />
@@ -134 +134 @@
     <Compile Include="Default\Xml\Compact\NumberEnumeration2XmlFormatterBase.cs" />
     <Compile Include="Default\Xml\Compact\NumberArray2XmlFormatterBase.cs" />
-    <Compile Include="Core\DataMemberAccessor.cs" />
+    <Compile Include="Default\Decomposers\Storable\DataMemberAccessor.cs" />
     <Compile Include="Default\Xml\Compact\IntList2XmlFormatter.cs" />
     <Compile Include="Default\Xml\XmlStringConstants.cs" />
@@ -180 +180 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="Core\StorableAttribute.cs" />
+    <Compile Include="Default\Decomposers\Storable\StorableAttribute.cs" />
     <Compile Include="Default\Xml\XmlGenerator.cs" />
     <Compile Include="Default\Xml\XmlParser.cs" />