10:03 a.m.
Author: mareshkau
Date: 2008-12-12 11:03:18 -0500 (Fri, 12 Dec 2008)
New Revision: 12572
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2354Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1580Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1639Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/JBIDE3280Test.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java
Log:
jbide-3032, Fix errors in junit tests
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/src/org/jboss/tools/jsf/vpe/facelets/test/FaceletsComponentTest.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -349,7 +349,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
// check that element is not null
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -60,7 +60,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
// check that element is not null
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -60,7 +60,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
// check that element is not null
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -66,7 +66,7 @@
assertNotNull(h_outputText);
- VpeController vpeController = getVpeController(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
VpeTemplateManager templateManager=
vpeController.getPageContext().getVisualBuilder().getTemplateManager();
assertNotNull(templateManager);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1615Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -60,7 +60,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
//check that element is not null
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -62,7 +62,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
// check that element is not null
@@ -137,7 +137,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
// check that element is not null
@@ -217,7 +217,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
// check that element is not null
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1744Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -61,7 +61,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
// check that element is not null
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -54,7 +54,7 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- VpeController vpeController = getVpeController(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
assertNotNull(vpeController);
// set show invisible tag's flag to false
@@ -64,7 +64,7 @@
TestUtil.waitForIdle();
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get element
nsIDOMElement element = document.getElementById(ELEMENT_WRAPPER_ID);
@@ -78,7 +78,7 @@
vpeController.visualRefresh();
TestUtil.waitForIdle();
- document = getVpeVisualDocument(part);
+ document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get element
element = document.getElementById(ELEMENT_WRAPPER_ID);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2119Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -62,7 +62,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
// check that element is not null
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2354Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2354Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2354Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -23,7 +23,7 @@
JsfAllTests.IMPORT_PROJECT_NAME);
IEditorInput input = new FileEditorInput(file);
JSPMultiPageEditor part = openEditor(input);
- VpeController controller = getVpeController(part);
+ VpeController controller = TestUtil.getVpeController(part);
Event keyEvent = new Event();
keyEvent.widget = controller.getXulRunnerEditor().getBrowser();
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -58,7 +58,7 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- VpeController controller = getVpeController(part);
+ VpeController controller = TestUtil.getVpeController(part);
controller.visualRefresh();
TestUtil.waitForJobs();
part.getVisualEditor().setVisualMode(0);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2505Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -95,7 +95,7 @@
- VpeController vpeController = getVpeController(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
vpeController.sourceSelectionChanged();
for (int i=0;i<10;i++) {
@@ -133,7 +133,7 @@
- VpeController vpeController = getVpeController(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
vpeController.sourceSelectionChanged();
for (int i=0;i<10;i++) {
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2526Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -63,7 +63,7 @@
JSPMultiPageEditor part = openEditor(input);
// get controller
- VpeController controller = getVpeController(part);
+ VpeController controller = TestUtil.getVpeController(part);
assertNotNull(controller);
Document document = getSourceDocument(controller);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2582Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -128,7 +128,7 @@
JSPMultiPageEditor part = openEditor(input);
// get controller
- VpeController controller = getVpeController(part);
+ VpeController controller = TestUtil.getVpeController(part);
assertNotNull(controller);
// get dommapping
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -60,7 +60,7 @@
Node simpleTextNode = TestUtil.getNodeMappingBySourcePosition(itextViewer, 14, 10);
- VpeController vpeController = getVpeController(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
VpeDomMapping domMapping = vpeController.getDomMapping();
@@ -99,7 +99,7 @@
Node simpleTextNode = TestUtil.getNodeMappingBySourcePosition(itextViewer, 15, 27);
- VpeController vpeController = getVpeController(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
VpeDomMapping domMapping = vpeController.getDomMapping();
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -64,9 +64,9 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- VpeController vpeController = getVpeController(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
@@ -82,7 +82,7 @@
TestUtil.delay(1000);
vpeController.visualRefresh();
TestUtil.delay(1000);
- document = getVpeVisualDocument(part);
+ document = TestUtil.getVpeVisualDocument(part);
element = document.getDocumentElement();
elements = new ArrayList<nsIDOMNode>();
TestUtil.findAllElementsByName(element, elements, HTML.TAG_TABLE);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -59,7 +59,7 @@
Point selectionRangeBeforeRefresh =
part.getSourceEditor().getTextViewer().getSelectedRange();
// get controller
- VpeController controller = getVpeController(part);
+ VpeController controller = TestUtil.getVpeController(part);
assertNotNull(controller);
controller.visualRefresh();
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3163Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -37,7 +37,7 @@
JsfAllTests.IMPORT_PROJECT_NAME);
IEditorInput editorInput = new FileEditorInput(file);
JSPMultiPageEditor part = openEditor(editorInput);
- VpeController controller = getVpeController(part);
+ VpeController controller = TestUtil.getVpeController(part);
XulRunnerEditor xulRunnerEditor = controller.getXulRunnerEditor();
int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(),
1, 6);
part.getSourceEditor().getTextViewer().setSelectedRange(position, 0);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -79,7 +79,7 @@
Node node = (Node) treeNode;
assertNotNull(node);
- VpeController vpeController = getVpeController(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
VpeDomMapping domMapping = vpeController.getDomMapping();
@@ -140,7 +140,7 @@
Node node = (Node) treeNode;
assertNotNull(node);
- VpeController vpeController = getVpeController(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
VpeDomMapping domMapping = vpeController.getDomMapping();
@@ -198,7 +198,7 @@
Node node = (Node) treeNode;
assertNotNull(node);
- VpeController vpeController = getVpeController(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
VpeDomMapping domMapping = vpeController.getDomMapping();
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -55,8 +55,8 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- VpeController vpeController = getVpeController(part);
- nsIDOMDocument document = getVpeVisualDocument(part);
+ VpeController vpeController = TestUtil.getVpeController(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>();
TestUtil.findAllElementsByName(element, elements, HTML.TAG_TABLE);
@@ -67,7 +67,7 @@
TestUtil.delay(10000);
vpeController.visualRefresh();
TestUtil.delay(10000);
- document = getVpeVisualDocument(part);
+ document = TestUtil.getVpeVisualDocument(part);
element = document.getDocumentElement();
elements = new ArrayList<nsIDOMNode>();
TestUtil.findAllElementsByName(element, elements, HTML.TAG_TABLE);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1467Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -78,7 +78,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
assertNotNull(element);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1501Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -79,7 +79,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
@@ -134,7 +134,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide1718Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -72,7 +72,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
@@ -159,7 +159,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
@@ -206,7 +206,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
@@ -254,7 +254,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -86,7 +86,7 @@
assertEquals(0, basicDoctypeString.length());
// get dom document from vpe
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get doctype from vpe's dom model
@@ -131,7 +131,7 @@
assertEquals(true, basicDoctypeString.length() > 0);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get doctype
@@ -177,7 +177,7 @@
assertEquals(true, basicDoctypeString.length() > 0);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get doctype
@@ -223,7 +223,7 @@
assertEquals(true, basicDoctypeString.length() > 0);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get doctype
@@ -260,7 +260,7 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- VpeController controller = getVpeController(part);
+ VpeController controller = TestUtil.getVpeController(part);
// controller must be not null
assertNotNull(controller);
@@ -292,7 +292,7 @@
TestUtil.delay(500);
- nsIDOMDocument visualDocument = getVpeVisualDocument(part);
+ nsIDOMDocument visualDocument = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = visualDocument.getElementById(ELEMENT_ID);
assertNotNull(element);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -123,7 +123,7 @@
JSPMultiPageEditor part = openEditor(input);
// get controller
- VpeController controller = getVpeController(part);
+ VpeController controller = TestUtil.getVpeController(part);
assertNotNull(controller);
// get dommapping
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -44,7 +44,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
//check that element is not null
@@ -82,7 +82,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
//check that element is not null
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -43,7 +43,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
//check that element is not null
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1713Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -60,7 +60,7 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
// check that element is not null
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1548Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -69,7 +69,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
assertNotNull(element);
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1580Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1580Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1580Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -60,7 +60,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
@@ -102,7 +102,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1614Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -60,7 +60,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
@@ -102,7 +102,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1639Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1639Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1639Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -59,7 +59,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
assertNotNull(document);
// get dom element
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -51,7 +51,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
//check that element is not null
@@ -94,7 +94,7 @@
JSPMultiPageEditor part = openEditor(input);
// get dom document
- nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMDocument document = TestUtil.getVpeVisualDocument(part);
nsIDOMElement element = document.getDocumentElement();
//check that element is not null
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -28,15 +28,11 @@
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
@@ -58,8 +54,8 @@
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage;
-import org.jboss.tools.vpe.editor.toolbar.VpeDropDownMenu;
import org.jboss.tools.vpe.editor.toolbar.IVpeToolBarManager;
+import org.jboss.tools.vpe.editor.toolbar.VpeDropDownMenu;
import org.jboss.tools.vpe.editor.toolbar.VpeToolBarManager;
import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager;
import org.jboss.tools.vpe.editor.toolbar.format.TextFormattingToolBar;
@@ -102,7 +98,6 @@
private FormatControllerManager formatControllerManager = new
FormatControllerManager();
private VpeController controller;
private Link link = null;
- private boolean loaded;
private boolean isRefreshPage = false;
private String doctype;
/**
@@ -289,7 +284,7 @@
// if the first load page
if (!isRefreshPage()) {
super.onLoadWindow();
- MozillaEditor.this.onLoadWindow();
+// MozillaEditor.this.onLoadWindow();
}
// if only refresh page
else {
@@ -319,14 +314,13 @@
super.onDispose();
}
};
- loaded = false;
xulRunnerEditor.getBrowser().addProgressListener(new ProgressListener() {
public void changed(ProgressEvent event) {
}
public void completed(ProgressEvent event) {
- loaded = true;
+ MozillaEditor.this.onLoadWindow();
xulRunnerEditor.getBrowser().removeProgressListener(this);
}
@@ -790,5 +784,4 @@
}
return editor;
}
-
}
\ No newline at end of file
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/JBIDE3280Test.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/JBIDE3280Test.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/jbide/JBIDE3280Test.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -58,7 +58,7 @@
TestUtil.waitForJobs();
- VpeController controller = getVpeController((JSPMultiPageEditor) editor);
+ VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor);
final nsIDOMDocument oldDocument = controller.getXulRunnerEditor().getDOMDocument();
final String oldStyle = oldDocument
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -79,7 +79,7 @@
TestUtil.waitForJobs();
- VpeController controller = getVpeController((JSPMultiPageEditor) editor);
+ VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor);
// get xml test file
File xmlTestFile = TestUtil.getComponentPath(
@@ -168,7 +168,7 @@
TestUtil.waitForJobs();
- VpeController controller = getVpeController((JSPMultiPageEditor) editor);
+ VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor);
// find source element and check if it is not null
Element sourceELement = findSourceElementById(controller, elementId);
@@ -233,7 +233,7 @@
TestUtil.waitForJobs();
- VpeController controller = getVpeController((JSPMultiPageEditor) editor);
+ VpeController controller = TestUtil.getVpeController((JSPMultiPageEditor) editor);
// find source element and check if it is not null
Element sourceELement = findSourceElementById(controller, elementId);
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -356,7 +356,24 @@
return resultOffcet;
}
+ /**
+ * Gets visual page editor controller.
+ *
+ * @param part the part
+ *
+ * @return {@link VpeController}
+ */
+ public static VpeController getVpeController(JSPMultiPageEditor part) {
+ VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor();
+ while(visualEditor.getController()==null) {
+ if (!Display.getCurrent().readAndDispatch()) {
+ Display.getCurrent().sleep();
+ }
+ }
+ return visualEditor.getController();
+ }
+
/**
* get xulrunner source page.
*
@@ -366,9 +383,8 @@
*/
public static nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) {
- VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor();
- VpeController vpeController = visualEditor.getController();
+ VpeController vpeController = TestUtil.getVpeController(part);
// get xulRunner editor
XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor();
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java
===================================================================
---
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2008-12-12
15:36:23 UTC (rev 12571)
+++
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2008-12-12
16:03:18 UTC (rev 12572)
@@ -32,13 +32,11 @@
import org.jboss.tools.common.model.util.ClassLoaderUtil;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.editor.VpeController;
-import org.jboss.tools.vpe.editor.VpeEditorPart;
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
import org.jboss.tools.vpe.editor.util.SelectionUtil;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
-import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -157,30 +155,8 @@
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false);
}
-
+
/**
- * get xulrunner source page.
- *
- * @param part - JSPMultiPageEditor
- *
- * @return nsIDOMDocument
- */
- protected nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) {
-
- VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor();
-
- VpeController vpeController = visualEditor.getController();
-
- // get xulRunner editor
- XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor();
-
- // get dom document
- nsIDOMDocument document = xulRunnerEditor.getDOMDocument();
-
- return document;
- }
-
- /**
*
* @return source document
*/
@@ -191,20 +167,6 @@
}
/**
- * Gets visual page editor controller.
- *
- * @param part the part
- *
- * @return {@link VpeController}
- */
- protected VpeController getVpeController(JSPMultiPageEditor part) {
-
- VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor();
-
- return visualEditor.getController();
- }
-
- /**
* Perfoms test for some page.
*
* @param componentPage the component page
@@ -305,7 +267,7 @@
*/
protected void checkSourceSelection(JSPMultiPageEditor part) {
// get controller
- VpeController controller = getVpeController(part);
+ VpeController controller = TestUtil.getVpeController(part);
assertNotNull(controller);
// get dommapping