From f1fd9b8b68d92cc7c2bea4281929fac6e60f9b92 Mon Sep 17 00:00:00 2001 From: stev Date: Mon, 10 Oct 2016 04:06:51 -0400 Subject: [PATCH 1/2] Updated assembly name --- ...ntities.csproj => CLP.Entities.Old.csproj} | 8 ++--- CLP.Entities/DAL/ClassPeriodContext.cs | 2 +- CLP.Entities/DAL/DatabaseConfiguration.cs | 2 +- CLP.Entities/DomainModel/AEntityBase.cs | 4 ++- CLP.Entities/DomainModel/CLPPage.cs | 4 ++- CLP.Entities/DomainModel/ClassPeriod.cs | 4 ++- CLP.Entities/DomainModel/ClassSubject.cs | 4 ++- .../DomainModel/Displays/ADisplayBase.cs | 4 ++- .../DomainModel/Displays/GridDisplay.cs | 4 ++- CLP.Entities/DomainModel/Displays/IDisplay.cs | 2 +- .../DomainModel/History/AHistoryItemBase.cs | 4 ++- .../DomainModel/History/AnimationIndicator.cs | 4 ++- ...CLPArrayDivisionValueChangedHistoryItem.cs | 2 +- .../CLPArrayDivisionsChangedHistoryItem.cs | 2 +- .../CLPArrayGridToggleHistoryItem.cs | 2 +- .../CLPArrayRotateHistoryItem.cs | 2 +- .../CLPArraySnapHistoryItem.cs | 2 +- .../FFCArrayRemovedHistoryItem.cs | 4 ++- .../FFCArraySnappedInHistoryItem.cs | 4 ++- .../DomainModel/History/IHistoryBatch.cs | 2 +- .../DomainModel/History/IHistoryItem.cs | 2 +- .../DomainModel/History/PageHistory.cs | 4 ++- .../PageObjectCutHistoryItem.cs | 2 +- .../PageObjectMoveBatchHistoryItem.cs | 2 +- .../PageObjectResizeBatchHistoryItem.cs | 2 +- .../PageObjectsAddedHistoryItem.cs | 2 +- .../PageObjectsRemovedHistoryItem.cs | 2 +- .../History/StrokesChangedHistoryItem.cs | 4 ++- CLP.Entities/DomainModel/IConnectedPerson.cs | 5 ++- CLP.Entities/DomainModel/Notebook.cs | 5 ++- .../PageObjects/APageObjectBase.cs | 4 ++- .../PageObjects/Arrays/ACLPArrayBase.cs | 5 ++- .../PageObjects/Arrays/CLPArray.cs | 4 ++- .../PageObjects/Arrays/FuzzyFactorCard.cs | 4 ++- .../PageObjects/Arrays/RemainderTiles.cs | 4 ++- .../DomainModel/PageObjects/CLPImage.cs | 4 ++- .../DomainModel/PageObjects/CLPTextBox.cs | 4 ++- .../PageObject Interfaces/ICountable.cs | 2 +- .../PageObject Interfaces/ICuttable.cs | 2 +- .../PageObject Interfaces/IPageObject.cs | 2 +- .../IPageObjectAccepter.cs | 2 +- .../PageObject Interfaces/IStrokeAccepter.cs | 2 +- .../ISubmittablePageObject.cs | 2 +- CLP.Entities/DomainModel/PageObjects/Shape.cs | 4 ++- CLP.Entities/DomainModel/Person.cs | 4 ++- .../Strokes/Extensions/StrokeExtension.cs | 2 +- CLP.Entities/DomainModel/Strokes/StrokeDTO.cs | 4 ++- CLP.Entities/DomainModel/Tags/ATagBase.cs | 4 ++- .../Tags/ArrayDivisionCorrectnessTag.cs | 4 ++- .../DomainModel/Tags/ArrayOrientationTag.cs | 4 ++- .../Tags/ArrayPartialProductsStrategyTag.cs | 4 ++- .../Tags/ArrayRepresentationCorrectnesTags.cs | 4 ++- .../DomainModel/Tags/ArrayXAxisStrategyTag.cs | 4 ++- .../DomainModel/Tags/ArrayYAxisStrategyTag.cs | 4 ++- .../DomainModel/Tags/CorrectnessTag.cs | 4 ++- .../Tags/FuzzyFactorCardCorrectnessTag.cs | 4 ++- .../Tags/FuzzyFactorCardDeletedTag.cs | 4 ++- .../Tags/FuzzyFactorCardFailedSnapTag.cs | 4 ++- ...uzzyFactorCardIncorrectArrayCreationTag.cs | 4 ++- ...yFactorCardRepresentationCorrectnessTag.cs | 8 +++-- .../Tags/FuzzyFactorCardStrategyTag.cs | 4 ++- CLP.Entities/DomainModel/Tags/ITag.cs | 2 +- .../DomainModel/Tags/PageDefinitionTag.cs | 4 ++- CLP.Entities/DomainModel/Tags/PageTopicTag.cs | 4 ++- .../Tags/Relations/MathRelation.cs | 5 +-- .../Tags/Relations/ProductRelation.cs | 4 ++- CLP.Entities/DomainModel/Tags/StarredTag.cs | 4 ++- .../DomainModel/Tags/Utility/TagAnalysis.cs | 2 +- CLP.Entities/Properties/AssemblyInfo.cs | 4 +-- .../Utility/Extentions/GuidExtensions.cs | 2 +- Classroom Learning Partner.sln | 24 ++----------- Classroom Learning Partner/App.xaml.cs | 2 +- Classroom Learning Partner/CLPServiceAgent.cs | 2 +- .../Classroom Learning Partner.csproj | 4 +-- .../DivisionPositionToColorMultiConverter.cs | 2 +- .../Converters/PageMatchToColorConverter.cs | 2 +- .../PageToStarredVisibilityConverter.cs | 2 +- .../PageToSubmissionVisibilityConverter.cs | 2 +- .../PageToSubmissionsListConverter.cs | 2 +- .../PersonToSubmissionsCountConverter.cs | 2 +- .../Converters/ShouldUseThumbnailConverter.cs | 2 +- .../Network/CLPNetwork.cs | 2 +- .../Network/INotebookContract.cs | 2 +- .../Network/InstructorService.cs | 2 +- .../Network/ProjectorService.cs | 2 +- .../Network/StudentService.cs | 2 +- .../Resources/Converters.cs | 2 +- .../Displays/GridDisplayViewModel.cs | 2 +- .../Displays/SingleDisplayViewModel.cs | 2 +- .../ViewModels/HoverBoxViewModel.cs | 2 +- .../ViewModels/MainWindowViewModel.cs | 2 +- .../Math/ProductRelationViewModel.cs | 2 +- .../Modal Windows/PersonCreationViewModel.cs | 10 +++--- .../PageObjects/APageObjectBaseViewModel.cs | 2 +- .../CLPAggregationDataTableViewModel.cs | 2 +- .../PageObjects/CLPArrayViewModel.cs | 2 +- .../PageObjects/CLPAudioViewModel.cs | 2 +- .../PageObjects/CLPFactorCardViewModel.cs | 2 +- .../PageObjects/CLPImageViewModel.cs | 2 +- .../PageObjects/CLPRegionViewModel.cs | 2 +- .../PageObjects/CLPStampCopyViewModel.cs | 2 +- .../PageObjects/CLPStampViewModel.cs | 2 +- .../PageObjects/CLPTextBoxViewModel.cs | 2 +- .../PageObjects/FuzzyFactorCardViewModel.cs | 2 +- .../Ink Regions/CLPDataTableViewModel.cs | 2 +- .../Ink Regions/CLPGroupingRegionViewModel.cs | 2 +- .../CLPHandwritingRegionViewModel.cs | 2 +- .../Ink Regions/CLPInkShapeRegionViewModel.cs | 2 +- .../Ink Regions/CLPShadingRegionViewModel.cs | 2 +- .../PageObjects/RemainderTilesViewModel.cs | 2 +- .../ViewModels/PageObjects/ShapeViewModel.cs | 2 +- .../ViewModels/Pages/ACLPPageBaseViewModel.cs | 2 +- .../Pages/CLPAnimationPageViewModel.cs | 2 +- .../ViewModels/Pages/CLPPageViewModel.cs | 2 +- .../Panels/ClassPeriodForDisplay.cs | 2 +- .../Panels/DisplaysPanelViewModel.cs | 2 +- .../Panels/NotebookPagesPanelViewModel.cs | 2 +- .../Panels/PageInformationPanelViewModel.cs | 2 +- .../Panels/ProgressPanelViewModel.cs | 2 +- .../ViewModels/Panels/StudentProgressInfo.cs | 2 +- .../Panels/StudentWorkPanelViewModel.cs | 2 +- .../Panels/SubmissionHistoryPanelViewModel.cs | 2 +- .../Panels/SubmissionsPanelViewModel.cs | 2 +- .../ViewModels/RibbonViewModel.cs | 2 +- .../NotebookChooserWorkspaceViewModel.cs | 2 +- .../Workspaces/NotebookWorkspaceViewModel.cs | 36 ++++++++++--------- .../Workspaces/UserLoginWorkspaceViewModel.cs | 2 +- .../Modal Windows/PageDefinitionView.xaml.cs | 2 +- .../Modal Windows/PersonCreationView.xaml | 2 +- .../CLPAggregationDataTableView.xaml.cs | 2 +- .../Views/PageObjects/CLPArrayView.xaml.cs | 2 +- .../PageObjects/CLPFactorCardView.xaml.cs | 2 +- .../Views/PageObjects/CLPStampCopyView.xaml | 2 +- .../Views/PageObjects/CLPStampView.xaml | 2 +- .../PageObjectContainerView.xaml.cs | 2 +- .../Views/Pages/CLPPagePreviewView.xaml.cs | 2 +- .../Views/Pages/CLPPageView.xaml.cs | 2 +- ConsoleScripts/ConsoleScripts.csproj | 4 +-- ConsoleScripts/Program.cs | 2 +- 139 files changed, 259 insertions(+), 189 deletions(-) rename CLP.Entities/{CLP.Entities.csproj => CLP.Entities.Old.csproj} (97%) diff --git a/CLP.Entities/CLP.Entities.csproj b/CLP.Entities/CLP.Entities.Old.csproj similarity index 97% rename from CLP.Entities/CLP.Entities.csproj rename to CLP.Entities/CLP.Entities.Old.csproj index 17f96cd97..7482ed0da 100644 --- a/CLP.Entities/CLP.Entities.csproj +++ b/CLP.Entities/CLP.Entities.Old.csproj @@ -7,8 +7,8 @@ {C6B95A31-7045-4C7E-A72D-C03468E20B20} Library Properties - CLP.Entities - CLP.Entities + CLP.Entities.Old + CLP.Entities.Old v4.5 512 @@ -82,10 +82,6 @@ - - - - diff --git a/CLP.Entities/DAL/ClassPeriodContext.cs b/CLP.Entities/DAL/ClassPeriodContext.cs index c2c712c64..93a8ffe94 100644 --- a/CLP.Entities/DAL/ClassPeriodContext.cs +++ b/CLP.Entities/DAL/ClassPeriodContext.cs @@ -1,6 +1,6 @@ using System.Data.Entity; -namespace CLP.Entities +namespace CLP.Entities.Old { public class ClassPeriodContext : DbContext { diff --git a/CLP.Entities/DAL/DatabaseConfiguration.cs b/CLP.Entities/DAL/DatabaseConfiguration.cs index 8578e07e5..aafd2f1f9 100644 --- a/CLP.Entities/DAL/DatabaseConfiguration.cs +++ b/CLP.Entities/DAL/DatabaseConfiguration.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; -namespace CLP.Entities +namespace CLP.Entities.Old { public class DatabaseConfiguration : DbConfiguration { diff --git a/CLP.Entities/DomainModel/AEntityBase.cs b/CLP.Entities/DomainModel/AEntityBase.cs index dbd9dca74..9a97c6413 100644 --- a/CLP.Entities/DomainModel/AEntityBase.cs +++ b/CLP.Entities/DomainModel/AEntityBase.cs @@ -1,8 +1,10 @@ using System.Runtime.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { + [RedirectType("CLP.Entities", "AEntityBase")] public abstract class AEntityBase : ModelBase { protected AEntityBase() { } diff --git a/CLP.Entities/DomainModel/CLPPage.cs b/CLP.Entities/DomainModel/CLPPage.cs index f60172231..ba74d8284 100644 --- a/CLP.Entities/DomainModel/CLPPage.cs +++ b/CLP.Entities/DomainModel/CLPPage.cs @@ -11,8 +11,9 @@ using System.Xml.Serialization; using Catel.Data; using Catel.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { public enum PageTypes { @@ -35,6 +36,7 @@ public enum PageLineTypes } [Serializable] + [RedirectType("CLP.Entities", "CLPPage")] public class CLPPage : AEntityBase { #region Fields diff --git a/CLP.Entities/DomainModel/ClassPeriod.cs b/CLP.Entities/DomainModel/ClassPeriod.cs index 0ddb64328..421fe1c5c 100644 --- a/CLP.Entities/DomainModel/ClassPeriod.cs +++ b/CLP.Entities/DomainModel/ClassPeriod.cs @@ -5,11 +5,13 @@ using System.Xml.Serialization; using Catel.Data; using Catel.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; using Path = Catel.IO.Path; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "ClassPeriod")] public class ClassPeriod : AEntityBase { #region Constructors diff --git a/CLP.Entities/DomainModel/ClassSubject.cs b/CLP.Entities/DomainModel/ClassSubject.cs index 964425e13..ca7d67242 100644 --- a/CLP.Entities/DomainModel/ClassSubject.cs +++ b/CLP.Entities/DomainModel/ClassSubject.cs @@ -4,11 +4,13 @@ using System.Runtime.Serialization; using Catel.Data; using Catel.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; using Path = Catel.IO.Path; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "ClassSubject")] public class ClassSubject : AEntityBase { #region Constructors diff --git a/CLP.Entities/DomainModel/Displays/ADisplayBase.cs b/CLP.Entities/DomainModel/Displays/ADisplayBase.cs index 5bfa3dabc..e08bea66f 100644 --- a/CLP.Entities/DomainModel/Displays/ADisplayBase.cs +++ b/CLP.Entities/DomainModel/Displays/ADisplayBase.cs @@ -5,9 +5,11 @@ using System.Xml.Serialization; using Catel.Data; using Catel.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { + [RedirectType("CLP.Entities", "ADisplayBase")] public abstract class ADisplayBase : AEntityBase, IDisplay { #region Constructors diff --git a/CLP.Entities/DomainModel/Displays/GridDisplay.cs b/CLP.Entities/DomainModel/Displays/GridDisplay.cs index b1ea8d125..48404c20b 100644 --- a/CLP.Entities/DomainModel/Displays/GridDisplay.cs +++ b/CLP.Entities/DomainModel/Displays/GridDisplay.cs @@ -4,10 +4,12 @@ using System.Runtime.Serialization; using Catel.Data; using Catel.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "GridDisplay")] public class GridDisplay : ADisplayBase { #region Constructors diff --git a/CLP.Entities/DomainModel/Displays/IDisplay.cs b/CLP.Entities/DomainModel/Displays/IDisplay.cs index 3cfa032e0..70eb6c194 100644 --- a/CLP.Entities/DomainModel/Displays/IDisplay.cs +++ b/CLP.Entities/DomainModel/Displays/IDisplay.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; -namespace CLP.Entities +namespace CLP.Entities.Old { public interface IDisplay { diff --git a/CLP.Entities/DomainModel/History/AHistoryItemBase.cs b/CLP.Entities/DomainModel/History/AHistoryItemBase.cs index 66257e4b8..ea6c8f847 100644 --- a/CLP.Entities/DomainModel/History/AHistoryItemBase.cs +++ b/CLP.Entities/DomainModel/History/AHistoryItemBase.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { + [RedirectType("CLP.Entities", "AHistoryItemBase")] public abstract class AHistoryItemBase : AEntityBase, IHistoryItem { public virtual int AnimationDelay diff --git a/CLP.Entities/DomainModel/History/AnimationIndicator.cs b/CLP.Entities/DomainModel/History/AnimationIndicator.cs index 7b929d200..d3e27b608 100644 --- a/CLP.Entities/DomainModel/History/AnimationIndicator.cs +++ b/CLP.Entities/DomainModel/History/AnimationIndicator.cs @@ -1,8 +1,9 @@ using System; using System.Runtime.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { public enum AnimationIndicatorType { @@ -11,6 +12,7 @@ public enum AnimationIndicatorType } [Serializable] + [RedirectType("CLP.Entities", "AnimationIndicator")] public class AnimationIndicator : AHistoryItemBase { #region Constructors diff --git a/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayDivisionValueChangedHistoryItem.cs b/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayDivisionValueChangedHistoryItem.cs index cfb6cdcfc..07ecf7961 100644 --- a/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayDivisionValueChangedHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayDivisionValueChangedHistoryItem.cs @@ -2,7 +2,7 @@ using System.Runtime.Serialization; using Catel.Data; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] public class CLPArrayDivisionValueChangedHistoryItem : AHistoryItemBase diff --git a/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayDivisionsChangedHistoryItem.cs b/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayDivisionsChangedHistoryItem.cs index c6374604e..f09e371b9 100644 --- a/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayDivisionsChangedHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayDivisionsChangedHistoryItem.cs @@ -4,7 +4,7 @@ using System.Runtime.Serialization; using Catel.Data; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] public class CLPArrayDivisionsChangedHistoryItem : AHistoryItemBase diff --git a/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayGridToggleHistoryItem.cs b/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayGridToggleHistoryItem.cs index 18f71cab0..663af92e8 100644 --- a/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayGridToggleHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayGridToggleHistoryItem.cs @@ -2,7 +2,7 @@ using System.Runtime.Serialization; using Catel.Data; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] public class CLPArrayGridToggleHistoryItem : AHistoryItemBase diff --git a/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayRotateHistoryItem.cs b/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayRotateHistoryItem.cs index fb258b91d..61e74e147 100644 --- a/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayRotateHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArrayRotateHistoryItem.cs @@ -2,7 +2,7 @@ using System.Runtime.Serialization; using Catel.Data; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] public class CLPArrayRotateHistoryItem : AHistoryItemBase diff --git a/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArraySnapHistoryItem.cs b/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArraySnapHistoryItem.cs index 5c7c3878f..e1a1dd93d 100644 --- a/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArraySnapHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/ArrayHistoryItems/CLPArraySnapHistoryItem.cs @@ -5,7 +5,7 @@ using System.Runtime.Serialization; using Catel.Data; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] public class CLPArraySnapHistoryItem : AHistoryItemBase diff --git a/CLP.Entities/DomainModel/History/FuzzyFactorCardHistoryItems/FFCArrayRemovedHistoryItem.cs b/CLP.Entities/DomainModel/History/FuzzyFactorCardHistoryItems/FFCArrayRemovedHistoryItem.cs index 2251b5765..55efc3d2b 100644 --- a/CLP.Entities/DomainModel/History/FuzzyFactorCardHistoryItems/FFCArrayRemovedHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/FuzzyFactorCardHistoryItems/FFCArrayRemovedHistoryItem.cs @@ -1,10 +1,12 @@ using System; using System.Runtime.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "FFCArrayRemovedHistoryItem")] public class FFCArrayRemovedHistoryItem : AHistoryItemBase { #region Constructors diff --git a/CLP.Entities/DomainModel/History/FuzzyFactorCardHistoryItems/FFCArraySnappedInHistoryItem.cs b/CLP.Entities/DomainModel/History/FuzzyFactorCardHistoryItems/FFCArraySnappedInHistoryItem.cs index c004744cf..0a7ceeaa5 100644 --- a/CLP.Entities/DomainModel/History/FuzzyFactorCardHistoryItems/FFCArraySnappedInHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/FuzzyFactorCardHistoryItems/FFCArraySnappedInHistoryItem.cs @@ -1,10 +1,12 @@ using System; using System.Runtime.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "FFCArraySnappedInHistoryItem")] public class FFCArraySnappedInHistoryItem : AHistoryItemBase { #region Constructors diff --git a/CLP.Entities/DomainModel/History/IHistoryBatch.cs b/CLP.Entities/DomainModel/History/IHistoryBatch.cs index ff89da870..980b84145 100644 --- a/CLP.Entities/DomainModel/History/IHistoryBatch.cs +++ b/CLP.Entities/DomainModel/History/IHistoryBatch.cs @@ -1,4 +1,4 @@ -namespace CLP.Entities +namespace CLP.Entities.Old { public interface IHistoryBatch : IHistoryItem { diff --git a/CLP.Entities/DomainModel/History/IHistoryItem.cs b/CLP.Entities/DomainModel/History/IHistoryItem.cs index 29dc38e58..d92085bdc 100644 --- a/CLP.Entities/DomainModel/History/IHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/IHistoryItem.cs @@ -1,4 +1,4 @@ -namespace CLP.Entities +namespace CLP.Entities.Old { public interface IHistoryItem { diff --git a/CLP.Entities/DomainModel/History/PageHistory.cs b/CLP.Entities/DomainModel/History/PageHistory.cs index 3961efffa..9ebaa4061 100644 --- a/CLP.Entities/DomainModel/History/PageHistory.cs +++ b/CLP.Entities/DomainModel/History/PageHistory.cs @@ -10,10 +10,12 @@ using Catel.Collections; using Catel.Data; using Catel.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "PageHistory")] public class PageHistory : AEntityBase { private readonly object _historyLock = new object(); diff --git a/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectCutHistoryItem.cs b/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectCutHistoryItem.cs index 2f71e59fb..f28fdd8e1 100644 --- a/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectCutHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectCutHistoryItem.cs @@ -6,7 +6,7 @@ using System.Xml.Serialization; using Catel.Data; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] public class PageObjectCutHistoryItem : AHistoryItemBase diff --git a/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectMoveBatchHistoryItem.cs b/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectMoveBatchHistoryItem.cs index d41cae1c2..111ddca8b 100644 --- a/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectMoveBatchHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectMoveBatchHistoryItem.cs @@ -5,7 +5,7 @@ using System.Windows; using Catel.Data; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] public class PageObjectMoveBatchHistoryItem : AHistoryItemBase, IHistoryBatch diff --git a/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectResizeBatchHistoryItem.cs b/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectResizeBatchHistoryItem.cs index a4ee3da56..b61b2c362 100644 --- a/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectResizeBatchHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectResizeBatchHistoryItem.cs @@ -5,7 +5,7 @@ using System.Windows; using Catel.Data; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] public class PageObjectResizeBatchHistoryItem : AHistoryItemBase, IHistoryBatch diff --git a/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectsAddedHistoryItem.cs b/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectsAddedHistoryItem.cs index cd7f435c7..be8671533 100644 --- a/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectsAddedHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectsAddedHistoryItem.cs @@ -5,7 +5,7 @@ using System.Xml.Serialization; using Catel.Data; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] public class PageObjectsAddedHistoryItem : AHistoryItemBase diff --git a/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectsRemovedHistoryItem.cs b/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectsRemovedHistoryItem.cs index 7d0002806..b3ee5371b 100644 --- a/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectsRemovedHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/PageObjectHistoryItems/PageObjectsRemovedHistoryItem.cs @@ -5,7 +5,7 @@ using System.Xml.Serialization; using Catel.Data; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] public class PageObjectsRemovedHistoryItem : AHistoryItemBase diff --git a/CLP.Entities/DomainModel/History/StrokesChangedHistoryItem.cs b/CLP.Entities/DomainModel/History/StrokesChangedHistoryItem.cs index 6592899cd..ed9675eec 100644 --- a/CLP.Entities/DomainModel/History/StrokesChangedHistoryItem.cs +++ b/CLP.Entities/DomainModel/History/StrokesChangedHistoryItem.cs @@ -5,10 +5,12 @@ using System.Windows.Ink; using System.Xml.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "StrokesChangedHistoryItem")] public class StrokesChangedHistoryItem : AHistoryItemBase { #region Constructors diff --git a/CLP.Entities/DomainModel/IConnectedPerson.cs b/CLP.Entities/DomainModel/IConnectedPerson.cs index 79a23356b..ae724c9f5 100644 --- a/CLP.Entities/DomainModel/IConnectedPerson.cs +++ b/CLP.Entities/DomainModel/IConnectedPerson.cs @@ -1,5 +1,8 @@ -namespace CLP.Entities +using Catel.Runtime.Serialization.Binary; + +namespace CLP.Entities.Old { + [RedirectType("CLP.Entities", "IConnectedPerson")] public interface IConnectedPerson { string CurrentMachineName { get; set; } diff --git a/CLP.Entities/DomainModel/Notebook.cs b/CLP.Entities/DomainModel/Notebook.cs index d2a30b3eb..39cb6a010 100644 --- a/CLP.Entities/DomainModel/Notebook.cs +++ b/CLP.Entities/DomainModel/Notebook.cs @@ -8,11 +8,13 @@ using System.Xml.Serialization; using Catel.Data; using Catel.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; using Path = Catel.IO.Path; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "Notebook")] public class Notebook : AEntityBase { #region Constructors @@ -542,6 +544,7 @@ public static Notebook OpenNotebook(string folderPath, bool includeSubmissions = { var filePath = Path.Combine(folderPath, "notebook.xml"); var notebook = Load(filePath, SerializationMode.Xml); + var pagesFolderPath = Path.Combine(folderPath, "Pages"); var thumbnailsFolderPath = Path.Combine(pagesFolderPath, "Thumbnails"); var pageAndHistoryFilePaths = Directory.EnumerateFiles(pagesFolderPath, "*.xml"); diff --git a/CLP.Entities/DomainModel/PageObjects/APageObjectBase.cs b/CLP.Entities/DomainModel/PageObjects/APageObjectBase.cs index 76b602a2d..e545233be 100644 --- a/CLP.Entities/DomainModel/PageObjects/APageObjectBase.cs +++ b/CLP.Entities/DomainModel/PageObjects/APageObjectBase.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { + [RedirectType("CLP.Entities", "APageObjectBase")] public abstract class APageObjectBase : AEntityBase, IPageObject { #region Constructors diff --git a/CLP.Entities/DomainModel/PageObjects/Arrays/ACLPArrayBase.cs b/CLP.Entities/DomainModel/PageObjects/Arrays/ACLPArrayBase.cs index 60b4255ab..ab0b2cb77 100644 --- a/CLP.Entities/DomainModel/PageObjects/Arrays/ACLPArrayBase.cs +++ b/CLP.Entities/DomainModel/PageObjects/Arrays/ACLPArrayBase.cs @@ -4,8 +4,9 @@ using System.Linq; using System.Runtime.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { public enum ArrayDivisionOrientation { @@ -14,6 +15,7 @@ public enum ArrayDivisionOrientation } [Serializable] + [RedirectType("CLP.Entities", "CLPArrayDivision")] public class CLPArrayDivision : ModelBase { #region Constructors @@ -110,6 +112,7 @@ public override bool Equals(object obj) } [Serializable] + [RedirectType("CLP.Entities", "ACLPArrayBase")] public abstract class ACLPArrayBase : APageObjectBase { #region Constructors diff --git a/CLP.Entities/DomainModel/PageObjects/Arrays/CLPArray.cs b/CLP.Entities/DomainModel/PageObjects/Arrays/CLPArray.cs index 556452363..33f36b6ff 100644 --- a/CLP.Entities/DomainModel/PageObjects/Arrays/CLPArray.cs +++ b/CLP.Entities/DomainModel/PageObjects/Arrays/CLPArray.cs @@ -4,8 +4,9 @@ using System.Runtime.Serialization; using System.Windows.Ink; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { public enum ArrayTypes { @@ -15,6 +16,7 @@ public enum ArrayTypes } [Serializable] + [RedirectType("CLP.Entities", "CLPArray")] public class CLPArray : ACLPArrayBase, ICountable, ICuttable { #region Constructors diff --git a/CLP.Entities/DomainModel/PageObjects/Arrays/FuzzyFactorCard.cs b/CLP.Entities/DomainModel/PageObjects/Arrays/FuzzyFactorCard.cs index 643910b78..6e601f6d0 100644 --- a/CLP.Entities/DomainModel/PageObjects/Arrays/FuzzyFactorCard.cs +++ b/CLP.Entities/DomainModel/PageObjects/Arrays/FuzzyFactorCard.cs @@ -3,10 +3,12 @@ using System.Linq; using System.Runtime.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "FuzzyFactorCard")] public class FuzzyFactorCard : ACLPArrayBase { #region Constructors diff --git a/CLP.Entities/DomainModel/PageObjects/Arrays/RemainderTiles.cs b/CLP.Entities/DomainModel/PageObjects/Arrays/RemainderTiles.cs index c578fce82..b093eb317 100644 --- a/CLP.Entities/DomainModel/PageObjects/Arrays/RemainderTiles.cs +++ b/CLP.Entities/DomainModel/PageObjects/Arrays/RemainderTiles.cs @@ -2,10 +2,12 @@ using System.Collections.ObjectModel; using System.Runtime.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "RemainderTiles")] public class RemainderTiles : APageObjectBase { #region Constructors diff --git a/CLP.Entities/DomainModel/PageObjects/CLPImage.cs b/CLP.Entities/DomainModel/PageObjects/CLPImage.cs index 83f047986..eace12bd9 100644 --- a/CLP.Entities/DomainModel/PageObjects/CLPImage.cs +++ b/CLP.Entities/DomainModel/PageObjects/CLPImage.cs @@ -3,10 +3,12 @@ using System.Runtime.Serialization; using System.Windows.Media.Imaging; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "CLPImage")] public class CLPImage : APageObjectBase { #region Constructors diff --git a/CLP.Entities/DomainModel/PageObjects/CLPTextBox.cs b/CLP.Entities/DomainModel/PageObjects/CLPTextBox.cs index de3e5c95e..66e91e79d 100644 --- a/CLP.Entities/DomainModel/PageObjects/CLPTextBox.cs +++ b/CLP.Entities/DomainModel/PageObjects/CLPTextBox.cs @@ -1,10 +1,12 @@ using System; using System.Runtime.Serialization; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "CLPTextBox")] public class CLPTextBox : APageObjectBase { #region Constructors diff --git a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ICountable.cs b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ICountable.cs index 1d556c2a9..b503d926e 100644 --- a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ICountable.cs +++ b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ICountable.cs @@ -1,4 +1,4 @@ -namespace CLP.Entities +namespace CLP.Entities.Old { public interface ICountable : IPageObject { diff --git a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ICuttable.cs b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ICuttable.cs index 9cfe86fc7..fc1383bcb 100644 --- a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ICuttable.cs +++ b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ICuttable.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Windows.Ink; -namespace CLP.Entities +namespace CLP.Entities.Old { public interface ICuttable : IPageObject { diff --git a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IPageObject.cs b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IPageObject.cs index 67f8aa72e..1967a3924 100644 --- a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IPageObject.cs +++ b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IPageObject.cs @@ -1,6 +1,6 @@ using System; -namespace CLP.Entities +namespace CLP.Entities.Old { public interface IPageObject { diff --git a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IPageObjectAccepter.cs b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IPageObjectAccepter.cs index ab12c5481..cb3452367 100644 --- a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IPageObjectAccepter.cs +++ b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IPageObjectAccepter.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; -namespace CLP.Entities +namespace CLP.Entities.Old { public interface IPageObjectAccepter : IPageObject { diff --git a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IStrokeAccepter.cs b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IStrokeAccepter.cs index 4025ab8cf..f1d7780b6 100644 --- a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IStrokeAccepter.cs +++ b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/IStrokeAccepter.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using System.Windows.Ink; -namespace CLP.Entities +namespace CLP.Entities.Old { public interface IStrokeAccepter : IPageObject { diff --git a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ISubmittablePageObject.cs b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ISubmittablePageObject.cs index 6dc837a71..59c1505a6 100644 --- a/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ISubmittablePageObject.cs +++ b/CLP.Entities/DomainModel/PageObjects/PageObject Interfaces/ISubmittablePageObject.cs @@ -1,4 +1,4 @@ -namespace CLP.Entities +namespace CLP.Entities.Old { public interface ISubmittablePageObject : IPageObject //TODO: Used for AggregationDataTable, nothing else implements this yet. { diff --git a/CLP.Entities/DomainModel/PageObjects/Shape.cs b/CLP.Entities/DomainModel/PageObjects/Shape.cs index fcca7aafb..5f5cf8c12 100644 --- a/CLP.Entities/DomainModel/PageObjects/Shape.cs +++ b/CLP.Entities/DomainModel/PageObjects/Shape.cs @@ -3,8 +3,9 @@ using System.Runtime.Serialization; using System.Windows.Ink; using Catel.Data; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { public enum ShapeType { @@ -17,6 +18,7 @@ public enum ShapeType } [Serializable] + [RedirectType("CLP.Entities", "Shape")] public class Shape : APageObjectBase, ICuttable, ICountable { #region Constructors diff --git a/CLP.Entities/DomainModel/Person.cs b/CLP.Entities/DomainModel/Person.cs index 3604be64b..7cd2daf1e 100644 --- a/CLP.Entities/DomainModel/Person.cs +++ b/CLP.Entities/DomainModel/Person.cs @@ -3,8 +3,9 @@ using System.Xml.Serialization; using Catel.Data; using Catel.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { public enum Handedness { @@ -13,6 +14,7 @@ public enum Handedness } [Serializable] + [RedirectType("CLP.Entities", "Person")] public class Person : AEntityBase, IConnectedPerson { #region Constructors diff --git a/CLP.Entities/DomainModel/Strokes/Extensions/StrokeExtension.cs b/CLP.Entities/DomainModel/Strokes/Extensions/StrokeExtension.cs index e372c8775..d8be6aacc 100644 --- a/CLP.Entities/DomainModel/Strokes/Extensions/StrokeExtension.cs +++ b/CLP.Entities/DomainModel/Strokes/Extensions/StrokeExtension.cs @@ -4,7 +4,7 @@ using System.Windows.Input; using Catel; -namespace CLP.Entities +namespace CLP.Entities.Old { /// /// Extension methods for the class. diff --git a/CLP.Entities/DomainModel/Strokes/StrokeDTO.cs b/CLP.Entities/DomainModel/Strokes/StrokeDTO.cs index bb6abd0cb..2a723132b 100644 --- a/CLP.Entities/DomainModel/Strokes/StrokeDTO.cs +++ b/CLP.Entities/DomainModel/Strokes/StrokeDTO.cs @@ -5,8 +5,9 @@ using System.Windows.Ink; using System.Windows.Input; using System.Windows.Media; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { public enum StylusTipType { @@ -15,6 +16,7 @@ public enum StylusTipType } [Serializable] + [RedirectType("CLP.Entities", "StrokeDTO")] public class StrokeDTO { #region Constructors diff --git a/CLP.Entities/DomainModel/Tags/ATagBase.cs b/CLP.Entities/DomainModel/Tags/ATagBase.cs index 605bac38b..b9369628b 100644 --- a/CLP.Entities/DomainModel/Tags/ATagBase.cs +++ b/CLP.Entities/DomainModel/Tags/ATagBase.cs @@ -3,8 +3,9 @@ using System.Xml.Serialization; using Catel.Data; using Catel.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { public enum Origin { @@ -18,6 +19,7 @@ public enum Origin } [Serializable] + [RedirectType("CLP.Entities", "ATagBase")] public abstract class ATagBase : AEntityBase, ITag { #region Constructors diff --git a/CLP.Entities/DomainModel/Tags/ArrayDivisionCorrectnessTag.cs b/CLP.Entities/DomainModel/Tags/ArrayDivisionCorrectnessTag.cs index 2335125b4..9156b99b5 100644 --- a/CLP.Entities/DomainModel/Tags/ArrayDivisionCorrectnessTag.cs +++ b/CLP.Entities/DomainModel/Tags/ArrayDivisionCorrectnessTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "ArrayDivisionCorrectnessTag")] public class ArrayDivisionCorrectnessTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/ArrayOrientationTag.cs b/CLP.Entities/DomainModel/Tags/ArrayOrientationTag.cs index 5dccc3fb4..94deb5ce4 100644 --- a/CLP.Entities/DomainModel/Tags/ArrayOrientationTag.cs +++ b/CLP.Entities/DomainModel/Tags/ArrayOrientationTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "ArrayOrientationTag")] public class ArrayOrientationTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/ArrayPartialProductsStrategyTag.cs b/CLP.Entities/DomainModel/Tags/ArrayPartialProductsStrategyTag.cs index 854506306..6bac49c0d 100644 --- a/CLP.Entities/DomainModel/Tags/ArrayPartialProductsStrategyTag.cs +++ b/CLP.Entities/DomainModel/Tags/ArrayPartialProductsStrategyTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "ArrayPartialProductsStrategyTag")] public class ArrayPartialProductsStrategyTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/ArrayRepresentationCorrectnesTags.cs b/CLP.Entities/DomainModel/Tags/ArrayRepresentationCorrectnesTags.cs index 6c57f8cdb..c49cbcd9e 100644 --- a/CLP.Entities/DomainModel/Tags/ArrayRepresentationCorrectnesTags.cs +++ b/CLP.Entities/DomainModel/Tags/ArrayRepresentationCorrectnesTags.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "ArrayRepresentationCorrectnessTag")] public class ArrayRepresentationCorrectnessTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/ArrayXAxisStrategyTag.cs b/CLP.Entities/DomainModel/Tags/ArrayXAxisStrategyTag.cs index 5cc6d44ba..11f908379 100644 --- a/CLP.Entities/DomainModel/Tags/ArrayXAxisStrategyTag.cs +++ b/CLP.Entities/DomainModel/Tags/ArrayXAxisStrategyTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "ArrayXAxisStrategyTag")] public class ArrayXAxisStrategyTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/ArrayYAxisStrategyTag.cs b/CLP.Entities/DomainModel/Tags/ArrayYAxisStrategyTag.cs index 31e53e5ec..9ebe20bf2 100644 --- a/CLP.Entities/DomainModel/Tags/ArrayYAxisStrategyTag.cs +++ b/CLP.Entities/DomainModel/Tags/ArrayYAxisStrategyTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "ArrayYAxisStrategyTag")] public class ArrayYAxisStrategyTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/CorrectnessTag.cs b/CLP.Entities/DomainModel/Tags/CorrectnessTag.cs index e873be9af..f0125ffc1 100644 --- a/CLP.Entities/DomainModel/Tags/CorrectnessTag.cs +++ b/CLP.Entities/DomainModel/Tags/CorrectnessTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "CorrectnessTag")] public class CorrectnessTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardCorrectnessTag.cs b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardCorrectnessTag.cs index cc1fd93ff..ee54412aa 100644 --- a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardCorrectnessTag.cs +++ b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardCorrectnessTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "FuzzyFactorCardCorrectnessTag")] public class FuzzyFactorCardCorrectnessTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardDeletedTag.cs b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardDeletedTag.cs index ecbe3dde4..1adcbd154 100644 --- a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardDeletedTag.cs +++ b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardDeletedTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "FuzzyFactorCardDeletedTag")] public class FuzzyFactorCardDeletedTag : ATagBase { diff --git a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardFailedSnapTag.cs b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardFailedSnapTag.cs index 6455f2c16..6fd640d0e 100644 --- a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardFailedSnapTag.cs +++ b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardFailedSnapTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "FuzzyFactorCardFailedSnapTag")] public class FuzzyFactorCardFailedSnapTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardIncorrectArrayCreationTag.cs b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardIncorrectArrayCreationTag.cs index e4044c654..39af79e76 100644 --- a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardIncorrectArrayCreationTag.cs +++ b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardIncorrectArrayCreationTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "FuzzyFactorCardIncorrectArrayCreationTag")] public class FuzzyFactorCardIncorrectArrayCreationTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardRepresentationCorrectnessTag.cs b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardRepresentationCorrectnessTag.cs index baaa6f8ac..9ca24e378 100644 --- a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardRepresentationCorrectnessTag.cs +++ b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardRepresentationCorrectnessTag.cs @@ -1,7 +1,11 @@ -using System.Runtime.Serialization; +using System; +using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { + [Serializable] + [RedirectType("CLP.Entities", "FuzzyFactorCardRepresentationCorrectnessTag")] public class FuzzyFactorCardRepresentationCorrectnessTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardStrategyTag.cs b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardStrategyTag.cs index f960d27f4..4ea7fa69e 100644 --- a/CLP.Entities/DomainModel/Tags/FuzzyFactorCardStrategyTag.cs +++ b/CLP.Entities/DomainModel/Tags/FuzzyFactorCardStrategyTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "FuzzyFactorCardStrategyTag")] public class FuzzyFactorCardStrategyTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/ITag.cs b/CLP.Entities/DomainModel/Tags/ITag.cs index 3e4fe1509..90d15f77e 100644 --- a/CLP.Entities/DomainModel/Tags/ITag.cs +++ b/CLP.Entities/DomainModel/Tags/ITag.cs @@ -2,7 +2,7 @@ using System.Xml.Serialization; using Catel.Runtime.Serialization; -namespace CLP.Entities +namespace CLP.Entities.Old { public interface ITag { /// diff --git a/CLP.Entities/DomainModel/Tags/PageDefinitionTag.cs b/CLP.Entities/DomainModel/Tags/PageDefinitionTag.cs index 891625485..146886160 100644 --- a/CLP.Entities/DomainModel/Tags/PageDefinitionTag.cs +++ b/CLP.Entities/DomainModel/Tags/PageDefinitionTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "PageDefinitionTag")] public class PageDefinitionTag : ATagBase { #region Constructors diff --git a/CLP.Entities/DomainModel/Tags/PageTopicTag.cs b/CLP.Entities/DomainModel/Tags/PageTopicTag.cs index b8b4f0263..ca34688d5 100644 --- a/CLP.Entities/DomainModel/Tags/PageTopicTag.cs +++ b/CLP.Entities/DomainModel/Tags/PageTopicTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "PageTopicTag")] public class PageTopicTag : ATagBase { #region Constructors diff --git a/CLP.Entities/DomainModel/Tags/Relations/MathRelation.cs b/CLP.Entities/DomainModel/Tags/Relations/MathRelation.cs index 50310c3c0..8d7907d9e 100644 --- a/CLP.Entities/DomainModel/Tags/Relations/MathRelation.cs +++ b/CLP.Entities/DomainModel/Tags/Relations/MathRelation.cs @@ -6,9 +6,9 @@ using System.Runtime.Serialization; using System.Collections.ObjectModel; using Catel.Data; +using Catel.Runtime.Serialization.Binary; - -namespace CLP.Entities +namespace CLP.Entities.Old { /// /// MathRelation Data object class which fully supports serialization, property changed notifications, @@ -16,6 +16,7 @@ namespace CLP.Entities /// #if !SILVERLIGHT [Serializable] + [RedirectType("CLP.Entities", "MathRelation")] #endif public abstract class MathRelation : ModelBase { diff --git a/CLP.Entities/DomainModel/Tags/Relations/ProductRelation.cs b/CLP.Entities/DomainModel/Tags/Relations/ProductRelation.cs index c674272fb..45513e126 100644 --- a/CLP.Entities/DomainModel/Tags/Relations/ProductRelation.cs +++ b/CLP.Entities/DomainModel/Tags/Relations/ProductRelation.cs @@ -5,8 +5,9 @@ using System.Threading.Tasks; using Catel.Data; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { /// @@ -15,6 +16,7 @@ namespace CLP.Entities /// #if !SILVERLIGHT [Serializable] + [RedirectType("CLP.Entities", "ProductRelation")] #endif public class ProductRelation : MathRelation diff --git a/CLP.Entities/DomainModel/Tags/StarredTag.cs b/CLP.Entities/DomainModel/Tags/StarredTag.cs index 3928ce6bf..d36435e26 100644 --- a/CLP.Entities/DomainModel/Tags/StarredTag.cs +++ b/CLP.Entities/DomainModel/Tags/StarredTag.cs @@ -1,9 +1,11 @@ using System; using System.Runtime.Serialization; +using Catel.Runtime.Serialization.Binary; -namespace CLP.Entities +namespace CLP.Entities.Old { [Serializable] + [RedirectType("CLP.Entities", "StarredTag")] public class StarredTag : ATagBase { public enum AcceptedValues diff --git a/CLP.Entities/DomainModel/Tags/Utility/TagAnalysis.cs b/CLP.Entities/DomainModel/Tags/Utility/TagAnalysis.cs index 2818dee6d..5e0996337 100644 --- a/CLP.Entities/DomainModel/Tags/Utility/TagAnalysis.cs +++ b/CLP.Entities/DomainModel/Tags/Utility/TagAnalysis.cs @@ -3,7 +3,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace CLP.Entities +namespace CLP.Entities.Old { public static class TagAnalysis { diff --git a/CLP.Entities/Properties/AssemblyInfo.cs b/CLP.Entities/Properties/AssemblyInfo.cs index 8960591ec..b09cb2c1b 100644 --- a/CLP.Entities/Properties/AssemblyInfo.cs +++ b/CLP.Entities/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("CLP.Entities")] +[assembly: AssemblyTitle("CLP.Entities.Old")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CLP.Entities")] +[assembly: AssemblyProduct("CLP.Entities.Old")] [assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/CLP.Entities/Utility/Extentions/GuidExtensions.cs b/CLP.Entities/Utility/Extentions/GuidExtensions.cs index ccf9693b2..f6d755acb 100644 --- a/CLP.Entities/Utility/Extentions/GuidExtensions.cs +++ b/CLP.Entities/Utility/Extentions/GuidExtensions.cs @@ -1,7 +1,7 @@ using System; using Catel; -namespace CLP.Entities +namespace CLP.Entities.Old { public static class GuidExtensions { diff --git a/Classroom Learning Partner.sln b/Classroom Learning Partner.sln index 5f33f4b35..a753b3786 100644 --- a/Classroom Learning Partner.sln +++ b/Classroom Learning Partner.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Classroom Learning Partner", "Classroom Learning Partner\Classroom Learning Partner.csproj", "{86FEBAD6-E946-4865-B189-D064B37DE607}" EndProject @@ -11,9 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleScripts", "ConsoleSc EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceModelEx", "ServiceModelEx\ServiceModelEx.csproj", "{0858C710-AF53-4049-B98E-CFE3638D1228}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaggingTests", "TaggingTests\TaggingTests.csproj", "{2F25A0A2-4F1C-4C29-B457-E467346A1315}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CLP.Entities", "CLP.Entities\CLP.Entities.csproj", "{C6B95A31-7045-4C7E-A72D-C03468E20B20}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CLP.Entities.Old", "CLP.Entities\CLP.Entities.Old.csproj", "{C6B95A31-7045-4C7E-A72D-C03468E20B20}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -117,22 +115,6 @@ Global {0858C710-AF53-4049-B98E-CFE3638D1228}.Release|x64.ActiveCfg = Release|x64 {0858C710-AF53-4049-B98E-CFE3638D1228}.Release|x64.Build.0 = Release|x64 {0858C710-AF53-4049-B98E-CFE3638D1228}.Release|x86.ActiveCfg = Release|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Debug|x64.ActiveCfg = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Debug|x86.ActiveCfg = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Design|Any CPU.ActiveCfg = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Design|Any CPU.Build.0 = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Design|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Design|Mixed Platforms.Build.0 = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Design|x64.ActiveCfg = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Design|x86.ActiveCfg = Debug|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Release|x64.ActiveCfg = Release|x64 - {2F25A0A2-4F1C-4C29-B457-E467346A1315}.Release|x86.ActiveCfg = Release|Any CPU {C6B95A31-7045-4C7E-A72D-C03468E20B20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C6B95A31-7045-4C7E-A72D-C03468E20B20}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6B95A31-7045-4C7E-A72D-C03468E20B20}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU diff --git a/Classroom Learning Partner/App.xaml.cs b/Classroom Learning Partner/App.xaml.cs index b8e9bc8d8..0594dd071 100644 --- a/Classroom Learning Partner/App.xaml.cs +++ b/Classroom Learning Partner/App.xaml.cs @@ -8,7 +8,7 @@ using Catel.Runtime.Serialization; using Classroom_Learning_Partner.ViewModels; using Classroom_Learning_Partner.Views; -using CLP.Entities; +using CLP.Entities.Old; using Path = Catel.IO.Path; namespace Classroom_Learning_Partner diff --git a/Classroom Learning Partner/CLPServiceAgent.cs b/Classroom Learning Partner/CLPServiceAgent.cs index c1164c876..4d48b2d4b 100644 --- a/Classroom Learning Partner/CLPServiceAgent.cs +++ b/Classroom Learning Partner/CLPServiceAgent.cs @@ -9,7 +9,7 @@ using Catel.Data; using Classroom_Learning_Partner.ViewModels; using Classroom_Learning_Partner.Views.Modal_Windows; -using CLP.Entities; +using CLP.Entities.Old; using Catel.Collections; using Catel.MVVM; using Catel.MVVM.Views; diff --git a/Classroom Learning Partner/Classroom Learning Partner.csproj b/Classroom Learning Partner/Classroom Learning Partner.csproj index 0ca28124d..a94dc96b6 100644 --- a/Classroom Learning Partner/Classroom Learning Partner.csproj +++ b/Classroom Learning Partner/Classroom Learning Partner.csproj @@ -814,9 +814,9 @@ - + {c6b95a31-7045-4c7e-a72d-c03468e20b20} - CLP.Entities + CLP.Entities.Old {0858c710-af53-4049-b98e-cfe3638d1228} diff --git a/Classroom Learning Partner/Converters/DivisionPositionToColorMultiConverter.cs b/Classroom Learning Partner/Converters/DivisionPositionToColorMultiConverter.cs index 90ee96f35..1ae871acc 100644 --- a/Classroom Learning Partner/Converters/DivisionPositionToColorMultiConverter.cs +++ b/Classroom Learning Partner/Converters/DivisionPositionToColorMultiConverter.cs @@ -4,7 +4,7 @@ using System.Windows.Data; using System.Collections.Generic; using System.Collections.ObjectModel; -using CLP.Entities; +using CLP.Entities.Old; using System.Windows.Media; namespace Classroom_Learning_Partner.Converters diff --git a/Classroom Learning Partner/Converters/PageMatchToColorConverter.cs b/Classroom Learning Partner/Converters/PageMatchToColorConverter.cs index 3359c9990..cbe3b7dc4 100644 --- a/Classroom Learning Partner/Converters/PageMatchToColorConverter.cs +++ b/Classroom Learning Partner/Converters/PageMatchToColorConverter.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Windows; using System.Windows.Data; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Converters { diff --git a/Classroom Learning Partner/Converters/PageToStarredVisibilityConverter.cs b/Classroom Learning Partner/Converters/PageToStarredVisibilityConverter.cs index 84e383ceb..ad0c1dd00 100644 --- a/Classroom Learning Partner/Converters/PageToStarredVisibilityConverter.cs +++ b/Classroom Learning Partner/Converters/PageToStarredVisibilityConverter.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Windows.Data; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Converters { diff --git a/Classroom Learning Partner/Converters/PageToSubmissionVisibilityConverter.cs b/Classroom Learning Partner/Converters/PageToSubmissionVisibilityConverter.cs index b407a2710..e67cf9d63 100644 --- a/Classroom Learning Partner/Converters/PageToSubmissionVisibilityConverter.cs +++ b/Classroom Learning Partner/Converters/PageToSubmissionVisibilityConverter.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Windows.Data; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Converters { diff --git a/Classroom Learning Partner/Converters/PageToSubmissionsListConverter.cs b/Classroom Learning Partner/Converters/PageToSubmissionsListConverter.cs index d9841008e..372b7bc9d 100644 --- a/Classroom Learning Partner/Converters/PageToSubmissionsListConverter.cs +++ b/Classroom Learning Partner/Converters/PageToSubmissionsListConverter.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Windows.Data; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Converters { diff --git a/Classroom Learning Partner/Converters/PersonToSubmissionsCountConverter.cs b/Classroom Learning Partner/Converters/PersonToSubmissionsCountConverter.cs index c6b77d60d..ee76f3ba5 100644 --- a/Classroom Learning Partner/Converters/PersonToSubmissionsCountConverter.cs +++ b/Classroom Learning Partner/Converters/PersonToSubmissionsCountConverter.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Windows; using System.Windows.Data; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Converters { diff --git a/Classroom Learning Partner/Converters/ShouldUseThumbnailConverter.cs b/Classroom Learning Partner/Converters/ShouldUseThumbnailConverter.cs index b1a15aaa4..e137220e3 100644 --- a/Classroom Learning Partner/Converters/ShouldUseThumbnailConverter.cs +++ b/Classroom Learning Partner/Converters/ShouldUseThumbnailConverter.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Windows; using System.Windows.Data; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Converters { diff --git a/Classroom Learning Partner/Network/CLPNetwork.cs b/Classroom Learning Partner/Network/CLPNetwork.cs index e0f1a3be3..f57464690 100644 --- a/Classroom Learning Partner/Network/CLPNetwork.cs +++ b/Classroom Learning Partner/Network/CLPNetwork.cs @@ -5,7 +5,7 @@ using System.ServiceModel; using System.Threading; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; using ServiceModelEx; namespace Classroom_Learning_Partner diff --git a/Classroom Learning Partner/Network/INotebookContract.cs b/Classroom Learning Partner/Network/INotebookContract.cs index 32a8e6377..6aa8d6f53 100644 --- a/Classroom Learning Partner/Network/INotebookContract.cs +++ b/Classroom Learning Partner/Network/INotebookContract.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ServiceModel; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner { diff --git a/Classroom Learning Partner/Network/InstructorService.cs b/Classroom Learning Partner/Network/InstructorService.cs index 1c5853e2b..2a4a3b2bf 100644 --- a/Classroom Learning Partner/Network/InstructorService.cs +++ b/Classroom Learning Partner/Network/InstructorService.cs @@ -10,7 +10,7 @@ using System.Windows; using System.Windows.Documents; using System.Windows.Threading; -using CLP.Entities; +using CLP.Entities.Old; using Microsoft.Ink; namespace Classroom_Learning_Partner diff --git a/Classroom Learning Partner/Network/ProjectorService.cs b/Classroom Learning Partner/Network/ProjectorService.cs index 48b30b5f7..895605063 100644 --- a/Classroom Learning Partner/Network/ProjectorService.cs +++ b/Classroom Learning Partner/Network/ProjectorService.cs @@ -8,7 +8,7 @@ using Catel.Data; using Classroom_Learning_Partner.ViewModels; using Classroom_Learning_Partner.Views; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner { diff --git a/Classroom Learning Partner/Network/StudentService.cs b/Classroom Learning Partner/Network/StudentService.cs index 11868d0a7..4be73a34c 100644 --- a/Classroom Learning Partner/Network/StudentService.cs +++ b/Classroom Learning Partner/Network/StudentService.cs @@ -4,7 +4,7 @@ using System.Windows; using System.Windows.Threading; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner { diff --git a/Classroom Learning Partner/Resources/Converters.cs b/Classroom Learning Partner/Resources/Converters.cs index 62427936b..e58b9bbc0 100644 --- a/Classroom Learning Partner/Resources/Converters.cs +++ b/Classroom Learning Partner/Resources/Converters.cs @@ -7,7 +7,7 @@ using System.Windows; using System.Windows.Data; using System.Windows.Media; -using CLP.Entities; +using CLP.Entities.Old; using Net.Sgoliver.NRtfTree.Core; namespace Classroom_Learning_Partner.Resources diff --git a/Classroom Learning Partner/ViewModels/Displays/GridDisplayViewModel.cs b/Classroom Learning Partner/ViewModels/Displays/GridDisplayViewModel.cs index 9754a1f64..9fe66c1be 100644 --- a/Classroom Learning Partner/ViewModels/Displays/GridDisplayViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Displays/GridDisplayViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Displays/SingleDisplayViewModel.cs b/Classroom Learning Partner/ViewModels/Displays/SingleDisplayViewModel.cs index bfb3b3b9b..383fa2ffc 100644 --- a/Classroom Learning Partner/ViewModels/Displays/SingleDisplayViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Displays/SingleDisplayViewModel.cs @@ -3,7 +3,7 @@ using System.Windows.Controls; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/HoverBoxViewModel.cs b/Classroom Learning Partner/ViewModels/HoverBoxViewModel.cs index ac07e54a3..f9f3fb246 100644 --- a/Classroom Learning Partner/ViewModels/HoverBoxViewModel.cs +++ b/Classroom Learning Partner/ViewModels/HoverBoxViewModel.cs @@ -3,7 +3,7 @@ using System.Windows.Input; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/MainWindowViewModel.cs b/Classroom Learning Partner/ViewModels/MainWindowViewModel.cs index 6e388c1c7..1d3ad6530 100644 --- a/Classroom Learning Partner/ViewModels/MainWindowViewModel.cs +++ b/Classroom Learning Partner/ViewModels/MainWindowViewModel.cs @@ -11,7 +11,7 @@ using Catel.MVVM; using Classroom_Learning_Partner.Views; using Classroom_Learning_Partner.Views.Modal_Windows; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Math/ProductRelationViewModel.cs b/Classroom Learning Partner/ViewModels/Math/ProductRelationViewModel.cs index 5650ca971..56a71d32e 100644 --- a/Classroom Learning Partner/ViewModels/Math/ProductRelationViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Math/ProductRelationViewModel.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Modal Windows/PersonCreationViewModel.cs b/Classroom Learning Partner/ViewModels/Modal Windows/PersonCreationViewModel.cs index cc6b712f7..e4335c449 100644 --- a/Classroom Learning Partner/ViewModels/Modal Windows/PersonCreationViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Modal Windows/PersonCreationViewModel.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { @@ -25,7 +25,7 @@ public Person Person public static readonly PropertyData PersonProperty = RegisterProperty("Person", typeof(Person)); /// - /// Unique Identifier for the . + /// Unique Identifier for the . /// [ViewModelToModel("Person")] public string ID @@ -37,7 +37,7 @@ public string ID public static readonly PropertyData IDProperty = RegisterProperty("ID", typeof(string)); /// - /// Full Name of the , delimited by spaces. + /// Full Name of the , delimited by spaces. /// [ViewModelToModel("Person")] public string FullName @@ -49,7 +49,7 @@ public string FullName public static readonly PropertyData FullNameProperty = RegisterProperty("FullName", typeof(string), string.Empty); /// - /// Alternate name for the , delimited by spaces. + /// Alternate name for the , delimited by spaces. /// [ViewModelToModel("Person")] public string Alias @@ -73,7 +73,7 @@ public Handedness Handedness public static readonly PropertyData HandednessProperty = RegisterProperty("Handedness", typeof(Handedness), Handedness.Right); /// - /// Signifies the is a student. + /// Signifies the is a student. /// [ViewModelToModel("Person")] public bool IsStudent diff --git a/Classroom Learning Partner/ViewModels/PageObjects/APageObjectBaseViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/APageObjectBaseViewModel.cs index bd23f33bc..eccbabed1 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/APageObjectBaseViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/APageObjectBaseViewModel.cs @@ -8,7 +8,7 @@ using System.Windows.Media; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; using System.Windows.Threading; using System; using System.Timers; diff --git a/Classroom Learning Partner/ViewModels/PageObjects/CLPAggregationDataTableViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/CLPAggregationDataTableViewModel.cs index 4167e7084..6ae0be4f9 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/CLPAggregationDataTableViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/CLPAggregationDataTableViewModel.cs @@ -6,7 +6,7 @@ using Catel.MVVM; using Catel.Windows; using Classroom_Learning_Partner.Views; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/CLPArrayViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/CLPArrayViewModel.cs index 527c2fcd7..08746ee17 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/CLPArrayViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/CLPArrayViewModel.cs @@ -10,7 +10,7 @@ using Catel.Data; using Catel.MVVM; using Classroom_Learning_Partner.Views.Modal_Windows; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/CLPAudioViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/CLPAudioViewModel.cs index 746d02e7f..b5597b821 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/CLPAudioViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/CLPAudioViewModel.cs @@ -9,7 +9,7 @@ using System.Windows.Threading; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; using NAudio; using NAudio.Wave; diff --git a/Classroom Learning Partner/ViewModels/PageObjects/CLPFactorCardViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/CLPFactorCardViewModel.cs index 629ebb7b5..1912f39d4 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/CLPFactorCardViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/CLPFactorCardViewModel.cs @@ -10,7 +10,7 @@ using Catel.Data; using Catel.MVVM; using Classroom_Learning_Partner.Views.Modal_Windows; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/CLPImageViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/CLPImageViewModel.cs index f9d5e09fb..9c8803b7f 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/CLPImageViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/CLPImageViewModel.cs @@ -5,7 +5,7 @@ using System.Windows.Media.Imaging; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/CLPRegionViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/CLPRegionViewModel.cs index a1a2bb0ba..338a6c9a7 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/CLPRegionViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/CLPRegionViewModel.cs @@ -3,7 +3,7 @@ using Catel; using Catel.MVVM; using Classroom_Learning_Partner.Views.Modal_Windows; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/CLPStampCopyViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/CLPStampCopyViewModel.cs index 43bc87b8c..3d6ec5018 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/CLPStampCopyViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/CLPStampCopyViewModel.cs @@ -6,7 +6,7 @@ using System.Windows.Media.Imaging; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/CLPStampViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/CLPStampViewModel.cs index ffd761016..6464b8417 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/CLPStampViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/CLPStampViewModel.cs @@ -8,7 +8,7 @@ using System.Windows.Media; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; using Classroom_Learning_Partner.Views.Modal_Windows; diff --git a/Classroom Learning Partner/ViewModels/PageObjects/CLPTextBoxViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/CLPTextBoxViewModel.cs index b1ab0f732..c59119ef8 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/CLPTextBoxViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/CLPTextBoxViewModel.cs @@ -1,6 +1,6 @@ using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/FuzzyFactorCardViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/FuzzyFactorCardViewModel.cs index 221e3501e..d1de0540a 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/FuzzyFactorCardViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/FuzzyFactorCardViewModel.cs @@ -6,7 +6,7 @@ using System.Windows.Input; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPDataTableViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPDataTableViewModel.cs index 71ed8c040..02adaadad 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPDataTableViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPDataTableViewModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPGroupingRegionViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPGroupingRegionViewModel.cs index 5752e3a4b..f14a512ab 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPGroupingRegionViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPGroupingRegionViewModel.cs @@ -1,6 +1,6 @@ using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPHandwritingRegionViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPHandwritingRegionViewModel.cs index 196ee45c0..9de238c83 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPHandwritingRegionViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPHandwritingRegionViewModel.cs @@ -1,6 +1,6 @@ using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPInkShapeRegionViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPInkShapeRegionViewModel.cs index 718e639f7..682774753 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPInkShapeRegionViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPInkShapeRegionViewModel.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPShadingRegionViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPShadingRegionViewModel.cs index 877d34614..143a68fa9 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPShadingRegionViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/Ink Regions/CLPShadingRegionViewModel.cs @@ -1,6 +1,6 @@ using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/RemainderTilesViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/RemainderTilesViewModel.cs index 739a7ea93..39e91288d 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/RemainderTilesViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/RemainderTilesViewModel.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/PageObjects/ShapeViewModel.cs b/Classroom Learning Partner/ViewModels/PageObjects/ShapeViewModel.cs index d0cc4f763..54d26d285 100644 --- a/Classroom Learning Partner/ViewModels/PageObjects/ShapeViewModel.cs +++ b/Classroom Learning Partner/ViewModels/PageObjects/ShapeViewModel.cs @@ -2,7 +2,7 @@ using System.Windows.Controls.Primitives; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Pages/ACLPPageBaseViewModel.cs b/Classroom Learning Partner/ViewModels/Pages/ACLPPageBaseViewModel.cs index 46c8f490d..ac46ab7c3 100644 --- a/Classroom Learning Partner/ViewModels/Pages/ACLPPageBaseViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Pages/ACLPPageBaseViewModel.cs @@ -12,7 +12,7 @@ using System.Windows.Threading; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Pages/CLPAnimationPageViewModel.cs b/Classroom Learning Partner/ViewModels/Pages/CLPAnimationPageViewModel.cs index 741d11bbd..4f0941c44 100644 --- a/Classroom Learning Partner/ViewModels/Pages/CLPAnimationPageViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Pages/CLPAnimationPageViewModel.cs @@ -5,7 +5,7 @@ using System.Windows.Threading; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Pages/CLPPageViewModel.cs b/Classroom Learning Partner/ViewModels/Pages/CLPPageViewModel.cs index 3e1748a9d..a55013122 100644 --- a/Classroom Learning Partner/ViewModels/Pages/CLPPageViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Pages/CLPPageViewModel.cs @@ -1,4 +1,4 @@ -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Panels/ClassPeriodForDisplay.cs b/Classroom Learning Partner/ViewModels/Panels/ClassPeriodForDisplay.cs index 6839c5f20..a72796220 100644 --- a/Classroom Learning Partner/ViewModels/Panels/ClassPeriodForDisplay.cs +++ b/Classroom Learning Partner/ViewModels/Panels/ClassPeriodForDisplay.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Panels/DisplaysPanelViewModel.cs b/Classroom Learning Partner/ViewModels/Panels/DisplaysPanelViewModel.cs index c30b9d92b..e4bf8d4ad 100644 --- a/Classroom Learning Partner/ViewModels/Panels/DisplaysPanelViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Panels/DisplaysPanelViewModel.cs @@ -8,7 +8,7 @@ using System.Windows.Media.Imaging; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Panels/NotebookPagesPanelViewModel.cs b/Classroom Learning Partner/ViewModels/Panels/NotebookPagesPanelViewModel.cs index c2e752aab..343251d43 100644 --- a/Classroom Learning Partner/ViewModels/Panels/NotebookPagesPanelViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Panels/NotebookPagesPanelViewModel.cs @@ -5,7 +5,7 @@ using Catel.Data; using Path = Catel.IO.Path; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; using System.IO; using System.Windows; using System.Windows.Media.Imaging; diff --git a/Classroom Learning Partner/ViewModels/Panels/PageInformationPanelViewModel.cs b/Classroom Learning Partner/ViewModels/Panels/PageInformationPanelViewModel.cs index f846d9c8f..bfc48c749 100644 --- a/Classroom Learning Partner/ViewModels/Panels/PageInformationPanelViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Panels/PageInformationPanelViewModel.cs @@ -1,6 +1,6 @@ using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Panels/ProgressPanelViewModel.cs b/Classroom Learning Partner/ViewModels/Panels/ProgressPanelViewModel.cs index 41b101fca..1256274a4 100644 --- a/Classroom Learning Partner/ViewModels/Panels/ProgressPanelViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Panels/ProgressPanelViewModel.cs @@ -6,7 +6,7 @@ using Catel.Data; using Catel.MVVM; using Classroom_Learning_Partner.Views; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Panels/StudentProgressInfo.cs b/Classroom Learning Partner/ViewModels/Panels/StudentProgressInfo.cs index dd7464c4a..8d48f43a2 100644 --- a/Classroom Learning Partner/ViewModels/Panels/StudentProgressInfo.cs +++ b/Classroom Learning Partner/ViewModels/Panels/StudentProgressInfo.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Panels/StudentWorkPanelViewModel.cs b/Classroom Learning Partner/ViewModels/Panels/StudentWorkPanelViewModel.cs index aceb9d9ea..e56640cbf 100644 --- a/Classroom Learning Partner/ViewModels/Panels/StudentWorkPanelViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Panels/StudentWorkPanelViewModel.cs @@ -3,7 +3,7 @@ using System.IO; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Panels/SubmissionHistoryPanelViewModel.cs b/Classroom Learning Partner/ViewModels/Panels/SubmissionHistoryPanelViewModel.cs index 6339fe87d..83eecdd2c 100644 --- a/Classroom Learning Partner/ViewModels/Panels/SubmissionHistoryPanelViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Panels/SubmissionHistoryPanelViewModel.cs @@ -3,7 +3,7 @@ using System.Windows.Controls.Primitives; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Panels/SubmissionsPanelViewModel.cs b/Classroom Learning Partner/ViewModels/Panels/SubmissionsPanelViewModel.cs index 5a8d42709..c239aab70 100644 --- a/Classroom Learning Partner/ViewModels/Panels/SubmissionsPanelViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Panels/SubmissionsPanelViewModel.cs @@ -8,7 +8,7 @@ using System.Windows.Data; using Catel.Data; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/RibbonViewModel.cs b/Classroom Learning Partner/ViewModels/RibbonViewModel.cs index a029a9b02..edd75f166 100644 --- a/Classroom Learning Partner/ViewModels/RibbonViewModel.cs +++ b/Classroom Learning Partner/ViewModels/RibbonViewModel.cs @@ -22,7 +22,7 @@ using Catel.MVVM.Services; using Classroom_Learning_Partner.Views; using Classroom_Learning_Partner.Views.Modal_Windows; -using CLP.Entities; +using CLP.Entities.Old; using System.Windows.Threading; using System.ServiceModel; diff --git a/Classroom Learning Partner/ViewModels/Workspaces/NotebookChooserWorkspaceViewModel.cs b/Classroom Learning Partner/ViewModels/Workspaces/NotebookChooserWorkspaceViewModel.cs index ec9f96e89..24428afb2 100644 --- a/Classroom Learning Partner/ViewModels/Workspaces/NotebookChooserWorkspaceViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Workspaces/NotebookChooserWorkspaceViewModel.cs @@ -7,7 +7,7 @@ using Catel.Data; using Catel.MVVM; using Catel.Windows; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.ViewModels { diff --git a/Classroom Learning Partner/ViewModels/Workspaces/NotebookWorkspaceViewModel.cs b/Classroom Learning Partner/ViewModels/Workspaces/NotebookWorkspaceViewModel.cs index 133855fe4..6073b7ff0 100644 --- a/Classroom Learning Partner/ViewModels/Workspaces/NotebookWorkspaceViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Workspaces/NotebookWorkspaceViewModel.cs @@ -4,7 +4,7 @@ using Catel.Data; using Catel.IO; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; using Brush = System.Windows.Media.Brush; namespace Classroom_Learning_Partner.ViewModels @@ -41,7 +41,7 @@ private void InitializePanels(Notebook notebook) NotebookPagesPanel = new NotebookPagesPanelViewModel(notebook); StudentWorkPanel = new StudentWorkPanelViewModel(notebook); ProgressPanel = new ProgressPanelViewModel(notebook); - if(App.MainWindowViewModel.Ribbon.CurrentLeftPanel == Panels.Progress) + if (App.MainWindowViewModel.Ribbon.CurrentLeftPanel == Panels.Progress) { LeftPanel = ProgressPanel; } @@ -61,13 +61,16 @@ private void InitializePanels(Notebook notebook) // BottomPanel = SubmissionHistoryPanel; //} - if(App.CurrentUserMode == App.UserMode.Projector) + if (App.CurrentUserMode == App.UserMode.Projector) { NotebookPagesPanel.IsVisible = false; } } - public override string Title { get { return "NotebookWorkspaceVM"; } } + public override string Title + { + get { return "NotebookWorkspaceVM"; } + } #endregion //Constructor @@ -239,7 +242,7 @@ public SubmissionHistoryPanelViewModel SubmissionHistoryPanel } public static readonly PropertyData SubmissionHistoryPanelProperty = RegisterProperty("SubmissionHistoryPanel", typeof(SubmissionHistoryPanelViewModel)); - + #endregion //Panels #endregion //Bindings @@ -248,18 +251,18 @@ public SubmissionHistoryPanelViewModel SubmissionHistoryPanel protected override void OnViewModelPropertyChanged(IViewModel viewModel, string propertyName) { - if(viewModel == null) + if (viewModel == null) { return; } - if(viewModel is RibbonViewModel) + if (viewModel is RibbonViewModel) { var ribbon = viewModel as RibbonViewModel; - if(propertyName == "CurrentLeftPanel") + if (propertyName == "CurrentLeftPanel") { - switch(ribbon.CurrentLeftPanel) + switch (ribbon.CurrentLeftPanel) { case Panels.NotebookPages: LeftPanel = NotebookPagesPanel; @@ -279,9 +282,9 @@ protected override void OnViewModelPropertyChanged(IViewModel viewModel, string } } - if(propertyName == "CurrentRightPanel") + if (propertyName == "CurrentRightPanel") { - switch(ribbon.CurrentRightPanel) + switch (ribbon.CurrentRightPanel) { case Panels.Displays: RightPanel = DisplaysPanel; @@ -298,13 +301,13 @@ protected override void OnViewModelPropertyChanged(IViewModel viewModel, string } } - if(viewModel is MainWindowViewModel) + if (viewModel is MainWindowViewModel) { var mainWindow = viewModel as MainWindowViewModel; - if(propertyName == "IsAuthoring") + if (propertyName == "IsAuthoring") { CurrentDisplay = null; - if(mainWindow.IsAuthoring) + if (mainWindow.IsAuthoring) { WorkspaceBackgroundColor = new SolidColorBrush(Colors.Salmon); mainWindow.Ribbon.AuthoringTabVisibility = Visibility.Visible; @@ -315,12 +318,11 @@ protected override void OnViewModelPropertyChanged(IViewModel viewModel, string mainWindow.Ribbon.AuthoringTabVisibility = Visibility.Collapsed; } } - } + } base.OnViewModelPropertyChanged(viewModel, propertyName); } #endregion //Methods } -} - \ No newline at end of file +} \ No newline at end of file diff --git a/Classroom Learning Partner/ViewModels/Workspaces/UserLoginWorkspaceViewModel.cs b/Classroom Learning Partner/ViewModels/Workspaces/UserLoginWorkspaceViewModel.cs index 4bbcb55bf..9e4ad6930 100644 --- a/Classroom Learning Partner/ViewModels/Workspaces/UserLoginWorkspaceViewModel.cs +++ b/Classroom Learning Partner/ViewModels/Workspaces/UserLoginWorkspaceViewModel.cs @@ -5,7 +5,7 @@ using System.Windows; using System.Windows.Threading; using Catel.MVVM; -using CLP.Entities; +using CLP.Entities.Old; using Microsoft.Ink; namespace Classroom_Learning_Partner.ViewModels diff --git a/Classroom Learning Partner/Views/Modal Windows/PageDefinitionView.xaml.cs b/Classroom Learning Partner/Views/Modal Windows/PageDefinitionView.xaml.cs index 5d858be60..fecfb6c05 100644 --- a/Classroom Learning Partner/Views/Modal Windows/PageDefinitionView.xaml.cs +++ b/Classroom Learning Partner/Views/Modal Windows/PageDefinitionView.xaml.cs @@ -3,7 +3,7 @@ using System.Windows.Controls; using Catel.Windows; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; // TODO (someday): Automatically populate combobox with all possible relation types diff --git a/Classroom Learning Partner/Views/Modal Windows/PersonCreationView.xaml b/Classroom Learning Partner/Views/Modal Windows/PersonCreationView.xaml index e35482a23..8c2e442ba 100644 --- a/Classroom Learning Partner/Views/Modal Windows/PersonCreationView.xaml +++ b/Classroom Learning Partner/Views/Modal Windows/PersonCreationView.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:catel="http://catel.codeplex.com" xmlns:sys="clr-namespace:System;assembly=mscorlib" - xmlns:entities="clr-namespace:CLP.Entities;assembly=CLP.Entities" + xmlns:entities="clr-namespace:CLP.Entities.Old;assembly=CLP.Entities" Title="Create New Person"> diff --git a/Classroom Learning Partner/Views/PageObjects/CLPAggregationDataTableView.xaml.cs b/Classroom Learning Partner/Views/PageObjects/CLPAggregationDataTableView.xaml.cs index d49853870..578c62dea 100644 --- a/Classroom Learning Partner/Views/PageObjects/CLPAggregationDataTableView.xaml.cs +++ b/Classroom Learning Partner/Views/PageObjects/CLPAggregationDataTableView.xaml.cs @@ -3,7 +3,7 @@ using Catel.MVVM.Views; using Catel.Windows.Controls; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Views { diff --git a/Classroom Learning Partner/Views/PageObjects/CLPArrayView.xaml.cs b/Classroom Learning Partner/Views/PageObjects/CLPArrayView.xaml.cs index 83a7d1050..96f9d6652 100644 --- a/Classroom Learning Partner/Views/PageObjects/CLPArrayView.xaml.cs +++ b/Classroom Learning Partner/Views/PageObjects/CLPArrayView.xaml.cs @@ -1,7 +1,7 @@ using System.Timers; using System.Windows.Input; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Views { diff --git a/Classroom Learning Partner/Views/PageObjects/CLPFactorCardView.xaml.cs b/Classroom Learning Partner/Views/PageObjects/CLPFactorCardView.xaml.cs index b58b58f7c..e12f51c1f 100644 --- a/Classroom Learning Partner/Views/PageObjects/CLPFactorCardView.xaml.cs +++ b/Classroom Learning Partner/Views/PageObjects/CLPFactorCardView.xaml.cs @@ -1,6 +1,6 @@ using System.Timers; using System.Windows.Input; -using CLP.Entities; +using CLP.Entities.Old; using Classroom_Learning_Partner.ViewModels; namespace Classroom_Learning_Partner.Views diff --git a/Classroom Learning Partner/Views/PageObjects/CLPStampCopyView.xaml b/Classroom Learning Partner/Views/PageObjects/CLPStampCopyView.xaml index 89d514f2f..978f5c0b7 100644 --- a/Classroom Learning Partner/Views/PageObjects/CLPStampCopyView.xaml +++ b/Classroom Learning Partner/Views/PageObjects/CLPStampCopyView.xaml @@ -6,7 +6,7 @@ xmlns:oldconv="clr-namespace:Classroom_Learning_Partner.Resources" xmlns:conv="clr-namespace:Classroom_Learning_Partner.Converters" xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" - xmlns:model="clr-namespace:CLP.Entities;assembly=CLP.Entities"> + xmlns:model="clr-namespace:CLP.Entities.Old;assembly=CLP.Entities"> diff --git a/Classroom Learning Partner/Views/PageObjects/CLPStampView.xaml b/Classroom Learning Partner/Views/PageObjects/CLPStampView.xaml index b7c0e42cf..74b6d5d3f 100644 --- a/Classroom Learning Partner/Views/PageObjects/CLPStampView.xaml +++ b/Classroom Learning Partner/Views/PageObjects/CLPStampView.xaml @@ -7,7 +7,7 @@ xmlns:views="clr-namespace:Classroom_Learning_Partner.Views" xmlns:conv="clr-namespace:Classroom_Learning_Partner.Converters" xmlns:resources="clr-namespace:Classroom_Learning_Partner.Resources" - xmlns:model="clr-namespace:CLP.Entities;assembly=CLP.Entities"> + xmlns:model="clr-namespace:CLP.Entities.Old;assembly=CLP.Entities"> diff --git a/Classroom Learning Partner/Views/PageObjects/PageObjectContainerView.xaml.cs b/Classroom Learning Partner/Views/PageObjects/PageObjectContainerView.xaml.cs index c14715703..7985b3991 100644 --- a/Classroom Learning Partner/Views/PageObjects/PageObjectContainerView.xaml.cs +++ b/Classroom Learning Partner/Views/PageObjects/PageObjectContainerView.xaml.cs @@ -1,6 +1,6 @@ using System; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Views { diff --git a/Classroom Learning Partner/Views/Pages/CLPPagePreviewView.xaml.cs b/Classroom Learning Partner/Views/Pages/CLPPagePreviewView.xaml.cs index f605f7a62..95315ef46 100644 --- a/Classroom Learning Partner/Views/Pages/CLPPagePreviewView.xaml.cs +++ b/Classroom Learning Partner/Views/Pages/CLPPagePreviewView.xaml.cs @@ -1,6 +1,6 @@ using System; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Views { diff --git a/Classroom Learning Partner/Views/Pages/CLPPageView.xaml.cs b/Classroom Learning Partner/Views/Pages/CLPPageView.xaml.cs index bfc66e8a5..480bc5dac 100644 --- a/Classroom Learning Partner/Views/Pages/CLPPageView.xaml.cs +++ b/Classroom Learning Partner/Views/Pages/CLPPageView.xaml.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using Catel.MVVM; using Classroom_Learning_Partner.ViewModels; -using CLP.Entities; +using CLP.Entities.Old; namespace Classroom_Learning_Partner.Views { diff --git a/ConsoleScripts/ConsoleScripts.csproj b/ConsoleScripts/ConsoleScripts.csproj index 7bfc692f2..4ad5d429e 100644 --- a/ConsoleScripts/ConsoleScripts.csproj +++ b/ConsoleScripts/ConsoleScripts.csproj @@ -84,9 +84,9 @@ - + {c6b95a31-7045-4c7e-a72d-c03468e20b20} - CLP.Entities + CLP.Entities.Old {60ee5162-e7ae-4af6-b497-a7861ec25c25} diff --git a/ConsoleScripts/Program.cs b/ConsoleScripts/Program.cs index d2d50edf7..35a10adba 100644 --- a/ConsoleScripts/Program.cs +++ b/ConsoleScripts/Program.cs @@ -7,7 +7,7 @@ using System.Windows.Media; using System.Xml.Serialization; using Catel.Data; -using CLP.Entities; +using CLP.Entities.Old; using Catel.Runtime.Serialization; using Path = Catel.IO.Path; From 4a34828f2a8a1cc81e856ae568a5ed4790341f01 Mon Sep 17 00:00:00 2001 From: stev Date: Mon, 10 Oct 2016 05:41:36 -0400 Subject: [PATCH 2/2] removed catel entity extensions --- CLP.Entities/CLP.Entities.Old.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/CLP.Entities/CLP.Entities.Old.csproj b/CLP.Entities/CLP.Entities.Old.csproj index 7482ed0da..8be29ef08 100644 --- a/CLP.Entities/CLP.Entities.Old.csproj +++ b/CLP.Entities/CLP.Entities.Old.csproj @@ -69,9 +69,6 @@ ..\Classroom Learning Partner\External Libraries\Catel.Core.dll - - ..\Classroom Learning Partner\External Libraries\Catel.Extensions.EntityFramework6.dll - ..\Classroom Learning Partner\External Libraries\EntityFramework.dll