Permalink
Browse files

Fixing Files for new FluentSharp namespace

  • Loading branch information...
1 parent 6daea86 commit 6705012f159dfae42abc5c2b289033b9fc2811aa @DinisCruz DinisCruz committed Jul 21, 2013
@@ -1,9 +1,6 @@
using System;
using System.Diagnostics;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.XRules.Database.Utils;
+using FluentSharp.CoreLib;
//O2File:Tool_API.cs
@@ -1,10 +1,9 @@
using System;
using System.Diagnostics;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
+using FluentSharp.REPL.Utils;
//O2File:Tool_API.cs
-using O2.XRules.Database.Utils;
+
namespace O2.XRules.Database.APIs
@@ -5,14 +5,8 @@
using System.Windows.Forms;
using System.Text;
using System.Xml.Linq;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.Windows;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Views.ASCX.classes.MainGUI;
-using O2.Views.ASCX.ExtensionMethods;
-using O2.XRules.Database.Utils;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
@@ -1,11 +1,9 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>//var topPanel = panel.clear().add_Panel();
+//var topPanel = panel.clear().add_Panel();
var topPanel = "Util - Armorize Findings Viewer (Beta)".popupWindow(1400,600);
//add local path to hacmebank
-Action&lt;string,string,string&gt; addFileMapping =
+Action<string,string,string> addFileMapping =
(fileToMap, virtualPath, fullPath)
- =&gt; {
+ => {
if (SourceCodeMappingsUtils.mapFile(fileToMap).fileExists().isFalse())
new SourceCodeMappingsUtils.resolvedFileMapping("")
.addMappingToCurrentListAndSaveIt(virtualPath, fullPath) ;
@@ -23,9 +21,9 @@ findingsViewer.setTraceTreeViewVisibleStatus(true);
//var traceViewer = topPanel.insert_Below().add_TraceViewer();
-Action&lt;string&gt; loadFile =
+Action<string> loadFile =
(fileToLoad)
- =&gt; {
+ => {
treeView.backColor(Color.LightPink);
"Processing File: {0}".info(fileToLoad);
if (fileToLoad.fileExists().isFalse())
@@ -34,7 +32,7 @@ Action&lt;string&gt; loadFile =
return;
}
treeView.clear();
- O2Thread.mtaThread(()=&gt;treeView.view_XmlFile_in_TreeView(fileToLoad));
+ O2Thread.mtaThread(()=>treeView.view_XmlFile_in_TreeView(fileToLoad));
@@ -43,7 +41,7 @@ Action&lt;string&gt; loadFile =
var armorize = new API_Armorize(fileToLoad);
var o2Timer = new O2Timer("Armorize Findings Conversion").start();
- var o2Findings = new List&lt;IO2Finding&gt;();
+ var o2Findings = new List<IO2Finding>();
foreach(var vulnerability in armorize.vulnerabilities())
{
@@ -77,7 +75,7 @@ Action&lt;string&gt; loadFile =
signature = element._name();
if (signature.inValid())
signature = element.str();
- if (currentTrace.notNull() &amp;&amp; indent &gt; currentTrace.ordinal)
+ if (currentTrace.notNull() && indent > currentTrace.ordinal)
addTracesTo = currentTrace.childTraces;
var newTrace = addTracesTo.add_Trace(signature);
@@ -120,7 +118,7 @@ Action&lt;string&gt; loadFile =
};
treeView.onDrop(
- (file)=&gt;{
+ (file)=>{
switch(file.extension())
{
case ".xml":
@@ -163,7 +161,7 @@ return "ok";
/*var traces = (from vulnerability in armorize.vulnerabilities()
from traceBack in vulnerability.traceBacks()
- select traceBack.elements()).SelectMany((x)=&gt;x).toList();
+ select traceBack.elements()).SelectMany((x)=>x).toList();
return (from trace in traces
select trace.Name.str()).Distinct().toList() ;
@@ -175,11 +173,7 @@ return (from trace in traces
//findingEditor.details();
-
-//using O2.DotNetWrappers.O2Misc
//using O2.XRules.Database.Findings
+//using O2.XRules.Database.APIs
//O2File:Findings_ExtensionMethods.cs
-//using O2.Interfaces.O2Findings
-//O2File:API_Armorize.cs</SourceCode>
- <ReferencedAssemblies />
-</H2>
+//O2File:API_Armorize.cs
@@ -1,11 +1,10 @@
// 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)
using System;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.O2Findings;
-using O2.Interfaces.O2Findings;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms.O2Findings;
+
//O2File:OzasmUtils_OunceV7_0.cs
namespace O2.XRules.ThirdPary.IBM
@@ -1,12 +1,10 @@
// 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)
using System;
using System.Windows.Forms;
-using O2.Kernel;
using O2.XRules.ThirdPary.IBM;
using O2.ImportExport.OunceLabs.Ozasmt_OunceV6;
using O2.ImportExport.OunceLabs.Ozasmt_OunceV6_1;
-using O2.Views.ASCX.O2Findings;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.WinForms.Controls;
//O2File:O2AssessmentLoad_OunceV6.cs
//O2File:O2AssessmentSave_OunceV6.cs
@@ -1,12 +1,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)
using System;
using System.Collections.Generic;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.O2Findings;
-using O2.Interfaces.O2Findings;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.WinForms.O2Findings;
+
//O2File:xsd_Ozasmt_OunceV7_0.cs
namespace O2.XRules.ThirdPary.IBM
@@ -1,9 +1,9 @@
// 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)
using System;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.O2Findings;
-using O2.Interfaces.O2Findings;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms.O2Findings;
//O2File:xsd_Ozasmt_OunceV6.cs
//O2File:O2AssessmentData_OunceV6.cs
@@ -1,9 +1,9 @@
// 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)
using System;
using System.Collections.Generic;
-using O2.DotNetWrappers.DotNet;
-using O2.Interfaces.O2Findings;
-using O2.Kernel;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.CoreLib.API;
+
//O2File:xsd_Ozasmt_OunceV6.cs
//O2File:OzasmtUtils_OunceV6.cs
@@ -4,13 +4,13 @@
using System.IO;
using System.Linq;
using System.Xml;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.O2Findings;
-using O2.DotNetWrappers.Windows;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.ImportExport.OunceLabs;
-using O2.ImportExport.OunceLabs.Ozasmt_OunceV6;
-using O2.Interfaces.O2Findings;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.O2Findings;
+using FluentSharp.WinForms.Utils;
+
//O2File:O2AssessmentData_OunceV6.cs
namespace O2.ImportExport.OunceLabs.Ozasmt_OunceV6
@@ -1,10 +1,9 @@
// 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)
using System;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.O2Findings;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Interfaces.O2Findings;
-using O2.Kernel;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms.O2Findings;
//O2File:OzasmUtils_OunceV6_1.cs
@@ -1,10 +1,9 @@
// 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)
using System;
using System.Collections.Generic;
-using O2.Kernel;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.O2Findings;
-using O2.Interfaces.O2Findings;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms.O2Findings;
//O2File:xsd_Ozasmt_OunceV6_1.cs
@@ -6,17 +6,12 @@
using System.Windows.Forms;
using System.Reflection;
using System.Text;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.Network;
-using O2.DotNetWrappers.Windows;
-using O2.DotNetWrappers.Zip;
-using O2.Views.ASCX.classes.MainGUI;
-using O2.Views.ASCX.ExtensionMethods;
-using O2.External.SharpDevelop.ExtensionMethods;
-using O2.XRules.Database.Utils;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.REPL;
+using FluentSharp.REPL.Utils;
+using FluentSharp.WinForms;
//O2File:_7_Zip.cs
namespace O2.XRules.Database.APIs
@@ -279,7 +274,7 @@ public string download(string file)
}
var s3Path = "{0}{1}".format(s3DownloadFolder, file);
- if (new Web().httpFileExists(s3Path))
+ if (s3Path.httpFileExists())
{
"found file at S3: {0}".info(s3Path);
var downloadedFile = download(s3Path.uri());
@@ -1,12 +1,10 @@
using System;
using System.Diagnostics;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.XRules.Database.Utils;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.Interfaces;
//O2File:Tool_API.cs
-
+
namespace O2.XRules.Database.APIs
{
public class SZip_Test
@@ -5,22 +5,21 @@
using System.Threading;
using System.Collections.Generic;
using System.Windows.Forms;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.O2Findings;
-using O2.DotNetWrappers.Windows;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.O2Findings;
+using FluentSharp.WinForms.Controls;
+using FluentSharp.WinForms.Utils;
+using FluentSharp.REPL;
+using FluentSharp.REPL.Controls;
+
+using O2.XRules.ThirdPary.IBM; //for O2.ImportExport.OunceLabs.Ozasmt_OunceV7_0;
using O2.ImportExport.OunceLabs.Ozasmt_OunceV6;
using O2.ImportExport.OunceLabs.Ozasmt_OunceV6_1;
-using O2.XRules.ThirdPary.IBM; //for O2.ImportExport.OunceLabs.Ozasmt_OunceV7_0;
-using O2.Interfaces.O2Core;
-using O2.Interfaces.O2Findings;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.ImportExport.OunceLabs;
-using O2.External.SharpDevelop.ExtensionMethods;
-using O2.External.SharpDevelop.Ascx;
-using O2.Views.ASCX.O2Findings;
-
+using O2.ImportExport.OunceLabs;
+
//O2File:Findings_ExtensionMethods_Gui_Viewers.cs
//O2File:OunceAvailableEngines.cs
@@ -181,7 +180,7 @@ public static ascx_FindingsViewer set_CodeViewer(this ascx_FindingsViewer findin
return findingsViewer.set_CodeEditor(codeViewer.editor());
}
- public static ascx_FindingsViewer set_CodeEditor(this ascx_FindingsViewer findingsViewer, ascx_SourceCodeEditor codeEditor)
+ public static ascx_FindingsViewer set_CodeEditor(this ascx_FindingsViewer findingsViewer, SourceCodeEditor codeEditor)
{
findingsViewer._onTraceSelected +=
(trace)=>{
@@ -503,7 +502,7 @@ public static ascx_SourceCodeViewer show(this ascx_SourceCodeViewer codeViewer,
codeViewer.editor().show(o2Finding);
return codeViewer;
}
- public static ascx_SourceCodeEditor show(this ascx_SourceCodeEditor codeEditor, IO2Finding o2Finding)
+ public static SourceCodeEditor show(this SourceCodeEditor codeEditor, IO2Finding o2Finding)
{
"in show".info();
codeEditor.open(o2Finding.file);
@@ -522,7 +521,7 @@ public static ascx_SourceCodeViewer show(this ascx_SourceCodeViewer codeViewer,
return codeViewer;
}
- public static ascx_SourceCodeEditor show(this ascx_SourceCodeEditor codeEditor, IO2Trace o2Trace)
+ public static SourceCodeEditor show(this SourceCodeEditor codeEditor, IO2Trace o2Trace)
{
codeEditor.open(o2Trace.file);
if (o2Trace.lineNumber > 0)
@@ -558,7 +557,7 @@ public static ascx_TraceTreeView afterSelect_ShowTraceInCodeViewer(this ascx_Tra
return traceViewer.afterSelect_ShowTraceInCodeEditor(codeViewer.editor());
}
- public static ascx_TraceTreeView afterSelect_ShowTraceInCodeEditor(this ascx_TraceTreeView traceViewer , ascx_SourceCodeEditor codeEditor)
+ public static ascx_TraceTreeView afterSelect_ShowTraceInCodeEditor(this ascx_TraceTreeView traceViewer , SourceCodeEditor codeEditor)
{
traceViewer._onTraceSelected +=
(o2Trace)=>{
Oops, something went wrong.

0 comments on commit 6705012

Please sign in to comment.