Skip to content

Commit

Permalink
Rename Subject to Connector part 5
Browse files Browse the repository at this point in the history
  • Loading branch information
krzysztof-lorenc committed Jun 3, 2019
1 parent 798bd11 commit c8cc43e
Show file tree
Hide file tree
Showing 35 changed files with 50 additions and 50 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace Soloplan.WhatsON.CruiseControl.GUI
{
using Soloplan.WhatsON.GUI.Common.BuildServer;
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;
using Soloplan.WhatsON.Jenkins.GUI;

public class CruiseControlProjectViewModel : BuildServerProjectStatusViewModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Soloplan.WhatsON.CruiseControl.GUI
{
using System;
using Soloplan.WhatsON.GUI.Common.BuildServer;
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;
using Soloplan.WhatsON.Jenkins.GUI;

public class CruiseControlStatusViewModel : BuildStatusViewModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Soloplan.WhatsON.CruiseControl.GUI
using System.IO;
using System.Text;
using System.Xml;
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;

public class CruiseControlTreViewPresentationPlugIn : ITreeViewPresentationPlugIn
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:local="clr-namespace:Soloplan.WhatsON.GUI.Common.BuildServer"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="clr-namespace:System;assembly=mscorlib"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.SubjectTreeView"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.ConnectorTreeView"
MaxHeight="16"
MaxWidth="16"
d:DataContext="{d:DesignInstance local:BuildStatusViewModel}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.SubjectTreeView">
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.ConnectorTreeView">

<BooleanToVisibilityConverter x:Key="BoolToVisibility" />
<connectorTreeView:StatusToColorConverter x:Key="StatusToColorConverter" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Soloplan.WhatsON.GUI.Common.BuildServer
{
using System.Windows.Controls;
using System.Windows.Input;
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;
using Soloplan.WhatsON.Jenkins.GUI;

public abstract class BuildServerProjectStatusViewModel : ConnectorViewModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Soloplan.WhatsON.GUI.Common.BuildServer
{
using System;
using System.Collections.ObjectModel;
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;
using Soloplan.WhatsON.Jenkins.GUI;

public abstract class BuildStatusViewModel : StatusViewModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:local="clr-namespace:Soloplan.WhatsON.GUI.Common.BuildServer"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="clr-namespace:System;assembly=mscorlib"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.SubjectTreeView"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.ConnectorTreeView"
d:DataContext="{d:DesignInstance local:BuildStatusViewModel}"
d:DesignHeight="450"
d:DesignWidth="800"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Soloplan.WhatsON.GUI.Common.BuildServer"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.SubjectTreeView"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.ConnectorTreeView"
d:DataContext="{d:DesignInstance local:BuildStatusViewModel}"
d:DesignHeight="450"
d:DesignWidth="800"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Licensed under the MIT License. See License-file in the project root for license information.
// </copyright>

namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Soloplan.WhatsON.GUI.Common.SubjectTreeView">
xmlns:local="clr-namespace:Soloplan.WhatsON.GUI.Common.ConnectorTreeView">

<ContextMenu x:Key="copyData">
<MenuItem Header="Copy data" Command="{Binding CopyData}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System.Text;
using System.Windows;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Licensed under the MIT License. See License-file in the project root for license information.
// </copyright>

namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System;
using System.Collections;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System;
using System.Collections.ObjectModel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<UserControl x:Class="Soloplan.WhatsON.GUI.Common.SubjectTreeView.ConnectorsTreeView"
<UserControl x:Class="Soloplan.WhatsON.GUI.Common.ConnectorTreeView.ConnectorsTreeView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:local="clr-namespace:Soloplan.WhatsON.GUI.Common.SubjectTreeView"
xmlns:local="clr-namespace:Soloplan.WhatsON.GUI.Common.ConnectorTreeView"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System;
using System.Windows.Input;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System;
using System.Xml;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System;
using System.Globalization;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Licensed under the MIT License. See License-file in the project root for license information.
// </copyright>

namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System;
using NLog;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System;
using System.Globalization;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// </copyright>
// --------------------------------------------------------------------------------------------------------------------

namespace Soloplan.WhatsON.GUI.Common.SubjectTreeView
namespace Soloplan.WhatsON.GUI.Common.ConnectorTreeView
{
using System.Windows.Input;

Expand Down
28 changes: 14 additions & 14 deletions src/Soloplan.WhatsON.GUI.Common/Soloplan.WhatsON.GUI.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,20 @@
<Compile Include="InvertBoolToVisibleConverter.cs" />
<Compile Include="OpenWebPageCommand.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SubjectTreeView\IHandleDoubleClick.cs" />
<Compile Include="SubjectTreeView\ITreeViewPresentationPlugIn.cs" />
<Compile Include="SubjectTreeView\PluginsManagerExtension.cs" />
<Compile Include="SubjectTreeView\StatusToColorConverter.cs" />
<Compile Include="SubjectTreeView\StatusViewModel.cs" />
<Compile Include="SubjectTreeView\ConnectorGroupViewModel.cs" />
<Compile Include="SubjectTreeView\ConnectorMissingViewModel.cs" />
<Compile Include="SubjectTreeView\ConnectorsTreeView.xaml.cs">
<Compile Include="ConnectorTreeView\IHandleDoubleClick.cs" />
<Compile Include="ConnectorTreeView\ITreeViewPresentationPlugIn.cs" />
<Compile Include="ConnectorTreeView\PluginsManagerExtension.cs" />
<Compile Include="ConnectorTreeView\StatusToColorConverter.cs" />
<Compile Include="ConnectorTreeView\StatusViewModel.cs" />
<Compile Include="ConnectorTreeView\ConnectorGroupViewModel.cs" />
<Compile Include="ConnectorTreeView\ConnectorMissingViewModel.cs" />
<Compile Include="ConnectorTreeView\ConnectorsTreeView.xaml.cs">
<DependentUpon>ConnectorsTreeView.xaml</DependentUpon>
</Compile>
<Compile Include="SubjectTreeView\ConnectorTreeViewModel.cs" />
<Compile Include="SubjectTreeView\ConnectorViewModel.cs" />
<Compile Include="SubjectTreeView\TimeToAproximateTimeConverter.cs" />
<Compile Include="SubjectTreeView\TreeItemViewModel.cs" />
<Compile Include="ConnectorTreeView\ConnectorTreeViewModel.cs" />
<Compile Include="ConnectorTreeView\ConnectorViewModel.cs" />
<Compile Include="ConnectorTreeView\TimeToAproximateTimeConverter.cs" />
<Compile Include="ConnectorTreeView\TreeItemViewModel.cs" />
<Compile Include="VisualConfig\GroupExpansionSettings.cs" />
<Compile Include="VisualConfig\MainWindowSettigns.cs" />
<Compile Include="VisualConfig\TreeListSettings.cs" />
Expand Down Expand Up @@ -143,11 +143,11 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="SubjectTreeView\ConnectorMissingDataTemplate.xaml">
<Page Include="ConnectorTreeView\ConnectorMissingDataTemplate.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="SubjectTreeView\ConnectorsTreeView.xaml">
<Page Include="ConnectorTreeView\ConnectorsTreeView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
Expand Down
2 changes: 1 addition & 1 deletion src/Soloplan.WhatsON.GUI/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:local="clr-namespace:Soloplan.WhatsON.GUI"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.SubjectTreeView;assembly=Soloplan.WhatsON.GUI.Common"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.ConnectorTreeView;assembly=Soloplan.WhatsON.GUI.Common"
Title="Soloplan WhatsON"
Width="800"
Height="450"
Expand Down
2 changes: 1 addition & 1 deletion src/Soloplan.WhatsON.GUI/NotificationsModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Soloplan.WhatsON.GUI
{
using System.Collections.ObjectModel;
using System.Linq;
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;

public class NotificationsModel : NotifyPropertyChanged
{
Expand Down
4 changes: 2 additions & 2 deletions src/Soloplan.WhatsON.GUI/ServerHealth.xaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Soloplan.WhatsON.GUI"
xmlns:subjectTreeView="clr-namespace:Soloplan.WhatsON.GUI.SubjectTreeView">
<DataTemplate DataType="{x:Type subjectTreeView:ServerHealthViewModel}">
xmlns:ConnectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.ConnectorTreeView">
<DataTemplate DataType="{x:Type ConnectorTreeView:ServerHealthViewModel}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="Ping: "/>
<TextBlock Text="{Binding Name}"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Soloplan.WhatsON.GUI/TrayHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Linq;
using System.Windows.Forms;
using NLog;
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;
using Soloplan.WhatsON.GUI.Common.VisualConfig;
using Soloplan.WhatsON.Serialization;
using Application = System.Windows.Application;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System;
using System.IO; using System.Text;
using System.Xml;
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;

public class GetJenkinsTreeViewPresentationPlugIn : ITreeViewPresentationPlugIn
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:buildServer="clr-namespace:Soloplan.WhatsON.GUI.Common.BuildServer;assembly=Soloplan.WhatsON.GUI.Common"
xmlns:gui="clr-namespace:Soloplan.WhatsON.Jenkins.GUI;assembly=Soloplan.WhatsON.Jenkins.GUI"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.SubjectTreeView;assembly=Soloplan.WhatsON.GUI.Common">
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.ConnectorTreeView;assembly=Soloplan.WhatsON.GUI.Common">

<BooleanToVisibilityConverter x:Key="BoolToVisibility" />
<connectorTreeView:StatusToColorConverter x:Key="StatusToColorConverter" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace Soloplan.WhatsON.Jenkins.GUI
{
using Soloplan.WhatsON.GUI.Common.BuildServer;
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;
using Soloplan.WhatsON.ServerBase;

public class JenkinsProjectViewModel : BuildServerProjectStatusViewModel
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:serverHealth="clr-namespace:Soloplan.WhatsON.ServerHealth.GUI;assembly=Soloplan.WhatsON.ServerHealth.GUI"
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.SubjectTreeView;assembly=Soloplan.WhatsON.GUI.Common">
xmlns:connectorTreeView="clr-namespace:Soloplan.WhatsON.GUI.Common.ConnectorTreeView;assembly=Soloplan.WhatsON.GUI.Common">

<connectorTreeView:StatusToColorConverter x:Key="StatusToColorConverter" />
<DataTemplate DataType="{x:Type serverHealth:ServerHealthViewModel}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Reflection;
using System.Text;
using System.Xml;
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;

public class ServerHealthTreeViewPresentationPlugIn : ITreeViewPresentationPlugIn
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Soloplan.WhatsON.ServerHealth.GUI
{
using Soloplan.WhatsON.GUI.Common.SubjectTreeView;
using Soloplan.WhatsON.GUI.Common.ConnectorTreeView;

public class ServerHealthViewModel : ConnectorViewModel
{
Expand Down

0 comments on commit c8cc43e

Please sign in to comment.