Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed all *.cs files for FluentSharp namespace changes

  • Loading branch information...
commit ecc5f957f51edd4cd4aa3bf7ba9266be00733e37 1 parent 32edd0c
@DinisCruz DinisCruz authored
Showing with 2,022 additions and 2,233 deletions.
  1. +2 −2 3rdParty/GitHub/GitHub - CustomO2.cs
  2. +1 −1  3rdParty/Microsoft/CatNet/API_CatNet_TeamMentor_VS2010.cs
  3. +12 −16 3rdParty/Microsoft/MSBuild/Util - Package O2 Script into separate Folder.h2
  4. +1 −1  3rdParty/Microsoft/VisualStudio/API_VisualStudio_2010.cs
  5. +2 −2 3rdParty/Microsoft/VisualStudio/O2_Add_In/Commands/CommandBase.cs
  6. +2 −2 3rdParty/Microsoft/VisualStudio/O2_Add_In/Commands/O2_LogViewer.cs
  7. +1 −1  3rdParty/Microsoft/VisualStudio/O2_Add_In/Commands/O2_ScriptGui.cs
  8. +1 −1  3rdParty/Microsoft/VisualStudio/O2_Add_In/Commands/O2_ScriptWithPanel.cs
  9. +2 −2 3rdParty/Microsoft/VisualStudio/O2_Add_In/Commands/VS2010_TeamMentor_Menu.cs
  10. +1 −1  3rdParty/Microsoft/VisualStudio/O2_Add_In/Microsoft_VisualStudio_ExtensionMethods.cs
  11. +1 −2  3rdParty/Microsoft/VisualStudio/O2_Add_In/O2_VS_AddIn.cs
  12. +1 −1  3rdParty/Microsoft/VisualStudio/O2_Add_In/VisualStudio_Connect.cs
  13. +1 −3 3rdParty/OWASP/OWASP_Summit_2011/UnitTests_Test_AttendeeData.cs
  14. +2 −3 3rdParty/SecurityInnovation/Exams/API_SI_Exams.cs
  15. +0 −2  3rdParty/SecurityInnovation/TeamProfessor/IE_TeamProfessor.cs
  16. +1 −1  3rdParty/Snoop/Process Injection Tests/Injected_Dll_WithCodeSnippet.cs
  17. +0 −1  3rdParty/Veracode/API_Veracode_DetailedXmlFindings.cs
  18. +2 −2 3rdParty/_Installers/JavaJdk.cs
  19. +0 −1  APIs/Amazon/API_AmazonS3.cs
  20. +2 −4 APIs/BTOpenZone/API_BTOpenZone.cs
  21. +2 −2 APIs/EtherpadLite/API_EtherpadLite.cs
  22. +0 −1  APIs/EtherpadLite/UnitTests_EtherpadLiteDotNet.cs
  23. +2 −3 APIs/EventBrite/API_EventBrite.cs
  24. +2 −4 APIs/Google/Blogger/API_Blogger.cs
  25. +3 −3 APIs/Google/GMail/API_GMail.cs
  26. +6 −10 APIs/HtmlAgilityPack/HtmlAgilityPack_Extra_ExtensionMethods_SourceCodeViewer.cs
  27. +4 −7 APIs/IE/IE_ExecutionGui/IE_Google - Execution.h2
  28. +5 −6 APIs/IE/IE_ExecutionGui/IE_Google - Scripting.h2
  29. +2 −2 APIs/IE/IE_ExecutionGui/IE_Google.cs
  30. +0 −1  APIs/IKVM/API_IKVMC.cs
  31. +0 −1  APIs/IKVM/API_IKVMC_CallMapping.cs
  32. +0 −1  APIs/Mailman/API_Mailman.cs
  33. +5 −17 APIs/MediaWiki/MediaWikiEditor.cs
  34. +0 −1  APIs/MediaWiki/MediaWiki_GuiControls/ascx_MediaWiki_ConfigAndLogin.cs
  35. +0 −1  APIs/MediaWiki/MediaWiki_GuiControls/ascx_MediaWiki_PageEditor_Simple.cs
  36. +5 −3 APIs/MerlinWizard/Wizard - SearchEngine UseCase 1.cs
  37. +3 −2 APIs/NUnit/API_NUnit_using_O2Gui.cs
  38. +1 −1  APIs/NUnit/Util - Execute O2ified tests on NUnitGui.h2
  39. +1 −0  APIs/NUnit/Write and Execute Unit Tests.h2
  40. +2 −2 APIs/O2_Web_Proxy/HTTPSDebuggingProxy/Cache_Objects.cs
  41. +4 −11 APIs/OpenPgp/UnitTests_API_Open_Pgp.cs
  42. +2 −2 APIs/Twitter/O2TwitterAPI.cs
  43. +1 −0  APIs/WPF/API_WPF_ToolKit.cs
  44. +2 −2 APIs/WPF/Graph/GraphSharp_ExtensionMethods.cs
  45. +100 −106 APIs/WPF/Graph/{ascx_GraphWithInspector.cs.o2 → ascx_GraphWithInspector.cs}
  46. +2 −0  APIs/WPF/WPF_GUI.cs
  47. +4 −5 APIs/WatiN/IE Automation (Simple mode).h2
  48. +9 −13 APIs/WatiN/IE Automation (using Windows Automation).h2
  49. +8 −8 APIs/WatiN/IE Automation using WatiN.h2
  50. +2 −2 APIs/WatiN/Unit_Tests_using_IE.cs
  51. +8 −8 APIs/WatiN/ascx_IE_ScriptExecution.cs
  52. +2 −0  APIs/Windows/InputSimulator/API_InputSimulator.cs
  53. +2 −2 APIs/WordPress/API_WordPress_IE.cs
  54. +12 −13 APIs/WordPress/Unit_Tests_API_WordPress_IE.cs
  55. +3 −2 APIs/_Javascript_Libraries/JQuery/IE_JQuery.cs
  56. +2 −2 APIs/_Javascript_Libraries/JQuery/jsTree/JsTreeNode.cs
  57. +2 −0  Languages/AspNet/ascx_Edit_AspNet_Pages.cs
  58. +1 −1  Languages/DotNet/Ast_Scanner/Ast_Engine/MethodMappings_Engine.cs
  59. +40 −1 Languages/DotNet/DotNet_ViewState.cs
  60. +2 −0  Languages/DotNet/Mono_and_Reflection/ascx_MonoDecompiler.cs
  61. +0 −1  Languages/J2EE/SpringMVC/SpringMvcMappings.cs
  62. +5 −5 Languages/J2EE/SpringMVC/v2.0/SpringMvcMappings_v2.0.cs
  63. +1 −1  Utils/ExtensionMethods/_Extra_methods_Xml_XSD.cs
  64. +2 −8 Utils/O2/UnitTests/UnitTest_Gui_Tests.cs
  65. +29 −30 Utils/O2/{ascx_O2_Command_Prompt.cs.o2 → ascx_O2_Command_Prompt.cs}
  66. +6 −5 Utils/O2_StandAlone_Modules/HostLocalWebsite/ascx_HostLocalWebsite.Designer.cs
  67. +3 −5 Utils/O2_StandAlone_Modules/HostLocalWebsite/ascx_HostLocalWebsite.cs
  68. +2 −5 Utils/O2_StandAlone_Modules/HostLocalWebsite/main.cs
  69. +2 −5 Utils/O2_StandAlone_Modules/HostLocalWebsite/webservices.cs
  70. +12 −15 Utils/O2_StandAlone_Modules/SearchEngine/SearchEngineGui.cs
  71. +2 −6 Utils/O2_StandAlone_Modules/SearchEngine/Tool - Search Engine.h2
  72. +3 −6 Utils/O2_StandAlone_Modules/SearchEngine/ascx_SearchResults.Controllers.cs
  73. +3 −11 Utils/O2_StandAlone_Modules/SearchEngine/ascx_SearchResults.cs
  74. +3 −3 Utils/O2_StandAlone_Modules/SearchEngine/ascx_SearchTargets.Controllers.cs
  75. +1 −2  Utils/O2_StandAlone_Modules/SearchEngine/ascx_SearchTargets.cs
  76. +4 −6 Utils/O2_StandAlone_Modules/SearchEngine/ascx_TextSearch.Designer.cs
  77. +1 −4 Utils/O2_StandAlone_Modules/SearchEngine/ascx_TextSearch.cs
  78. +4 −5 Utils/Web/SimpleCSharpREPL.cs
  79. +3 −2 Utils/Web/SimpleTextEditor.cs
  80. +6 −14 Utils/Web/ascx_HtmlTagViewer.cs
  81. +200 −215 Utils/Web/{ascx_Html_Editor.cs.o2 → ascx_Html_Editor.cs}
  82. +72 −83 Utils/Web/{ascx_Translate_Text.cs.o2 → ascx_Translate_Text.cs}
  83. +130 −139 Utils/Web/{ascx_View_WebPage_Details.cs.o2 → ascx_View_WebPage_Details.cs}
  84. +1 −4 Utils/Windows/API_SecureCredentials.cs
  85. +7 −19 Utils/Windows/{ascx_Processes_Stop.cs.o2 → ascx_Processes_Stop.cs}
  86. +222 −230 Utils/Windows/{ascx_Running_Processes_Details.cs.o2 → ascx_Running_Processes_Details.cs}
  87. +204 −210 Utils/Windows/{ascx_Services_Stop.cs.o2 → ascx_Services_Stop.cs}
  88. +109 −116 Utils/Windows/{ascx_Start_Tools.cs.o2 → ascx_Start_Tools.cs}
  89. +3 −1 Utils/_O2_Development/Compile All Local O2 Scripts.h2
  90. +1 −0  Utils/_O2_Development/O2Dev_UnitTests/UnitTest_BrowserAutomation_and_IE_Demos.cs
  91. +1 −0  Utils/_O2_Development/O2Dev_UnitTests/UnitTest_SimpleTextEditor.cs
  92. +3 −3 Utils/_Sample Files/Hello_O2_World.cs
  93. +382 −384 Utils/_Sample Files/{SampleScripts.cs.o2 → SampleScripts.cs}
  94. +2 −6 Utils/_Sample Files/SampleUnitTests.cs
  95. +5 −3 Utils/_Sample Files/Support files For Unit Tests/1_helloWorld.cs
  96. +0 −4 Utils/_Sample Files/Support files For Unit Tests/_Sample_UnitTests.cs
  97. +3 −7 _Custom_O2s/_Templates/Empty_Class.cs
  98. +7 −8 _Custom_O2s/_Templates/Empty_XRule.cs
  99. +9 −7 _Custom_O2s/v2.0/Util - Clone_or_Open and compile O2 Repositories.cs
  100. +1 −1  _Custom_O2s/v4.1/Main O2 Gui.h2
  101. +1 −8 _DataFiles/_UnitTests/CheckBehaviourOfSecurityActionDemands.cs
  102. +13 −25 _Sample_Vulns/HacmeBank/API_HacmeBank.cs
  103. +221 −228 _Sample_Vulns/HacmeBank/{HacmeBank_BlackBox_Exploits.cs.o2 → HacmeBank_BlackBox_Exploits.cs}
  104. +5 −16 _Sample_Vulns/JPetClinic/Spring_PetClinic_BlackBox_Exploits.cs
  105. +3 −6 _Sample_Vulns/NerdDinner/NerdDinner_Installer.cs
  106. +6 −11 _Sample_Vulns/SuperSecureBank/API_SuperSecureBank.cs
  107. +6 −20 _Sample_Vulns/WebGoat/API_WebGoat.cs
  108. +10 −18 _Sample_Vulns/WebGoat/{WebGoat_BlackBox_Exploits.cs.o2 → WebGoat_BlackBox_Exploits.cs}
  109. +6 −11 _Sample_Vulns/jPetStore/API_JPetStore.cs
  110. +5 −9 _Templates/Empty_Class.cs
  111. +6 −7 _Templates/Empty_XRule.cs
