[longomatch] Revert namespace changes in the Migration library

From: Andoni Morales Alastruey <amorales src gnome org>
To: commits-list gnome org
Cc:
Subject: [longomatch] Revert namespace changes in the Migration library
Date: Fri, 10 Oct 2014 23:42:58 +0000 (UTC)
commit 78bbec3372f7f42fd8b0ac17b1e3fd1208630904
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Fri Oct 10 18:55:24 2014 +0200

    Revert namespace changes in the Migration library

 LongoMatch.Migration/Common/Color.cs               |    2 +-
 LongoMatch.Migration/Common/Config.cs              |    2 +-
 LongoMatch.Migration/Common/Constants.cs           |    2 +-
 LongoMatch.Migration/Common/Enums.cs               |    2 +-
 LongoMatch.Migration/Common/Image.cs               |    2 +-
 LongoMatch.Migration/Common/SerializableObject.cs  |    8 ++++----
 LongoMatch.Migration/Converter.cs                  |    8 ++++----
 LongoMatch.Migration/Core/Category.cs              |   16 ++++++++--------
 LongoMatch.Migration/Core/Coordinates.cs           |    2 +-
 LongoMatch.Migration/Core/Drawing.cs               |    4 ++--
 LongoMatch.Migration/Core/GameUnit.cs              |    2 +-
 LongoMatch.Migration/Core/GameUnitsList.cs         |    4 ++--
 LongoMatch.Migration/Core/HotKey.cs                |    4 ++--
 .../Core/Interfaces/ISubCategory.cs                |    2 +-
 LongoMatch.Migration/Core/Interfaces/ITag.cs       |    4 ++--
 LongoMatch.Migration/Core/Interfaces/ITemplates.cs |    6 +++---
 .../Core/Interfaces/ITimelineNode.cs               |    4 ++--
 LongoMatch.Migration/Core/MediaFile.cs             |    4 ++--
 LongoMatch.Migration/Core/Period.cs                |    2 +-
 LongoMatch.Migration/Core/PixbufTimeNode.cs        |    4 ++--
 LongoMatch.Migration/Core/Play.cs                  |    6 +++---
 LongoMatch.Migration/Core/PlayListPlay.cs          |    2 +-
 LongoMatch.Migration/Core/Player.cs                |    4 ++--
 LongoMatch.Migration/Core/Point.cs                 |    2 +-
 LongoMatch.Migration/Core/Project.cs               |   10 +++++-----
 LongoMatch.Migration/Core/ProjectDescription.cs    |    4 ++--
 LongoMatch.Migration/Core/SubCategory.cs           |    6 +++---
 LongoMatch.Migration/Core/Tag.cs                   |    6 +++---
 LongoMatch.Migration/Core/TagStore.cs              |    8 ++++----
 .../Core/Templates/CategoriesTemplate.cs           |    8 ++++----
 .../Core/Templates/SubCategoryTemplate.cs          |    8 ++++----
 .../Core/Templates/TeamTemplate.cs                 |    6 +++---
 LongoMatch.Migration/Core/Time.cs                  |    4 ++--
 LongoMatch.Migration/Core/TimeNode.cs              |    4 ++--
 LongoMatch.Migration/Core/TimelineNode.cs          |    4 ++--
 LongoMatch.Migration/Core/Timer.cs                 |    4 ++--
 LongoMatch.Migration/DataBase.cs                   |   14 +++++++-------
 LongoMatch.Migration/MainWindow.cs                 |    2 +-
 LongoMatch.Migration/Tests/CateogiresTest.cs       |    4 ++--
 LongoMatch.Migration/Tests/TestProject.cs          |    4 ++--
 LongoMatch.Migration/Tests/TestTeam.cs             |    4 ++--
 41 files changed, 99 insertions(+), 99 deletions(-)
