Skip to content

Commit 6705012

Browse files
DinisCruzDinisCruz
committed
Fixing Files for new FluentSharp namespace
1 parent 6daea86 commit 6705012

16 files changed

+81
-120
lines changed

‎3rdParty/Antlr/Antlr_Installer.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
using System;
22
using System.Diagnostics;
3-
using O2.Kernel;
4-
using O2.Kernel.ExtensionMethods;
5-
using O2.DotNetWrappers.ExtensionMethods;
6-
using O2.XRules.Database.Utils;
3+
using FluentSharp.CoreLib;
74

85
//O2File:Tool_API.cs
96

‎3rdParty/Apache/Apache_HttpServer_Installer.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
using System;
22
using System.Diagnostics;
3-
using O2.Kernel;
4-
using O2.Kernel.ExtensionMethods;
5-
using O2.DotNetWrappers.ExtensionMethods;
3+
using FluentSharp.CoreLib;
4+
using FluentSharp.REPL.Utils;
65
//O2File:Tool_API.cs
7-
using O2.XRules.Database.Utils;
6+
87

98

109
namespace O2.XRules.Database.APIs

‎3rdParty/Armorize/API_Armorize.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@
55
using System.Windows.Forms;
66
using System.Text;
77
using System.Xml.Linq;
8-
using O2.Kernel;
9-
using O2.Kernel.ExtensionMethods;
10-
using O2.DotNetWrappers.DotNet;
11-
using O2.DotNetWrappers.Windows;
12-
using O2.DotNetWrappers.ExtensionMethods;
13-
using O2.Views.ASCX.classes.MainGUI;
14-
using O2.Views.ASCX.ExtensionMethods;
15-
using O2.XRules.Database.Utils;
8+
using FluentSharp.CoreLib;
9+
using FluentSharp.WinForms;
1610

1711

1812

