Skip to content

Commit 3e94450

Browse files
committed
More FluentSharp namespaces fixes
1 parent 5fc3b53 commit 3e94450

File tree

151 files changed

+563
-1329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+563
-1329
lines changed

3rdParty/Chrome/API_Chrome.cs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
22
using System;
3-
using System.Linq;
43
using System.Threading;
5-
using System.Collections.Generic;
6-
using System.Windows.Forms;
7-
using System.Text;
8-
using O2.Kernel.ExtensionMethods;
9-
using O2.DotNetWrappers.DotNet;
10-
using O2.DotNetWrappers.ExtensionMethods;
4+
using System.Windows.Forms;
5+
using FluentSharp.CoreLib;
6+
using FluentSharp.CoreLib.API;
7+
using FluentSharp.WinForms;
118
using CefSharp;
129
using CefSharp.WinForms;
1310

14-
//Installer:CefSharp.cs!CefSharp\CefSharp-1.19.0\CefSharp.WinForms.dll
11+
//Installer:CefSharp_Installer.cs!CefSharp\CefSharp-1.19.0\CefSharp.WinForms.dll
1512
//O2Ref:CefSharp\CefSharp-1.19.0\CefSharp.WinForms.dll
1613
//O2Ref:CefSharp\CefSharp-1.19.0\CefSharp.dll
1714

@@ -23,9 +20,8 @@ public class API_Chrome_Test
2320
{
2421
public void launchChrome()
2522
{
26-
"Chrome Browser test".popupWindow()
27-
.add_Chrome()
28-
.Load("http://news.bbc.co.uk");
23+
API_Chrome_WinForms.add_Chrome("Chrome Browser test".popupWindow())
24+
.Load("http://news.bbc.co.uk");
2925
}
3026
}
3127

3rdParty/Chrome/API_ChromeDriver.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
using System;
2-
using System.Linq;
1+
using System.Linq;
32
using System.Collections.Generic;
4-
using O2.DotNetWrappers.ExtensionMethods;
5-
using OpenQA.Selenium.Remote;
3+
using FluentSharp.CoreLib;
64
using OpenQA.Selenium.Chrome;
7-
using OpenQA.Selenium.IE;
85
using OpenQA.Selenium;
96
//Installer:Selenium_Installer.cs!Selenium\net40\WebDriver.dll
107
//O2File:SeleniumWebDrivers_Setup.cs

3rdParty/Chrome/API_Chrome_Hijack.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
22
using System;
3-
using System.Collections.Generic;
4-
using System.Windows.Forms;
5-
using System.Text;
6-
using System.Reflection;
7-
using System.Management;
3+
using System.Windows.Forms;
4+
using System.Reflection;
85
using System.Diagnostics;
9-
using O2.Kernel.ExtensionMethods;
10-
using O2.DotNetWrappers.DotNet;
11-
using O2.DotNetWrappers.ExtensionMethods;
12-
using O2.XRules.Database.Utils;
6+
using FluentSharp.CoreLib;
7+
using FluentSharp.REPL;
8+
using FluentSharp.REPL.Controls;
9+
using FluentSharp.WinForms;
1310
using OpenQA.Selenium;
1411
using OpenQA.Selenium.Chrome;
12+
1513
//O2File:API_Win32_Handle_Hijack.cs
1614
//O2Ref:Selenium\net40\WebDriver.dll
1715
//Installer:Selenium_Installer.cs!Selenium\net40\WebDriver.dll

3rdParty/Chrome/API_Chrome_WPF.cs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
2-
using System;
3-
using System.Linq;
2+
43
using System.Threading;
5-
using System.Collections.Generic;
6-
using System.Text;
7-
using O2.Kernel.ExtensionMethods;
8-
using O2.DotNetWrappers.DotNet;
9-
using O2.DotNetWrappers.ExtensionMethods;
10-
using O2.XRules.Database.Utils;
11-
using CefSharp;
4+
using FluentSharp.CoreLib;
5+
using FluentSharp.CoreLib.API;
6+
using FluentSharp.WPF;
7+
using FluentSharp.WinForms;
128
using CefSharp.Wpf;
139

1410
//O2Ref:FluentSharp.WPF.dll
@@ -26,7 +22,7 @@
2622

