Code cleanup / improved

BornToBeRoot · BornToBeRoot · commit 2a9606538ae3 · 2017-10-31T17:23:52.000+01:00
diff --git a/Source/NETworkManager/Models/Settings/IPScannerProfileManager.cs b/Source/NETworkManager/Models/Settings/IPScannerProfileManager.cs
@@ -17,6 +17,19 @@ public static string GetProfilesFilePath()
             return Path.Combine(SettingsManager.GetSettingsLocation(), ProfilesFileName);
         }
 
+        public static List<string> GetProfileGroups()
+        {
+            List<string> list = new List<string>();
+
+            foreach (IPScannerProfileInfo profile in Profiles)
+            {
+                if (!list.Contains(profile.Group))
+                    list.Add(profile.Group);
+            }
+
+            return list;
+        }
+
         public static void Load(bool deserialize = true)
         {
             Profiles = new ObservableCollection<IPScannerProfileInfo>();
diff --git a/Source/NETworkManager/Models/Settings/PortScannerProfileManager.cs b/Source/NETworkManager/Models/Settings/PortScannerProfileManager.cs
@@ -18,6 +18,19 @@ public static string GetProfilesFilePath()
             return Path.Combine(SettingsManager.GetSettingsLocation(), ProfilesFileName);
         }
 
+        public static List<string> GetProfileGroups()
+        {
+            List<string> list = new List<string>();
+
+            foreach (PortScannerProfileInfo profile in Profiles)
+            {
+                if (!list.Contains(profile.Group))
+                    list.Add(profile.Group);
+            }
+
+            return list;
+        }
+
         public static void Load(bool deserialize = true)
         {
             Profiles = new ObservableCollection<PortScannerProfileInfo>();
diff --git a/Source/NETworkManager/Models/Settings/RemoteDesktopSessionManager.cs b/Source/NETworkManager/Models/Settings/RemoteDesktopSessionManager.cs
@@ -17,6 +17,19 @@ public static string GetSessionsFilePath()
             return Path.Combine(SettingsManager.GetSettingsLocation(), SessionsFileName);
         }
 
+        public static List<string> GetSessionGroups()
+        {
+            List<string> list = new List<string>();
+
+            foreach (RemoteDesktopSessionInfo session in Sessions)
+            {
+                if (!list.Contains(session.Group))
+                    list.Add(session.Group);
+            }
+
+            return list;
+        }
+
         public static void Load(bool deserialize = true)
         {
             Sessions = new ObservableCollection<RemoteDesktopSessionInfo>();
diff --git a/Source/NETworkManager/Models/Settings/WakeOnLANClientManager.cs b/Source/NETworkManager/Models/Settings/WakeOnLANClientManager.cs
@@ -17,6 +17,19 @@ public static string GetClientsFilePath()
             return Path.Combine(SettingsManager.GetSettingsLocation(), ClientsFileName);
         }
 
+        public static List<string> GetClientGroups()
+        {
+            List<string> list = new List<string>();
+
+            foreach (WakeOnLANClientInfo client in Clients)
+            {
+                if (!list.Contains(client.Group))
+                    list.Add(client.Group);
+            }
+
+            return list;
+        }
+
         public static void Load(bool deserialize = true)
         {
             Clients = new ObservableCollection<WakeOnLANClientInfo>();
diff --git a/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/Applications/IPScannerViewModel.cs
@@ -260,23 +260,7 @@ public ICollectionView IPScannerProfiles
         {
             get { return _ipScannerProfiles; }
         }
-
-        public List<string> IPScannerProfileGroups
-        {
-            get
-            {
-                List<string> list = new List<string>();
-
-                foreach (IPScannerProfileInfo profile in IPScannerProfileManager.Profiles)
-                {
-                    if (!list.Contains(profile.Group))
-                        list.Add(profile.Group);
-                }
-
-                return list;
-            }
-        }
-
+               
         private IPScannerProfileInfo _selectedProfile = new IPScannerProfileInfo();
         public IPScannerProfileInfo SelectedProfile
         {
@@ -405,7 +389,7 @@ private async void AddProfileAction()
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, IPScannerProfileGroups, new IPScannerProfileInfo() { IPRange = IPRange });
+            }, IPScannerProfileManager.GetProfileGroups(), new IPScannerProfileInfo() { IPRange = IPRange });
 
             customDialog.Content = new IPScannerProfileDialog
             {
@@ -444,7 +428,7 @@ private async void EditProfileAction()
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, IPScannerProfileGroups, SelectedProfile);
+            }, IPScannerProfileManager.GetProfileGroups(), SelectedProfile);
 
             customDialog.Content = new IPScannerProfileDialog
             {
@@ -481,7 +465,7 @@ private async void CopyAsProfileAction()
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, IPScannerProfileGroups, SelectedProfile);
+            }, IPScannerProfileManager.GetProfileGroups(), SelectedProfile);
 
             customDialog.Content = new IPScannerProfileDialog
             {
diff --git a/Source/NETworkManager/ViewModels/Applications/PortScannerViewModel.cs b/Source/NETworkManager/ViewModels/Applications/PortScannerViewModel.cs
@@ -283,22 +283,6 @@ public ICollectionView PortScannerProfiles
             get { return _portScannerProfiles; }
         }
 
