[jbosstools-commits] JBoss Tools SVN: r3550 - in branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/mozilla and 1 other directories.

Author: svasilyev Date: 2007-09-11 07:54:48 -0400 (Tue, 11 Sep 2007) New Revision: 3550 Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/ve/init.html Log: http://jira.jboss.org/jira/browse/JBIDE-746 SWT.Browser has been decorated in XulRunnerBrowser instead of implementation of Browser on XulRunner by ourself Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-09-11 10:49:55 UTC (rev 3549) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-09-11 11:54:48 UTC (rev 3550) @@ -228,7 +228,7 @@ templateManager.addTemplateListener(this); - xulRunnerEditor = (XulRunnerEditor) visualEditor.getControl(); + xulRunnerEditor = visualEditor.getXulRunnerEditor(); // TODO Sergey Vasilyev figure out with nsIPressShell // presShell = browser.getPresShell(); visualSelectionController = new VpeSelectionController(xulRunnerEditor.getSelection()); @@ -878,7 +878,7 @@ //adding calls of core event handlers, for example 'CTR+H' or 'CTRL+M' event handler dialog Event keyboardEvent = new Event (); //widget where event occur - keyboardEvent.widget = xulRunnerEditor; + keyboardEvent.widget = xulRunnerEditor.getBrowser(); keyboardEvent.stateMask = (keyEvent.getAltKey() ? SWT.ALT : 0) | (keyEvent.getCtrlKey() ? SWT.CTRL : 0) | (keyEvent.getShiftKey() ? SWT.SHIFT : 0) | (keyEvent.getMetaKey() ? SWT.MOD1 : 0); keyboardEvent.x=0; Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2007-09-11 10:49:55 UTC (rev 3549) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2007-09-11 11:54:48 UTC (rev 3550) @@ -86,7 +86,7 @@ public VpePreviewDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter, VpeTemplateManager templateManager, MozillaEditor visualEditor, VpePageContext pageContext) { super(domMapping, sorceAdapter, templateManager, visualEditor, pageContext); this.visualEditor = visualEditor; - browser = (XulRunnerEditor)visualEditor.getControl(); + browser = visualEditor.getXulRunnerEditor(); this.visualDocument = visualEditor.getDomDocument(); this.visualContentArea = visualEditor.getContentArea(); this.pageContext = pageContext; Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-09-11 10:49:55 UTC (rev 3549) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-09-11 11:54:48 UTC (rev 3550) @@ -143,7 +143,7 @@ public VpeVisualDomBuilder(VpeDomMapping domMapping, INodeAdapter sorceAdapter, VpeTemplateManager templateManager, MozillaEditor visualEditor, VpePageContext pageContext) { super(domMapping, sorceAdapter, templateManager); this.visualEditor = visualEditor; - xulRunnerEditor = (XulRunnerEditor)visualEditor.getControl(); + xulRunnerEditor = visualEditor.getXulRunnerEditor(); this.visualDocument = visualEditor.getDomDocument(); this.visualContentArea = visualEditor.getContentArea(); // TODO Max Areshkau figure out Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2007-09-11 10:49:55 UTC (rev 3549) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2007-09-11 11:54:48 UTC (rev 3550) @@ -304,7 +304,7 @@ // removeClipboardDragDropHooks(); if (xulRunnerEditor != null) { - xulRunnerEditor.dispose(); + xulRunnerEditor.getBrowser().dispose(); xulRunnerEditor = null; } @@ -342,11 +342,11 @@ } public Menu getMenu() { - return xulRunnerEditor.getMenu(); + return xulRunnerEditor.getBrowser().getMenu(); } public Control getControl() { - return xulRunnerEditor; + return xulRunnerEditor.getBrowser(); } // TODO Max Areshkau add DnD support @@ -563,5 +563,12 @@ hookList.removeClipboardDragDropHooks(baseEventListener); } } + + /** + * @return the xulRunnerEditor + */ + public XulRunnerEditor getXulRunnerEditor() { + return xulRunnerEditor; + } } \ No newline at end of file Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/ve/init.html =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2007-09-11 10:49:55 UTC (rev 3549) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2007-09-11 11:54:48 UTC (rev 3550) @@ -62,36 +62,7 @@ </style> </head> -<script language="JavaScript"> -<!-- - netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); - var prefs = Components.classes[&#39;(a)mozilla.org/preferences-service;1&#39;].getService(Components.interfaces.nsIPrefService).getBranch(null); - if(!prefs.getBoolPref('accessibility.browsewithcaret')) - prefs.setBoolPref('accessibility.browsewithcaret', true); - - if(prefs.getBoolPref('browser.cache.enable')) - prefs.setBoolPref('browser.cache.enable', false); - - if(prefs.getBoolPref('browser.cache.disk.enable')) - prefs.setBoolPref('browser.cache.disk.enable', false); - - prefs.setIntPref('browser.cache.disk.capacity', 0); - - if(prefs.getBoolPref('browser.cache.memory.enable')) - prefs.setBoolPref('browser.cache.memory.enable', false); - - // -1 = determine dynamically, 0 = none, n = memory capacity in kilobytes - prefs.setIntPref('browser.cache.memory.capacity', 0); - - // 0 = once-per-session, 1 = each-time, 2 = never, 3 = when-appropriate/automatically - prefs.setIntPref('browser.cache.check_doc_frequency', 2); - - if(prefs.getBoolPref('network.http.use-cache')) - prefs.setBoolPref('network.http.use-cache', false); -//--> -</script> - <body id="__content__area__"></body> </html>