2723
namespace O2.XRules.Database.APIs
2824
{
29-
public class API_Chrome_Test
25+
public class API_Chrome_WPF_Test
3026
{
3127
public void launchChrome()
3228
{
@@ -43,7 +39,7 @@ public API_Chrome_WPF()
4339
}
4440
}
4541

46-
public static class API_Chrome_WinForms
42+
public static class API_Chrome_WPF_Extension_Methods
4743
{
4844
public static WebView add_Chrome_Wpf(this System.Windows.Forms.Control control, bool addNavigationBar = false)
4945
{

3rdParty/Chrome/CefSharp_Installer.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
using System;
2-
using System.Diagnostics;
3-
using O2.Kernel;
4-
using O2.Kernel.ExtensionMethods;
5-
using O2.DotNetWrappers.ExtensionMethods;
6-
using O2.XRules.Database.Utils;
1+
using System.Diagnostics;
2+
using FluentSharp.CoreLib;
3+
74
//O2File:Tool_API.cs
85

96
namespace O2.XRules.Database.APIs

3rdParty/IBM/Analysis_Workflows/Analysis_WorkFlow.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
22
using System.IO;
3-
using O2.Interfaces.O2Core;
4-
using O2.Interfaces.XRules;
5-
using O2.Kernel;
6-
using O2.DotNetWrappers.O2CmdShell;
7-
using O2.DotNetWrappers.Windows;
3+
using FluentSharp.CoreLib.API;
4+
using FluentSharp.CoreLib.Interfaces;
85
using NUnit.Framework;
96
using O2.XRules.Database.Interfaces;
107

3rdParty/IBM/Analysis_Workflows/Analysis_WorkFlow_Phase_1.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
//O2Tag_OnlyAddReferencedAssemblies
33
using System.IO;
44
using System.Collections.Generic;
5-
using O2.Interfaces.O2Core;
6-
using O2.Interfaces.XRules;
7-
using O2.Kernel;
8-
using O2.DotNetWrappers.Windows;
9-
using O2.DotNetWrappers.O2CmdShell;
5+
using FluentSharp.CoreLib.API;
6+
using FluentSharp.CoreLib.Interfaces;
107
using O2.XRules.Database.Interfaces;
118
using NUnit.Framework;
129

3rdParty/IBM/Analysis_Workflows/Analysis_WorkFlow_Phase_2.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
using System;
33
using System.IO;
44
using System.Collections.Generic;
5-
using O2.Interfaces.O2Findings;
6-
using O2.Interfaces.XRules;
7-
using O2.DotNetWrappers.O2Findings;
8-
using O2.DotNetWrappers.O2CmdShell;
9-
using O2.DotNetWrappers.Windows;
5+
using FluentSharp.CoreLib.API;
6+
using FluentSharp.CoreLib.Interfaces;
7+
using FluentSharp.WinForms.O2Findings;
108
using O2.XRules.Database.Interfaces;
119
using NUnit.Framework;
1210

3rdParty/IBM/Analysis_Workflows/Analysis_WorkFlow_Phase_3.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
22
using System.IO;
33
using System.Collections.Generic;
4-
using O2.Interfaces.O2Findings;
5-
using O2.Interfaces.XRules;
6-
using O2.DotNetWrappers.O2CmdShell;
7-
using O2.DotNetWrappers.Windows;
4+
using FluentSharp.CoreLib.API;
5+
using FluentSharp.CoreLib.Interfaces;
86
using O2.XRules.Database.Interfaces;
97
//O2Ref:nunit.framework.dll
108
using NUnit.Framework;
11-
using O2.XRules.Database._Rules;
129
using O2.XRules.Database._Rules.J2EE.Struts;
10+
1311
//O2File:IAnalysisArtifacts.cs
1412
//O2File:KAnalysisArtifacts.cs
1513
//O2File:XUtils_Findings_v0_1.cs

3rdParty/IBM/Analysis_Workflows/Analysis_WorkFlow_Phase_4.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
// This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
22
using System.IO;
33
using System.Collections.Generic;
4-
using System.Linq;
5-
using O2.Interfaces.O2Findings;
6-
using O2.Interfaces.XRules;
7-
using O2.DotNetWrappers.O2Findings;
8-
using O2.DotNetWrappers.O2CmdShell;
9-
using O2.DotNetWrappers.Windows;
10-
using O2.XRules.Database._Rules;
4+
using FluentSharp.CoreLib.API;
5+
using FluentSharp.CoreLib.Interfaces;
6+
using FluentSharp.WinForms.O2Findings;
117
using O2.XRules.Database.Interfaces;
128
//O2Ref:nunit.framework.dll
139
using NUnit.Framework;

0 commit comments

Comments
 (0)