-        public List<string> PortScannerProfileGroups
-        {
-            get
-            {
-                List<string> list = new List<string>();
-
-                foreach (PortScannerProfileInfo profile in PortScannerProfileManager.Profiles)
-                {
-                    if (!list.Contains(profile.Group))
-                        list.Add(profile.Group);
-                }
-
-                return list;
-            }
-        }
-
         private PortScannerProfileInfo _selectedProfile = new PortScannerProfileInfo();
         public PortScannerProfileInfo SelectedProfile
         {
@@ -422,7 +406,7 @@ private async void AddProfileAction()
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, PortScannerProfileGroups, new PortScannerProfileInfo() { HostnameOrIPAddress = HostnameOrIPAddress, Ports = Ports });
+            }, PortScannerProfileManager.GetProfileGroups(), new PortScannerProfileInfo() { HostnameOrIPAddress = HostnameOrIPAddress, Ports = Ports });
 
             customDialog.Content = new PortScannerProfileDialog
             {
@@ -462,7 +446,7 @@ private async void EditProfileAction()
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, PortScannerProfileGroups, SelectedProfile);
+            }, PortScannerProfileManager.GetProfileGroups(), SelectedProfile);
 
             customDialog.Content = new PortScannerProfileDialog
             {
@@ -500,7 +484,7 @@ private async void CopyAsProfileAction()
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, PortScannerProfileGroups, SelectedProfile);
+            }, PortScannerProfileManager.GetProfileGroups(), SelectedProfile);
 
             customDialog.Content = new PortScannerProfileDialog
             {
diff --git a/Source/NETworkManager/ViewModels/Applications/RemoteDesktopViewModel.cs b/Source/NETworkManager/ViewModels/Applications/RemoteDesktopViewModel.cs
@@ -43,23 +43,7 @@ public ICollectionView RemoteDesktopSessions
         {
             get { return _remoteDesktopSessions; }
         }
-
-        public List<string> RemoteDesktopSessionGroups
-        {
-            get
-            {
-                List<string> list = new List<string>();
-
-                foreach (RemoteDesktopSessionInfo session in RemoteDesktopSessionManager.Sessions)
-                {
-                    if (!list.Contains(session.Group))
-                        list.Add(session.Group);
-                }
-
-                return list;
-            }
-        }
-
+               
         private RemoteDesktopSessionInfo _selectedSession = new RemoteDesktopSessionInfo();
         public RemoteDesktopSessionInfo SelectedSession
         {
@@ -202,7 +186,7 @@ private async void AddSessionAction()
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
                 ConfigurationManager.Current.FixAirspace = false;
-            }, RemoteDesktopSessionGroups);
+            }, RemoteDesktopSessionManager.GetSessionGroups());
 
             customDialog.Content = new RemoteDesktopSessionDialog
             {
@@ -259,7 +243,7 @@ private async void EditSessionAction()
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
                 ConfigurationManager.Current.FixAirspace = false;
-            }, RemoteDesktopSessionGroups, SelectedSession);
+            }, RemoteDesktopSessionManager.GetSessionGroups(), SelectedSession);
 
             customDialog.Content = new RemoteDesktopSessionDialog
             {
@@ -299,7 +283,7 @@ private async void CopyAsSessionAction()
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
                 ConfigurationManager.Current.FixAirspace = false;
-            }, RemoteDesktopSessionGroups, SelectedSession);
+            }, RemoteDesktopSessionManager.GetSessionGroups(), SelectedSession);
 
             customDialog.Content = new RemoteDesktopSessionDialog
             {
diff --git a/Source/NETworkManager/ViewModels/Applications/WakeOnLanViewModel.cs b/Source/NETworkManager/ViewModels/Applications/WakeOnLanViewModel.cs
@@ -141,22 +141,6 @@ public ICollectionView WakeOnLANClients
             get { return _wakeOnLANClients; }
         }
 