---
diff --git a/LongoMatch.Migration/Common/Color.cs b/LongoMatch.Migration/Common/Color.cs
index b27eb34..009cbc8 100644
--- a/LongoMatch.Migration/Common/Color.cs
+++ b/LongoMatch.Migration/Common/Color.cs
@@ -18,7 +18,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Core.Common
+namespace LongoMatch.Common
 {
 
        [JsonConverter (typeof (LongoMatchConverter))]
diff --git a/LongoMatch.Migration/Common/Config.cs b/LongoMatch.Migration/Common/Config.cs
index 76aeaf5..01d3805 100644
--- a/LongoMatch.Migration/Common/Config.cs
+++ b/LongoMatch.Migration/Common/Config.cs
@@ -17,7 +17,7 @@
 //
 using System;
 
-namespace LongoMatch.Core.Common
+namespace LongoMatch.Common
 {
        public class Config
        {
diff --git a/LongoMatch.Migration/Common/Constants.cs b/LongoMatch.Migration/Common/Constants.cs
index 396980e..f51aa74 100644
--- a/LongoMatch.Migration/Common/Constants.cs
+++ b/LongoMatch.Migration/Common/Constants.cs
@@ -22,7 +22,7 @@ using Gdk;
 #endif
 
 
-namespace LongoMatch.Core.Common
+namespace LongoMatch.Common
 {
        public class Constants {
                public const string SOFTWARE_NAME = "LongoMatch";
diff --git a/LongoMatch.Migration/Common/Enums.cs b/LongoMatch.Migration/Common/Enums.cs
index 006c180..ae62c2b 100644
--- a/LongoMatch.Migration/Common/Enums.cs
+++ b/LongoMatch.Migration/Common/Enums.cs
@@ -17,7 +17,7 @@
 //
 using System;
 
-namespace LongoMatch.Core.Common
+namespace LongoMatch.Common
 {
        public enum Team {
                NONE = 0,
diff --git a/LongoMatch.Migration/Common/Image.cs b/LongoMatch.Migration/Common/Image.cs
index 455cb46..483c2a1 100644
--- a/LongoMatch.Migration/Common/Image.cs
+++ b/LongoMatch.Migration/Common/Image.cs
@@ -18,7 +18,7 @@
 using System.Runtime.Serialization;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Core.Common
+namespace LongoMatch.Common
 {
        using System;
        using System.IO;
diff --git a/LongoMatch.Migration/Common/SerializableObject.cs 
b/LongoMatch.Migration/Common/SerializableObject.cs
index 5aeb297..c7060be 100644
--- a/LongoMatch.Migration/Common/SerializableObject.cs
+++ b/LongoMatch.Migration/Common/SerializableObject.cs
@@ -23,14 +23,14 @@ using System.Runtime.Serialization.Formatters.Binary;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using LongoMatch.Core.Interfaces;
+using LongoMatch.Interfaces;
 using System.Reflection;
-using LongoMatch.Core.Store.Templates;
+using LongoMatch.Store.Templates;
 using Newtonsoft.Json.Converters;
-using LongoMatch.Core.Store;
+using LongoMatch.Store;
 using System.Globalization;
 
-namespace LongoMatch.Core.Common
+namespace LongoMatch.Common
 {
        public class SerializableObject
        {
diff --git a/LongoMatch.Migration/Converter.cs b/LongoMatch.Migration/Converter.cs
index 4bb9b27..591efb8 100644
--- a/LongoMatch.Migration/Converter.cs
+++ b/LongoMatch.Migration/Converter.cs
@@ -18,12 +18,12 @@
 using System;
 using System.Linq;
 using System.IO;
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Store.Templates;
-using LongoMatch.Core.Store;
+using LongoMatch.Common;
+using LongoMatch.Store.Templates;
+using LongoMatch.Store;
 using System.Collections.Generic;
 using LongoMatch.DB;
-using LongoMatch.Core.Interfaces;
+using LongoMatch.Interfaces;
 
 namespace LongoMatch.Migration
 {
diff --git a/LongoMatch.Migration/Core/Category.cs b/LongoMatch.Migration/Core/Category.cs
index 8bb8f17..aeac71c 100644
--- a/LongoMatch.Migration/Core/Category.cs
+++ b/LongoMatch.Migration/Core/Category.cs
@@ -25,11 +25,11 @@ using System.Runtime.Serialization;
 using Mono.Unix;
 using Newtonsoft.Json;
 
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
-using Image = LongoMatch.Core.Common.Image;
+using LongoMatch.Common;
+using LongoMatch.Interfaces;
+using Image = LongoMatch.Common.Image;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 
        /// <summary>
@@ -185,10 +185,10 @@ namespace LongoMatch.Core.Store
                        Position = (Int32) info.GetValue("position", typeof (Int32));
                        SortMethod = (SortMethodType)info.GetValue("sort_method", typeof(SortMethodType));
                        Color = System.Drawing.Color.FromArgb(
-                               LongoMatch.Core.Common.Color.UShortToByte((ushort)info.GetValue("red", 
typeof(ushort))),
-                               LongoMatch.Core.Common.Color.UShortToByte((ushort)info.GetValue("green", 
typeof(ushort))),
-                               LongoMatch.Core.Common.Color.UShortToByte((ushort)info.GetValue("blue", 
typeof(ushort))));
-                       LColor = LongoMatch.Core.Common.Color.ColorFromUShort ((ushort)info.GetValue("red", 
typeof(ushort)),
+                               LongoMatch.Common.Color.UShortToByte((ushort)info.GetValue("red", 
typeof(ushort))),
+                               LongoMatch.Common.Color.UShortToByte((ushort)info.GetValue("green", 
typeof(ushort))),
+                               LongoMatch.Common.Color.UShortToByte((ushort)info.GetValue("blue", 
typeof(ushort))));
+                       LColor = LongoMatch.Common.Color.ColorFromUShort ((ushort)info.GetValue("red", 
typeof(ushort)),
                                                                          (ushort)info.GetValue("green", 
typeof(ushort)),
                                                                          (ushort)info.GetValue("blue", 
typeof(ushort)));
                        try {
diff --git a/LongoMatch.Migration/Core/Coordinates.cs b/LongoMatch.Migration/Core/Coordinates.cs
index 62f8a6a..dfd8422 100644
--- a/LongoMatch.Migration/Core/Coordinates.cs
+++ b/LongoMatch.Migration/Core/Coordinates.cs
@@ -20,7 +20,7 @@ using System.Linq;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Core.Common
+namespace LongoMatch.Common
 {
        [Serializable]
        [JsonObject]
diff --git a/LongoMatch.Migration/Core/Drawing.cs b/LongoMatch.Migration/Core/Drawing.cs
index 3dba084..96bcb0d 100644
--- a/LongoMatch.Migration/Core/Drawing.cs
+++ b/LongoMatch.Migration/Core/Drawing.cs
@@ -19,9 +19,9 @@
 using System;
 using Newtonsoft.Json;
 
-using LongoMatch.Core.Common;
+using LongoMatch.Common;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 
        [Serializable]
diff --git a/LongoMatch.Migration/Core/GameUnit.cs b/LongoMatch.Migration/Core/GameUnit.cs
index 2a394aa..f9ce9b9 100644
--- a/LongoMatch.Migration/Core/GameUnit.cs
+++ b/LongoMatch.Migration/Core/GameUnit.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
        [Serializable]
        public class GameUnit: List<TimelineNode>
diff --git a/LongoMatch.Migration/Core/GameUnitsList.cs b/LongoMatch.Migration/Core/GameUnitsList.cs
index 1cf4689..4cb7c4a 100644
--- a/LongoMatch.Migration/Core/GameUnitsList.cs
+++ b/LongoMatch.Migration/Core/GameUnitsList.cs
@@ -18,9 +18,9 @@
 using System;
 using System.Collections.Generic;
 
-using LongoMatch.Core.Store;
+using LongoMatch.Store;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
        [Serializable]
        public class GameUnitsList: List<GameUnit>
diff --git a/LongoMatch.Migration/Core/HotKey.cs b/LongoMatch.Migration/Core/HotKey.cs
index b9521dd..3f88f70 100644
--- a/LongoMatch.Migration/Core/HotKey.cs
+++ b/LongoMatch.Migration/Core/HotKey.cs
@@ -24,7 +24,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using Mono.Unix;
-using LongoMatch.Core.Common;
+using LongoMatch.Common;
 using Newtonsoft.Json;
 
 
@@ -32,7 +32,7 @@ using Newtonsoft.Json;
 using Gdk;
 #endif
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/Interfaces/ISubCategory.cs 
b/LongoMatch.Migration/Core/Interfaces/ISubCategory.cs
index 376b7c1..15ffd16 100644
--- a/LongoMatch.Migration/Core/Interfaces/ISubCategory.cs
+++ b/LongoMatch.Migration/Core/Interfaces/ISubCategory.cs
@@ -18,7 +18,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LongoMatch.Core.Interfaces
+namespace LongoMatch.Interfaces
 {
        public interface ISubCategory
        {
diff --git a/LongoMatch.Migration/Core/Interfaces/ITag.cs b/LongoMatch.Migration/Core/Interfaces/ITag.cs
index a5725d5..90c3e0a 100644
--- a/LongoMatch.Migration/Core/Interfaces/ITag.cs
+++ b/LongoMatch.Migration/Core/Interfaces/ITag.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 // 
 using System;
-using LongoMatch.Core.Store;
+using LongoMatch.Store;
 
-namespace LongoMatch.Core.Interfaces
+namespace LongoMatch.Interfaces
 {
        public interface ITag<T>
        {
diff --git a/LongoMatch.Migration/Core/Interfaces/ITemplates.cs 
b/LongoMatch.Migration/Core/Interfaces/ITemplates.cs
index f833e7d..a6d17c9 100644
--- a/LongoMatch.Migration/Core/Interfaces/ITemplates.cs
+++ b/LongoMatch.Migration/Core/Interfaces/ITemplates.cs
@@ -17,10 +17,10 @@
 // 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Core.Store;
-using LongoMatch.Core.Store.Templates;
+using LongoMatch.Store;
+using LongoMatch.Store.Templates;
        
-namespace LongoMatch.Core.Interfaces
+namespace LongoMatch.Interfaces
 {
        public interface ITemplate
        {
diff --git a/LongoMatch.Migration/Core/Interfaces/ITimelineNode.cs 
b/LongoMatch.Migration/Core/Interfaces/ITimelineNode.cs
index ebcf925..d0ff33d 100644
--- a/LongoMatch.Migration/Core/Interfaces/ITimelineNode.cs
+++ b/LongoMatch.Migration/Core/Interfaces/ITimelineNode.cs
@@ -16,9 +16,9 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 // 
 using System;
-using LongoMatch.Core.Store;
+using LongoMatch.Store;
 
-namespace LongoMatch.Core.Interfaces
+namespace LongoMatch.Interfaces
 {
        public interface ITimelineNode
        {       
diff --git a/LongoMatch.Migration/Core/MediaFile.cs b/LongoMatch.Migration/Core/MediaFile.cs
index 4751a24..0d05cef 100644
--- a/LongoMatch.Migration/Core/MediaFile.cs
+++ b/LongoMatch.Migration/Core/MediaFile.cs
@@ -21,10 +21,10 @@
 using System;
 using Mono.Unix;
 
-using LongoMatch.Core.Common;
+using LongoMatch.Common;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 
        [Serializable]
diff --git a/LongoMatch.Migration/Core/Period.cs b/LongoMatch.Migration/Core/Period.cs
index c2a2ecc..215f6cf 100644
--- a/LongoMatch.Migration/Core/Period.cs
+++ b/LongoMatch.Migration/Core/Period.cs
@@ -19,7 +19,7 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
        public class Period: Timer
        {
diff --git a/LongoMatch.Migration/Core/PixbufTimeNode.cs b/LongoMatch.Migration/Core/PixbufTimeNode.cs
index 8251028..5902f3f 100644
--- a/LongoMatch.Migration/Core/PixbufTimeNode.cs
+++ b/LongoMatch.Migration/Core/PixbufTimeNode.cs
@@ -21,9 +21,9 @@
 using System;
 using System.IO;
 
-using LongoMatch.Core.Common;
+using LongoMatch.Common;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/Play.cs b/LongoMatch.Migration/Core/Play.cs
index 8907ced..74a603c 100644
--- a/LongoMatch.Migration/Core/Play.cs
+++ b/LongoMatch.Migration/Core/Play.cs
@@ -22,11 +22,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Mono.Unix;
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
+using LongoMatch.Common;
+using LongoMatch.Interfaces;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/PlayListPlay.cs b/LongoMatch.Migration/Core/PlayListPlay.cs
index 97c71b9..eca7f57 100644
--- a/LongoMatch.Migration/Core/PlayListPlay.cs
+++ b/LongoMatch.Migration/Core/PlayListPlay.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
        /// <summary>
        /// Represents a video segment used by <see cref="LongoMatch.Playlist.Playlist"/>.
diff --git a/LongoMatch.Migration/Core/Player.cs b/LongoMatch.Migration/Core/Player.cs
index c16b0e7..5a1704a 100644
--- a/LongoMatch.Migration/Core/Player.cs
+++ b/LongoMatch.Migration/Core/Player.cs
@@ -17,10 +17,10 @@
 //
 
 using System;
-using LongoMatch.Core.Common;
+using LongoMatch.Common;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
        /// <summary>
        /// Player of a team
diff --git a/LongoMatch.Migration/Core/Point.cs b/LongoMatch.Migration/Core/Point.cs
index 6986a8f..45447b6 100644
--- a/LongoMatch.Migration/Core/Point.cs
+++ b/LongoMatch.Migration/Core/Point.cs
@@ -20,7 +20,7 @@ using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Core.Common
+namespace LongoMatch.Common
 {
        
        [Serializable]
diff --git a/LongoMatch.Migration/Core/Project.cs b/LongoMatch.Migration/Core/Project.cs
index 1b6a75d..98d671b 100644
--- a/LongoMatch.Migration/Core/Project.cs
+++ b/LongoMatch.Migration/Core/Project.cs
@@ -25,12 +25,12 @@ using System.Linq;
 using Newtonsoft.Json;
 using Mono.Unix;
 
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
-using LongoMatch.Core.Store;
-using LongoMatch.Core.Store.Templates;
+using LongoMatch.Common;
+using LongoMatch.Interfaces;
+using LongoMatch.Store;
+using LongoMatch.Store.Templates;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/ProjectDescription.cs b/LongoMatch.Migration/Core/ProjectDescription.cs
index 949a805..1a6dd9f 100644
--- a/LongoMatch.Migration/Core/ProjectDescription.cs
+++ b/LongoMatch.Migration/Core/ProjectDescription.cs
@@ -18,9 +18,9 @@
 
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Core.Store;
+using LongoMatch.Store;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/SubCategory.cs b/LongoMatch.Migration/Core/SubCategory.cs
index f44d52f..2a712c3 100644
--- a/LongoMatch.Migration/Core/SubCategory.cs
+++ b/LongoMatch.Migration/Core/SubCategory.cs
@@ -21,10 +21,10 @@ using System.Linq;
 using Mono.Unix;
 using Newtonsoft.Json;
 
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
+using LongoMatch.Common;
+using LongoMatch.Interfaces;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
        /// <summary>
        /// A sub category is used to extend the tags of a category.
diff --git a/LongoMatch.Migration/Core/Tag.cs b/LongoMatch.Migration/Core/Tag.cs
index fed2ce9..e33f344 100644
--- a/LongoMatch.Migration/Core/Tag.cs
+++ b/LongoMatch.Migration/Core/Tag.cs
@@ -20,10 +20,10 @@ using System;
 using System.Linq;
 using System.Collections.Generic;
 
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
+using LongoMatch.Common;
+using LongoMatch.Interfaces;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 [Serializable]
        
diff --git a/LongoMatch.Migration/Core/TagStore.cs b/LongoMatch.Migration/Core/TagStore.cs
index 1db28bc..92d8323 100644
--- a/LongoMatch.Migration/Core/TagStore.cs
+++ b/LongoMatch.Migration/Core/TagStore.cs
@@ -20,11 +20,11 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
-using LongoMatch.Core.Store;
+using LongoMatch.Common;
+using LongoMatch.Interfaces;
+using LongoMatch.Store;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
        [Serializable]
        [JsonObject (MemberSerialization = MemberSerialization.OptIn)]
diff --git a/LongoMatch.Migration/Core/Templates/CategoriesTemplate.cs 
b/LongoMatch.Migration/Core/Templates/CategoriesTemplate.cs
index 627e354..682e5d5 100644
--- a/LongoMatch.Migration/Core/Templates/CategoriesTemplate.cs
+++ b/LongoMatch.Migration/Core/Templates/CategoriesTemplate.cs
@@ -23,12 +23,12 @@ using System.Linq;
 using Newtonsoft.Json;
 
 using Mono.Unix;
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
+using LongoMatch.Common;
+using LongoMatch.Interfaces;
 
-using Image = LongoMatch.Core.Common.Image;
+using Image = LongoMatch.Common.Image;
 
-namespace LongoMatch.Core.Store.Templates
+namespace LongoMatch.Store.Templates
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/Templates/SubCategoryTemplate.cs 
b/LongoMatch.Migration/Core/Templates/SubCategoryTemplate.cs
index 6c727e1..4b0fef4 100644
--- a/LongoMatch.Migration/Core/Templates/SubCategoryTemplate.cs
+++ b/LongoMatch.Migration/Core/Templates/SubCategoryTemplate.cs
@@ -18,12 +18,12 @@
 
 using System;
 using System.Collections.Generic;
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
-using LongoMatch.Core.Store;
+using LongoMatch.Common;
+using LongoMatch.Interfaces;
+using LongoMatch.Store;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Core.Store.Templates
+namespace LongoMatch.Store.Templates
 {
 
        [Serializable]
diff --git a/LongoMatch.Migration/Core/Templates/TeamTemplate.cs 
b/LongoMatch.Migration/Core/Templates/TeamTemplate.cs
index 1481f83..8904ab3 100644
--- a/LongoMatch.Migration/Core/Templates/TeamTemplate.cs
+++ b/LongoMatch.Migration/Core/Templates/TeamTemplate.cs
@@ -22,10 +22,10 @@ using System.Linq;
 using Mono.Unix;
 using Newtonsoft.Json;
 
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
+using LongoMatch.Common;
+using LongoMatch.Interfaces;
 
-namespace LongoMatch.Core.Store.Templates
+namespace LongoMatch.Store.Templates
 {
        [Serializable]
        [JsonObject]
diff --git a/LongoMatch.Migration/Core/Time.cs b/LongoMatch.Migration/Core/Time.cs
index e2710f4..10d17dc 100644
--- a/LongoMatch.Migration/Core/Time.cs
+++ b/LongoMatch.Migration/Core/Time.cs
@@ -20,9 +20,9 @@
 
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Core.Common;
+using LongoMatch.Common;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/TimeNode.cs b/LongoMatch.Migration/Core/TimeNode.cs
index 9dabe55..36267f9 100644
--- a/LongoMatch.Migration/Core/TimeNode.cs
+++ b/LongoMatch.Migration/Core/TimeNode.cs
@@ -21,9 +21,9 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using LongoMatch.Core.Store;
+using LongoMatch.Store;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
 
        /// <summary>
diff --git a/LongoMatch.Migration/Core/TimelineNode.cs b/LongoMatch.Migration/Core/TimelineNode.cs
index 5dbad8e..e85e7c5 100644
--- a/LongoMatch.Migration/Core/TimelineNode.cs
+++ b/LongoMatch.Migration/Core/TimelineNode.cs
@@ -17,9 +17,9 @@
 // 
 using System;
 using Newtonsoft.Json;
-using LongoMatch.Core.Interfaces;
+using LongoMatch.Interfaces;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
     /* FIXME: Code duplicated from Play, unfortunately we can't
       * modify the class hierachy */
diff --git a/LongoMatch.Migration/Core/Timer.cs b/LongoMatch.Migration/Core/Timer.cs
index 6e4099c..ee28aac 100644
--- a/LongoMatch.Migration/Core/Timer.cs
+++ b/LongoMatch.Migration/Core/Timer.cs
@@ -17,11 +17,11 @@
 //
 using System;
 using System.Linq;
-using LongoMatch.Core.Store;
+using LongoMatch.Store;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace LongoMatch.Core.Store
+namespace LongoMatch.Store
 {
        public class Timer
        {
diff --git a/LongoMatch.Migration/DataBase.cs b/LongoMatch.Migration/DataBase.cs
index 434f3cd..32ba381 100644
--- a/LongoMatch.Migration/DataBase.cs
+++ b/LongoMatch.Migration/DataBase.cs
@@ -26,10 +26,10 @@ using Db4objects.Db4o;
 using Db4objects.Db4o.Query;
 using Db4objects.Db4o.Ext;
 
-using LongoMatch.Core.Common;
-using LongoMatch.Core.Interfaces;
-using LongoMatch.Core.Store;
-using LongoMatch.Core.Store.Templates;
+using LongoMatch.Common;
+using LongoMatch.Interfaces;
+using LongoMatch.Store;
+using LongoMatch.Store.Templates;
 
 namespace LongoMatch.DB
 {
@@ -492,15 +492,15 @@ namespace LongoMatch.DB
                        Image image = null;
                        
                        if (backgroundName == Constants.FIELD_BACKGROUND) {
-                               image = Config.FieldBackground;
+                               image = LongoMatch.Common.Config.FieldBackground;
                                project.Categories.FieldBackground = image; 
                                coords =  project.AllPlays().Select(p => p.FieldPosition).ToList();
                        } else if (backgroundName == Constants.HALF_FIELD_BACKGROUND) {
-                               image = Config.HalfFieldBackground;
+                               image = LongoMatch.Common.Config.HalfFieldBackground;
                                project.Categories.HalfFieldBackground = image; 
                                coords = project.AllPlays().Select(p => p.HalfFieldPosition).ToList();
                        } else if (backgroundName == Constants.GOAL_BACKGROUND) {
-                               image = Config.GoalBackground;
+                               image = LongoMatch.Common.Config.GoalBackground;
                                project.Categories.GoalBackground = image;
                        }
                        
diff --git a/LongoMatch.Migration/MainWindow.cs b/LongoMatch.Migration/MainWindow.cs
index e20fb08..b760de7 100644
--- a/LongoMatch.Migration/MainWindow.cs
+++ b/LongoMatch.Migration/MainWindow.cs
@@ -20,7 +20,7 @@ using System.IO;
 using Gtk;
 using System.Collections.Generic;
 using LongoMatch.DB;
-using LongoMatch.Core.Store;
+using LongoMatch.Store;
 
 public partial class MainWindow: Gtk.Window
 {      
diff --git a/LongoMatch.Migration/Tests/CateogiresTest.cs b/LongoMatch.Migration/Tests/CateogiresTest.cs
index 2f0ebde..cc65853 100644
--- a/LongoMatch.Migration/Tests/CateogiresTest.cs
+++ b/LongoMatch.Migration/Tests/CateogiresTest.cs
@@ -18,8 +18,8 @@
 using NUnit.Framework;
 using System;
 using System.Reflection;
-using LongoMatch.Core.Store.Templates;
-using LongoMatch.Core.Common;
+using LongoMatch.Store.Templates;
+using LongoMatch.Common;
 using System.IO;
 
 namespace LongoMatch.Migration.Tests
diff --git a/LongoMatch.Migration/Tests/TestProject.cs b/LongoMatch.Migration/Tests/TestProject.cs
index 4e88e03..c4a7d88 100644
--- a/LongoMatch.Migration/Tests/TestProject.cs
+++ b/LongoMatch.Migration/Tests/TestProject.cs
@@ -19,8 +19,8 @@ using NUnit.Framework;
 using System;
 using System.Reflection;
 using System.IO;
-using LongoMatch.Core.Store;
-using LongoMatch.Core.Common;
+using LongoMatch.Store;
+using LongoMatch.Common;
 
 namespace LongoMatch.Migration.Tests
 {
diff --git a/LongoMatch.Migration/Tests/TestTeam.cs b/LongoMatch.Migration/Tests/TestTeam.cs
index dfba16a..0829d55 100644
--- a/LongoMatch.Migration/Tests/TestTeam.cs
+++ b/LongoMatch.Migration/Tests/TestTeam.cs
@@ -19,8 +19,8 @@ using NUnit.Framework;
 using System;
 using System.Reflection;
 using System.IO;
-using LongoMatch.Core.Store.Templates;
-using LongoMatch.Core.Common;
+using LongoMatch.Store.Templates;
+using LongoMatch.Common;
 
 namespace LongoMatch.Migration.Tests
 {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]