diff options
| author | Jason Lepp <jlepp@arcresources.com> | 2010-10-18 11:28:00 -0600 |
|---|---|---|
| committer | Jason Lepp <jlepp@arcresources.com> | 2010-10-18 11:28:00 -0600 |
| commit | 62373c895f74937b5fdc086c1b68a82959796c15 (patch) | |
| tree | 6a6707771d07d6b5c5df1c8cf842a767c5045555 | |
| parent | 5f48436e3cdd6adf6f31ccf9b3c972bed533c09f (diff) | |
| parent | 47fc3147d12f4f07c98880d2871f2dc4e208cb70 (diff) | |
Merge branch 'master' of github.com:arcresources/MVPtoMVVM
33 files changed, 731 insertions, 18 deletions
diff --git a/MVPtoMVVM.mvp.sln b/MVPtoMVVM.mvp.sln index 7a5a3d9..c380e9c 100755 --- a/MVPtoMVVM.mvp.sln +++ b/MVPtoMVVM.mvp.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVPtoMVVM", "src\MVPtoMVVM\ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVPtoMVVM.test", "src\MVPtoMVVM.test\MVPtoMVVM.test.csproj", "{49C84DD0-766B-44B4-A871-4D2C829556F1}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVPtoMVVM.mvvm", "src\MVPtoMVVM.mvvm\MVPtoMVVM.mvvm.csproj", "{E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -47,6 +49,16 @@ Global {49C84DD0-766B-44B4-A871-4D2C829556F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{49C84DD0-766B-44B4-A871-4D2C829556F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{49C84DD0-766B-44B4-A871-4D2C829556F1}.Release|x86.ActiveCfg = Release|Any CPU
+ {E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}.Debug|x86.ActiveCfg = Debug|x86
+ {E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}.Debug|x86.Build.0 = Debug|x86
+ {E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}.Release|Any CPU.ActiveCfg = Release|x86
+ {E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}.Release|Mixed Platforms.Build.0 = Release|x86
+ {E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}.Release|x86.ActiveCfg = Release|x86
+ {E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/src/MVPtoMVVM.mvp/App.xaml.cs b/src/MVPtoMVVM.mvp/App.xaml.cs index 67945bc..16a8a7b 100755 --- a/src/MVPtoMVVM.mvp/App.xaml.cs +++ b/src/MVPtoMVVM.mvp/App.xaml.cs @@ -1,9 +1,4 @@ -using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Windows;
+using System.Windows;
namespace MVPtoMVVM.mvp
{
@@ -17,4 +12,4 @@ namespace MVPtoMVVM.mvp new Bootstrap().Execute();
}
}
-}
+}
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvp/MVPtoMVVM.mvp.csproj b/src/MVPtoMVVM.mvp/MVPtoMVVM.mvp.csproj index be93ad3..29fc93d 100755 --- a/src/MVPtoMVVM.mvp/MVPtoMVVM.mvp.csproj +++ b/src/MVPtoMVVM.mvp/MVPtoMVVM.mvp.csproj @@ -59,9 +59,19 @@ <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
+ <Compile Include="mappers\ITodoItemMapper.cs" />
+ <Compile Include="mappers\ITodoItemPresenterMapper.cs" />
+ <Compile Include="mappers\TodoItemMapper.cs" />
+ <Compile Include="mappers\TodoItemPresenterMapper.cs" />
+ <Compile Include="presenters\IMvpPresenter.cs" />
+ <Compile Include="presenters\ITodoItemPresenter.cs" />
+ <Compile Include="presenters\MvpPresenter.cs" />
+ <Compile Include="presenters\TodoItemPresenter.cs" />
<Compile Include="TodoItemView.xaml.cs">
<DependentUpon>TodoItemView.xaml</DependentUpon>
</Compile>
+ <Compile Include="views\IMvpView.cs" />
+ <Compile Include="views\ITodoItemView.cs" />
<Page Include="MvpWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
diff --git a/src/MVPtoMVVM/mappers/ITodoItemMapper.cs b/src/MVPtoMVVM.mvp/mappers/ITodoItemMapper.cs index dc6d15f..dc6d15f 100755..100644 --- a/src/MVPtoMVVM/mappers/ITodoItemMapper.cs +++ b/src/MVPtoMVVM.mvp/mappers/ITodoItemMapper.cs diff --git a/src/MVPtoMVVM/mappers/ITodoItemPresenterMapper.cs b/src/MVPtoMVVM.mvp/mappers/ITodoItemPresenterMapper.cs index 904444c..904444c 100755..100644 --- a/src/MVPtoMVVM/mappers/ITodoItemPresenterMapper.cs +++ b/src/MVPtoMVVM.mvp/mappers/ITodoItemPresenterMapper.cs diff --git a/src/MVPtoMVVM/mappers/TodoItemMapper.cs b/src/MVPtoMVVM.mvp/mappers/TodoItemMapper.cs index 98b3cc1..98b3cc1 100755..100644 --- a/src/MVPtoMVVM/mappers/TodoItemMapper.cs +++ b/src/MVPtoMVVM.mvp/mappers/TodoItemMapper.cs diff --git a/src/MVPtoMVVM/mappers/TodoItemPresenterMapper.cs b/src/MVPtoMVVM.mvp/mappers/TodoItemPresenterMapper.cs index 69d56c5..69d56c5 100755..100644 --- a/src/MVPtoMVVM/mappers/TodoItemPresenterMapper.cs +++ b/src/MVPtoMVVM.mvp/mappers/TodoItemPresenterMapper.cs diff --git a/src/MVPtoMVVM/presenters/IMvpPresenter.cs b/src/MVPtoMVVM.mvp/presenters/IMvpPresenter.cs index 24dc65b..24dc65b 100755..100644 --- a/src/MVPtoMVVM/presenters/IMvpPresenter.cs +++ b/src/MVPtoMVVM.mvp/presenters/IMvpPresenter.cs diff --git a/src/MVPtoMVVM/presenters/ITodoItemPresenter.cs b/src/MVPtoMVVM.mvp/presenters/ITodoItemPresenter.cs index 5866786..5866786 100755..100644 --- a/src/MVPtoMVVM/presenters/ITodoItemPresenter.cs +++ b/src/MVPtoMVVM.mvp/presenters/ITodoItemPresenter.cs diff --git a/src/MVPtoMVVM/presenters/MvpPresenter.cs b/src/MVPtoMVVM.mvp/presenters/MvpPresenter.cs index e4e19ee..e4e19ee 100755..100644 --- a/src/MVPtoMVVM/presenters/MvpPresenter.cs +++ b/src/MVPtoMVVM.mvp/presenters/MvpPresenter.cs diff --git a/src/MVPtoMVVM/presenters/TodoItemPresenter.cs b/src/MVPtoMVVM.mvp/presenters/TodoItemPresenter.cs index 6a9eb13..6a9eb13 100755..100644 --- a/src/MVPtoMVVM/presenters/TodoItemPresenter.cs +++ b/src/MVPtoMVVM.mvp/presenters/TodoItemPresenter.cs diff --git a/src/MVPtoMVVM/views/IMvpView.cs b/src/MVPtoMVVM.mvp/views/IMvpView.cs index e3f3d4e..e3f3d4e 100755..100644 --- a/src/MVPtoMVVM/views/IMvpView.cs +++ b/src/MVPtoMVVM.mvp/views/IMvpView.cs diff --git a/src/MVPtoMVVM/views/ITodoItemView.cs b/src/MVPtoMVVM.mvp/views/ITodoItemView.cs index 4813ddd..4813ddd 100755..100644 --- a/src/MVPtoMVVM/views/ITodoItemView.cs +++ b/src/MVPtoMVVM.mvp/views/ITodoItemView.cs diff --git a/src/MVPtoMVVM.mvvm/App.xaml b/src/MVPtoMVVM.mvvm/App.xaml new file mode 100644 index 0000000..7a9668d --- /dev/null +++ b/src/MVPtoMVVM.mvvm/App.xaml @@ -0,0 +1,8 @@ +<Application x:Class="MVPtoMVVM.mvvm.App"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ StartupUri="MainWindow.xaml">
+ <Application.Resources>
+
+ </Application.Resources>
+</Application>
diff --git a/src/MVPtoMVVM.mvvm/App.xaml.cs b/src/MVPtoMVVM.mvvm/App.xaml.cs new file mode 100644 index 0000000..88d61d9 --- /dev/null +++ b/src/MVPtoMVVM.mvvm/App.xaml.cs @@ -0,0 +1,15 @@ +using System.Windows;
+
+namespace MVPtoMVVM.mvvm
+{
+ /// <summary>
+ /// Interaction logic for App.xaml
+ /// </summary>
+ public partial class App : Application
+ {
+ protected override void OnStartup(StartupEventArgs e)
+ {
+ new Bootstrap().Execute();
+ }
+ }
+}
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvvm/Bootstrap.cs b/src/MVPtoMVVM.mvvm/Bootstrap.cs new file mode 100644 index 0000000..755b741 --- /dev/null +++ b/src/MVPtoMVVM.mvvm/Bootstrap.cs @@ -0,0 +1,20 @@ +using MVPtoMVVM.domain;
+using StructureMap;
+
+namespace MVPtoMVVM.mvvm
+{
+ public class Bootstrap
+ {
+ public void Execute()
+ {
+ ObjectFactory.Initialize(x =>
+ x.Scan(scanner =>
+ {
+ scanner.AssemblyContainingType(typeof(TodoItem));
+ scanner.WithDefaultConventions();
+ })
+ );
+
+ }
+ }
+}
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvvm/MVPtoMVVM.mvvm.csproj b/src/MVPtoMVVM.mvvm/MVPtoMVVM.mvvm.csproj new file mode 100644 index 0000000..5d4713b --- /dev/null +++ b/src/MVPtoMVVM.mvvm/MVPtoMVVM.mvvm.csproj @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{E4A42F0B-36D0-44F4-8EBA-9B4C18FFF842}</ProjectGuid>
+ <OutputType>WinExe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MVPtoMVVM.mvvm</RootNamespace>
+ <AssemblyName>MVPtoMVVM.mvvm</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkProfile>
+ </TargetFrameworkProfile>
+ <FileAlignment>512</FileAlignment>
+ <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="StructureMap">
+ <HintPath>..\..\lib\StructureMap\StructureMap.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="System.Xaml">
+ <RequiredTargetFramework>4.0</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="WindowsBase" />
+ <Reference Include="PresentationCore" />
+ <Reference Include="PresentationFramework" />
+ </ItemGroup>
+ <ItemGroup>
+ <ApplicationDefinition Include="App.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </ApplicationDefinition>
+ <Compile Include="Bootstrap.cs" />
+ <Compile Include="viewmodels\IObservableCommand.cs" />
+ <Compile Include="viewmodels\MainWindowViewModel.cs" />
+ <Compile Include="viewmodels\SimpleCommand.cs" />
+ <Compile Include="viewmodels\Synchronizer.cs" />
+ <Compile Include="viewmodels\ToDoItemViewModel.cs" />
+ <Page Include="MainWindow.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Compile Include="App.xaml.cs">
+ <DependentUpon>App.xaml</DependentUpon>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="MainWindow.xaml.cs">
+ <DependentUpon>MainWindow.xaml</DependentUpon>
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Properties\AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <Compile Include="Properties\Settings.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Settings.settings</DependentUpon>
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
+ </Compile>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ <None Include="app.config" />
+ <None Include="Properties\Settings.settings">
+ <Generator>SettingsSingleFileGenerator</Generator>
+ <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+ </None>
+ <AppDesigner Include="Properties\" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\MVPtoMVVM\MVPtoMVVM.csproj">
+ <Project>{FFF299F6-DB6A-4858-B7A9-B5BE3F7C6325}</Project>
+ <Name>MVPtoMVVM</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvvm/MainWindow.xaml b/src/MVPtoMVVM.mvvm/MainWindow.xaml new file mode 100644 index 0000000..debab4c --- /dev/null +++ b/src/MVPtoMVVM.mvvm/MainWindow.xaml @@ -0,0 +1,23 @@ +<Window x:Class="MVPtoMVVM.mvvm.MainWindow"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ Title="MainWindow" Height="350" Width="525">
+ <DockPanel LastChildFill="False">
+ <ListView DockPanel.Dock="Top" ItemsSource="{Binding Path=TodoItems}" >
+ <ListView.ItemTemplate>
+ <DataTemplate>
+ <StackPanel Orientation="Horizontal">
+ <TextBox Width="200" Text="{Binding Path=Description}" />
+ <DatePicker SelectedDate="{Binding Path=DueDate}" />
+ <Button Content="Save" Command="{Binding Path=SaveCommand}"></Button>
+ <Button Content="Del" Command="{Binding Path=DeleteCommand}"></Button>
+ </StackPanel>
+ </DataTemplate>
+ </ListView.ItemTemplate>
+ </ListView>
+ <DockPanel DockPanel.Dock="Bottom" LastChildFill="False">
+ <Button Content="Cancel Changes" DockPanel.Dock="Right" Command="{Binding Path=CancelChangesCommand}"/>
+ <Button Content="Add New Item" DockPanel.Dock="Right" Command="{Binding Path=AddNewItemCommand}"/>
+ </DockPanel>
+ </DockPanel>
+</Window>
diff --git a/src/MVPtoMVVM.mvvm/MainWindow.xaml.cs b/src/MVPtoMVVM.mvvm/MainWindow.xaml.cs new file mode 100644 index 0000000..3ba146d --- /dev/null +++ b/src/MVPtoMVVM.mvvm/MainWindow.xaml.cs @@ -0,0 +1,24 @@ +using System.Windows;
+using MVPtoMVVM.mvvm.viewmodels;
+using StructureMap;
+
+namespace MVPtoMVVM.mvvm
+{
+ /// <summary>
+ /// Interaction logic for MainWindow.xaml
+ /// </summary>
+ public partial class MainWindow : Window
+ {
+ public MainWindow()
+ {
+ InitializeComponent();
+ ViewModel = ObjectFactory.GetInstance<MainWindowViewModel>();
+ }
+
+ public MainWindowViewModel ViewModel
+ {
+ get { return (MainWindowViewModel) DataContext; }
+ set { DataContext = value; }
+ }
+ }
+}
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvvm/Properties/AssemblyInfo.cs b/src/MVPtoMVVM.mvvm/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..7da4224 --- /dev/null +++ b/src/MVPtoMVVM.mvvm/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// 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("MVPtoMVVM.mvvm")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("MVPtoMVVM.mvvm")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>. For example, if you are using US english
+//in your source files, set the <UICulture> to en-US. Then uncomment
+//the NeutralResourceLanguage attribute below. Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+ ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+ //(used if a resource is not found in the page,
+ // or application resource dictionaries)
+ ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+ //(used if a resource is not found in the page,
+ // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/MVPtoMVVM.mvvm/Properties/Resources.Designer.cs b/src/MVPtoMVVM.mvvm/Properties/Resources.Designer.cs new file mode 100644 index 0000000..ec10852 --- /dev/null +++ b/src/MVPtoMVVM.mvvm/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.1
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MVPtoMVVM.mvvm.Properties {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MVPtoMVVM.mvvm.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+ }
+}
diff --git a/src/MVPtoMVVM.mvvm/Properties/Resources.resx b/src/MVPtoMVVM.mvvm/Properties/Resources.resx new file mode 100644 index 0000000..ffecec8 --- /dev/null +++ b/src/MVPtoMVVM.mvvm/Properties/Resources.resx @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvvm/Properties/Settings.Designer.cs b/src/MVPtoMVVM.mvvm/Properties/Settings.Designer.cs new file mode 100644 index 0000000..50842b5 --- /dev/null +++ b/src/MVPtoMVVM.mvvm/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.1
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MVPtoMVVM.mvvm.Properties {
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default {
+ get {
+ return defaultInstance;
+ }
+ }
+ }
+}
diff --git a/src/MVPtoMVVM.mvvm/Properties/Settings.settings b/src/MVPtoMVVM.mvvm/Properties/Settings.settings new file mode 100644 index 0000000..8f2fd95 --- /dev/null +++ b/src/MVPtoMVVM.mvvm/Properties/Settings.settings @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+ <Profiles>
+ <Profile Name="(Default)" />
+ </Profiles>
+ <Settings />
+</SettingsFile>
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvvm/app.config b/src/MVPtoMVVM.mvvm/app.config new file mode 100644 index 0000000..cb2586b --- /dev/null +++ b/src/MVPtoMVVM.mvvm/app.config @@ -0,0 +1,3 @@ +<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/src/MVPtoMVVM.mvvm/viewmodels/IObservableCommand.cs b/src/MVPtoMVVM.mvvm/viewmodels/IObservableCommand.cs new file mode 100644 index 0000000..e3a6daf --- /dev/null +++ b/src/MVPtoMVVM.mvvm/viewmodels/IObservableCommand.cs @@ -0,0 +1,9 @@ +using System.Windows.Input;
+
+namespace MVPtoMVVM.mvvm.viewmodels
+{
+ public interface IObservableCommand : ICommand
+ {
+ void Changed();
+ }
+}
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvvm/viewmodels/MainWindowViewModel.cs b/src/MVPtoMVVM.mvvm/viewmodels/MainWindowViewModel.cs new file mode 100644 index 0000000..2e59e0d --- /dev/null +++ b/src/MVPtoMVVM.mvvm/viewmodels/MainWindowViewModel.cs @@ -0,0 +1,67 @@ +using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Windows.Input;
+using MVPtoMVVM.domain;
+using MVPtoMVVM.repositories;
+
+namespace MVPtoMVVM.mvvm.viewmodels
+{
+ public class MainWindowViewModel : INotifyPropertyChanged
+ {
+ private ITodoItemRepository todoItemRepository;
+ private Synchronizer<MainWindowViewModel> updater;
+
+ public MainWindowViewModel(ITodoItemRepository todoItemRepository)
+ {
+ this.todoItemRepository = todoItemRepository;
+ AddNewItemCommand = new SimpleCommand(AddNewItem);
+ CancelChangesCommand = new SimpleCommand(RefreshChanges);
+ updater = new Synchronizer<MainWindowViewModel>(this.PropertyChanged);
+ TodoItems = new ObservableCollection<TodoItemViewModel>();
+ RefreshChanges();
+ }
+
+ private void RefreshChanges()
+ {
+ TodoItems.Clear();
+ foreach (var item in todoItemRepository.GetAll().Select(MapFrom))
+ {
+ TodoItems.Add(item);
+ }
+
+ updater.Update(x => x.TodoItems);
+ }
+
+ private void AddNewItem()
+ {
+ TodoItems.Add(new TodoItemViewModel(todoItemRepository){Parent = this});
+ updater.Update(x => x.TodoItems);
+ }
+
+ private TodoItemViewModel MapFrom(TodoItem x)
+ {
+ return new TodoItemViewModel(todoItemRepository)
+ {
+ Id = x.Id,
+ Description = x.Description,
+ DueDate = x.DueDate,
+ Parent = this,
+ };
+ }
+
+ public ICollection<TodoItemViewModel> TodoItems { get; set; }
+ public event PropertyChangedEventHandler PropertyChanged = (o,e)=> { };
+ public ICommand CancelChangesCommand { get; set; }
+ public ICommand AddNewItemCommand { get; set; }
+
+ public void Update(Expression<Func<MainWindowViewModel, object>> property)
+ {
+ updater.Update(property);
+ }
+ }
+}
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvvm/viewmodels/SimpleCommand.cs b/src/MVPtoMVVM.mvvm/viewmodels/SimpleCommand.cs new file mode 100644 index 0000000..904b000 --- /dev/null +++ b/src/MVPtoMVVM.mvvm/viewmodels/SimpleCommand.cs @@ -0,0 +1,38 @@ +using System;
+
+namespace MVPtoMVVM.mvvm.viewmodels
+{
+ public class SimpleCommand : IObservableCommand
+ {
+ private readonly Action command;
+ private Func<bool> predicate;
+
+ public SimpleCommand(Action command): this(command, () => true)
+ {
+
+ }
+
+ public SimpleCommand(Action command, Func<bool> predicate)
+ {
+ this.command = command;
+ this.predicate = predicate;
+ }
+
+ public void Execute(object parameter)
+ {
+ command();
+ }
+
+ public bool CanExecute(object parameter)
+ {
+ return predicate();
+ }
+
+ public void Changed()
+ {
+ CanExecuteChanged(this, EventArgs.Empty);
+ }
+
+ public event EventHandler CanExecuteChanged = (o,e)=>{};
+ }
+}
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvvm/viewmodels/Synchronizer.cs b/src/MVPtoMVVM.mvvm/viewmodels/Synchronizer.cs new file mode 100644 index 0000000..5c4488b --- /dev/null +++ b/src/MVPtoMVVM.mvvm/viewmodels/Synchronizer.cs @@ -0,0 +1,35 @@ +using System;
+using System.ComponentModel;
+using System.Linq.Expressions;
+
+namespace MVPtoMVVM.mvvm.viewmodels
+{
+ public class Synchronizer<T> where T : INotifyPropertyChanged
+ {
+ private readonly PropertyChangedEventHandler eventHandler;
+
+ public Synchronizer(PropertyChangedEventHandler eventHandler)
+ {
+ this.eventHandler = eventHandler;
+ }
+
+ public void Update(Expression<Func<T, object>> property)
+ {
+ eventHandler(null, new PropertyChangedEventArgs(GetPropertyNameFrom(property)));
+ }
+
+ string GetPropertyNameFrom(Expression<Func<T, object>> property)
+ {
+ if (property.Body.NodeType == ExpressionType.Convert)
+ {
+ var body = (UnaryExpression)property.Body;
+ return (body.Operand as MemberExpression).Member.Name;
+ }
+ if (property.Body.NodeType == ExpressionType.MemberAccess)
+ {
+ return (property.Body as MemberExpression).Member.Name;
+ }
+ return "";
+ }
+ }
+}
\ No newline at end of file diff --git a/src/MVPtoMVVM.mvvm/viewmodels/ToDoItemViewModel.cs b/src/MVPtoMVVM.mvvm/viewmodels/ToDoItemViewModel.cs new file mode 100644 index 0000000..f84b4c2 --- /dev/null +++ b/src/MVPtoMVVM.mvvm/viewmodels/ToDoItemViewModel.cs @@ -0,0 +1,70 @@ +using System;
+using System.ComponentModel;
+using System.Windows.Input;
+using MVPtoMVVM.domain;
+using MVPtoMVVM.repositories;
+
+namespace MVPtoMVVM.mvvm.viewmodels
+{
+ public class TodoItemViewModel : INotifyPropertyChanged
+ {
+ private readonly ITodoItemRepository todoItemRepository;
+ private Synchronizer<TodoItemViewModel> updater;
+
+ public TodoItemViewModel(ITodoItemRepository todoItemRepository)
+ {
+ this.todoItemRepository = todoItemRepository;
+ SaveCommand = new SimpleCommand(Save, CanSave);
+ DeleteCommand = new SimpleCommand(Delete);
+ updater = new Synchronizer<TodoItemViewModel>(PropertyChanged);
+ }
+
+ private void Delete()
+ {
+ todoItemRepository.Delete(Id);
+ Parent.TodoItems.Remove(this);
+ Parent.Update(x => x.TodoItems);
+ }
+
+ private bool CanSave()
+ {
+ return !string.IsNullOrEmpty(Description) && DueDate >= DateTime.Today;
+ }
+
+ private void Save()
+ {
+ var todoItem = todoItemRepository.Get(Id) ?? new TodoItem();
+ todoItem.DueDate = DueDate;
+ todoItem.Description = Description;
+ todoItemRepository.Save(todoItem);
+ }
+
+ public event PropertyChangedEventHandler PropertyChanged = (o,e)=> { };
+ public int Id { get; set; }
+ private string description;
+ public string Description
+ {
+ get { return description; }
+ set
+ {
+ description = value;
+ updater.Update(x => x.Description);
+ SaveCommand.Changed();
+ }
+ }
+
+ private DateTime dueDate;
+ public DateTime DueDate
+ {
+ get { return dueDate; }
+ set { dueDate = value;
+ updater.Update(x => x.DueDate);
+ SaveCommand.Changed();
+ }
+ }
+
+ public IObservableCommand SaveCommand { get; set; }
+ public IObservableCommand DeleteCommand { get; set; }
+ public MainWindowViewModel Parent { get; set; }
+ }
+}
\ No newline at end of file diff --git a/src/MVPtoMVVM/MVPtoMVVM.csproj b/src/MVPtoMVVM/MVPtoMVVM.csproj index 30ad51d..a07341d 100755 --- a/src/MVPtoMVVM/MVPtoMVVM.csproj +++ b/src/MVPtoMVVM/MVPtoMVVM.csproj @@ -46,19 +46,9 @@ </ItemGroup>
<ItemGroup>
<Compile Include="domain\TodoItem.cs" />
- <Compile Include="mappers\ITodoItemMapper.cs" />
- <Compile Include="mappers\ITodoItemPresenterMapper.cs" />
- <Compile Include="mappers\TodoItemMapper.cs" />
- <Compile Include="mappers\TodoItemPresenterMapper.cs" />
- <Compile Include="presenters\ITodoItemPresenter.cs" />
- <Compile Include="presenters\TodoItemPresenter.cs" />
- <Compile Include="views\IMvpView.cs" />
- <Compile Include="presenters\IMvpPresenter.cs" />
- <Compile Include="presenters\MvpPresenter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="repositories\ITodoItemRepository.cs" />
<Compile Include="repositories\TodoItemRepository.cs" />
- <Compile Include="views\ITodoItemView.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/src/MVPtoMVVM/repositories/ITodoItemRepository.cs b/src/MVPtoMVVM/repositories/ITodoItemRepository.cs index cfe9ab1..21a51c6 100755 --- a/src/MVPtoMVVM/repositories/ITodoItemRepository.cs +++ b/src/MVPtoMVVM/repositories/ITodoItemRepository.cs @@ -9,5 +9,6 @@ namespace MVPtoMVVM.repositories TodoItem Get(int id);
IEnumerable<TodoItem> GetAll();
void Delete(TodoItem item);
+ void Delete(int todoItemId);
}
}
\ No newline at end of file diff --git a/src/MVPtoMVVM/repositories/TodoItemRepository.cs b/src/MVPtoMVVM/repositories/TodoItemRepository.cs index 23418e5..0783c97 100755 --- a/src/MVPtoMVVM/repositories/TodoItemRepository.cs +++ b/src/MVPtoMVVM/repositories/TodoItemRepository.cs @@ -38,7 +38,12 @@ namespace MVPtoMVVM.repositories public void Delete(TodoItem item)
{
- var repoItem = items.Find(x => x.Id == item.Id);
+ Delete(item.Id);
+ }
+
+ public void Delete(int todoItemId)
+ {
+ var repoItem = Get(todoItemId);
items.Remove(repoItem);
}
|