‎3rdParty/Armorize/Util - Armorize Findings Viewer (Beta).h2‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
<?xml version="1.0"?>
2-
<H2>
3-
<SourceCode>//var topPanel = panel.clear().add_Panel();
1+
//var topPanel = panel.clear().add_Panel();
42
var topPanel = "Util - Armorize Findings Viewer (Beta)".popupWindow(1400,600);
53
//add local path to hacmebank
6-
Action&lt;string,string,string&gt; addFileMapping =
4+
Action<string,string,string> addFileMapping =
75
(fileToMap, virtualPath, fullPath)
8-
=&gt; {
6+
=> {
97
if (SourceCodeMappingsUtils.mapFile(fileToMap).fileExists().isFalse())
108
new SourceCodeMappingsUtils.resolvedFileMapping("")
119
.addMappingToCurrentListAndSaveIt(virtualPath, fullPath) ;
@@ -23,9 +21,9 @@ findingsViewer.setTraceTreeViewVisibleStatus(true);
2321
//var traceViewer = topPanel.insert_Below().add_TraceViewer();
2422

2523

26-
Action&lt;string&gt; loadFile =
24+
Action<string> loadFile =
2725
(fileToLoad)
28-
=&gt; {
26+
=> {
2927
treeView.backColor(Color.LightPink);
3028
"Processing File: {0}".info(fileToLoad);
3129
if (fileToLoad.fileExists().isFalse())
@@ -34,7 +32,7 @@ Action&lt;string&gt; loadFile =
3432
return;
3533
}
3634
treeView.clear();
37-
O2Thread.mtaThread(()=&gt;treeView.view_XmlFile_in_TreeView(fileToLoad));
35+
O2Thread.mtaThread(()=>treeView.view_XmlFile_in_TreeView(fileToLoad));
3836

3937

4038

@@ -43,7 +41,7 @@ Action&lt;string&gt; loadFile =
4341
var armorize = new API_Armorize(fileToLoad);
4442

4543
var o2Timer = new O2Timer("Armorize Findings Conversion").start();
46-
var o2Findings = new List&lt;IO2Finding&gt;();
44+
var o2Findings = new List<IO2Finding>();
4745

4846
foreach(var vulnerability in armorize.vulnerabilities())
4947
{
@@ -77,7 +75,7 @@ Action&lt;string&gt; loadFile =
7775
signature = element._name();
7876
if (signature.inValid())
7977
signature = element.str();
80-
if (currentTrace.notNull() &amp;&amp; indent &gt; currentTrace.ordinal)
78+
if (currentTrace.notNull() && indent > currentTrace.ordinal)
8179
addTracesTo = currentTrace.childTraces;
8280

8381
var newTrace = addTracesTo.add_Trace(signature);
@@ -120,7 +118,7 @@ Action&lt;string&gt; loadFile =
120118
};
121119

122120
treeView.onDrop(
123-
(file)=&gt;{
121+
(file)=>{
124122
switch(file.extension())
125123
{
126124
case ".xml":
@@ -163,7 +161,7 @@ return "ok";
163161

164162
/*var traces = (from vulnerability in armorize.vulnerabilities()
165163
from traceBack in vulnerability.traceBacks()
166-
select traceBack.elements()).SelectMany((x)=&gt;x).toList();
164+
select traceBack.elements()).SelectMany((x)=>x).toList();
167165

168166
return (from trace in traces
169167
select trace.Name.str()).Distinct().toList() ;
@@ -175,11 +173,7 @@ return (from trace in traces
175173

176174
//findingEditor.details();
177175

178-
179-
//using O2.DotNetWrappers.O2Misc
180176
//using O2.XRules.Database.Findings
177+
//using O2.XRules.Database.APIs
181178
//O2File:Findings_ExtensionMethods.cs
182-
//using O2.Interfaces.O2Findings
183-
//O2File:API_Armorize.cs</SourceCode>
184-
<ReferencedAssemblies />
185-
</H2>
179+
//O2File:API_Armorize.cs

‎3rdParty/IBM/AppScan Source 7.0/O2AssessmentLoad_OunceV7_0.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +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)
22
using System;
3-
using O2.Kernel;
4-
using O2.Kernel.ExtensionMethods;
5-
using O2.DotNetWrappers.ExtensionMethods;
6-
using O2.DotNetWrappers.DotNet;
7-
using O2.DotNetWrappers.O2Findings;
8-
using O2.Interfaces.O2Findings;
3+
using FluentSharp.CoreLib;
4+
using FluentSharp.CoreLib.Interfaces;
5+
using FluentSharp.CoreLib.API;
6+
using FluentSharp.WinForms.O2Findings;
7+
98
//O2File:OzasmUtils_OunceV7_0.cs
109

1110
namespace O2.XRules.ThirdPary.IBM

‎3rdParty/IBM/AppScan Source 7.0/OunceAvailableEngines.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +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)
22
using System;
33
using System.Windows.Forms;
4-
using O2.Kernel;
54
using O2.XRules.ThirdPary.IBM;
65
using O2.ImportExport.OunceLabs.Ozasmt_OunceV6;
76
using O2.ImportExport.OunceLabs.Ozasmt_OunceV6_1;
8-
using O2.Views.ASCX.O2Findings;
9-
using O2.DotNetWrappers.ExtensionMethods;
7+
using FluentSharp.WinForms.Controls;
108

119
//O2File:O2AssessmentLoad_OunceV6.cs
1210
//O2File:O2AssessmentSave_OunceV6.cs

‎3rdParty/IBM/AppScan Source 7.0/OzasmUtils_OunceV7_0.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
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;
33
using System.Collections.Generic;
4-
using O2.Kernel;
5-
using O2.Kernel.ExtensionMethods;
6-
using O2.DotNetWrappers.ExtensionMethods;
7-
using O2.DotNetWrappers.DotNet;
8-
using O2.DotNetWrappers.O2Findings;
9-
using O2.Interfaces.O2Findings;
4+
using FluentSharp.CoreLib;
5+
using FluentSharp.CoreLib.API;
6+
using FluentSharp.CoreLib.Interfaces;
7+
using FluentSharp.WinForms.O2Findings;
8+
109
//O2File:xsd_Ozasmt_OunceV7_0.cs
1110

1211
namespace O2.XRules.ThirdPary.IBM

‎3rdParty/IBM/AppScan Source 7.0/Ozasmt_OunceV6/O2AssessmentLoad_OunceV6.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +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;
3-
using O2.DotNetWrappers.ExtensionMethods;
4-
using O2.DotNetWrappers.DotNet;
5-
using O2.DotNetWrappers.O2Findings;
6-
using O2.Interfaces.O2Findings;
3+
using FluentSharp.CoreLib;
4+
using FluentSharp.CoreLib.Interfaces;
5+
using FluentSharp.CoreLib.API;
6+
using FluentSharp.WinForms.O2Findings;
77

88
//O2File:xsd_Ozasmt_OunceV6.cs
99
//O2File:O2AssessmentData_OunceV6.cs

‎3rdParty/IBM/AppScan Source 7.0/Ozasmt_OunceV6/O2AssessmentSave_OunceV6.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +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;
33
using System.Collections.Generic;
4-
using O2.DotNetWrappers.DotNet;
5-
using O2.Interfaces.O2Findings;
6-
using O2.Kernel;
4+
using FluentSharp.CoreLib.Interfaces;
5+
using FluentSharp.CoreLib.API;
6+
77
//O2File:xsd_Ozasmt_OunceV6.cs
88
//O2File:OzasmtUtils_OunceV6.cs
99

‎3rdParty/IBM/AppScan Source 7.0/Ozasmt_OunceV6/OzasmtUtils_OunceV6.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
using System.IO;
55
using System.Linq;
66
using System.Xml;
7-
using O2.DotNetWrappers.DotNet;
8-
using O2.DotNetWrappers.O2Findings;
9-
using O2.DotNetWrappers.Windows;
10-
using O2.DotNetWrappers.ExtensionMethods;
11-
using O2.ImportExport.OunceLabs;
12-
using O2.ImportExport.OunceLabs.Ozasmt_OunceV6;
13-
using O2.Interfaces.O2Findings;
7+
using FluentSharp.CoreLib;
8+
using FluentSharp.CoreLib.API;
9+
using FluentSharp.CoreLib.Interfaces;
10+
using FluentSharp.WinForms;
11+
using FluentSharp.WinForms.O2Findings;
12+
using FluentSharp.WinForms.Utils;
13+
1414
//O2File:O2AssessmentData_OunceV6.cs
1515

1616
namespace O2.ImportExport.OunceLabs.Ozasmt_OunceV6

0 commit comments

Comments
 (0)