View
4 3rdParty/GitHub/GitHub - CustomO2.cs
@@ -7,7 +7,6 @@
using FluentSharp.WinForms;
using FluentSharp.WinForms.Controls;
using O2.XRules.Database.Utils;
-//O2File:Watin_IE_ExtensionMethods.cs
//O2File:CustomO2.cs
//O2File:API_GitHub.cs
//O2File:Git_Installer.cs
@@ -15,7 +14,8 @@
//O2File:API_GitHub_Issues.cs
//O2Ref:WindowsFormsIntegration.dll
//O2Ref:RibbonControlsLibrary.dll
-//O2Ref:WatiN.Core.1x.dll
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
//O2Ref:White.Core.dll
namespace O2.XRules.Database.APIs
View
2  3rdParty/Microsoft/CatNet/API_CatNet_TeamMentor_VS2010.cs
@@ -5,9 +5,9 @@
using System.Windows.Forms;
using CefSharp.WinForms;
using FluentSharp.CoreLib;
+using FluentSharp.VisualStudio.Utils;
using FluentSharp.WinForms;
using Microsoft.ACESec.CATNet.UI;
-using O2.FluentSharp.VisualStudio;
//O2File:API_CatNet_VS2010.cs
//O2File:API_VisualStudio_2010.cs
View
28 3rdParty/Microsoft/MSBuild/Util - Package O2 Script into separate Folder.h2
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>O2ConfigSettings.O2Version = "Package_O2_Script_v1";
+O2ConfigSettings.O2Version = "Package_O2_Script_v1";
O2Setup.extractEmbededConfigZips();
//var topPanel = panel.clear().add_Panel();
@@ -16,13 +14,13 @@ var dropZone = topPanel.insert_Left(200)
var lastScriptFile = "";
var compiledScript = "";
-Action&lt;string&gt; packageScript =
- (scriptFile)=&gt;{
+Action<string> packageScript =
+ (scriptFile)=>{
lastScriptFile = scriptFile;
dropZone.green();
O2Thread.mtaThread(
- ()=&gt;{
+ ()=>{
var pathToAssemblies = "";
var projectFile = "";
if (scriptFile.package_Script(ref compiledScript, ref pathToAssemblies, ref projectFile).valid())
@@ -34,25 +32,23 @@ Action&lt;string&gt; packageScript =
{
var logFile = projectFile + ".log";
"LogFile: {0}".error(logFile);
- browser.set_Text(logFile.fileContents().replace("".line(), "&lt;br&gt;"));
+ browser.set_Text(logFile.fileContents().replace("".line(), "<br>"));
dropZone.pink();
}
});
};
-dropZone.parent().insert_Below(20).add_Link("Execute", ()=&gt; compiledScript.startProcess())
- .append_Link("Open Folder", ()=&gt; compiledScript.directoryName().startProcess())
- .append_Link("Edit Target", ()=&gt; lastScriptFile.local().showInCodeEditor());
-// .append_Link("Clear Cache", ()=&gt; { CompileEngine.CachedCompiledAssemblies.Clear(); "Compilation Cache Cleared".info();});
+dropZone.parent().insert_Below(20).add_Link("Execute", ()=> compiledScript.startProcess())
+ .append_Link("Open Folder", ()=> compiledScript.directoryName().startProcess())
+ .append_Link("Edit Target", ()=> lastScriptFile.local().showInCodeEditor());
+// .append_Link("Clear Cache", ()=> { CompileEngine.CachedCompiledAssemblies.Clear(); "Compilation Cache Cleared".info();});
dropZone.onDrop(packageScript);
-dropZone.onClick(()=&gt;packageScript(lastScriptFile));
+dropZone.onClick(()=>packageScript(lastScriptFile));
dropZone.add_MenuItem_with_TestScripts(packageScript);
return packageScript;
-
+
+//using O2.XRules.Database.APIs
//O2File:API_MicrosoftBuild.cs
//O2Package:ALL_SCRIPTS
-</SourceCode>
- <ReferencedAssemblies />
-</H2>
View
2  3rdParty/Microsoft/VisualStudio/API_VisualStudio_2010.cs
@@ -6,8 +6,8 @@
using EnvDTE;
using EnvDTE80;
using FluentSharp.CoreLib;
+using FluentSharp.VisualStudio.Utils;
using Microsoft.VisualStudio.CommandBars;
-using O2.FluentSharp.VisualStudio;
//O2File:O2_VS_AddIn.cs
//O2File:VisualStudio_Connect.cs
View
4 3rdParty/Microsoft/VisualStudio/O2_Add_In/Commands/CommandBase.cs
@@ -1,13 +1,13 @@
using System;
using FluentSharp.CoreLib;
-using O2.FluentSharp.VisualStudio.ExtensionMethods;
+using FluentSharp.VisualStudio;
using EnvDTE;
//O2File:O2_VS_AddIn.cs
//O2File:Microsoft_VisualStudio_ExtensionMethods.cs
//O2Ref:EnvDTE.dll
-namespace O2.FluentSharp.VisualStudio
+namespace FluentSharp.VisualStudio.Utils
{
public class CommandBase
{
View
4 3rdParty/Microsoft/VisualStudio/O2_Add_In/Commands/O2_LogViewer.cs
@@ -1,9 +1,9 @@
using FluentSharp.WinForms;
-using O2.FluentSharp.VisualStudio.ExtensionMethods;
+using FluentSharp.VisualStudio;
//O2File:O2_VS_AddIn.cs
-namespace O2.FluentSharp.VisualStudio
+namespace FluentSharp.VisualStudio.Utils
{
public class O2_LogViewer : CommandBase
{
View
2  3rdParty/Microsoft/VisualStudio/O2_Add_In/Commands/O2_ScriptGui.cs
@@ -2,7 +2,7 @@
//O2File:O2_VS_AddIn.cs
-namespace O2.FluentSharp.VisualStudio
+namespace FluentSharp.VisualStudio.Utils
{
public class O2_ScriptGui : CommandBase
{
View
2  3rdParty/Microsoft/VisualStudio/O2_Add_In/Commands/O2_ScriptWithPanel.cs
@@ -1,6 +1,6 @@
//O2File:O2_VS_AddIn.cs
-namespace O2.FluentSharp.VisualStudio
+namespace FluentSharp.VisualStudio.Utils
{
public class O2_ScriptWithPanel : CommandBase
{
View
4 3rdParty/Microsoft/VisualStudio/O2_Add_In/Commands/VS2010_TeamMentor_Menu.cs
@@ -1,10 +1,10 @@
using FluentSharp.CoreLib;
+using FluentSharp.VisualStudio;
using FluentSharp.WinForms;
-using O2.FluentSharp.VisualStudio.ExtensionMethods;
//O2File:O2_VS_AddIn.cs
-namespace O2.FluentSharp.VisualStudio
+namespace FluentSharp.VisualStudio.Utils
{
public class VS2010_TeamMentor_Menu : CommandBase
{
View
2  3rdParty/Microsoft/VisualStudio/O2_Add_In/Microsoft_VisualStudio_ExtensionMethods.cs
@@ -12,7 +12,7 @@
//O2Ref:Microsoft.VisualStudio.CommandBars.dll
-namespace O2.FluentSharp.VisualStudio.ExtensionMethods
+namespace FluentSharp.VisualStudio
{
/// <summary>
///
View
3  3rdParty/Microsoft/VisualStudio/O2_Add_In/O2_VS_AddIn.cs
@@ -8,7 +8,6 @@
using FluentSharp.WinForms;
using FluentSharp.WinForms.Controls;
using Microsoft.VisualStudio.CommandBars;
-using O2.FluentSharp.VisualStudio.ExtensionMethods;
//O2File:Microsoft_VisualStudio_ExtensionMethods.cs
//O2File:CommandBase.cs
@@ -23,7 +22,7 @@
//O2Ref:Microsoft.VisualStudio.CommandBars.dll
-namespace O2.FluentSharp.VisualStudio
+namespace FluentSharp.VisualStudio.Utils
{
public class O2_VS_AddIn
{
View
2  3rdParty/Microsoft/VisualStudio/O2_Add_In/VisualStudio_Connect.cs
@@ -13,7 +13,7 @@
//O2Ref:Extensibility.dll
//O2Ref:Microsoft.VisualStudio.CommandBars.dll
-namespace O2.FluentSharp.VisualStudio
+namespace FluentSharp.VisualStudio.Utils
{
/// <summary>The object for implementing an Add-in.</summary>
/// <seealso class='IDTExtensibility2' />
View
4 3rdParty/OWASP/OWASP_Summit_2011/UnitTests_Test_AttendeeData.cs
@@ -4,10 +4,8 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Text;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
using O2.XRules.Database.APIs;
+using FluentSharp.CoreLib;
using NUnit.Framework;
//O2File:API_OWASP_Summit_2011.cs
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
View
5 3rdParty/SecurityInnovation/Exams/API_SI_Exams.cs
@@ -1,5 +1,4 @@
// 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.Collections.Generic;
using System.Linq;
using FluentSharp.CoreLib;
@@ -9,9 +8,9 @@
using FluentSharp.Watin;
using White.Core.UIItems.WindowItems;
-//O2File:WatiN_IE_ExtensionMethods.cs
//O2File:API_GuiAutomation.cs
-//O2Ref:WatiN.Core.1x.dll
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
//O2Ref:White.Core.dll
namespace O2.XRules.Database.APIs
View
2  3rdParty/SecurityInnovation/TeamProfessor/IE_TeamProfessor.cs
@@ -6,8 +6,6 @@
using FluentSharp.WinForms;
//O2File:API_IE_ExecutionGUI.cs
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
namespace O2.XRules.Database.APIs
{
View
2  3rdParty/Snoop/Process Injection Tests/Injected_Dll_WithCodeSnippet.cs
@@ -15,7 +15,7 @@
using O2.Views.ASCX.ExtensionMethods;
using O2.External.SharpDevelop.ExtensionMethods;
*/
-namespace O2
+namespace O2.XRules
{
public class InjectedClass
{
View
1  3rdParty/Veracode/API_Veracode_DetailedXmlFindings.cs
@@ -10,7 +10,6 @@
using FluentSharp.WinForms;
using FluentSharp.WinForms.Controls;
using FluentSharp.XObjects;
-using O2.XRules.Database.Utils;
using https.www.veracode.com.schema.reports.export.Item1.Item0;
//O2File:detailedreport.cs
View
4 3rdParty/_Installers/JavaJdk.cs
@@ -7,8 +7,8 @@
using FluentSharp.WinForms;
using FluentSharp.WinForms.Controls;
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
//O2File:Tool_API.cs
namespace O2.XRules.Database.APIs
View
1  APIs/Amazon/API_AmazonS3.cs
@@ -9,7 +9,6 @@
using FluentSharp.CoreLib.Utils;
using FluentSharp.WinForms;
using FluentSharp.WinForms.Controls;
-using O2.XRules.Database.Utils;
using Amazon.S3.Model;
using Amazon.S3;
View
6 APIs/BTOpenZone/API_BTOpenZone.cs
@@ -3,11 +3,9 @@
using FluentSharp.CoreLib;
using FluentSharp.CoreLib.Utils;
using FluentSharp.Watin;
-
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2File:WatiN_IE.cs
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
//O2Ref:Interop.SHDocVw.dll
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:O2_External_IE.dll
//O2Ref:System.Xml.Linq.dll
//O2Ref:System.Xml.dll
View
4 APIs/EtherpadLite/API_EtherpadLite.cs
@@ -4,9 +4,9 @@
using FluentSharp.Watin;
using Etherpad;
-//O2File:WatiN_IE_ExtensionMethods.cs
//O2File:EtherpadLiteDotNet.cs
-//O2Ref:WatiN.Core.1x.dll
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
namespace O2.XRules.Database.APIs
View
1  APIs/EtherpadLite/UnitTests_EtherpadLiteDotNet.cs
@@ -3,7 +3,6 @@
using FluentSharp.CoreLib;
using NUnit.Framework;
using Etherpad;
-using O2.XRules.Database.Utils;
//O2File:EtherpadLiteDotNet.cs
//O2Ref:nunit.framework.dll
View
5 APIs/EventBrite/API_EventBrite.cs
@@ -8,10 +8,9 @@
using FluentSharp.WinForms.Controls;
using SHDocVw;
using WatiN.Core;
-using O2.XRules.Database.Utils;
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2File:WatiN_IE.cs
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
//O2Ref:Interop.SHDocVw.dll
//O2Ref:WatiN.Core.1x.dll
View
6 APIs/Google/Blogger/API_Blogger.cs
@@ -12,11 +12,9 @@
using O2.External.IE.Wrapper;
using WatiN.Core;
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2File:WatiN_IE.cs
-
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
//O2Ref:Interop.SHDocVw.dll
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:O2_External_IE.dll
//O2Ref:System.Xml.Linq.dll
//O2Ref:System.Xml.dll
View
6 APIs/Google/GMail/API_GMail.cs
@@ -3,11 +3,11 @@
using FluentSharp.CoreLib.Utils;
using FluentSharp.Watin;
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2File:WatiN_IE.cs
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
+
//O2File:ISecretData.cs
//O2Ref:Interop.SHDocVw.dll
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:O2_External_IE.dll
//O2Ref:System.Xml.Linq.dll
//O2Ref:System.Xml.dll
View
16 APIs/HtmlAgilityPack/HtmlAgilityPack_Extra_ExtensionMethods_SourceCodeViewer.cs
@@ -1,14 +1,10 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Drawing;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.External.SharpDevelop.Ascx;
-using O2.External.SharpDevelop.ExtensionMethods;
-using System.Xml;
-using System.IO;
+using FluentSharp.CoreLib;
+using FluentSharp.For_HtmlAgilityPack;
+using FluentSharp.REPL;
+using FluentSharp.REPL.Controls;
using System.Windows.Forms;
+using FluentSharp.WinForms;
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
@@ -23,7 +19,7 @@ public static ascx_SourceCodeViewer showHtmlNodeLocation(this ascx_SourceCodeVie
return codeViewer;
}
- public static ascx_SourceCodeEditor showHtmlNodeLocation(this ascx_SourceCodeEditor codeEditor, HtmlAgilityPack.HtmlNode htmlNode)
+ public static SourceCodeEditor showHtmlNodeLocation(this SourceCodeEditor codeEditor, HtmlAgilityPack.HtmlNode htmlNode)
{
var startLine = htmlNode.Line;
View
11 APIs/IE/IE_ExecutionGui/IE_Google - Execution.h2
@@ -1,9 +1,6 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>var popupWindow = "IE Execution GUI - IE Google".popupWindow(700,500);
+var popupWindow = "IE Execution GUI - IE Google".popupWindow(700,500);
popupWindow.add_IE_ExecutionGui("IE_Google.cs");
-
+
+//using O2.XRules.Database.APIs
//O2File:API_IE_ExecutionGUI.cs
-//O2Ref:WatiN.Core.1x.dll</SourceCode>
- <ReferencedAssemblies />
-</H2>
+//O2Ref:WatiN.Core.1x.dll
View
11 APIs/IE/IE_ExecutionGui/IE_Google - Scripting.h2
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>var topPanel = O2Gui.open&lt;Panel&gt;("IE Google - Scripting",1200,700);
+var topPanel = O2Gui.open<Panel>("IE Google - Scripting",1200,700);
//var topPanel = panel.clear().add_Panel();
var ie =topPanel.add_IE();
@@ -16,6 +14,7 @@ return ie.links();
//new IE_Google("popup".popupWindow()); //
//O2File:IE_Google.cs
-//O2Ref:WatiN.Core.1x.dll</SourceCode>
- <ReferencedAssemblies />
-</H2>
+//using O2.XRules.Database.APIs
+//O2Ref:FluentSharp.Watin
+//using FluentSharp.Watin
+//O2Ref:Watin.Core.dll
View
4 APIs/IE/IE_ExecutionGui/IE_Google.cs
@@ -4,8 +4,8 @@
using FluentSharp.Watin;
//O2File:API_IE_ExecutionGUI.cs
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
namespace O2.XRules.Database.APIs
{
View
1  APIs/IKVM/API_IKVMC.cs
@@ -13,7 +13,6 @@
using FluentSharp.REPL;
using FluentSharp.REPL.Controls;
using FluentSharp.WinForms;
-using O2.XRules.Database.Utils;
//O2File:API_IKVMC_JavaMetadata.cs
//O2Ref:IKVM\ikvm-7.1.4532.2\bin\IKVM.Runtime.dll
View
1  APIs/IKVM/API_IKVMC_CallMapping.cs
@@ -8,7 +8,6 @@
using FluentSharp.REPL.Controls;
using FluentSharp.WinForms;
using FluentSharp.WinForms.Utils;
-using O2.XRules.Database.Utils;
//O2File:API_IKVMC.cs
View
1  APIs/Mailman/API_Mailman.cs
@@ -6,7 +6,6 @@
using FluentSharp.CoreLib;
using FluentSharp.For_HtmlAgilityPack;
using FluentSharp.WinForms;
-using O2.XRules.Database.Utils;
using HtmlAgilityPack;
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
View
22 APIs/MediaWiki/MediaWikiEditor.cs
@@ -3,24 +3,12 @@
using System.Drawing;
using System.Windows.Forms;
using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.Windows;
-using O2.DotNetWrappers.DotNet;
-using O2.Views.ASCX;
-using O2.Views.ASCX.ExtensionMethods;
-using O2.Views.ASCX.classes.MainGUI;
-using O2.Views.ASCX.Ascx.MainGUI;
-using O2.External.IE.ExtensionMethods;
-
-using O2.XRules.Database.APIs;
-using O2.XRules.Database.Utils;
using AvalonDock;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WPF;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Controls;
//O2File:OwaspWikiAPI.cs
//O2File:O2PlatformWikiAPI.cs
View
1  APIs/MediaWiki/MediaWiki_GuiControls/ascx_MediaWiki_ConfigAndLogin.cs
@@ -7,7 +7,6 @@
using FluentSharp.CoreLib.Utils;
using FluentSharp.WinForms;
using FluentSharp.WinForms.Controls;
-using O2.XRules.Database.Utils;
//O2File:O2MediaWikiAPI.cs
//O2File:O2PlatformWikiApi.cs
View
1  APIs/MediaWiki/MediaWiki_GuiControls/ascx_MediaWiki_PageEditor_Simple.cs
@@ -6,7 +6,6 @@
using FluentSharp.CoreLib.API;
using FluentSharp.WinForms;
using FluentSharp.WinForms.Controls;
-using O2.XRules.Database.Utils;
//O2File:O2PlatformWikiAPI.cs
//O2File:O2MediaWikiApi.cs
//O2File:ascx_AskUserForLoginDetails.cs
View
8 APIs/MerlinWizard/Wizard - SearchEngine UseCase 1.cs
@@ -3,6 +3,8 @@
using System.Text;
using FluentSharp.CoreLib.API;
using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.WinForms.Controls;
+using O2.Tool.SearchEngine.Ascx;
using O2.Views.ASCX.MerlinWizard;
using O2.Views.ASCX.MerlinWizard.O2Wizard_ExtensionMethods;
//O2Ref:_SearchEngine (O2 Tool).exe
@@ -45,7 +47,7 @@ public string runWizard(string startFolder)
{
var o2Wizard = new O2Wizard("Search Engine - Use Case 1");
- o2Wizard.Steps.add_Control(new ascx_FileMappings(),
+ o2Wizard.Steps.add_Control(new FileMappings(),
"Search Targets",
"Drag and Drop target folder with source files and Select files to index", step0_loadDefaultValues);
o2Wizard.Steps.add_Action("Confirm files to index", confirmFilesToIndex);
@@ -62,7 +64,7 @@ public void step0_loadDefaultValues(IStep step)
() => {
PublicDI.log.error("in step0_loadDefaultValues");
PublicDI.log.error(step.Controller.steps[0].FirstControl.GetType().FullName);
- var fileMappings = (ascx_FileMappings)step.Controller.steps[0].FirstControl;
+ var fileMappings = (FileMappings)step.Controller.steps[0].FirstControl;
PublicDI.reflection.invoke(fileMappings,"hideDropHelpInfo", new object[]{});
var fileFilter = ".cs";
fileMappings.setExtensionsToShow(fileFilter);
@@ -89,7 +91,7 @@ public void step3_SearchResults(IStep step)
public void confirmFilesToIndex(IStep step)
{
- var fileMappings = (ascx_FileMappings)step.Controller.steps[0].FirstControl;
+ var fileMappings = (FileMappings)step.Controller.steps[0].FirstControl;
var filesToIndex = fileMappings.getFilesThatMatchCurrentExtensionFilter();
step.set_Text(string.Format("There are {0} files to index", filesToIndex.Count));
View
5 APIs/NUnit/API_NUnit_using_O2Gui.cs
@@ -4,9 +4,10 @@
using System.Windows.Forms;
using FluentSharp.CoreLib;
using FluentSharp.CoreLib.API;
+using FluentSharp.REPL;
using FluentSharp.WinForms;
using FluentSharp.WinForms.Controls;
-
+using O2.Core.XRules.Ascx;
//O2Ref:O2_Core_XRules.dll
//O2Ref:O2_External_O2Mono.dll
@@ -20,7 +21,7 @@ public static Panel executeCurrentScript()
return executeScript(PublicDI.CurrentScript);
}
public static Panel executeScript(string script)
- {
+ {
var topPanel = O2Gui.open<Panel>("Unit Test Execution", 400,500);
topPanel.insert_Below<ascx_LogViewer>(120).fill();
var unitTest = topPanel.add_Control<ascx_XRules_UnitTests>();
View
2  APIs/NUnit/Util - Execute O2ified tests on NUnitGui.h2
@@ -68,7 +68,7 @@ items.add("topPanel", topPanel);
items.add("api_NUnit_Gui", api_NUnit_Gui);
return items;
-
+//using O2.XRules.Database.APIs
//using NUnit.Gui
//using NUnit.UiKit
//O2File:API_NUnit_Gui.cs
View
1  APIs/NUnit/Write and Execute Unit Tests.h2
@@ -42,6 +42,7 @@ loadFile(tempFile);
return loadFile;
+//using O2.XRules.Database.APIs
//using O2.Core.XRules.Ascx
//O2Ref:O2_Core_XRules.dll
//O2Ref:O2_External_O2Mono.dll
View
4 APIs/O2_Web_Proxy/HTTPSDebuggingProxy/Cache_Objects.cs
@@ -53,7 +53,7 @@ public class CacheEntry
//added to this code since the original version was compiled in .Net 4.0 which has equivalent classes
- public class Tuple<T>
+/* public class Tuple<T>
{
public Tuple(T first)
{
@@ -73,5 +73,5 @@ public Tuple(T first, T2 second)
public T2 Item2 { get; set; }
- }
+ }*/
}
View
15 APIs/OpenPgp/UnitTests_API_Open_Pgp.cs
@@ -1,16 +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.Text;
-using System.Linq;
-using System.Collections.Generic;
-using System.Reflection;
-using NUnit.Framework;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.Windows;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.CoreLib.Interfaces;
+using NUnit.Framework;
//O2File:API_OpenPgp.cs
View
4 APIs/Twitter/O2TwitterAPI.cs
@@ -15,9 +15,9 @@
using TweetSharp.Twitter.Model;
//O2File:ISecretData.cs
-//O2File:Watin_IE.cs
-//O2File:Watin_IE_ExtensionMethods.cs
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
//O2Ref:Hammock.dll
//O2Ref:Newtonsoft.Json.dll
//O2Ref:TweetSharp.dll
View
1  APIs/WPF/API_WPF_ToolKit.cs
@@ -15,6 +15,7 @@
//O2Ref:PresentationCore.dll
//O2Ref:WindowsBase.dll
//O2Ref:PresentationFramework.dll
+//O2Ref:System.Xaml.dll
namespace O2.XRules.Database.APIs
View
4 APIs/WPF/Graph/GraphSharp_ExtensionMethods.cs
@@ -80,7 +80,7 @@ public static GraphLayout add_Node(this GraphLayout graphLayout,object vertexToA
}
return (GraphLayout)graphLayout.wpfInvoke(
()=>{
- graph.add_Node(vertexToAdd);
+ graph.add_Node_To_Graph(vertexToAdd);
return graphLayout;
});
}
@@ -353,7 +353,7 @@ public static GraphLayout layout(this GraphLayout graphLayout, string type)
public static object addFromTreeNode(this BidirectionalGraph<object, IEdge<object>> graph, System.Windows.Forms.TreeNode treeNode, bool recursive)
{
var vertex = treeNode.Text;
- graph.add_Node(vertex);
+ graph.add_Node_To_Graph(vertex);
if (recursive)
treeNode.Nodes.forEach<System.Windows.Forms.TreeNode>(
(childNode) =>
View
206 APIs/WPF/Graph/ascx_GraphWithInspector.cs.o2 → APIs/WPF/Graph/ascx_GraphWithInspector.cs
@@ -1,107 +1,101 @@
-// 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 System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Forms.Integration;
-using System.Windows;
-using QuickGraph;
-using GraphSharp;
-using GraphSharp.Controls;
-
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.External.IE.Wrapper;
-using O2.External.IE.ExtensionMethods;
-using O2.External.SharpDevelop.ExtensionMethods;
-using O2.API.Visualization.Ascx;
-using O2.Views.ASCX.classes.MainGUI;
-
-//O2File:GraphSharp_ExtensionMethods.cs
-//O2File:VerticesAndEdges_ExtensionMethods.cs
-
-//O2Ref:FluentSharp.WPF.dll
-//O2Ref:WindowsFormsIntegration.dll
-//O2Ref:GraphSharp.dll
-//O2Ref:QuickGraph.dll
-//O2Ref:GraphSharp.Controls.dll
-//O2Ref:WPFExtensions.dll
-//O2Ref:O2_External_IE.dll
-
-//O2Ref:PresentationCore.dll
-//O2Ref:PresentationFramework.dll
-//O2Ref:WindowsBase.dll
-//O2Ref:System.Xaml.dll
-
-namespace O2.XRules.Database.Utils
-{
- public class ascx_GraphWithInspector : Control
- {
-
- public static void runControl()
- {
- O2Gui.load<ascx_GraphWithInspector>("Graph");
- }
-
- public ascx_GraphWithInspector()
- {
- this.Width = 600;
- this.Height = 400;
- /*var editor = this.add_SourceCodeViewer();
- editor.set_Text("asd");
- return;
- */
- var controls = this.add_1x1("Graph","Inspector",false,200);
-
- var graph = controls[0].add_Graph();
-
- //graph.testGraph();
- var xamlHost = (ascx_Xaml_Host)(controls[0].Controls[0]);
- var script = controls[1].add_Script(true);
-
- script.Code = "graph.testGraph();".line() +
- "return \"comment (using //) this line to see more graph actions\";".line()
- .line() +
- "graph.node(100);".line() +
- "graph.edge(100,\"A\");".line() +
- "graph.edge(100,\"F\");" .line() +
- "graph.edge(200,\"F\");".line() +
- "graph.edge(200,300);" .line() +
- "var blueLabel = graph.add_UIElement<WPF.Label>();" .line() +
- "blueLabel.set_Content(\"blue label\");" .line() +
- "blueLabel.color(\"Blue\");" .line() +
- "graph.edge(200,blueLabel);" .line() +
- "var redLabel = graph.add_UIElement<WPF.TextBox>().set_Text(\"red textbox\").color(\"Red\");" .line() +
- "graph.edge(blueLabel,redLabel);".line() +
- "//graph.edgeToAll(200);".line() +
- "graph.defaultLayout();".line() +
- "//graph.overlapRemovalParameters(20, 50);".line() +
- "graph.showAllLayouts(2000);".line() +
- "graph.circular();".line().line() +
- "return graph;".line().line() +
- "//using System.Xml.Linq".line()+
- "//using System.Linq".line()+
- "//using WPF=System.Windows.Controls".line() +
- "//O2File:GraphSharp_ExtensionMethods.cs".line()+
- "//O2File:VerticesAndEdges_ExtensionMethods.cs".line()+
- "//O2Ref:FluentSharp.WPF.dll".line()+
- "//O2Ref:System.Xml.dll".line()+
- "//O2Ref:System.Xml.Linq.dll".line()+
- "//O2Ref:PresentationCore.dll".line()+
- "//O2Ref:PresentationFramework.dll".line()+
- "//O2Ref:WindowsBase.dll ".line()+
- "//O2Ref:System.Core.dll".line()+
- "//O2Ref:WindowsFormsIntegration.dll".line()+
- "//O2Ref:GraphSharp.dll".line()+
- "//O2Ref:QuickGraph.dll".line()+
- "//O2Ref:GraphSharp.Controls.dll".line()+
- "//O2Ref:ICSharpCode.AvalonEdit.dll".line() +
- "//O2Ref:System.Xaml".line();
-
- script.InvocationParameters.Add("graph", graph);
- script.InvocationParameters.Add("elementHost", xamlHost.element());
- script.onCompileExecuteOnce();
- script.compileCodeSnippet(script.Code);
- }
- }
+// 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.Windows.Forms;
+using FluentSharp.CoreLib;
+using FluentSharp.REPL;
+using FluentSharp.WPF.Controls;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Controls;
+
+
+//O2File:GraphSharp_ExtensionMethods.cs
+//O2File:VerticesAndEdges_ExtensionMethods.cs
+
+//O2Ref:FluentSharp.WPF.dll
+//O2Ref:WindowsFormsIntegration.dll
+//O2Ref:GraphSharp.dll
+//O2Ref:QuickGraph.dll
+//O2Ref:GraphSharp.Controls.dll
+//O2Ref:WPFExtensions.dll
+//O2Ref:O2_External_IE.dll
+
+//O2Ref:PresentationCore.dll
+//O2Ref:PresentationFramework.dll
+//O2Ref:WindowsBase.dll
+//O2Ref:System.Xaml.dll
+
+namespace O2.XRules.Database.Utils
+{
+ public class ascx_GraphWithInspector : Control
+ {
+
+ public static void runControl()
+ {
+ O2Gui.load<ascx_GraphWithInspector>("Graph");
+ }
+
+ public ascx_GraphWithInspector()
+ {
+ this.Width = 600;
+ this.Height = 400;
+ /*var editor = this.add_SourceCodeViewer();
+ editor.set_Text("asd");
+ return;
+ */
+ var controls = this.add_1x1("Graph","Inspector",false,200);
+
+ var graph = controls[0].add_Graph();
+
+ //graph.testGraph();
+ var xamlHost = (ascx_Xaml_Host)(controls[0].Controls[0]);
+ var script = controls[1].add_Script(true);
+
+ script.Code = "graph.testGraph();".line() +
+ "return \"comment (using //) this line to see more graph actions\";".line()
+ .line() +
+ "graph.node(100);".line() +
+ "graph.edge(100,\"A\");".line() +
+ "graph.edge(100,\"F\");" .line() +
+ "graph.edge(200,\"F\");".line() +
+ "graph.edge(200,300);" .line() +
+ "var blueLabel = graph.add_UIElement<WPF.Label>();" .line() +
+ "blueLabel.set_Content(\"blue label\");" .line() +
+ "Control_ExtensionMethods.color(blueLabel,\"Blue\");" .line() +
+ "graph.edge(200,blueLabel);" .line() +
+ "var redLabel = graph.add_UIElement<WPF.TextBox>().set_Text(\"red textbox\");" .line() +
+ "Control_ExtensionMethods.color(redLabel,\"Red\");".line() +
+ "graph.edge(blueLabel,redLabel);".line() +
+ "//graph.edgeToAll(200);".line() +
+ "graph.defaultLayout();".line() +
+ "//graph.overlapRemovalParameters(20, 50);".line() +
+ "graph.showAllLayouts(2000);".line() +
+ "graph.circular();".line().line() +
+ "return graph;".line().line() +
+ "//using O2.XRules.Database.Utils;".line() +
+ "//using FluentSharp.WPF".line() +
+ "//using System.Xml.Linq".line()+
+ "//using System.Linq".line()+
+ "//using WPF=System.Windows.Controls".line() +
+ "//O2File:GraphSharp_ExtensionMethods.cs".line()+
+ "//O2File:VerticesAndEdges_ExtensionMethods.cs".line()+
+ "//O2Ref:FluentSharp.WPF.dll".line()+
+ "//O2Ref:System.Xml.dll".line()+
+ "//O2Ref:System.Xml.Linq.dll".line()+
+ "//O2Ref:PresentationCore.dll".line()+
+ "//O2Ref:PresentationFramework.dll".line()+
+ "//O2Ref:WindowsBase.dll ".line()+
+ "//O2Ref:System.Core.dll".line()+
+ "//O2Ref:WindowsFormsIntegration.dll".line()+
+ "//O2Ref:GraphSharp.dll".line()+
+ "//O2Ref:QuickGraph.dll".line()+
+ "//O2Ref:GraphSharp.Controls.dll".line()+
+ "//O2Ref:ICSharpCode.AvalonEdit.dll".line() +
+ "//O2Ref:System.Xaml".line();
+
+ script.InvocationParameters.Add("graph", graph);
+ script.InvocationParameters.Add("elementHost", xamlHost.element());
+ script.onCompileExecuteOnce();
+ script.compileCodeSnippet(script.Code);
+ }
+ }
}
View
2  APIs/WPF/WPF_GUI.cs
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using FluentSharp.CoreLib;
using FluentSharp.CoreLib.API;
+using FluentSharp.O2Platform.Controls;
using FluentSharp.REPL.Controls;
using FluentSharp.WPF;
using FluentSharp.WinForms;
@@ -23,6 +24,7 @@
//O2Ref:QuickGraph.dll
//O2Ref:GraphSharp.Controls.dll
//O2Ref:ICSharpCode.AvalonEdit.dll
+//O2Ref:FluentSharp.O2Platform.dll
namespace O2.XRules.Database.APIs
{
View
9 APIs/WatiN/IE Automation (Simple mode).h2
@@ -11,9 +11,8 @@ helpPanel.add_Label("Need Help?", 3,3)
topPanel.insert_Below(80).add_LogViewer();
topPanel.add_Control<ascx_IE_ScriptExecution>().buildGui();
-
-//O2File:WatiN_IE_ExtensionMethods.cs
+
+//using O2.XRules.Database.Utils
//O2File:ascx_IE_ScriptExecution.cs
-//O2Ref:WatiN.Core.1x.dll
-//O2Tag_DontAddExtraO2Files
-//O2Package:WatiN_IE_ExtensionMethods.cs,WatiN_IE.cs,DotNet_Viewstate.cs
+
+//O2Package:DotNet_Viewstate.cs
View
22 APIs/WatiN/IE Automation (using Windows Automation).h2
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>//var topPanel = panel.clear().add_Panel();
+//var topPanel = panel.clear().add_Panel();
var title = "IE Automation (using Windows Automation)";
var topPanel = title.popupWindow(1200, 700);
topPanel.parentForm().top(0).left(0);
var ie = topPanel.add_IE().silent(true);
-Action&lt;string,string,string&gt; loginToSSB =
- (url, username, password) =&gt;
+Action<string,string,string> loginToSSB =
+ (url, username, password) =>
{
ie.open(url);
@@ -28,11 +26,9 @@ Action&lt;string,string,string&gt; loginToSSB =
loginToSSB("http://127.0.0.1:81", "admin","admin");
topPanel.closeForm_InNSeconds(5);
-
-
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
-//O2File:API_GuiAutomation.cs
-//O2Ref:White.Core.dll </SourceCode>
- <ReferencedAssemblies />
-</H2>
+//using FluentSharp.Watin
+//using FluentSharp.GuiAutomation
+//O2Ref:FluentSharp.WatiN.dll
+//O2Ref:WatiN.Core.dll
+//O2Ref:White.Core.dll
+//O2File:API_GuiAutomation.cs
View
16 APIs/WatiN/IE Automation using WatiN.h2
@@ -31,21 +31,21 @@ var defaultScript = "// persist the ie objects accross multiple executions".line
"".line() +
"".line() +
"// *********** <end of IE automation script> ***********".line() +
- "".line() +
- "//using O2.XRules.Database.APIs".line() +
+ "".line() +
"//using mshtml".line() +
"".line() +
- "//O2File:WatiN_IE_ExtensionMethods.cs ".line() +
- "//O2Ref:WatiN.Core.1x.dll".line() +
+ "//using FluentSharp.Watin".line() +
+ "//O2Ref:FluentSharp.WatiN.dll ".line() +
+ "//O2Ref:WatiN.Core.dll".line() +
"//O2Ref:Microsoft.mshtml.dll";
script.set_Command(defaultScript);
-
-//O2File:Ref:WatiN_IE_ExtensionMethods.cs
-//using WatiN.Core
+var watin = typeof(WatiN_IE);
+//using FluentSharp.Watin
+//O2Ref:FluentSharp.WatiN.dll
+//O2Ref:WatiN.Core.dll
//using WatiN.Core.Interfaces
-//O2Ref:WatiN.Core.1x.dll
//O2Ref:Interop.SHDocVw.dll
//O2Ref:Microsoft.mshtml.dll
//O2Ref:O2_External_IE.dll
View
4 APIs/WatiN/Unit_Tests_using_IE.cs
@@ -5,8 +5,8 @@
using FluentSharp.WinForms;
using NUnit.Framework;
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
//O2Ref:nunit.framework.dll
namespace O2.UnitTests
View
16 APIs/WatiN/ascx_IE_ScriptExecution.cs
@@ -74,9 +74,9 @@ public string getDefaultScript()
ie.open(""http://www.google.com"");
-//O2File:WatiN_IE_ExtensionMethods.cs
-//using O2.XRules.Database.Utils
-//O2Ref:WatiN.Core.1x.dll
+//using FluentSharp.Watin;
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:WatiN.Core.dll
//O2Tag_DontAddExtraO2Files;";
*/
@@ -106,7 +106,7 @@ public string getDefaultScript()
()=>{
ie.open(""http://www.google.com"");
ie.link(""Images"").click();
- ie.waitForField(""Search Images"").value(""O2 Platform"");
+ ie.waitForField(""q"").value(""O2 Platform"");
// ie.inject_FirebugLite();
ie.inject_jQuery();
//ie.invokeEval(""alert(jQuery)"");
@@ -117,11 +117,11 @@ public string getDefaultScript()
""Page is open, so returning all image's links"".info();
return ie.links()
.uris()
- .queryParameters_Values(""imgurl"");
+ .queryParameters_Values(""imgrefurl"");
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
-//O2Tag_DontAddExtraO2Files;
+//using FluentSharp.Watin;
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:WatiN.Core.dll
";
return scriptWrapper;
}
View
2  APIs/Windows/InputSimulator/API_InputSimulator.cs
@@ -13,7 +13,9 @@
//O2Ref:FluentSharp.WPF.dll
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
//O2Ref:WindowsBase.dll
+//O2Ref:PresentationFramework.dll
//O2Ref:PresentationCore.dll
+//O2Ref:System.Xaml.dll
namespace O2.XRules.Database.APIs
View
4 APIs/WordPress/API_WordPress_IE.cs
@@ -8,8 +8,8 @@
using FluentSharp.Watin;
using FluentSharp.WinForms.Controls;
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
namespace O2.XRules.Database.APIs
{
View
25 APIs/WordPress/Unit_Tests_API_WordPress_IE.cs
@@ -1,17 +1,14 @@
// 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.IO;
-using System.Linq;
-using System.Collections.Generic;
-using NUnit.Framework;
-using O2.Kernel;
+
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.CoreLib.Utils;
+using FluentSharp.GuiAutomation;
+using FluentSharp.Watin;
+using NUnit.Framework;
using O2.XRules.Database.APIs;
-using O2.XRules.Database.Utils;
-using O2.DotNetWrappers.Network;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Kernel.ExtensionMethods;
using WatiN.Core.DialogHandlers;
+
//O2File:Unit_Tests_using_IE.cs
//O2File:API_WordPress_IE.cs
//O2File:API_GuiAutomation.cs
@@ -22,11 +19,13 @@ namespace O2.UnitTests
public class Unit_Tests_API_WordPress_IE : Unit_Tests_using_IE
{
public API_WordPress_IE apiWordPressIE;
- public AlertAndConfirmDialogHandler alertsHander;
+
+ //public AlertAndConfirmDialogHandler alertsHander;
+
public Unit_Tests_API_WordPress_IE()
{
base.set_IE_Object("Unit_Tests_API_WordPress_IE");
- alertsHander = ie.getAlertsHandler();
+ //alertsHander = ie.getAlertsHandler();
var serverUrl = "https://o2platform.wordpress.com".uri();
apiWordPressIE = new API_WordPress_IE(ie, serverUrl);
View
5 APIs/_Javascript_Libraries/JQuery/IE_JQuery.cs
@@ -3,8 +3,9 @@
using FluentSharp.CoreLib;
using FluentSharp.Watin;
-//O2File:WatiN_IE_ExtensionMethods.cs
-//O2Ref:WatiN.Core.1x.dll
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:Watin.Core.dll
+//O2Ref:Interop.SHDocVw.dll
namespace O2.XRules.Database.APIs
{
View
4 APIs/_Javascript_Libraries/JQuery/jsTree/JsTreeNode.cs
@@ -4,8 +4,8 @@
using System.Web;
using System.Web.Script.Serialization;
using System.Windows.Forms;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
//O2Ref:System.Web.Extensions.dll
View
2  Languages/AspNet/ascx_Edit_AspNet_Pages.cs
@@ -7,6 +7,8 @@
using FluentSharp.WinForms;
using FluentSharp.Watin;
+//O2Ref:FluentSharp.Watin.dll
+//O2Ref:WatiN.Core.dll
//O2Ref:Interop.SHDocVw.dll
namespace O2.XRules.Database.Languages_and_Frameworks.AspNet
View
2  Languages/DotNet/Ast_Scanner/Ast_Engine/MethodMappings_Engine.cs
@@ -12,7 +12,7 @@
//O2File:Ast_Engine_ExtensionMethods.cs
//O2File:MethodMappings_ExtensionMethods.cs
//O2File:ascx_ManualMethodStreams.cs
-//O2Ref:O2_Platform_External_SharpDevelop.dll
+
//O2Ref:Quickgraph.dll
//O2Ref:GraphSharp.dll
//O2Ref:GraphSharp.Controls.dll
View
41 Languages/DotNet/DotNet_ViewState.cs
@@ -11,8 +11,11 @@
using FluentSharp.CoreLib;
using FluentSharp.CoreLib.API;
using FluentSharp.REPL;
+using FluentSharp.Watin;
using FluentSharp.WinForms;
+//O2Ref:FluentSharp.WatiN.dll
+//O2Ref:WatiN.Core.dll
//O2Ref:System.Web.dll
namespace O2.XRules.Database.Languages_and_Frameworks.DotNet
@@ -267,5 +270,41 @@ private static string GetShortTypename(object obj)
string str = obj.GetType().ToString();
return str.Substring(str.LastIndexOf(".") + 1);
}
- }
+ }
+
+
+ public static class WatiN_ASPNET_ExtensionMethods
+ {
+ public static DotNet_ViewState viewState(this WatiN_IE ie)
+ {
+ return new DotNet_ViewState(ie.viewStateRaw());
+ }
+ public static string viewStateRaw(this WatiN_IE ie)
+ {
+ return ie.field("__VIEWSTATE").value();
+ }
+
+ public static T showViewState<T>(this T control, WatiN_IE ie, bool showDetailedView)
+ where T : System.Windows.Forms.Control
+ {
+ if (showDetailedView)
+ control.showViewState(ie);
+ else
+ control.showViewStateValues(ie);
+ return control;
+ }
+
+ public static T showViewState<T>(this T control, WatiN_IE ie)
+ where T : System.Windows.Forms.Control
+ {
+ return ie.viewState().show(control);
+ }
+
+
+ public static T showViewStateValues<T>(this T control, WatiN_IE ie)
+ where T : System.Windows.Forms.Control
+ {
+ return ie.viewState().showValues(control);
+ }
+ }
}
View
2  Languages/DotNet/Mono_and_Reflection/ascx_MonoDecompiler.cs
@@ -3,6 +3,7 @@
using System.Windows.Forms;
using System.Reflection;
//O2Ref:Mono.Cecil.dll
+using Cecil.Decompiler.ControlFlow;
using FluentSharp.CoreLib.API;
using FluentSharp.CoreLib.Interfaces;
using FluentSharp.REPL;
@@ -17,6 +18,7 @@
using O2.External.O2Mono;
using O2.External.O2Mono.MonoCecil;
+//O2File:CecilDecompiler.cs
//O2Ref:System.Xml.dll
//O2Ref:System.Xml.Linq.dll
//O2Ref:Cecil.Decompiler.dll
View
1  Languages/J2EE/SpringMVC/SpringMvcMappings.cs
@@ -8,7 +8,6 @@
using FluentSharp.CoreLib;
using FluentSharp.CoreLib.API;
using FluentSharp.WinForms;
-using O2.XRules.Database.Utils;
using O2.XRules.Database.APIs.IKVM;
using www.springframework.org.schema.beans;
View
10 Languages/J2EE/SpringMVC/v2.0/SpringMvcMappings_v2.0.cs
@@ -5,12 +5,12 @@
using System.Windows.Forms;
using System.Xml.Serialization;
using System.Collections.Generic;
-using O2.XRules.Database.Utils;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.ExtensionMethods;
-//using www.springframework.org.schema.beans;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
+using FluentSharp.REPL;
+using FluentSharp.CoreLib.API;
using O2.XRules.Database.APIs.IKVM;
+
//O2File:spring-servlet-2.0.xsd.cs
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
View
2  Utils/ExtensionMethods/_Extra_methods_Xml_XSD.cs
@@ -5,7 +5,7 @@
using FluentSharp.XObjects;
//O2Ref:Ionic.Zip.dll
-//O2Ref:O2_External_SharpDevelop.dll
+//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
namespace O2.XRules.Database.Utils
{
View
10 Utils/O2/UnitTests/UnitTest_Gui_Tests.cs
@@ -1,13 +1,7 @@
// 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.IO;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.REPL.Utils;
+using FluentSharp.WinForms;
//O2Ref:nunit.framework.dll
using NUnit.Framework;
View
59 Utils/O2/ascx_O2_Command_Prompt.cs.o2 → Utils/O2/ascx_O2_Command_Prompt.cs
@@ -1,31 +1,30 @@
-using O2.External.SharpDevelop.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Views.ASCX.classes.MainGUI;
-using O2.Views.ASCX.CoreControls;
-using O2.Kernel.ExtensionMethods;
-using O2.Kernel;
-using O2.Interfaces;
-using System.Drawing;
-using System.Windows.Forms;
-using System;
-
-
-namespace O2.XRules.Database.Utils
-{
- public class O2CommandPrompt
- {
- public static void run()
- {
- var script = O2Gui.open<ascx_Simple_Script_Editor>("O2 Command Prompt (press enter to execute the command)", 700, 70);
- script.splitContainer_CommandBox.distance(400);
- script.splitContainer_CommandBox.Panel2.clear();
- var groupBox = script.splitContainer_Results.controls(true).@get<GroupBox>();
- script.splitContainer_CommandBox.Panel2.@add(groupBox);
- script.commandsToExecute.textEditor().showInvalidLines(false);
- //script.commandsToExecute.textEditor().showLineNumbers(false);
- script.ExecuteOnEnter = true;
- script.onCompileExecuteOnce();
- script.commandsToExecute.set_Text("hello".line());
- }
- }
+using O2.External.SharpDevelop.ExtensionMethods;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Controls;
+using FluentSharp.REPL;
+using FluentSharp.REPL.Controls;
+using System.Drawing;
+using System.Windows.Forms;
+using System;
+
+
+namespace O2.XRules.Database.Utils
+{
+ public class O2CommandPrompt
+ {
+ public static void run()
+ {
+ var script = O2Gui.open<ascx_Simple_Script_Editor>("O2 Command Prompt (press enter to execute the command)", 700, 70);
+ script.splitContainer_CommandBox.distance(400);
+ script.splitContainer_CommandBox.Panel2.clear();
+ var groupBox = script.splitContainer_Results.controls(true).@get<GroupBox>();
+ script.splitContainer_CommandBox.Panel2.@add(groupBox);
+ script.commandsToExecute.textEditor().showInvalidLines(false);
+ //script.commandsToExecute.textEditor().showLineNumbers(false);
+ script.ExecuteOnEnter = true;
+ script.onCompileExecuteOnce();
+ script.commandsToExecute.set_Text("hello".line());
+ }
+ }
}
View
11 Utils/O2_StandAlone_Modules/HostLocalWebsite/ascx_HostLocalWebsite.Designer.cs
@@ -1,9 +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 O2.Kernel.CodeUtils;
-using O2.Views.ASCX.CoreControls;
//O2File:ascx_HostLocalWebsite.cs
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms.Controls;
+
namespace O2.Tool.HostLocalWebsite.ascx
{
partial class ascx_HostLocalWebsite
@@ -49,7 +50,7 @@ private void InitializeComponent()
this.btSetTestEnvironment = new System.Windows.Forms.Button();
this.tbUrlToLoad = new System.Windows.Forms.TextBox();
this.btReloadUrl = new System.Windows.Forms.Button();
- this.ascx_DropObject1 = new O2.Views.ASCX.CoreControls.ascx_DropObject();
+ this.ascx_DropObject1 = new DropObject();
this.label5 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
@@ -206,7 +207,7 @@ private void InitializeComponent()
this.ascx_DropObject1.Size = new System.Drawing.Size(177, 78);
this.ascx_DropObject1.TabIndex = 7;
this.ascx_DropObject1.Text = "Step 1: Drop Here Folder With Website to Host ";
- this.ascx_DropObject1.eDnDAction_ObjectDataReceived_Event += new O2.Kernel.CodeUtils.Callbacks.dMethod_Object(this.ascx_DropObject1_eDnDAction_ObjectDataReceived_Event);
+ this.ascx_DropObject1.eDnDAction_ObjectDataReceived_Event += new Callbacks.dMethod_Object(this.ascx_DropObject1_eDnDAction_ObjectDataReceived_Event);
//
// label5
//
@@ -255,7 +256,7 @@ private void InitializeComponent()
private System.Windows.Forms.Button btSetTestEnvironment;
private System.Windows.Forms.TextBox tbUrlToLoad;
private System.Windows.Forms.Button btReloadUrl;
- private ascx_DropObject ascx_DropObject1;
+ private DropObject ascx_DropObject1;
private System.Windows.Forms.Label label5;
}
}
View
8 Utils/O2_StandAlone_Modules/HostLocalWebsite/ascx_HostLocalWebsite.cs
@@ -2,12 +2,10 @@
using System;
using System.IO;
using System.Windows.Forms;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods ;
-using O2.Kernel;
-using O2.Tool.HostLocalWebsite;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms;
using O2.Tool.HostLocalWebsite.classes;
-using O2.XRules.Database.Utils;
//O2File:webservices.cs
//O2File:ascx_HostLocalWebsite.designer.cs
View
7 Utils/O2_StandAlone_Modules/HostLocalWebsite/main.cs
@@ -1,10 +1,7 @@
// 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.Reflection;
-using System.Windows.Forms;
-using O2.External.WinFormsUI.Forms;
-using O2.External.WinFormsUI.O2Environment;
-using O2.Interfaces.Views;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.WinFormUI.Utils;
using O2.Tool.HostLocalWebsite.ascx;
//O2File:ascx_HostLocalWebsite.cs
View
7 Utils/O2_StandAlone_Modules/HostLocalWebsite/webservices.cs
@@ -2,11 +2,8 @@
using System;
using System.Diagnostics;
using System.IO;
-using O2.Kernel;
-using O2.XRules.Database.Utils;
-using O2.DotNetWrappers.Windows;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
//O2Ref:CassiniDev_4.0.exe
View
27 Utils/O2_StandAlone_Modules/SearchEngine/SearchEngineGui.cs
@@ -6,18 +6,15 @@
using O2.Core.FileViewers.Ascx;
using O2.Core.FileViewers.Ascx.O2Rules;
using O2.Core.FileViewers.Ascx.tests;*/
-using O2.External.SharpDevelop;
-using O2.External.SharpDevelop.Ascx;
-using O2.External.WinFormsUI.Forms;
+
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.Interfaces;
+using FluentSharp.REPL.Controls;
+using FluentSharp.REPL.Utils;
+using FluentSharp.WinFormUI.Utils;
+using FluentSharp.WinForms.Controls;
using O2.ImportExport.OunceLabs;
-using O2.Interfaces.Views;
using O2.Tool.SearchEngine.Ascx;
-using O2.Views.ASCX.CoreControls;
-using O2.Views.ASCX.DataViewers;
-using O2.Views.ASCX.O2Findings;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.DotNet;
-
//O2File:ascx_SearchResults.cs
//O2File:ascx_SearchTargets.cs
//O2File:ascx_TextSearch.cs
@@ -35,22 +32,22 @@ public void open()
public class SearchEngineGui
{
- public static DotNetWrappers.SearchApi.SearchEngine searchEngineAPI { get; set; }
+ public static FluentSharp.CoreLib.API.SearchEngine searchEngineAPI { get; set; }
public SearchEngineGui()
{
- searchEngineAPI = new DotNetWrappers.SearchApi.SearchEngine();
+ searchEngineAPI = new FluentSharp.CoreLib.API.SearchEngine();
}
public void buildGui()
- {
+ {
// this will make files to be opened on the main Document window
HandleO2MessageOnSD.setO2MessageFileEventListener();
if (O2AscxGUI.launch("O2 Tool - Search Engine"))
// O2Messages.openGUI();
{
- var fileMappings = (ascx_FileMappings)O2AscxGUI.openAscx(typeof (ascx_FileMappings), O2DockState.DockLeft, "File Mappings");
+ var fileMappings = (FileMappings)O2AscxGUI.openAscx(typeof (FileMappings), O2DockState.DockLeft, "File Mappings");
//fileMappings.loadFilesFromFolder(DI.config.CurrentExecutableDirectory);
// O2Messages.openControlInGUI(typeof (ascx_TextSearch), O2DockState.Document, "Text Search");
@@ -63,7 +60,7 @@ public void buildGui()
OunceAvailableEngines.addAvailableEnginesToControl(typeof (ascx_FindingsViewer));
//ascx_FindingsViewer.o2AssessmentLoadEngines.Add(new O2AssessmentLoad_OunceV6());
O2AscxGUI.addControlToMenu(typeof(ascx_FindingsViewer), O2DockState.Document, "Findings Viewer");
- O2AscxGUI.addControlToMenu(typeof(ascx_SourceCodeEditor), O2DockState.Document, "Source Code Editor");
+ O2AscxGUI.addControlToMenu(typeof(SourceCodeEditor), O2DockState.Document, "Source Code Editor");
/* O2AscxGUI.addControlToMenu(typeof (ascx_TilesDefinition_xml));
O2AscxGUI.addControlToMenu(typeof(ascx_J2EE_web_xml));
View
8 Utils/O2_StandAlone_Modules/SearchEngine/Tool - Search Engine.h2
@@ -1,6 +1,4 @@
-<?xml version="1.0"?>
-<H2>
- <SourceCode>//open.logViewer();
+//open.logViewer();
new SearchEngineGui().buildGui();
@@ -10,6 +8,4 @@ new SearchEngineGui().buildGui();
//using O2.Tool.SearchEngine.Ascx;
//using O2.Tool.SearchEngine
-//O2File:SearchEngineGui.cs</SourceCode>
- <ReferencedAssemblies />
-</H2>
+//O2File:SearchEngineGui.cs
View
9 Utils/O2_StandAlone_Modules/SearchEngine/ascx_SearchResults.Controllers.cs
@@ -1,14 +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 System.Linq;
-using System.Text;
using System.Text.RegularExpressions;
using System.Windows.Forms;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.SearchApi;
-using O2.Kernel.CodeUtils;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Utils;
//O2File:ascx_SearchResults.Controllers.cs
//O2File:ascx_SearchResults.cs
View
14 Utils/O2_StandAlone_Modules/SearchEngine/ascx_SearchResults.cs
@@ -1,20 +1,12 @@
// 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 System.ComponentModel;
using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
using System.Threading;
using System.Windows.Forms;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.SearchApi;
-using O2.DotNetWrappers.Windows;
-using O2.External.WinFormsUI.Forms;
-using O2.External.WinFormsUI.O2Environment;
-using O2.Kernel.CodeUtils;
+using FluentSharp.CoreLib.API;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Utils;
//O2File:ascx_SearchResults.Controllers.cs
//O2File:ascx_SearchResults.Designer.cs
View
6 Utils/O2_StandAlone_Modules/SearchEngine/ascx_SearchTargets.Controllers.cs
@@ -2,10 +2,10 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
-using O2.DotNetWrappers.DotNet;
+using FluentSharp.CoreLib.API;
using System.IO;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Kernel;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Utils;
//O2File:ascx_SearchTargets.cs
//O2File:ascx_SearchTargets.Designer.cs
View
3  Utils/O2_StandAlone_Modules/SearchEngine/ascx_SearchTargets.cs
@@ -2,8 +2,7 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
-using O2.DotNetWrappers.DotNet;
-using O2.Kernel.CodeUtils;
+using FluentSharp.WinForms.Utils;
//O2File:ascx_SearchTargets.Controllers.cs
//O2File:ascx_SearchTargets.Designer.cs
View
10 Utils/O2_StandAlone_Modules/SearchEngine/ascx_TextSearch.Designer.cs
@@ -1,8 +1,6 @@
// 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 O2.External.SharpDevelop.Ascx;
-using O2.Kernel.CodeUtils;
-using O2.Views.ASCX.CoreControls;
-using O2.Views.ASCX.SourceCodeEdit;
+
+using FluentSharp.REPL.Controls;
//O2File:ascx_TextSearch.cs
@@ -44,7 +42,7 @@ private void InitializeComponent()
this.label1 = new System.Windows.Forms.Label();
this.tbTextToSearch1 = new System.Windows.Forms.TextBox();
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
- this.asceSourceCodeEditor = new ascx_SourceCodeEditor();
+ this.asceSourceCodeEditor = new SourceCodeEditor();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -204,6 +202,6 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox tbTextToSearch1;
private System.Windows.Forms.SplitContainer splitContainer3;
private System.Windows.Forms.Label label3;
- private ascx_SourceCodeEditor asceSourceCodeEditor;
+ private SourceCodeEditor asceSourceCodeEditor;
}
}
View
5 Utils/O2_StandAlone_Modules/SearchEngine/ascx_TextSearch.cs
@@ -1,10 +1,7 @@
// 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 System.Text.RegularExpressions;
using System.Windows.Forms;
-using O2.DotNetWrappers.DotNet;
-using O2.Tool.SearchEngine;
+using FluentSharp.WinForms.Utils;
//O2File:ascx_TextSearch.Designer.cs
View
9 Utils/Web/SimpleCSharpREPL.cs
@@ -1,9 +1,8 @@
// 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.DotNetWrappers.Windows;
-using O2.DotNetWrappers.ExtensionMethods;
+
+using FluentSharp.REPL.Controls;
+using FluentSharp.REPL.Utils;
+
//O2Ref:FluentSharp.REPL.exe
namespace O2.XRules.Database.Utils
View
5 Utils/Web/SimpleTextEditor.cs
@@ -1,8 +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.Windows.Forms;
-using O2.DotNetWrappers.Windows;
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Utils;
namespace O2.Script
{
View
20 Utils/Web/ascx_HtmlTagViewer.cs
@@ -1,20 +1,12 @@
// 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.Drawing;
-using System.Linq;
-using System.Collections.Generic;
using System.Windows.Forms;
-using System.Text;
-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.External.SharpDevelop.Ascx;
-using O2.External.SharpDevelop.ExtensionMethods;
-using O2.XRules.Database.Utils;
+using FluentSharp.CoreLib;
+using FluentSharp.REPL.Controls;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Controls;
+using FluentSharp.REPL;
+
//O2File:HtmlAgilityPack_Extra_ExtensionMethods.cs
//O2File:HtmlAgilityPack_Extra_ExtensionMethods_SourceCodeViewer.cs
//O2Ref:O2_Misc_Microsoft_MPL_Libs.dll
View
415 Utils/Web/ascx_Html_Editor.cs.o2 → Utils/Web/ascx_Html_Editor.cs
@@ -1,215 +1,200 @@
-// 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)
-//O2Ref:System.dll
-//O2Ref:System.Core.dll
-//O2Ref:System.Windows.Forms.dll
-//O2Ref:FluentSharp.CoreLib.dll
-//O2Ref:O2_External_IE.dll
-//O2Ref:System.Drawing.dll
-//O2Ref:Microsoft.mshtml.dll
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-using System.Windows.Forms;
-using System.Drawing;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.Interfaces.O2Core;
-using O2.DotNetWrappers.DotNet;
-using O2.DotNetWrappers.Windows;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Views.ASCX;
-using O2.Views.ASCX.classes;
-using O2.Views.ASCX.classes.MainGUI;
-using O2.Views.ASCX.CoreControls;
-using O2.Views.ASCX.ExtensionMethods;
-
-using O2.External.IE;
-using O2.External.IE.Wrapper;
-using O2.External.IE.Interfaces;
-using O2.External.IE.ExtensionMethods;
-
-using O2.External.SharpDevelop.Ascx;
-using O2.External.SharpDevelop.ExtensionMethods;
-
-using mshtml;
-
-
-using System.Threading;
-
-namespace O2.XRules.Database.Utils
-{
- public class ascx_Html_Editor: UserControl
- {
- private static IO2Log log = PublicDI.log;
- public ascx_Directory directory;
- public IO2Browser browser;
- public ascx_SourceCodeViewer htmlCode;
- public PictureBox pictureBox;
- public string currentFile = "";
-
- public string startDir = Path.Combine(PublicDI.config.O2TempDir,"_HtmlPages");
-
- public static void startControl()
- {
- O2Gui.open<ascx_Html_Editor>("Html Editor", 700,500);
- }
-
- public ascx_Html_Editor()
- {
- Thread.CurrentThread.SetApartmentState( ApartmentState.STA);
- buildGui();
- browser.open("http://www.google.com");
- }
-
- private void buildGui()
- {
- //var groupBoxes = this.add_SplitContainer_2x2("Directory","WebEditor","Config","HtmlCode",true, 100,40,40);
- var groupBoxes = this.add_1x1("WebEditor (Edit on page)","HtmlCode (see results in code)");
- browser = groupBoxes[0].add_WebBrowserWithLocationBar();
- htmlCode = groupBoxes[1].add_SourceCodeViewer();
- //directory = groupBoxes[0].add_Directory(startDir);
- //browser = groupBoxes[1].add_WebBrowserWithLocationBar();
- //htmlCode = groupBoxes[3].add_SourceCodeViewer();
- htmlCode.astDetails(false);
-
- // build config
- /*groupBoxes[2].add_Link("toggle edit mode", 20 ,10,()=> setEditMode(!getEditMode()) );
- groupBoxes[2].add_Link("refresh", 40 ,10,()=> updateHtmlPage() );
- groupBoxes[2].add_Link("take screenshot", 60 ,10,()=> takeScreenShot() );
-
- pictureBox = groupBoxes[2].add_PictureBox(70,10);
- pictureBox.anchor_All();
- takeScreenShot();
- // setup controls events
- directory._onDirectoryDoubleClick+=selectedFileOrFolder;
- */
- browser.onDocumentCompleted +=onDocumentCompleted;
- //htmlCode.eDocumentDataChanged += htmlTextChanged;
- // fine tune loaded controls behaviour
- //directory._WatchFolder = true;
- //directory.AllowDrop = false;
- htmlCode.editor().colorCodeForExtension(".html");
-
- // remove on next code Sync
- ((O2BrowserIE)browser).AllowWebBrowserDrop = false;
-
- }
-
- public Image takeScreenShot()
- {
- var image = Screenshots.getScreenshotOfDesktop();
- //var image = Screenshots.getScreenshotOfFormObjectAndItsControls(this);
- "image:{0}".info(image.typeName());
-
- pictureBox.BackgroundImage = image;
- return image;
- }
-
- public void onBrowserLocationChanged(IO2Browser _browser, string file)
- {
- log.info("file: {0}", file);
- loadFile(file);
- }
-
- public void loadFile(string fileToLoad)
- {
- log.info("fileToLoad: {0}", fileToLoad);
- if (fileToLoad.empty())
- return;
- var file = Path.Combine(directory.getCurrentDirectory(), fileToLoad);
- log.info("file: {0}", file);
- if (! file.extension(".html"))
- file+=".html";
- if (! file.exists())
- {
- log.info("Creating file: {0}", file);
- file.create("<html><body>web content</body></html>");
- }
- selectedFileOrFolder(file);
- }
-
- public void selectedFileOrFolder(string fileOrFolder)
- {
- if (fileOrFolder.dirExists()) // if it is a directory return
- return;
- currentFile = fileOrFolder;
-
- browser.open(fileOrFolder);
- }
-
- public void onDocumentCompleted(IO2HtmlPage htmlPage)
- {
- "---- onDocumentCompleted".info();
- var o2BrowserIE = (O2BrowserIE)browser;
-
- //this.info("---- Text: {0}" , o2BrowserIE.Text());
- setEditMode(true);
- }
-
- public bool getEditMode()
- {
- return browser.HtmlEditMode;
- }
-
- public void setEditMode(bool value)
- {
- var o2BrowserIE = (O2BrowserIE)browser;
- o2BrowserIE.HtmlEditMode = value;
- if (value)
- o2BrowserIE.onEditedHtmlChange(updateHtmlPage);
-
- updateHtmlPage();
- }
-
- public void updateHtmlPage()
- {
- var o2BrowserIE = (O2BrowserIE)browser;
- updateHtmlPage(o2BrowserIE.html());
- }
- public void updateHtmlPage(string html)
- {
-
- var value = htmlCode.textEditorControl().ActiveTextAreaControl.VScrollBar.Value;
- htmlCode.textEditorControl().Document.TextContent = html;
- htmlCode.textEditorControl().ActiveTextAreaControl.VScrollBar.Value = value;
-