JBoss Tools SVN: r12580 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-12-12 17:37:47 -0500 (Fri, 12 Dec 2008)
New Revision: 12580
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
JBIDE-3080 Created servers uses specific JDK instead default JDK
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2008-12-12 21:32:48 UTC (rev 12579)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2008-12-12 22:37:47 UTC (rev 12580)
@@ -79,6 +79,7 @@
explanationLabel;
private Text nameText, homeDirText;
private Combo jreCombo;
+ private int jreComboIndex;
private Button homeDirButton, jreButton;
private Composite nameComposite, homeDirComposite, jreComposite,
configComposite;
@@ -144,14 +145,18 @@
configurations.setConfiguration(config);
configLabel.setText(Messages.wf_ConfigLabel);
- IVMInstall install = rt.getVM();
- String vmName = install.getName();
- String[] jres = jreCombo.getItems();
- for (int i = 0; i < jres.length; i++) {
- if (vmName.equals(jres[i]))
- jreCombo.select(i);
+ if (rt.isUsingDefaultJRE()) {
+ jreCombo.select(0);
+ } else {
+ IVMInstall install = rt.getVM();
+ String vmName = install.getName();
+ String[] jres = jreCombo.getItems();
+ for (int i = 0; i < jres.length; i++) {
+ if (vmName.equals(jres[i]))
+ jreCombo.select(i);
+ }
}
-
+ jreComboIndex = jreCombo.getSelectionIndex();
homeDirText.setEditable(canEdit);
homeDirButton.setEnabled(canEdit);
configurations.getTable().setVisible(canEdit);
@@ -305,6 +310,7 @@
jreCombo.setText(currentVM);
if (jreCombo.getSelectionIndex() == -1)
jreCombo.select(defaultVMIndex);
+ jreComboIndex = jreCombo.getSelectionIndex();
}
}
});
@@ -396,8 +402,8 @@
}
int sel = jreCombo.getSelectionIndex();
- if (sel != -1)
- selectedVM = installedJREs.get(sel);
+ if (sel > 0)
+ selectedVM = installedJREs.get(sel-1);
else
selectedVM = null;
}
@@ -429,7 +435,7 @@
if (homeDir == null || homeDir.equals(""))
return Messages.rwf_homeDirBlank;
- if (selectedVM == null)
+ if (jreComboIndex < 0)
return "No VM selected";
return null;
@@ -509,14 +515,16 @@
// get names
size = installedJREs.size();
- jreNames = new String[size];
+ jreNames = new String[size+1];
+ jreNames[0] = "Default JRE";
for (int i = 0; i < size; i++) {
IVMInstall vmInstall = installedJREs.get(i);
- jreNames[i] = vmInstall.getName();
+ jreNames[i+1] = vmInstall.getName();
}
- selectedVM = JavaRuntime.getDefaultVMInstall();
- defaultVMIndex = installedJREs.indexOf(selectedVM);
+ //selectedVM = JavaRuntime.getDefaultVMInstall();
+ //defaultVMIndex = installedJREs.indexOf(selectedVM);
+ defaultVMIndex = 0;
}
// WST API methods
17 years
- 1
- 0
JBoss Tools SVN: r12579 - trunk/tests/features/org.jboss.tools.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2008-12-12 16:32:48 -0500 (Fri, 12 Dec 2008)
New Revision: 12579
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
Log:
[JBIDE-3191] add JMX core and UI tests to uber tests builder
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-12-12 21:06:45 UTC (rev 12578)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2008-12-12 21:32:48 UTC (rev 12579)
@@ -400,4 +400,17 @@
install-size="0"
version="0.0.0"/>
+ <plugin
+ id="org.jboss.tools.jmx.core.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.jboss.tools.jmx.ui.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
17 years
- 1
- 0
JBoss Tools SVN: r12578 - in trunk/jmx/tests: org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2008-12-12 16:06:45 -0500 (Fri, 12 Dec 2008)
New Revision: 12578
Added:
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTests.java
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTestsUtil.java
trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTests.java
trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTestsUtil.java
Log:
[JBIDE-3191] add AllTests suite to test plugins
Added: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTests.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTests.java (rev 0)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTests.java 2008-12-12 21:06:45 UTC (rev 12578)
@@ -0,0 +1,9 @@
+package org.jboss.tools.jmx.core;
+import junit.framework.Test;
+
+
+public class AllTests {
+ public static Test suite() {
+ return AllTestsUtil.suite();
+ }
+}
Added: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTestsUtil.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTestsUtil.java (rev 0)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/AllTestsUtil.java 2008-12-12 21:06:45 UTC (rev 12578)
@@ -0,0 +1,166 @@
+package org.jboss.tools.jmx.core;
+
+//Copyright (c) 2006 Alex Blewitt
+//All rights reserved. This program and the accompanying materials
+//are made available under the terms of the Eclipse Public License v1.0
+//which accompanies this distribution, and is available at
+//http://www.eclipse.org/legal/epl-v10.html
+//
+//Contributors:
+//Alex Blewitt - Initial API and implementation
+//
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Vector;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.runner.ClassPathTestCollector;
+import junit.runner.TestCollector;
+import org.eclipse.core.runtime.Platform;
+/**
+* Run all the tests in this project, either computed from the classpath or from
+* the bundlepath. To use this as-is, drop it into a non-default package that
+* has the same name as the plugin. For example, if the plugin is called
+* <code>org.example.foo</code>, this should be placed in a package
+* <code>org.example.foo</code>, and all tests should live under the
+* <code>org.example.foo</code> package structure (either directly, or in any
+* subpackage). By default this will include all non-abstract classes named
+* <code>XxxTest</code>, excluding <code>XxxPlatformTest</code> if running
+* outside of the platform.
+*/
+
+public class AllTestsUtil {
+ /**
+ * Detects classes from the bundle PLUGIN_NAME's entries. Uses
+ * <code>bundle.findEntries</code> to obtain a list of classes that live
+ * in the specified PACKAGE_NAME, and adds those to the test path, providing
+ * that they are {@link AllTests#isValidTest(String, boolean) valid}.
+ */
+ private static class BundleTestDetector implements TestCollector {
+ /*
+ * @see junit.runner.TestCollector#collectTests()
+ */
+ public Enumeration collectTests() {
+ final Vector tests = new Vector();
+ try {
+ Enumeration entries = Platform.getBundle(PLUGIN_NAME).findEntries("/", "*" + SUFFIX + ".class", true);
+ while (entries.hasMoreElements()) {
+ URL entry = (URL) entries.nextElement();
+ // Change the URLs to have Java class names
+ String path = entry.getPath().replace('/', '.');
+ int start = path.indexOf(PACKAGE_NAME);
+ String name = path.substring(start, path.length()
+ - ".class".length());
+ if (isValidTest(name, true)) {
+ tests.add(name);
+ }
+ }
+ } catch (Exception e) {
+ // If we get here, the Platform isn't installed and so we fail
+ // quietly. This isn't a problem; we might be outside of the
+ // Platform framework and just running tests locally. It's not
+ // even worth printing anything out to the error log as it would
+ // just confuse people investigating stack traces etc.
+ }
+ return tests.elements();
+ }
+ }
+ /**
+ * Searches the current classpath for tests, which are those ending with
+ * SUFFIX, excluding those which end in IN_CONTAINER_SUFFIX, providing that
+ * they are {@link AllTests#isValidTest(String, boolean) valid}.
+ */
+ private static class ClassFileDetector extends ClassPathTestCollector {
+ /*
+ * @see junit.runner.ClassPathTestCollector#isTestClass(java.lang.String)
+ */
+ protected boolean isTestClass(String classFileName) {
+ return classFileName.endsWith(SUFFIX + ".class")
+ && isValidTest(classNameFromFile(classFileName), false);
+ }
+ }
+ /**
+ * All tests should end in XxxTest
+ */
+ public static final String SUFFIX = "Test";
+ /**
+ * All in-container tests should end in XxxPlatformTest
+ */
+ public static final String IN_CONTAINER_SUFFIX = "Platform" + SUFFIX;
+ /**
+ * The base package name of the tests to run. This defaults to the name of
+ * the package that the AllTests class is in for ease of management but may
+ * be trivially changed if required. Note that at least some identifiable
+ * part must be provided here (so default package names are not allowed)
+ * since the URL that comes up in the bundle entries have a prefix that is
+ * not detectable automatically. Even if this is "org" or "com" that should
+ * be enough.
+ */
+ public static final String PACKAGE_NAME = AllTests.class.getPackage()
+ .getName();
+ /**
+ * The name of the plugin to search if the platform is loaded. This defaults
+ * to the name of the package that the AllTests class is in for ease of
+ * management but may be trivially changed if required.
+ */
+
+ //PO: this is wrong. we need to use the PLUGIN_ID of the host, not that of the
+ // fragment
+// public static final String PLUGIN_NAME = AllTests.class.getPackage()
+// .getName();
+ public static final String PLUGIN_NAME = "org.drools.eclipse";
+
+ /**
+ * Add the tests reported by collector to the list of tests to run
+ * @param collector the test collector to run
+ * @param suite the suite to add the tests to
+ */
+ private static void addTestsToSuite(TestCollector collector, TestSuite suite) {
+ Enumeration e = collector.collectTests();
+ while (e.hasMoreElements()) {
+ String name = (String) e.nextElement();
+ try {
+ suite.addTestSuite(Class.forName(name));
+ } catch (ClassNotFoundException e1) {
+ System.err.println("Cannot load test: " + e1);
+ }
+ }
+ }
+ /**
+ * Is the test a valid test?
+ * @param name the name of the test
+ * @param inContainer true if we want to include the inContainer tests
+ * @return true if the name is a valid class (can be loaded), that it is not
+ * abstract, and that it ends with SUFFIX, and that either
+ * inContainer tests are to be included or the name does not end
+ * with IN_CONTAINER_SUFFIX
+ */
+ private static boolean isValidTest(String name, boolean inContainer) {
+ try {
+ return name.endsWith(SUFFIX)
+ && (inContainer || !name.endsWith(IN_CONTAINER_SUFFIX))
+ && ((Class.forName(name).getModifiers() & Modifier.ABSTRACT) == 0);
+ } catch (ClassNotFoundException e) {
+ System.err.println(e.toString());
+ return false;
+ }
+ }
+ /**
+ * Return all the tests. If we're in a platform, return everything. If not,
+ * we return those tests that end in SUFFIX but excluding those ending in
+ * IN_CONTAINER_SUFFIX.
+ * @return a suite of tests for JUnit to run
+ * @throws Error if there are no tests to run.
+ */
+ public static Test suite() {
+ TestSuite suite = new TestSuite(AllTests.class.getName());
+ addTestsToSuite(new ClassFileDetector(), suite);
+ addTestsToSuite(new BundleTestDetector(), suite);
+ if (suite.countTestCases() == 0) {
+ throw new Error("There are no test cases to run");
+ } else {
+ return suite;
+ }
+ }
+}
Added: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTests.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTests.java (rev 0)
+++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTests.java 2008-12-12 21:06:45 UTC (rev 12578)
@@ -0,0 +1,9 @@
+package org.jboss.tools.jmx.ui;
+import junit.framework.Test;
+
+
+public class AllTests {
+ public static Test suite() {
+ return AllTestsUtil.suite();
+ }
+}
Added: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTestsUtil.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTestsUtil.java (rev 0)
+++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/AllTestsUtil.java 2008-12-12 21:06:45 UTC (rev 12578)
@@ -0,0 +1,166 @@
+package org.jboss.tools.jmx.ui;
+
+//Copyright (c) 2006 Alex Blewitt
+//All rights reserved. This program and the accompanying materials
+//are made available under the terms of the Eclipse Public License v1.0
+//which accompanies this distribution, and is available at
+//http://www.eclipse.org/legal/epl-v10.html
+//
+//Contributors:
+//Alex Blewitt - Initial API and implementation
+//
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Vector;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.runner.ClassPathTestCollector;
+import junit.runner.TestCollector;
+import org.eclipse.core.runtime.Platform;
+/**
+* Run all the tests in this project, either computed from the classpath or from
+* the bundlepath. To use this as-is, drop it into a non-default package that
+* has the same name as the plugin. For example, if the plugin is called
+* <code>org.example.foo</code>, this should be placed in a package
+* <code>org.example.foo</code>, and all tests should live under the
+* <code>org.example.foo</code> package structure (either directly, or in any
+* subpackage). By default this will include all non-abstract classes named
+* <code>XxxTest</code>, excluding <code>XxxPlatformTest</code> if running
+* outside of the platform.
+*/
+
+public class AllTestsUtil {
+ /**
+ * Detects classes from the bundle PLUGIN_NAME's entries. Uses
+ * <code>bundle.findEntries</code> to obtain a list of classes that live
+ * in the specified PACKAGE_NAME, and adds those to the test path, providing
+ * that they are {@link AllTests#isValidTest(String, boolean) valid}.
+ */
+ private static class BundleTestDetector implements TestCollector {
+ /*
+ * @see junit.runner.TestCollector#collectTests()
+ */
+ public Enumeration collectTests() {
+ final Vector tests = new Vector();
+ try {
+ Enumeration entries = Platform.getBundle(PLUGIN_NAME).findEntries("/", "*" + SUFFIX + ".class", true);
+ while (entries.hasMoreElements()) {
+ URL entry = (URL) entries.nextElement();
+ // Change the URLs to have Java class names
+ String path = entry.getPath().replace('/', '.');
+ int start = path.indexOf(PACKAGE_NAME);
+ String name = path.substring(start, path.length()
+ - ".class".length());
+ if (isValidTest(name, true)) {
+ tests.add(name);
+ }
+ }
+ } catch (Exception e) {
+ // If we get here, the Platform isn't installed and so we fail
+ // quietly. This isn't a problem; we might be outside of the
+ // Platform framework and just running tests locally. It's not
+ // even worth printing anything out to the error log as it would
+ // just confuse people investigating stack traces etc.
+ }
+ return tests.elements();
+ }
+ }
+ /**
+ * Searches the current classpath for tests, which are those ending with
+ * SUFFIX, excluding those which end in IN_CONTAINER_SUFFIX, providing that
+ * they are {@link AllTests#isValidTest(String, boolean) valid}.
+ */
+ private static class ClassFileDetector extends ClassPathTestCollector {
+ /*
+ * @see junit.runner.ClassPathTestCollector#isTestClass(java.lang.String)
+ */
+ protected boolean isTestClass(String classFileName) {
+ return classFileName.endsWith(SUFFIX + ".class")
+ && isValidTest(classNameFromFile(classFileName), false);
+ }
+ }
+ /**
+ * All tests should end in XxxTest
+ */
+ public static final String SUFFIX = "Test";
+ /**
+ * All in-container tests should end in XxxPlatformTest
+ */
+ public static final String IN_CONTAINER_SUFFIX = "Platform" + SUFFIX;
+ /**
+ * The base package name of the tests to run. This defaults to the name of
+ * the package that the AllTests class is in for ease of management but may
+ * be trivially changed if required. Note that at least some identifiable
+ * part must be provided here (so default package names are not allowed)
+ * since the URL that comes up in the bundle entries have a prefix that is
+ * not detectable automatically. Even if this is "org" or "com" that should
+ * be enough.
+ */
+ public static final String PACKAGE_NAME = AllTests.class.getPackage()
+ .getName();
+ /**
+ * The name of the plugin to search if the platform is loaded. This defaults
+ * to the name of the package that the AllTests class is in for ease of
+ * management but may be trivially changed if required.
+ */
+
+ //PO: this is wrong. we need to use the PLUGIN_ID of the host, not that of the
+ // fragment
+// public static final String PLUGIN_NAME = AllTests.class.getPackage()
+// .getName();
+ public static final String PLUGIN_NAME = "org.drools.eclipse";
+
+ /**
+ * Add the tests reported by collector to the list of tests to run
+ * @param collector the test collector to run
+ * @param suite the suite to add the tests to
+ */
+ private static void addTestsToSuite(TestCollector collector, TestSuite suite) {
+ Enumeration e = collector.collectTests();
+ while (e.hasMoreElements()) {
+ String name = (String) e.nextElement();
+ try {
+ suite.addTestSuite(Class.forName(name));
+ } catch (ClassNotFoundException e1) {
+ System.err.println("Cannot load test: " + e1);
+ }
+ }
+ }
+ /**
+ * Is the test a valid test?
+ * @param name the name of the test
+ * @param inContainer true if we want to include the inContainer tests
+ * @return true if the name is a valid class (can be loaded), that it is not
+ * abstract, and that it ends with SUFFIX, and that either
+ * inContainer tests are to be included or the name does not end
+ * with IN_CONTAINER_SUFFIX
+ */
+ private static boolean isValidTest(String name, boolean inContainer) {
+ try {
+ return name.endsWith(SUFFIX)
+ && (inContainer || !name.endsWith(IN_CONTAINER_SUFFIX))
+ && ((Class.forName(name).getModifiers() & Modifier.ABSTRACT) == 0);
+ } catch (ClassNotFoundException e) {
+ System.err.println(e.toString());
+ return false;
+ }
+ }
+ /**
+ * Return all the tests. If we're in a platform, return everything. If not,
+ * we return those tests that end in SUFFIX but excluding those ending in
+ * IN_CONTAINER_SUFFIX.
+ * @return a suite of tests for JUnit to run
+ * @throws Error if there are no tests to run.
+ */
+ public static Test suite() {
+ TestSuite suite = new TestSuite(AllTests.class.getName());
+ addTestsToSuite(new ClassFileDetector(), suite);
+ addTestsToSuite(new BundleTestDetector(), suite);
+ if (suite.countTestCases() == 0) {
+ throw new Error("There are no test cases to run");
+ } else {
+ return suite;
+ }
+ }
+}
17 years
- 1
- 0
JBoss Tools SVN: r12577 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-12 16:03:32 -0500 (Fri, 12 Dec 2008)
New Revision: 12577
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java
Log:
fix for test errors in last build
testOpenSourceFileTest Error resource: mapping/abstractembeddedcomponents/cid/abstractembeddedcomponents.cid.hbm.xml not found
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java 2008-12-12 16:34:31 UTC (rev 12576)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/HibernateAllMappingTests.java 2008-12-12 21:03:32 UTC (rev 12577)
@@ -18,6 +18,7 @@
import junit.framework.TestSuite;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -50,6 +51,8 @@
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().setPerspective(
PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId("org.eclipse.ui.resourcePerspective")); //$NON-NLS-1$
+ waitForJobs();
+
IPackagesViewPart packageExplorer = null;
try {
packageExplorer = (IPackagesViewPart) PlatformUI.getWorkbench()
@@ -135,13 +138,21 @@
}
}
}
-
+ private static final long MAX_IDLE = 30*60*1000L;
/**
* Wait until all background tasks are complete.
*/
public void waitForJobs() {
- while (Platform.getJobManager().currentJob() != null)
+ long start = System.currentTimeMillis();
+ // Job.getJobManager().isIdle() is more efficient than EditorTestHelper.allJobsQuiet()
+ // EditorTestHelper.allJobsQuiet() isn't thread-safe
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=198241 is fixed
+ //while (!EditorTestHelper.allJobsQuiet()) {
+ while (!Job.getJobManager().isIdle()) {
delay(1000);
+ if ( (System.currentTimeMillis()-start) > MAX_IDLE )
+ throw new RuntimeException("A long running task detected"); //$NON-NLS-1$
+ }
}
protected MappingTestProject getProject() {
17 years
- 1
- 0
JBoss Tools SVN: r12576 - trunk/documentation/jboss-tools-docs.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-12-12 11:34:31 -0500 (Fri, 12 Dec 2008)
New Revision: 12576
Modified:
trunk/documentation/jboss-tools-docs/all-guides.xml
trunk/documentation/jboss-tools-docs/pom.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3296
smooks guide is added to nightly docs, incorrect folder name in settings is fixed
Modified: trunk/documentation/jboss-tools-docs/all-guides.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/all-guides.xml 2008-12-12 16:33:00 UTC (rev 12575)
+++ trunk/documentation/jboss-tools-docs/all-guides.xml 2008-12-12 16:34:31 UTC (rev 12576)
@@ -288,7 +288,7 @@
</fileSet>
<fileSet>
- <directory>../../smooks/docs/references/target/docbook/publish/en-US</directory>
+ <directory>../../smooks/docs/reference/target/docbook/publish/en-US</directory>
<outputDirectory>/jboss_smooks_plugin_ref_guide</outputDirectory>
<filtered>false</filtered>
<lineEnding>keep</lineEnding>
Modified: trunk/documentation/jboss-tools-docs/pom.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/pom.xml 2008-12-12 16:33:00 UTC (rev 12575)
+++ trunk/documentation/jboss-tools-docs/pom.xml 2008-12-12 16:34:31 UTC (rev 12576)
@@ -28,6 +28,7 @@
<module>../../birt/docs</module>
<module>../../smooks/docs/reference</module>
<module>../../jbpm/docs/converter_ref</module>
+
<module>index</module>
</modules>
17 years
- 1
- 0
JBoss Tools SVN: r12575 - trunk/smooks/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-12-12 11:33:00 -0500 (Fri, 12 Dec 2008)
New Revision: 12575
Modified:
trunk/smooks/docs/reference/en/modules/quick_start.xml
trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3296
correcting language
Modified: trunk/smooks/docs/reference/en/modules/quick_start.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/quick_start.xml 2008-12-12 16:25:47 UTC (rev 12574)
+++ trunk/smooks/docs/reference/en/modules/quick_start.xml 2008-12-12 16:33:00 UTC (rev 12575)
@@ -16,7 +16,7 @@
data
transformation.</para>
<para>
- This chapter should give the readers a brief understanding of
+ This chapter should give you a brief understanding of
the
Smooks
dev tools.
@@ -30,19 +30,16 @@
<tip>
<title>Tip:</title>
<para>
- The example projects is base on Maven, we suggest user to
- create a
- new eclipse Java project and copy the example codes and .jar
- files
- from the
- example project paste them to the eclipse Java
+ The example project is base on Maven, you suggest you to
+ create a new eclipse Java project and copy the example code and .jar
+ files from the example project paste them into the eclipse Java
project.
</para>
</tip>
</section>
<section>
<title>Smooks configuration file wizard</title>
- <para>Select the Smooks Java-to-Java example project what you created and right-click, select the menu: "New" ->
+ <para>Select the Smooks Java-to-Java example project what you created and right-click, select the menu: "New" ->
"Other...", find the
"Smooks Configuration File" wizard. Click
"Next" button.
@@ -55,12 +52,12 @@
</imageobject>
</mediaobject>
</figure>
- <para>First wizard page is file path creation page. Select the
- "src" to be the file's container, and input
+ <para>The first wizard page is a file path creation page. Select the
+ "src" to be the files container, and input
"smooks-newconfig.smooks". Click "Next".</para>
<figure>
<title>Choose the configuration file container and type the
- file's name</title>
+ file name</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/common/input_file_name.png"
@@ -68,15 +65,13 @@
</imageobject>
</mediaobject>
</figure>
- <para>The second wizard page is the transform data type choose page.</para>
+ <para>The second wizard page is a transform data type choose page.</para>
<tip>
<title>Note</title>
<para>
- Because the quick start introduce how to create/edit the
- Java-to-Java
- Smooks configuration file, so choose "Java" type
- to be
- the source/target transform data type please.
+ As the quick start introduces how to create/edit the
+ Java-to-Java Smooks configuration file, it's necessary that "Java" type
+ is the source/target transform data type please.
</para>
</tip>
<figure>
@@ -90,10 +85,10 @@
</figure>
</section>
<section id="quickstart_formeditor">
- <title>Smooks form editor</title>
- <para>When the wizard was finished, a new Smooks configuration file was created and the Smooks editor will be opened automatically.
+ <title>Smooks form Editor</title>
+ <para>When all the wizard steps are passed, a new Smooks configuration file is created and the Smooks editor will be opened automatically.
</para>
- <para> We will see the
+ <para> You will see the
"Smooks Form Editor":
</para>
<figure>
@@ -108,15 +103,15 @@
<para> This editor contains several parts:
<orderedlist numeration="loweralpha" inheritnum="inherit">
<listitem>
- <para>Notify message display area. If there are any errors when users are editing the file,
+ <para>Notify message display area. If there are any errors when you are editing the file,
the error area will display them.</para>
</listitem>
<listitem>
- <para>Source data tree. The tree will display the structured of transform source data.</para>
+ <para>Source data tree. The tree will display the structure of transformed source data.</para>
</listitem>
<listitem>
- <para>Target data tree. The tree will display the structured of transform target data.</para>
+ <para>Target data tree. The tree will display the structure of transformed target data.</para>
</listitem>
<listitem>
@@ -125,25 +120,24 @@
<listitem>
<para>Source/Target data selection links. Click the link,
- there will open the
- <link linkend="graphicaleditor_datalink">"Data
+ and <link linkend="graphicaleditor_datalink">"Data
Selection
- Wizard"</link>
- to help user to choose the source/target
+ Wizard"</link> will be opened
+ helping you to choose the source/target
data.</para>
</listitem>
</orderedlist>
</para>
</section>
<section id="graphicaleditor_datalink">
- <title>Choose the source/target data
+ <title>Choosing the source/target data
</title>
<para>Click the data selection links to choose the transform data. The "Data Selection Wizard" is opened, and there are two data types on the list: XML and Java.
</para>
<tip>
<title>Note</title>
<para>
- There will be more and more data types on the list as the
+ There will be more and more data types on a list as the
development went on.
</para>
</tip>
@@ -159,7 +153,7 @@
<para>Select the "JavaBean Data Type" and click "Next", you will see a java class selection page:
</para>
<figure>
- <title>JavaBean data selection wizard</title>
+ <title>JavaBean Data Selection Wizard</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/java2java/java_data_selection_wizard.png"
@@ -167,11 +161,10 @@
</imageobject>
</mediaobject>
</figure>
- <para>When you finished the java class selection, click "Finish"
- , we will see, the structured of the java class was be displayed on the Source data tree. Please do the same operation with the target data link.
+ <para>When you select all the necessary java classes, click "Finish" and the structure of the java class will be displayed on the Source data tree. Please, do the same with a target data link.
</para>
<figure>
- <title>Display structure of the transform data</title>
+ <title>Displaying Structure of the Transformed Data</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/java2java/java_data_display.png"
@@ -182,9 +175,9 @@
</section>
<section id="quickstart_mapping">
<title>Mapping</title>
- <para> As you see, the source/target data tree display the structure of the java class. </para>
- <para>How to mapping it?</para>
- <para> First, we should know what is we want to transform:
+ <para> As you see, the source/target data tree displays the structure of the java class. </para>
+ <para>How to map it?</para>
+ <para> First, you should know what to transform:
<orderedlist numeration="loweralpha" inheritnum="inherit">
<listitem><para>Bind the "customerName" property of the
Order#header to
@@ -219,12 +212,12 @@
</para>
<para> Make sense?</para>
<para> OK, let's select the "customerName" item of the
- "header" item on the source data tree and start to drag it. When the drag item cross into the Mapping graphical area, we will see a connection line. Drop the item onto the "customerName" of the
+ "header" item on the source data tree and start to drag it. When the drag item crosses the Mapping graphical area, you will see a connection line. Drop the item onto the "customerName" of the
"LineOrder" on the target data view.</para>
- <para> Now there will open a dialog to ask you to connect the root node:
+ <para> Now a dialog is oped asking you to connect the root node:
</para>
<figure>
- <title>A dialog to ask user to connect the root nodes</title>
+ <title>Dialog Asking You to Connect to the Root Nodes</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/java2java/connect_rootnode.png"
@@ -232,24 +225,23 @@
</imageobject>
</mediaobject>
</figure>
- <para> Please click "Yes" to connect the root node, if you didn't do that, this dialog will open again when you connect other nodes.
+ <para> Please, click "Yes" to connect the root node, if you didn't do that, this dialog will be opened again when you connect other nodes.
</para>
<tip>
<title>Note</title>
- <para>Please
+ <para>Please,
remember that:
The root nodes of the source data
and target data
*MUST*
be connected.</para>
- <para>This rule is not only for Java-to-Java, same with
- XML-to-Java too </para>
+ <para>This rule is not only for Java-to-Java, but the same is also relevant for XML-to-Java </para>
</tip>
- <para> Now let's do the same operation with the "customerNumber", that is the what we want to see:
+ <para> Now let's do the same operation with the "customerNumber", that is what you want to see:
</para>
<figure>
- <title>Correctly mapping editor</title>
+ <title>Correctly Mapping Editor</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/java2java/java_connection1.png"
@@ -257,7 +249,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>Next, we are going to try to bind the properties of the
+ <para>Next, you are going to bind the properties of the
"OrderItem" to the properties of the "LineItem".
</para>
<para>Select the "price" and drag it onto the "unitPrice" of the other side tree viewer. The error message display area will show an error:
@@ -272,13 +264,13 @@
</mediaobject>
</figure>
<para>How to deal with the error ?</para>
- <para>Please click the "Fix it" link, there pop a menu and there are several "resolve methods" on the menu.
+ <para>Please click the "Fix it" link, a menu is popped-up with several "resolve methods" on it.
</para>
<para> Select the first resolve method: 'Connect the "OrderItem" to the
"LineItem" ', then the "OrderItem" was connected with the
"LineItem".
</para>
- <para>But the notify message area still show some other errors:
+ <para>But the notify message area still shows some other errors:
</para>
<figure>
<title>Connection Error 2</title>
@@ -289,28 +281,22 @@
</imageobject>
</mediaobject>
</figure>
- <para>OK,Deal it with the fire error ---- Click "Fix it" link and select the first resolve method. The "orderItems" was connected with the "lineItems".
+ <para>OK, let's deal with the fire error ---- Click "Fix it" link and select the first resolve method. The "orderItems" was connected with the "lineItems".
</para>
<tip>
<title>Tip</title>
<para>
- Why there will occur error?</para>
- <para> We will find that, if we only
- connect the
- property node without
- to connect the parent node of the
- property,
- the "connection error"
- will happen. </para>
+ Why does the occur error?</para>
+ <para> You will find that, if you only connect the property node without connecting the parent node of the property, the "connection error" occur</para>
<para>The
connection of
the "price-to-unitPrice" is
the "Binding
Connection",
- but there need
+ but it needs
a "Instance
Creation
- Connection" ---- the
+ Connection" -the
connection
of
the
@@ -327,8 +313,8 @@
</imageobject>
</mediaobject>
</figure>
- <para>Now, we should save the file.The Smooks tools will generate the correct configuration file contents.</para>
- <para>OK, Let run the test class: example.Main (Please make sure that the Smooks engine load the correct configuration file)
+ <para>Now, you should save the file and the Smooks tools will generate the correct configuration file content.</para>
+ <para>OK, Let run the test class: example.Main (Please, make sure that the Smooks engine loads the correct configuration file)
</para>
<para>Success!
</para>
Modified: trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml
===================================================================
--- trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml 2008-12-12 16:25:47 UTC (rev 12574)
+++ trunk/smooks/docs/reference/en/modules/smooksformeditor_graphicalpage.xml 2008-12-12 16:33:00 UTC (rev 12575)
@@ -23,18 +23,18 @@
</mediaobject>
</figure>
<para>
- This graphical editor could allow user to do drug/drop operations
+ This graphical editor could allow you to do drug/drop operations
with the nodes of transform data to mapping the source data to target
data.
</para>
<para>
- When user save the graphical editor the correct Smooks
+ When you save the graphical editor the correct Smooks
configuration file contents
will be generated.
</para>
<section>
<title>Introduce the areas of graphical editor</title>
- <para> Please read the
+ <para> Please, read the
<link linkend="quickstart_formeditor">"Quick Start/Smooks Form Editor"</link>
</para>
</section>
@@ -85,31 +85,31 @@
</para>
</section>
<section>
- <title>User the graphical editor to mapping</title>
- <para> Please read the
+ <title>Use the graphical editor to mapping</title>
+ <para> Please, read the
<link linkend="quickstart_mapping">"Quick Start/Mapping"</link>
</para>
</section>
<section>
<title>Error messages</title>
- <para> When user do any mapping operations, the Smooks tools will validate the file contents with "Mapping Logic", If there is any errors of the configuration file contents
+ <para> When you do any mapping operations, the Smooks tools will validate the file contents with "Mapping Logic", If there is any errors of the configuration file contents
,error messages will be shown on the
<link linkend="quickstart_formeditor">"Error
message area"</link>
.
</para>
- <para> Please read the
+ <para> Please, read the
<link linkend="quickstart_mapping">"Quick Start/Mapping"</link> to find how to fix the errors.
</para>
</section>
<section id="graphicalpage_propertiesview">
<title>Properties Viewer</title>
- <para> User can edit the properties of the "connection lines" with the properties viewer.
+ <para> You can edit the properties of the "connection lines" with the properties viewer.
</para>
<para> Select the menu: "Window -> Show View -> Other -> Properties", the properties viewer will be opened.
</para>
<para>
- When user select on the connection lines, the properties viewer
+ When you select on the connection lines, the properties viewer
will show a sets of section GUI for editing the properties of the
connection line.
</para>
17 years
- 1
- 0
JBoss Tools SVN: r12574 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-12-12 11:25:47 -0500 (Fri, 12 Dec 2008)
New Revision: 12574
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java
Log:
jbide-3032, Fix errors in junit tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java 2008-12-12 16:13:44 UTC (rev 12573)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java 2008-12-12 16:25:47 UTC (rev 12574)
@@ -38,9 +38,9 @@
JsfAllTests.IMPORT_PROJECT_NAME);
IEditorInput input = new FileEditorInput(file);
JSPMultiPageEditor editor = openEditor(input);
+ VpeController vpeController = TestUtil.getVpeController(editor);
int offcet = TestUtil.getLinePositionOffcet(editor.getSourceEditor().getTextViewer(), 13, 78);
editor.getSourceEditor().getTextViewer().setSelectedRange(offcet, 1);
- VpeController vpeController = (VpeController)editor.getVisualEditor().getController();
assertTrue("VE sould be visible", vpeController.isVisualEditorVisible()); //$NON-NLS-1$
assertTrue("It's should be a div","DIV".equalsIgnoreCase(vpeController.getXulRunnerEditor().getLastSelectedNode().getNodeName())); //$NON-NLS-1$//$NON-NLS-2$
VpeEditorPart editorPart = ((VpeEditorPart)editor.getVisualEditor());
17 years
- 1
- 0
JBoss Tools SVN: r12573 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-12-12 11:13:44 -0500 (Fri, 12 Dec 2008)
New Revision: 12573
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3397
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-12 16:03:18 UTC (rev 12572)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-12-12 16:13:44 UTC (rev 12573)
@@ -273,13 +273,16 @@
.replaceFirst(
"^\\s*(\\#|\\$)\\{facesContext.externalContext.requestContextPath\\}", Constants.EMPTY); //$NON-NLS-1$
- IFile file = pageContext.getVisualBuilder().getCurrentIncludeInfo()
- .getFile();
+ IFile file = null;
+ if (pageContext.getVisualBuilder().getCurrentIncludeInfo() != null)
+ file = pageContext.getVisualBuilder().getCurrentIncludeInfo()
+ .getFile();
+ if (file == null)
+ return resolvedValue;
+
resolvedValue = ElService.getInstance().replaceEl(file, resolvedValue);
-// IPath path = new Path(resolvedValue);
-
URI uri = null;
try {
uri = new URI(resolvedValue);
@@ -290,7 +293,9 @@
&& (uri.isAbsolute() || (new File(resolvedValue)).exists()))
return resolvedValue;
- return Constants.FILE_PREFIX+FileUtil.getFile(resolvedValue, file).getLocation().toOSString();
+ return Constants.FILE_PREFIX
+ + FileUtil.getFile(resolvedValue, file).getLocation()
+ .toOSString();
}
/**
17 years
- 1
- 0
JBoss Tools SVN: r12572 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 4 other directories.
by jbosstools-commits＠lists.jboss.org
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
17 years
- 1
- 0
JBoss Tools SVN: r12571 - workspace/grid/esb-example.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-12-12 10:36:23 -0500 (Fri, 12 Dec 2008)
New Revision: 12571
Modified:
workspace/grid/esb-example/transform_CSV2XML.zip
workspace/grid/esb-example/transform_XML2XML_simple.zip
Log:
change some esb samples
Modified: workspace/grid/esb-example/transform_CSV2XML.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/transform_XML2XML_simple.zip
===================================================================
(Binary files differ)
17 years
- 1
- 0