Skip to content

Commit a5b8e1a

Browse files
thoemmithoemmi
committed
Renamed ViewModels namespace to Models
1 parent aba3f5b commit a5b8e1a

11 files changed

Lines changed: 18 additions & 21 deletions

File tree

‎Solutionizer.Tests/ProjectTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.IO;
22
using NUnit.Framework;
3-
using Solutionizer.ViewModels;
3+
using Solutionizer.Models;
44

55
namespace Solutionizer.Tests {
66
[TestFixture]

‎Solutionizer.Tests/SolutionViewModelTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Linq;
44
using NUnit.Framework;
55
using Solutionizer.Commands;
6-
using Solutionizer.ViewModels;
6+
using Solutionizer.Models;
77
using Solutionizer.VisualStudio;
88

99
namespace Solutionizer.Tests {

‎Solutionizer/Commands/SaveSolutionCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.IO;
33
using Solutionizer.Extensions;
44
using Solutionizer.Helper;
5-
using Solutionizer.ViewModels;
5+
using Solutionizer.Models;
66
using Solutionizer.VisualStudio;
77

88
namespace Solutionizer.Commands {

Solutionizer/ViewModels/MainViewModel.cs renamed to Solutionizer/Models/MainViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Solutionizer.Commands;
99
using Solutionizer.Infrastructure;
1010

11-
namespace Solutionizer.ViewModels {
11+
namespace Solutionizer.Models {
1212
public class MainViewModel : ViewModelBase {
1313
private SolutionViewModel _solution = new SolutionViewModel();
1414
private readonly ICommand _onLoadedCommand;

Solutionizer/ViewModels/Project.cs renamed to Solutionizer/Models/Project.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.IO;
44
using System.Xml;
55

6-
namespace Solutionizer.ViewModels {
6+
namespace Solutionizer.Models {
77
public class Project {
88
private string _filepath;
99
private string _name;

Solutionizer/ViewModels/SolutionViewModel.cs renamed to Solutionizer/Models/SolutionViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Solutionizer.Scanner;
1111
using Solutionizer.VisualStudio;
1212

13-
namespace Solutionizer.ViewModels {
13+
namespace Solutionizer.Models {
1414
public class SolutionViewModel : ViewModelBase {
1515
private SolutionFolder _solutionRoot = new SolutionFolder();
1616
private readonly ICommand _dropCommand;

‎Solutionizer/Solutionizer.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@
9595
<Compile Include="Infrastructure\FixedRelayCommand.cs" />
9696
<Compile Include="Infrastructure\FixedRelayCommandGeneric.cs" />
9797
<Compile Include="Infrastructure\ModelAttacher.cs" />
98-
<Compile Include="ViewModels\Project.cs" />
99-
<Compile Include="ViewModels\SolutionViewModel.cs" />
98+
<Compile Include="Models\Project.cs" />
99+
<Compile Include="Models\SolutionViewModel.cs" />
100100
<Compile Include="Scanner\ProjectScanner.cs" />
101-
<Compile Include="ViewModels\MainViewModel.cs" />
101+
<Compile Include="Models\MainViewModel.cs" />
102102
<Compile Include="Infrastructure\SortedObservableCollection.cs" />
103103
<Compile Include="Views\MainView.xaml.cs">
104104
<DependentUpon>MainView.xaml</DependentUpon>

‎Solutionizer/Views/MainView.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:extToolkit="clr-namespace:Microsoft.Windows.Controls;assembly=WPFToolkit.Extended"
7-
xmlns:ViewModels="clr-namespace:Solutionizer.ViewModels"
8-
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
7+
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
98
xmlns:cmd="clr-namespace:GalaSoft.MvvmLight.Command;assembly=GalaSoft.MvvmLight.Extras.WPF4"
109
xmlns:Converters="clr-namespace:Solutionizer.Converters"
1110
xmlns:Views="clr-namespace:Solutionizer.Views"
1211
xmlns:Infrastructure="clr-namespace:Solutionizer.Infrastructure"
1312
xmlns:Commands="clr-namespace:Solutionizer.Commands" xmlns:Controls="clr-namespace:Solutionizer.Controls"
14-
Infrastructure:ModelAttacher.AttachModel="{x:Type ViewModels:MainViewModel}"
13+
xmlns:Models="clr-namespace:Solutionizer.Models"
14+
Infrastructure:ModelAttacher.AttachModel="{x:Type Models:MainViewModel}"
1515
mc:Ignorable="d"
16-
d:DataContext="{d:DesignInstance ViewModels:MainViewModel}"
16+
d:DataContext="{d:DesignInstance Models:MainViewModel}"
1717
d:DesignHeight="300" d:DesignWidth="300"
1818
TextOptions.TextFormattingMode="Display"
1919
TextOptions.TextHintingMode="Fixed"

‎Solutionizer/Views/SolutionView.xaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
mc:Ignorable="d"
7-
xmlns:Helper="clr-namespace:Solutionizer.Helper"
8-
xmlns:ViewModels="clr-namespace:Solutionizer.ViewModels"
9-
xmlns:Converters="clr-namespace:Solutionizer.Converters"
7+
xmlns:Helper="clr-namespace:Solutionizer.Helper" xmlns:Converters="clr-namespace:Solutionizer.Converters"
108
xmlns:VisualStudio="clr-namespace:Solutionizer.VisualStudio"
11-
d:DataContext="{d:DesignInstance ViewModels:SolutionViewModel}"
9+
xmlns:Models="clr-namespace:Solutionizer.Models"
10+
d:DataContext="{d:DesignInstance Models:SolutionViewModel}"
1211
d:DesignHeight="300" d:DesignWidth="300">
1312
<Grid>
1413
<Grid.Resources>
1514
<Converters:FilePathToImageSourceConverter x:Key="FilePathToImageSource"/>
16-
<DataTemplate x:Key="NameWithImage" DataType="{x:Type ViewModels:Project}">
15+
<DataTemplate x:Key="NameWithImage" DataType="{x:Type Models:Project}">
1716
<StackPanel Orientation="Horizontal">
1817
<Image Height="16" Width="16" Source="{Binding Path=Filepath, Converter={StaticResource FilePathToImageSource}}" Margin="0 0 4 0"/>
1918
<TextBlock Text="{Binding Name}" />

‎Solutionizer/VisualStudio/SolutionFolder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.ObjectModel;
33
using System.Linq;
44
using Solutionizer.Infrastructure;
5-
using Solutionizer.ViewModels;
5+
using Solutionizer.Models;
66

77
namespace Solutionizer.VisualStudio {
88
public class SolutionFolder : SolutionItem {

0 commit comments

Comments
 (0)