-        public List<string> WakeOnLANClientGroups
-        {
-            get
-            {
-                List<string> list = new List<string>();
-
-                foreach (WakeOnLANClientInfo client in WakeOnLANClientManager.Clients)
-                {
-                    if (!list.Contains(client.Group))
-                        list.Add(client.Group);
-                }
-
-                return list;
-            }
-        }
-
         private WakeOnLANClientInfo _selectedClient;
         public WakeOnLANClientInfo SelectedClient
         {
@@ -166,7 +150,7 @@ public WakeOnLANClientInfo SelectedClient
                 if (value == _selectedClient)
                     return;
 
-                if(value != null)
+                if (value != null)
                 {
                     MACAddress = value.MACAddress;
                     Broadcast = value.Broadcast;
@@ -293,7 +277,7 @@ private async void AddClientAction()
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, WakeOnLANClientGroups, new WakeOnLANClientInfo() { MACAddress = MACAddress, Broadcast = Broadcast, Port = Port });
+            }, WakeOnLANClientManager.GetClientGroups(), new WakeOnLANClientInfo() { MACAddress = MACAddress, Broadcast = Broadcast, Port = Port });
 
             customDialog.Content = new WakeOnLANClientDialog
             {
@@ -334,7 +318,7 @@ private async void EditClientAction()
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, WakeOnLANClientGroups, SelectedClient);
+            }, WakeOnLANClientManager.GetClientGroups(), SelectedClient);
 
             customDialog.Content = new WakeOnLANClientDialog
             {
@@ -373,7 +357,7 @@ private async void CopyAsProfileAction()
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, WakeOnLANClientGroups, SelectedClient);
+            }, WakeOnLANClientManager.GetClientGroups(), SelectedClient);
 
             customDialog.Content = new WakeOnLANClientDialog
             {

Original file line number	Diff line number	Diff line change
`@@ -260,23 +260,7 @@ public ICollectionView IPScannerProfiles`
`260`	`260`	`{`
`261`	`261`	`get { return _ipScannerProfiles; }`
`262`	`262`	`}`
`263`		`-`
`264`		`- public List<string> IPScannerProfileGroups`
`265`		`- {`
`266`		`- get`
`267`		`- {`
`268`		`- List<string> list = new List<string>();`
`269`		`-`
`270`		`- foreach (IPScannerProfileInfo profile in IPScannerProfileManager.Profiles)`
`271`		`- {`
`272`		`- if (!list.Contains(profile.Group))`
`273`		`- list.Add(profile.Group);`
`274`		`- }`
`275`		`-`
`276`		`- return list;`
`277`		`- }`
`278`		`- }`
`279`		`-`
	`263`	`+`
`280`	`264`	`private IPScannerProfileInfo _selectedProfile = new IPScannerProfileInfo();`
`281`	`265`	`public IPScannerProfileInfo SelectedProfile`
`282`	`266`	`{`
`@@ -405,7 +389,7 @@ private async void AddProfileAction()`
`405`	`389`	`}, instance =>`
`406`	`390`	`{`
`407`	`391`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`408`		`- }, IPScannerProfileGroups, new IPScannerProfileInfo() { IPRange = IPRange });`
	`392`	`+ }, IPScannerProfileManager.GetProfileGroups(), new IPScannerProfileInfo() { IPRange = IPRange });`
`409`	`393`
`410`	`394`	`customDialog.Content = new IPScannerProfileDialog`
`411`	`395`	`{`
`@@ -444,7 +428,7 @@ private async void EditProfileAction()`
`444`	`428`	`}, instance =>`
`445`	`429`	`{`
`446`	`430`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`447`		`- }, IPScannerProfileGroups, SelectedProfile);`
	`431`	`+ }, IPScannerProfileManager.GetProfileGroups(), SelectedProfile);`
`448`	`432`
`449`	`433`	`customDialog.Content = new IPScannerProfileDialog`
`450`	`434`	`{`
`@@ -481,7 +465,7 @@ private async void CopyAsProfileAction()`
`481`	`465`	`}, instance =>`
`482`	`466`	`{`
`483`	`467`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`484`		`- }, IPScannerProfileGroups, SelectedProfile);`
	`468`	`+ }, IPScannerProfileManager.GetProfileGroups(), SelectedProfile);`
`485`	`469`
`486`	`470`	`customDialog.Content = new IPScannerProfileDialog`
`487`	`471`	`{`
Original file line number	Diff line number	Diff line change
`@@ -283,22 +283,6 @@ public ICollectionView PortScannerProfiles`
`283`	`283`	`get { return _portScannerProfiles; }`
`284`	`284`	`}`
`285`	`285`
`286`		`- public List<string> PortScannerProfileGroups`
`287`		`- {`
`288`		`- get`
`289`		`- {`
`290`		`- List<string> list = new List<string>();`
`291`		`-`
`292`		`- foreach (PortScannerProfileInfo profile in PortScannerProfileManager.Profiles)`
`293`		`- {`
`294`		`- if (!list.Contains(profile.Group))`
`295`		`- list.Add(profile.Group);`
`296`		`- }`
`297`		`-`
`298`		`- return list;`
`299`		`- }`
`300`		`- }`
`301`		`-`
`302`	`286`	`private PortScannerProfileInfo _selectedProfile = new PortScannerProfileInfo();`
`303`	`287`	`public PortScannerProfileInfo SelectedProfile`
`304`	`288`	`{`
`@@ -422,7 +406,7 @@ private async void AddProfileAction()`
`422`	`406`	`}, instance =>`
`423`	`407`	`{`
`424`	`408`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`425`		`- }, PortScannerProfileGroups, new PortScannerProfileInfo() { HostnameOrIPAddress = HostnameOrIPAddress, Ports = Ports });`
	`409`	`+ }, PortScannerProfileManager.GetProfileGroups(), new PortScannerProfileInfo() { HostnameOrIPAddress = HostnameOrIPAddress, Ports = Ports });`
`426`	`410`
`427`	`411`	`customDialog.Content = new PortScannerProfileDialog`
`428`	`412`	`{`
`@@ -462,7 +446,7 @@ private async void EditProfileAction()`
`462`	`446`	`}, instance =>`
`463`	`447`	`{`
`464`	`448`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`465`		`- }, PortScannerProfileGroups, SelectedProfile);`
	`449`	`+ }, PortScannerProfileManager.GetProfileGroups(), SelectedProfile);`
`466`	`450`
`467`	`451`	`customDialog.Content = new PortScannerProfileDialog`
`468`	`452`	`{`
`@@ -500,7 +484,7 @@ private async void CopyAsProfileAction()`
`500`	`484`	`}, instance =>`
`501`	`485`	`{`
`502`	`486`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`503`		`- }, PortScannerProfileGroups, SelectedProfile);`
	`487`	`+ }, PortScannerProfileManager.GetProfileGroups(), SelectedProfile);`
`504`	`488`
`505`	`489`	`customDialog.Content = new PortScannerProfileDialog`
`506`	`490`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,23 +43,7 @@ public ICollectionView RemoteDesktopSessions`
`43`	`43`	`{`
`44`	`44`	`get { return _remoteDesktopSessions; }`
`45`	`45`	`}`
`46`		`-`
`47`		`- public List<string> RemoteDesktopSessionGroups`
`48`		`- {`
`49`		`- get`
`50`		`- {`
`51`		`- List<string> list = new List<string>();`
`52`		`-`
`53`		`- foreach (RemoteDesktopSessionInfo session in RemoteDesktopSessionManager.Sessions)`
`54`		`- {`
`55`		`- if (!list.Contains(session.Group))`
`56`		`- list.Add(session.Group);`
`57`		`- }`
`58`		`-`
`59`		`- return list;`
`60`		`- }`
`61`		`- }`
`62`		`-`
	`46`	`+`
`63`	`47`	`private RemoteDesktopSessionInfo _selectedSession = new RemoteDesktopSessionInfo();`
`64`	`48`	`public RemoteDesktopSessionInfo SelectedSession`
`65`	`49`	`{`
`@@ -202,7 +186,7 @@ private async void AddSessionAction()`
`202`	`186`	`{`
`203`	`187`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`204`	`188`	`ConfigurationManager.Current.FixAirspace = false;`
`205`		`- }, RemoteDesktopSessionGroups);`
	`189`	`+ }, RemoteDesktopSessionManager.GetSessionGroups());`
`206`	`190`
`207`	`191`	`customDialog.Content = new RemoteDesktopSessionDialog`
`208`	`192`	`{`
`@@ -259,7 +243,7 @@ private async void EditSessionAction()`
`259`	`243`	`{`
`260`	`244`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`261`	`245`	`ConfigurationManager.Current.FixAirspace = false;`
`262`		`- }, RemoteDesktopSessionGroups, SelectedSession);`
	`246`	`+ }, RemoteDesktopSessionManager.GetSessionGroups(), SelectedSession);`
`263`	`247`
`264`	`248`	`customDialog.Content = new RemoteDesktopSessionDialog`
`265`	`249`	`{`
`@@ -299,7 +283,7 @@ private async void CopyAsSessionAction()`
`299`	`283`	`{`
`300`	`284`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`301`	`285`	`ConfigurationManager.Current.FixAirspace = false;`
`302`		`- }, RemoteDesktopSessionGroups, SelectedSession);`
	`286`	`+ }, RemoteDesktopSessionManager.GetSessionGroups(), SelectedSession);`
`303`	`287`
`304`	`288`	`customDialog.Content = new RemoteDesktopSessionDialog`
`305`	`289`	`{`