JBoss Tools SVN: r42177 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-06-22 14:42:38 -0400 (Fri, 22 Jun 2012)
New Revision: 42177
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java
Log:
https://issues.jboss.org/browse/JBIDE-10611 As-you-type CDI validation
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java 2012-06-22 16:56:54 UTC (rev 42176)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java 2012-06-22 18:42:38 UTC (rev 42177)
@@ -14,6 +14,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitDocumentProvider;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.IAnnotationAccessExtension;
@@ -69,7 +70,7 @@
*/
@Override
public int getLayer() {
- return seveirty;
+ return CompilationUnitDocumentProvider.ProblemAnnotation.DEFAULT_LAYER;
}
protected abstract String getWarningIconPath();
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r42176 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test: editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-06-22 12:56:54 -0400 (Fri, 22 Jun 2012)
New Revision: 42176
Removed:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/ScrollingTest_Jbide8701.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
Log:
https://issues.jboss.org/browse/JBIDE-11640 - old test was removed.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2012-06-22 16:55:27 UTC (rev 42175)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2012-06-22 16:56:54 UTC (rev 42176)
@@ -18,7 +18,6 @@
import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest;
import org.jboss.tools.vpe.ui.test.editor.CustomSashFormTest;
import org.jboss.tools.vpe.ui.test.editor.MultipleSelectionTest;
-import org.jboss.tools.vpe.ui.test.editor.ScrollingTest_Jbide8701;
import org.jboss.tools.vpe.ui.test.editor.ToggleClassCastTest_Jbide9790;
import org.jboss.tools.vpe.ui.test.handlers.VpeCommandsTests;
import org.jboss.tools.vpe.ui.test.preferences.VpeEditorPreferencesPageTest;
@@ -35,10 +34,8 @@
suite.addTestSuite(VpeResourcesDialogTest.class);
suite.addTestSuite(VpeEditorPreferencesPageTest.class);
suite.addTestSuite(CustomSashFormTest.class);
-// suite.addTestSuite(VpePopupMenuTest.class);
suite.addTestSuite(VpeEditAnyDialogTest.class);
suite.addTestSuite(MultipleSelectionTest.class);
-// suite.addTestSuite(ScrollingTest_Jbide8701.class);
suite.addTestSuite(ToggleClassCastTest_Jbide9790.class);
return new VpeTestSetup(suite);
}
Deleted: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/ScrollingTest_Jbide8701.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/ScrollingTest_Jbide8701.java 2012-06-22 16:55:27 UTC (rev 42175)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/ScrollingTest_Jbide8701.java 2012-06-22 16:56:54 UTC (rev 42176)
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is 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:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.ui.test.editor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.intro.IIntroManager;
-import org.eclipse.ui.intro.IIntroPart;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.jboss.tools.jst.jsp.JspEditorPlugin;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
-import org.jboss.tools.vpe.base.test.TestUtil;
-import org.jboss.tools.vpe.base.test.VpeTest;
-import org.jboss.tools.vpe.editor.VpeController;
-import org.jboss.tools.vpe.editor.VpeEditorPart;
-import org.jboss.tools.vpe.editor.mozilla.MozillaEditor;
-import org.jboss.tools.vpe.ui.test.VpeUiTests;
-import org.mozilla.interfaces.nsIDOMWindow;
-import org.mozilla.interfaces.nsIDOMWindowInternal;
-import org.mozilla.interfaces.nsIWebBrowser;
-
-public class ScrollingTest_Jbide8701 extends VpeTest {
-
- private final String INITIALIZATION_FAILED = "Initialization failed!"; //$NON-NLS-1$
- private final String FILE_NAME = "facets.jsp"; //$NON-NLS-1$
- private final long DELAY_1S = 1*1000L;
- private final long DELAY_5S = 5*1000L;
-
- public ScrollingTest_Jbide8701(String name) {
- super(name);
- }
-
- public void testScrolling_Jbide8701() throws Throwable {
- boolean testFinished = false;
- IFile file = (IFile) TestUtil.getComponentPath(FILE_NAME,
- VpeUiTests.IMPORT_PROJECT_NAME);
- assertNotNull("Specified file does not exist: file name = " + FILE_NAME //$NON-NLS-1$
- + "; project name = " + VpeUiTests.IMPORT_PROJECT_NAME, file); //$NON-NLS-1$
- /*
- * Open file in the VPE
- */
- IEditorInput input = new FileEditorInput(file);
- assertNotNull(INITIALIZATION_FAILED, input);
-
- JSPMultiPageEditor part = openEditor(input);
- assertNotNull(INITIALIZATION_FAILED, part);
-
- VpeEditorPart vep = (VpeEditorPart) part.getVisualEditor();
- assertNotNull(INITIALIZATION_FAILED, vep);
-
- VpeController vc = TestUtil.getVpeController(part);
- MozillaEditor visualEditor = vep.getVisualEditor();
- StructuredTextEditor sourceEditor = vc. getSourceEditor();
- if (visualEditor.getXulRunnerEditor() != null) {
- nsIWebBrowser webBrowser = visualEditor.getXulRunnerEditor().getWebBrowser();
- if (webBrowser != null) {
- /*
- * Initialize mozilla browser content window
- */
- nsIDOMWindow domWindow = webBrowser.getContentDOMWindow();
- nsIDOMWindowInternal windowInternal = org.jboss.tools.vpe.xulrunner.util.XPCOM
- .queryInterface(domWindow, nsIDOMWindowInternal.class);
- /*
- * Set source position -- visual part should be scrolled.
- */
- int scrollY = windowInternal.getScrollY();
- int halfHeight = windowInternal.getScrollMaxY()/2;
- assertEquals("Initital visual position is wrong", 0, scrollY); //$NON-NLS-1$
-
- sourceEditor.setFocus();
- TestUtil.delay(DELAY_5S);
- /*
- * Press CTRL+END to get to the end of the page
- */
- pressCtrlEnd(PlatformUI.getWorkbench().getDisplay());
- TestUtil.delay(DELAY_1S);
- /*
- * Press ARROW_UP several times to select element at the bottom
- */
- for (int i = 0; i < 5; i++) {
- pressKeyCode(PlatformUI.getWorkbench().getDisplay(), SWT.ARROW_UP);
- }
- TestUtil.delay(DELAY_1S);
- scrollY = windowInternal.getScrollY();
- assertTrue("Visual scrolling should be at the bottom of the page,\ncurrent scrolling opstion is " //$NON-NLS-1$
- + scrollY + ", but should be more than " + halfHeight, scrollY > halfHeight); //$NON-NLS-1$
- /*
- * Set visual position -- source part should be scrolled.
- */
- visualEditor.setFocus();
- pressKeyCode(PlatformUI.getWorkbench().getDisplay(), SWT.ARROW_UP);
- TestUtil.delay(DELAY_1S);
- domWindow.scrollTo(0,0);
- TestUtil.delay(DELAY_5S);
- int topIndex = sourceEditor.getTextViewer().getTopIndex();
- assertTrue("Top source line is wrong, top line is " + topIndex //$NON-NLS-1$
- + ", but should be less than 100", topIndex < 100); //$NON-NLS-1$
- domWindow.scrollTo(0, halfHeight);
- TestUtil.delay(DELAY_1S);
- topIndex = sourceEditor.getTextViewer().getTopIndex();
- assertTrue("Top source line for the middle position is wrong, top line is " //$NON-NLS-1$
- + topIndex + ", but should be less than 700", topIndex < 700); //$NON-NLS-1$
- testFinished = true;
- }
- }
- assertTrue("Test hasn't passed all steps", testFinished); //$NON-NLS-1$
- }
-
- public static void pressCtrlEnd(Display display) {
- Event keyPressed = new Event();
- keyPressed.keyCode = SWT.CTRL;
- keyPressed.display = display;
- keyPressed.type = SWT.KeyDown;
- display.post(keyPressed);
-
- keyPressed = new Event();
- keyPressed.keyCode = SWT.END;
- keyPressed.display = display;
- keyPressed.type = SWT.KeyDown;
- display.post(keyPressed);
-
- Event keyReleased = new Event();
- keyReleased.keyCode = SWT.END;
- keyPressed.display = display;
- keyReleased.type = SWT.KeyUp;
-
- keyReleased = new Event();
- keyReleased.keyCode = SWT.CTRL;
- keyPressed.display = display;
- keyReleased.type = SWT.KeyUp;
-
- display.post(keyReleased);
- }
-
- public static void pressKeyCode(Display display, int keyCode) {
- Event keyPressed = new Event();
- keyPressed.keyCode = keyCode;
- keyPressed.type = SWT.KeyDown;
- display.post(keyPressed);
- Event keyReleased = new Event();
- keyReleased.keyCode = keyCode;
- keyReleased.type = SWT.KeyUp;
- display.post(keyReleased);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- /*
- * Close Welcome screen if it's opened.
- */
- final IIntroManager introManager =
- PlatformUI.getWorkbench().getIntroManager();
- IIntroPart part = introManager.getIntro();
- introManager.closeIntro(part);
- /*
- * Set property to enable scroll correlation
- */
- JspEditorPlugin.getDefault().getPreferenceStore().setValue(
- IVpePreferencesPage.SYNCHRONIZE_SCROLLING_BETWEEN_SOURCE_VISUAL_PANES, true);
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- /*
- * Disable scroll correlation at the end
- */
- JspEditorPlugin.getDefault().getPreferenceStore().setValue(
- IVpePreferencesPage.SYNCHRONIZE_SCROLLING_BETWEEN_SOURCE_VISUAL_PANES, false);
- }
-
-
-}
\ No newline at end of file
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r42175 - in trunk/vpe/tests: org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-06-22 12:55:27 -0400 (Fri, 22 Jun 2012)
New Revision: 42175
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/WebContent/facets.jsp
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ScrollingSynchronizationTest.java
Removed:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/facets.jsp
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java
Log:
https://issues.jboss.org/browse/JBIDE-11640 - SWTBot test to check synchronized scrolling of visual and source part
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/WebContent/facets.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/WebContent/facets.jsp (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/WebContent/facets.jsp 2012-06-22 16:55:27 UTC (rev 42175)
@@ -0,0 +1,1308 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+
+<html>
+<head>
+<title></title>
+<link href="/css/main.css" rel="stylesheet" type="text/css" />
+<style type="text/css">
+h1 {
+ background-color: white;
+}
+
+.label {
+ font-weight: bold;
+}
+
+.whiteLine {
+ background-color: white;
+ border: 1px solid black;
+}
+
+.panel {
+ background-color: SteelBlue;
+ border: 1px solid black;
+ vertical-align: top;
+}
+
+.goldPanel {
+ background-color: gold;
+ border: 1px solid black;
+}
+
+.greenPanel {
+ background-color: forestGreen;
+ border: 1px solid black;
+}
+
+.indianRedPanel {
+ background-color: IndianRed;
+ border: 1px solid black;
+}
+
+.thistlePanel {
+ background-color: thistle;
+ border: 1px solid black;
+}
+
+.orangePanel {
+ background-color: orange;
+ border: 1px solid black;
+}
+
+.darkBluePanel {
+ background-color: DarkSlateBlue;
+ border: 1px solid black;
+}
+
+.darkVioletPanel {
+ background-color: DarkViolet;
+ border: 1px solid black;
+}
+</style>
+</head>
+<body>
+<f:view>
+ <h1>1) h:panelGrid</h1>
+
+ <h:panelGrid columns="2" styleClass="panel">
+ <h:panelGrid columns="2" border="5" width="150" rules="all"
+ frame="above" cellpadding="4" cellspacing="6" bgcolor="silver"
+ style="COLOR: #ff0080; BACKGROUND-COLOR: #ffff00; TEXT-DECORATION: underline; FONT-STYLE: italic; FONT-WEIGHT: bold; FONT-SIZE: medium; FONT-FAMILY: 'Arial Black';"
+ styleClass="goldPanel" captionClass="myStyle0" columnClasses=""
+ rowClasses="" headerClass="" footerClass="">
+ <f:facet name="footer">
+ <h:commandButton value="CB">CB</h:commandButton>
+ <p>part 111</p>
+ <p>part 222</p>
+ <input type="button" value="Input Button">Input Button</input>
+ Just Text
+ </f:facet>
+ <h:outputText value="begin" />
+
+ </h:panelGrid>
+ <h:panelGrid columns="2" border="5" width="150" rules="all"
+ frame="above" cellpadding="4" cellspacing="6" bgcolor="silver"
+ style="COLOR: #ff0080; BACKGROUND-COLOR: green; TEXT-DECORATION: underline; FONT-STYLE: italic; FONT-WEIGHT: bold; FONT-SIZE: small; FONT-FAMILY: 'Arial Black';"
+ styleClass="greenPanel" captionClass="myStyle0" columnClasses=""
+ rowClasses="" headerClass="" footerClass="">
+ <f:facet name="footer">
+ <p>part 111</p>
+ <p>part 222</p>
+ <input type="button" value="Input Button">Input Button</input>
+ Just Text
+ </f:facet>
+ <h:outputText value="begin" />
+ </h:panelGrid>
+ </h:panelGrid>
+
+ <h1>2) h:dataTable</h1>
+
+<h:dataTable border="1">
+ <f:facet name="header">
+<h:outputText value="AAAAAAA" />
+HHHHHHH1111Text111111
+<h:outputText value="BBBBBBBBBBBBBBB" />
+HHHHHHH222Text2222222
+</f:facet>
+</h:dataTable>
+
+ <h:panelGrid columns="4" border="1" styleClass="panel">
+ <h:panelGroup>
+ <h:outputText styleClass="whiteLine"> Correct table </h:outputText>
+ <h:dataTable value="#{user.list}" var="item" styleClass="goldPanel">
+ <f:facet name="header">
+ <h:outputText>Header</h:outputText>
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText>Footer</h:outputText>
+ </f:facet>
+ <f:facet name="caption">
+ <h:outputText>Caption</h:outputText>
+ </f:facet>
+ <h:column>
+ <h:outputText>Column 1</h:outputText>
+ </h:column>
+ </h:dataTable>
+ </h:panelGroup>
+
+ <h:panelGroup>
+ <h:outputText styleClass="whiteLine">
+ Plain HTML in facets with JSF tags
+ <p></p>
+ And plus the second jsf components in facets
+ </h:outputText>
+ <h:dataTable value="#{user.list}" var="item" border="1"
+ styleClass="greenPanel">
+ <f:facet name="header">
+ <h:outputText>Header</h:outputText>
+ <h:outputText>Header2</h:outputText>
+ <p>Part 111</p>
+ Some HTML text
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText>Footer</h:outputText>
+ <h:outputText>Footer2</h:outputText>
+ <p>Part 111</p>
+ Some HTML text
+ </f:facet>
+ <f:facet name="caption">
+ <h:outputText>Caption</h:outputText>
+ <p>Part 111</p>
+ Some HTML text
+ </f:facet>
+ </h:dataTable>
+ </h:panelGroup>
+
+ <h:panelGroup>
+ <h:outputText styleClass="whiteLine"> Only plain HTML in Caption </h:outputText>
+ <h:dataTable value="#{user.list}" var="item" border="1"
+ styleClass="indianRedPanel">
+ <f:facet name="header">
+ <h:outputText>Header1</h:outputText>
+ <h:outputText>Header2</h:outputText>
+ <h:outputText>Header3</h:outputText>
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText>Footer1</h:outputText>
+ <h:outputText>Footer2</h:outputText>
+ <h:outputText>Footer3</h:outputText>
+ </f:facet>
+ <f:facet name="caption">
+ <p>Part 111</p>
+ Some HTML text
+ </f:facet>
+ <h:column>
+ <h:outputText>Column 1</h:outputText>
+ </h:column>
+ <h:column>
+ <h:outputText>Column 2</h:outputText>
+ </h:column>
+ <h:column>
+ <h:outputText>Column 3</h:outputText>
+ </h:column>
+ </h:dataTable>
+ </h:panelGroup>
+
+ <h:panelGroup>
+ <h:outputText styleClass="whiteLine"> Only plain HTML in facets and columns </h:outputText>
+ <h:dataTable value="#{user.list}" var="item"
+ styleClass="thistlePanel">
+ <f:facet name="header">
+ <p>Part 111</p>
+ Some HTML text
+ </f:facet>
+ <f:facet name="footer">
+ <p>Part 111</p>
+ Some HTML text
+ </f:facet>
+ <f:facet name="caption">
+ <p>Part 111</p>
+ Some HTML text
+ </f:facet>
+ <h:column>
+ <h:outputText>Column 1</h:outputText>
+ </h:column>
+ <h:column>
+ <h:outputText>Column 2</h:outputText>
+ </h:column>
+ <h:column>
+ <h:outputText>Column 3</h:outputText>
+ </h:column>
+ </h:dataTable>
+ </h:panelGroup>
+
+ </h:panelGrid>
+
+ <h1>3) h:column</h1>
+ <h:outputText> Correct table </h:outputText>
+ <h:dataTable value="#{user.list}" var="item" styleClass="panel"
+ columnClasses="goldPanel">
+ <f:facet name="header">
+ <h:outputText>Table Header</h:outputText>
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText>Table Footer</h:outputText>
+ </f:facet>
+ <f:facet name="caption">
+ <h:outputText styleClass="whiteLine">Table Caption</h:outputText>
+ </f:facet>
+ <h:column footerClass="greenPanel" headerClass="greenPanel">
+ <f:facet name="header">
+ <h:outputText>Col 1 header1</h:outputText>
+ <h:outputText>Col 1 header2</h:outputText>
+ <h:outputText>Col 1 header3</h:outputText>
+ <span>COL1HEAD</span> C1HText
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText>Col 1 footer1</h:outputText>
+ <h:outputText>Col 1 footer2</h:outputText>
+ <h:outputText>Col 1 footer3</h:outputText>
+ <span>COL1FOOT</span> C1FText
+ </f:facet>
+ <h:outputText>[Column 1] </h:outputText>
+ <h:outputText value="#{item}" />
+ </h:column>
+ <h:column footerClass="indianRedPanel" headerClass="indianRedPanel">
+ <f:facet name="header">
+ <span>COL2HEAD</span> C2FHead
+ </f:facet>
+ <f:facet name="footer">
+ <span>COL2FOOT</span> C2FText
+ </f:facet>
+ <h:outputText>[Column 2] </h:outputText>
+ <h:outputText value="#{item}" />
+ </h:column>
+ <h:column footerClass="thistlePanel" headerClass="thistlePanel">
+ <f:facet name="header">
+ <f:facet name="header">
+ <span>COL3HEAD</span> C3FHead
+ </f:facet>
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText>Col 3 footer</h:outputText>
+ </f:facet>
+ <h:outputText>[Column 3] </h:outputText>
+ <h:outputText value="#{item}" />
+ </h:column>
+ </h:dataTable>
+
+ <h1>4) rich:panel</h1>
+ <rich:panel>
+ <f:facet name="header">
+ PHead111
+ <h:outputText>PanelHeader1</h:outputText>
+ <h:outputText>PanelHeader2</h:outputText>
+ <h:outputText>PanelHeader3</h:outputText>
+ <span>P1Head</span> PHead
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText>Col 1 footer3</h:outputText>
+ <span>COL1FOOT</span> C1FText
+ FooterFacet
+ </f:facet>
+ Panel Content
+ </rich:panel>
+
+ <h1>5) rich:simpleTogglePanel</h1>
+ <rich:simpleTogglePanel id="simpleTogglePanel" switchType="client"
+ label="STP LABEL">
+ <f:facet name="header">
+ STPHead111
+ <h:outputText>STPHeader1</h:outputText>
+ <h:outputText>STPHeader2</h:outputText>
+ <h:outputText>STPHeader3</h:outputText>
+ <span>STP1Head</span> STPHead
+ </f:facet>
+ <f:facet name="footer">
+ STPFoot111
+ <h:outputText>STPFooter1</h:outputText>
+ <h:outputText>STPFooter2</h:outputText>
+ <h:outputText>STPFooter3</h:outputText>
+ <span>STP1Foot</span> STPFoot
+ </f:facet>
+ [rich:simpleTogglePanel CONTENT]
+ </rich:simpleTogglePanel>
+
+ <h1>6) rich:togglePanel</h1>
+ <rich:togglePanel switchType="client" stateOrder="closed,tip1,tip2">
+ <f:facet name="closed">
+ <h:outputText value="Closed" />
+ <rich:toggleControl>
+ <rich:toggleControl switchToState="tip1" value="#{user.next}" />
+ </rich:toggleControl>
+ </f:facet>
+ <f:facet name="tip1">
+ <h:outputText value="TIP 1" />
+ <h:panelGrid columns="2">
+ <rich:toggleControl switchToState="closed" value="#{user.close}" />
+ <rich:toggleControl switchToState="tip2" value="#{user.next}" />
+ </h:panelGrid>
+ </f:facet>
+ <f:facet name="tip2">
+ <h:outputText value="TIP 2" />
+ <h:panelGrid columns="2">
+ <rich:toggleControl switchToState="closed" value="#{user.close}" />
+ <rich:toggleControl switchToState="tip1" value="#{user.previous}" />
+ </h:panelGrid>
+ </f:facet>
+ </rich:togglePanel>
+ <rich:togglePanel switchType="client" stateOrder="tip2,tip1,closed">
+ <f:facet name="closed">
+ STPFoot111
+ <h:outputText>STPFooter1</h:outputText>
+ <h:outputText>STPFooter2</h:outputText>
+ <h:outputText>STPFooter3</h:outputText>
+ <span>STP1Foot</span> STPFoot
+ <h:outputText value="CLOSE" />
+ </f:facet>
+ <f:facet name="tip1">
+ <h:panelGroup>
+ <h:outputText value="TIPPPP111" />
+ <rich:toggleControl switchToState="tip2" value="#{user.next}" />
+ <h:outputText value="TIPPPP111" />
+ </h:panelGroup>
+ <h:outputText value="TIPPP222222" />
+ </f:facet>
+ <f:facet name="tip2">
+ <h:outputText value="TIP 2" />
+ </f:facet>
+ </rich:togglePanel>
+
+ <h1>7) tabPanel</h1>
+ <h:panelGrid columns="3">
+
+ <rich:tabPanel switchType="ajax">
+ <rich:tab label="First">
+ Here is tab #1
+ </rich:tab>
+ <rich:tab label="Second" disabled="true">
+ Here is tab #2
+ </rich:tab>
+ <rich:tab label="Third">
+ Here is tab #3
+ </rich:tab>
+ </rich:tabPanel>
+
+ <rich:tabPanel switchType="ajax">
+ <rich:tab label="First">
+ <f:facet name="label">
+ Tab Label 1
+ <h:outputText>Tab Label 111</h:outputText>
+ <h:outputText>Tab Label 222</h:outputText>
+ <h:outputText>Tab Label 333</h:outputText>
+ <span>TabLabelSpan1 </span> TabLabelSpan2
+ </f:facet>
+ Here is tab #1
+ </rich:tab>
+ <rich:tab disabled="true">
+ <f:facet name="label">
+ Tab Label 2
+ <h:outputText>Tab Label 2-111</h:outputText>
+ <h:outputText>Tab Label 2-222</h:outputText>
+ <h:outputText>Tab Label 2-333</h:outputText>
+ <span>TabLabelSpan2-1 </span> TabLabelSpan2-2
+ </f:facet>
+ Here is tab #2
+ </rich:tab>
+ <rich:tab label="Third">
+ Here is tab #3
+ </rich:tab>
+ </rich:tabPanel>
+ </h:panelGrid>
+
+ <br></br>
+ <h1>8) rich:dataTable</h1>
+ <br></br>
+
+ <h:panelGrid styleClass="panel" columns="3">
+
+ <rich:dataTable var="row" value="#{user.list}" rowKeyVar="rowKey"
+ rowClasses="goldPanel panel" columns="2">
+ <f:facet name="header">
+ <rich:columnGroup>
+ <rich:column rowspan="2">
+ <rich:spacer />
+ </rich:column>
+ <rich:column colspan="3">
+ <h:outputText value="FIELDS" />
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="field1" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="field2" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="field3" />
+ </rich:column>
+ </rich:columnGroup>
+ </f:facet>
+
+
+ <rich:columnGroup>
+ <rich:column>
+ <h:outputText value="#{rowKey}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{row}">
+ </h:outputText>
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{row}">
+ </h:outputText>
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{row}">
+ </h:outputText>
+ </rich:column>
+ </rich:columnGroup>
+
+ <f:facet name="footer">
+
+ <rich:columnGroup>
+ <rich:column></rich:column>
+ <rich:column>
+ <h:outputText value="footer1" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="footer2" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="footer3" />
+ </rich:column>
+
+ </rich:columnGroup>
+ </f:facet>
+
+ </rich:dataTable>
+
+ <rich:dataTable var="row" value="#{user.list}" rowKeyVar="rowKey"
+ rowClasses="goldPanel panel">
+ <f:facet name="caption">
+ TableCaptionText
+ <h:outputText>Caption 1</h:outputText>
+ <h:outputText>Caption 2</h:outputText>
+ <h:outputText>Caption 3</h:outputText>
+ <span>TableCaption1</span> TableCaption2
+ </f:facet>
+ <f:facet name="header">
+ Table1HText2
+ <h:outputText>Table header1</h:outputText>
+ <h:outputText>Table header2</h:outputText>
+ <h:outputText>Table header3</h:outputText>
+ <span>Table1HEAD</span> Table1HText2
+ </f:facet>
+ <f:facet name="footer">
+ TableC1FText2
+ <h:outputText>Table FOOTER1</h:outputText>
+ <h:outputText>Table FOOTER2</h:outputText>
+ <h:outputText>Table FOOTER3</h:outputText>
+ <span>Table1FOOT</span> Table1FText2
+ </f:facet>
+
+ <rich:column>
+ <h:outputText value="#{rowKey}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{row}">
+ </h:outputText>
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{row}">
+ </h:outputText>
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{row}">
+ </h:outputText>
+ </rich:column>
+
+ </rich:dataTable>
+ </h:panelGrid>
+
+ <br></br>
+ <h1>9) rich:column</h1>
+
+ <h:panelGrid styleClass="panel" columns="3">
+
+ <rich:dataTable var="row" value="#{user.list}" rowKeyVar="rowKey"
+ rowClasses="greenPanel">
+ <f:facet name="header">
+ Table1HText2
+ <h:outputText>Table header1</h:outputText>
+ <h:outputText>Table header2</h:outputText>
+ <h:outputText>Table header3</h:outputText>
+ <span>Table1HEAD</span> Table1HText2
+ </f:facet>
+ <f:facet name="footer">
+ TableC1FText2
+ <h:outputText>Table FOOTER1</h:outputText>
+ <h:outputText>Table FOOTER2</h:outputText>
+ <h:outputText>Table FOOTER3</h:outputText>
+ <span>Table1FOOT</span> Table1FText2
+ </f:facet>
+
+ <rich:column>
+ <h:outputText value="#{rowKey}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText>Col 1 header1</h:outputText>
+ <h:outputText>Col 1 header2</h:outputText>
+ <h:outputText>Col 1 header3</h:outputText>
+ <span>COL1HEAD</span> C1HText
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText>Col 1 footer1</h:outputText>
+ <h:outputText>Col 1 footer2</h:outputText>
+ <h:outputText>Col 1 footer3</h:outputText>
+ <span>COL1FOOT</span> C1FText
+ </f:facet>
+ <h:outputText value="[column 1] #{row}">
+ </h:outputText>
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <span>COL2HEAD</span> C2FHead
+ </f:facet>
+ <f:facet name="footer">
+ <span>COL2FOOT</span> C2FText
+ </f:facet>
+ <h:outputText value="[column 2] #{row}">
+ </h:outputText>
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <span>COL3HEAD</span> C3Head
+ <h:outputText value="[header 3]" />
+ </f:facet>
+ <f:facet name="footer">
+ <span>COL3FOOT</span> C3Foot
+ <h:outputText value="[footer 3]" />
+ </f:facet>
+ <h:outputText value="[column 3] #{row}">
+ </h:outputText>
+ </rich:column>
+
+ </rich:dataTable>
+ </h:panelGrid>
+
+ <h1>10) rich:subTable</h1>
+ <h:panelGrid columns="3" styleClass="panel">
+ <rich:dataTable value="#{user.users}" var="users" border="1">
+ <rich:column colspan="3" styleClass="orangePanel">
+ <h:outputText value="#{users.name} #{users.lastName}" />
+ </rich:column>
+
+ <rich:subTable value="#{users.list}" var="book1"
+ rowClasses="goldPanel, greenPanel">
+ <rich:column>
+ <h:outputText value="#{book1}" />
+ </rich:column>
+ <rich:column colspan="2" breakBefore="true">
+ <h:outputText value="#{book1}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book1}" />
+ </rich:column>
+ </rich:subTable>
+
+ <rich:subTable value="#{user.list}" var="book2"
+ columnClasses="indianRedPanel, thistlePanel">
+ <rich:column rowspan="2">
+ <h:outputText value="#{book2}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book2}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book2}" />
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="#{book2}" />
+ </rich:column>
+ <rich:column rowspan="2">
+ <h:outputText value="#{book2}" />
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="#{book2}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book2}" />
+ </rich:column>
+ <rich:column colspan="2" breakBefore="true">
+ <h:outputText value="#{book2}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book2}" />
+ </rich:column>
+ </rich:subTable>
+ </rich:dataTable>
+
+ <rich:dataTable value="#{user.users}" var="users" border="1">
+ <rich:column colspan="3" styleClass="orangePanel">
+ <h:outputText value="#{users.name} #{users.lastName}" />
+ </rich:column>
+
+ <rich:subTable value="#{users.list}" var="book3"
+ rowClasses="goldPanel, greenPanel" headerClass="darkVioletPanel"
+ footerClass="darkBluePanel">
+
+ <f:facet name="caption">
+ TableCaptionText
+ <h:outputText>Caption 1</h:outputText>
+ <h:outputText>Caption 2</h:outputText>
+ <h:outputText>Caption 3</h:outputText>
+ <span>TableCaption1</span> TableCaption2
+ </f:facet>
+ <f:facet name="header">
+ Table1HText2
+ <h:outputText>Table header1</h:outputText>
+ <h:outputText>Table header2</h:outputText>
+ <h:outputText>Table header3</h:outputText>
+ <span>Table1HEAD</span> Table1HText2
+ </f:facet>
+ <f:facet name="footer">
+ TableC1FText2
+ <h:outputText>Table FOOTER1</h:outputText>
+ <h:outputText>Table FOOTER2</h:outputText>
+ <h:outputText>Table FOOTER3</h:outputText>
+ <span>Table1FOOT</span> Table1FText2
+ </f:facet>
+
+ <rich:column>
+ <h:outputText value="#{book3}" />
+ </rich:column>
+ <rich:column colspan="2" breakBefore="true">
+ <h:outputText value="#{book3}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book3}" />
+ </rich:column>
+ </rich:subTable>
+
+ <rich:subTable value="#{user.list}" var="book4"
+ columnClasses="indianRedPanel, thistlePanel"
+ headerClass="darkVioletPanel" footerClass="darkBluePanel">
+
+ <f:facet name="caption">
+ TableCaptionText
+ <h:outputText>Caption 1</h:outputText>
+ <h:outputText>Caption 2</h:outputText>
+ <h:outputText>Caption 3</h:outputText>
+ <span>TableCaption1</span> TableCaption2
+ </f:facet>
+ <f:facet name="header">
+ Table1HText2
+ <h:outputText>Table header1</h:outputText>
+ <h:outputText>Table header2</h:outputText>
+ <h:outputText>Table header3</h:outputText>
+ <span>Table1HEAD</span> Table1HText2
+ </f:facet>
+ <f:facet name="footer">
+ TableC1FText2
+ <h:outputText>Table FOOTER1</h:outputText>
+ <h:outputText>Table FOOTER2</h:outputText>
+ <h:outputText>Table FOOTER3</h:outputText>
+ <span>Table1FOOT</span> Table1FText2
+ </f:facet>
+
+ <rich:column rowspan="2">
+ <h:outputText value="#{book4}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book4}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book4}" />
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="#{book4}" />
+ </rich:column>
+ <rich:column rowspan="2">
+ <h:outputText value="#{book4}" />
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="#{book4}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book4}" />
+ </rich:column>
+ <rich:column colspan="2" breakBefore="true">
+ <h:outputText value="#{book4}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book4}" />
+ </rich:column>
+ </rich:subTable>
+ </rich:dataTable>
+
+ <rich:dataTable value="#{user.users}" var="users" border="1">
+ <rich:column colspan="4" styleClass="orangePanel">
+ <h:outputText value="#{users.name} #{users.lastName}" />
+ </rich:column>
+
+ <rich:subTable value="#{users.list}" var="book5"
+ rowClasses="goldPanel, greenPanel">
+ <rich:column headerClass="darkVioletPanel"
+ footerClass="darkBluePanel">
+ <f:facet name="header">
+ <h:outputText>Col 111111111 header1</h:outputText>
+ <h:outputText>Col 111111111 header2</h:outputText>
+ <h:outputText>Col 111111111 header3</h:outputText>
+ <span>COL1111111111HEAD</span> C1111111111HText
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText>Col 1111111111 footer1</h:outputText>
+ <h:outputText>Col 1111111111 footer2</h:outputText>
+ <h:outputText>Col 1111111111 footer3</h:outputText>
+ <span>COL1111111111FOOT</span> C1111111111FText
+ </f:facet>
+ <h:outputText value="#{book5}" />
+ </rich:column>
+ <rich:column colspan="2" breakBefore="true"
+ headerClass="darkVioletPanel" footerClass="darkBluePanel">
+ <f:facet name="header">
+ <span>COL2HEAD</span> C2FHead
+ </f:facet>
+ <f:facet name="footer">
+ <span>COL2FOOT</span> C2FText
+ </f:facet>
+
+ <h:outputText value="#{book5}" />
+ </rich:column>
+ <rich:column headerClass="darkVioletPanel"
+ footerClass="darkBluePanel">
+ <f:facet name="header">
+ <span>COL3HEAD</span> C3Head
+ <h:outputText value="[header 3]" />
+ </f:facet>
+ <f:facet name="footer">
+ <span>COL3FOOT</span> C3Foot
+ <h:outputText value="[footer 3]" />
+ </f:facet>
+ <h:outputText value="#{book5}" />
+ </rich:column>
+ </rich:subTable>
+
+ <rich:subTable value="#{user.list}" var="book6"
+ columnClasses="indianRedPanel, thistlePanel" headerClass="goldPanel"
+ footerClass="thistlePanel">
+ <rich:column rowspan="2" headerClass="darkVioletPanel"
+ footerClass="darkBluePanel">
+ <f:facet name="header">
+ <h:outputText>Col 12222222 header1</h:outputText>
+ <h:outputText>Col 12222222 header2</h:outputText>
+ <h:outputText>Col 12222222 header3</h:outputText>
+ <span>COL12222222HEAD</span> C12222222HText
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText>Col 12222222 footer1</h:outputText>
+ <h:outputText>Col 12222222 footer2</h:outputText>
+ <h:outputText>Col 12222222 footer3</h:outputText>
+ <span>COL12222222FOOT</span> C12222222FText
+ </f:facet>
+ <h:outputText value="#{book6}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <span>COL22222222HEAD</span> C22222222FHead
+ </f:facet>
+ <f:facet name="footer">
+ <span>COL22222222FOOT</span> C22222222FText
+ </f:facet>
+ <h:outputText value="#{book6}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <span>COL32222222HEAD</span> C32222222Head
+ <h:outputText value="[header 3]2222222" />
+ </f:facet>
+ <f:facet name="footer">
+ <span>COL32222222FOOT</span> C32222222Foot
+ <h:outputText value="[footer 3]" />
+ </f:facet>
+ <h:outputText value="#{book6}" />
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="#{book6}" />
+ </rich:column>
+ <rich:column rowspan="2">
+ <h:outputText value="#{book6}" />
+ </rich:column>
+ <rich:column breakBefore="true">
+ <h:outputText value="#{book6}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book6}" />
+ </rich:column>
+ <rich:column colspan="2" breakBefore="true">
+ <h:outputText value="#{book6}" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="#{book6}" />
+ </rich:column>
+ </rich:subTable>
+ </rich:dataTable>
+ </h:panelGrid>
+
+ <h1>11) rich:extendedDataTable</h1>
+ <h:panelGrid columns="3" styleClass="panel">
+ <rich:extendedDataTable value="#{user.list}" var="item1" width="200px"
+ height="200px">
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText>Header</h:outputText>
+ </f:facet>
+ <h:outputText value="#{item1}" />
+ </rich:column>
+ </rich:extendedDataTable>
+
+ <rich:extendedDataTable value="#{user.list}" var="item" width="500px"
+ height="200px">
+ <rich:column sortable="false">
+ <f:facet name="header">
+ <h:outputText value="Flag" />
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="Footer1" />
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:column>
+ <rich:column sortable="true">
+ <f:facet name="header">
+ <h:outputText value="State Name" />
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="Footer2" />
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="State Capital" />
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="Footer3" />
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:column>
+ <rich:column sortable="false">
+ <f:facet name="header">
+ <h:outputText value="Time Zone" />
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="Footer4" />
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:column>
+ </rich:extendedDataTable>
+
+ <rich:extendedDataTable value="#{user.list}" var="item" width="600px"
+ height="200px">
+ <rich:column sortable="false">
+ <f:facet name="header">
+ <h:outputText value="F1" />
+ <h:outputText value="F2" />
+ <h:outputText value="F3" />
+ <span>S1</span> T1
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="FF1" />
+ <h:outputText value="FF2" />
+ <h:outputText value="FF3" />
+ <span>SS1</span> TT1
+ </f:facet>
+
+ <h:outputText value="#{item}" />
+ </rich:column>
+ <rich:column sortable="true">
+ <f:facet name="header">
+ <span>COL2HEAD</span> C2FHead
+ </f:facet>
+ <f:facet name="footer">
+ <span>COL2FOOT</span> C2FText
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="State Capital" />
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:column>
+ <rich:column sortable="false" width="300px">
+ <f:facet name="header">
+ <h:outputText value="Time Zone" />
+ <span>COL3HEAD</span> C3Head
+ <h:outputText value="[header 3]" />
+ </f:facet>
+ <f:facet name="footer">
+ <span>COL3FOOT</span> C3Foot
+ <h:outputText value="[footer 3]" />
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:column>
+ </rich:extendedDataTable>
+ </h:panelGrid>
+
+ <h1>12) rich:dataGrid</h1>
+
+ <h:panelGrid columns="2" styleClass="panel">
+ <rich:dataGrid value="#{user.list}" var="item" columns="2"
+ elements="4">
+ <f:facet name="caption">
+ <h:outputText value="Caption #{item}"></h:outputText>
+ </f:facet>
+ <f:facet name="header">
+ <h:outputText value="Header #{item}"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:dataGrid>
+
+ <rich:dataGrid value="#{user.list}" var="item" columns="3"
+ elements="3">
+ <f:facet name="caption">
+ <p>Part 111</p>
+ Some HTML text
+ </f:facet>
+ <f:facet name="header">
+ <span>HEAD</span>
+ <h:outputText value="#{item}"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:dataGrid>
+
+ <rich:dataGrid value="#{user.list}" var="item" columns="2"
+ elements="6">
+ <f:facet name="header">
+ HEAD
+ <h:outputText value="#{item}"></h:outputText>
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:dataGrid>
+
+ <rich:dataGrid value="#{user.list}" var="item" columns="2"
+ elements="3">
+ <f:facet name="caption">
+ CText1
+ <h:outputText value="C1" />
+ <h:outputText value="C2" />
+ <h:outputText value="C3" />
+ <span>CapS1</span> CapT1
+ </f:facet>
+ <f:facet name="header">
+ W1
+ <h:outputText value="F1" />
+ <h:outputText value="F2" />
+ <h:outputText value="F3" />
+ <span>S1</span> T1
+ </f:facet>
+ <f:facet name="footer">
+ WW1
+ <h:outputText value="FF1" />
+ <h:outputText value="FF2" />
+ <h:outputText value="FF3" />
+ <span>SS1</span> TT1
+ </f:facet>
+ <h:outputText value="#{item}" />
+ </rich:dataGrid>
+ <rich:dataGrid value="#{user.list}" var="item" columns="2"
+ elements="4">
+ <h:outputText value="#{item}" />
+ </rich:dataGrid>
+ </h:panelGrid>
+
+ <h1>13) rich:dataDefinitionList</h1>
+
+ <h:panelGrid columns="3" styleClass="panel">
+
+ <rich:dataDefinitionList var="car" value="#{user.list}" rows="3"
+ first="2" title="Cars" styleClass="greenPanel">
+ <f:facet name="term">
+ <h:outputText value="#{car}"></h:outputText>
+ </f:facet>
+ <h:outputText value="Price:" styleClass="label"></h:outputText>
+ <h:outputText value="#{car}" />
+ <br />
+ <h:outputText value="Mileage:" styleClass="label"></h:outputText>
+ <h:outputText value="#{car}" />
+ <br />
+ </rich:dataDefinitionList>
+
+ <rich:dataDefinitionList var="car" value="#{user.list}" rows="3"
+ first="2" title="Cars" styleClass="greenPanel">
+ <f:facet name="term">
+ <h:outputText value="[term]"></h:outputText>
+ </f:facet>
+ <f:facet name="header">
+ <h:outputText value="[header]"></h:outputText>
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="[footer]"></h:outputText>
+ </f:facet>
+ <h:outputText value="Price:" styleClass="label"></h:outputText>
+ <h:outputText value="#{car}" />
+ <br />
+ </rich:dataDefinitionList>
+
+ <rich:dataDefinitionList var="car" value="#{user.list}" rows="3"
+ first="2" title="Cars" styleClass="greenPanel">
+ <f:facet name="caption">
+ CText1
+ <h:outputText value="C1" />
+ <h:outputText value="C2" />
+ <h:outputText value="C3" />
+ <span>CapS1</span> CapT1
+ </f:facet>
+ <f:facet name="header">
+ W1
+ <h:outputText value="F1" />
+ <h:outputText value="F2" />
+ <h:outputText value="F3" />
+ <span>S1</span> T1
+ </f:facet>
+ <f:facet name="term">
+ Term1
+ <h:outputText value="T1" />
+ <h:outputText value="T2" />
+ <h:outputText value="T3" />
+ <span>TS1</span> TT1
+ </f:facet>
+ <f:facet name="myfacet">
+ MYF1
+ <h:outputText value="MYF-OUT-1" />
+ <h:outputText value="MYF-OUT-2" />
+ <h:outputText value="MYF-OUT-3" />
+ <span>MYF-S1</span> MYF-T1
+ </f:facet>
+ <f:facet name="footer">
+ WW1
+ <h:outputText value="FF1" />
+ <h:outputText value="FF2" />
+ <h:outputText value="FF3" />
+ <span>SS1</span> TT1
+ </f:facet>
+ <h:outputText value="Mileage:" styleClass="label"></h:outputText>
+ <h:outputText value="#{car}" />
+ myt1
+ <h:outputText value="myt1" />
+ <h:outputText value="myt2" />
+ <h:outputText value="myt3" />
+ <span>myt-S1</span> myt-T1
+ <br />
+ </rich:dataDefinitionList>
+ </h:panelGrid>
+
+ <h1>14) rich:inplaceInput</h1>
+ <h:panelGrid columns="3" styleClass="panel">
+ <rich:inplaceInput value="#{user.name}" showControls="true" />
+ <rich:inplaceInput value="#{user.name}" showControls="true">
+ <f:facet name="controls">
+ <h:panelGroup>
+ <h:commandButton value="Save" type="button" />
+ <h:commandButton value="Close" type="button" />
+ </h:panelGroup>
+ </f:facet>
+ </rich:inplaceInput>
+
+ <rich:inplaceInput value="#{user.name}" showControls="true">
+ <f:facet name="controls">
+ <h:commandButton value="Save" type="button" />
+ <h:commandButton value="Close" type="button" />
+ </f:facet>
+ </rich:inplaceInput>
+
+ <rich:inplaceInput value="#{user.name}" showControls="true">
+ <f:facet name="controls">
+ <h:commandButton value="Save" type="button" />
+ <h:commandButton value="Close" type="button" />
+ </f:facet>
+ myt1
+ <h:outputText value="myt1" />
+ <h:outputText value="myt2" />
+ <h:outputText value="myt3" />
+ <span>myt-S1</span> myt-T1
+ <br />
+ </rich:inplaceInput>
+
+ <rich:inplaceInput value="#{user.name}" showControls="true">
+ <f:facet name="controls">
+ <h:commandButton value="Save" type="button" />
+ <h:commandButton value="Close" type="button" />
+ </f:facet>
+ <f:facet name="header">
+ W1
+ <h:outputText value="F1" />
+ <h:outputText value="F2" />
+ <h:outputText value="F3" />
+ <span>S1</span> T1
+ </f:facet>
+ <f:facet name="term">
+ Term1
+ <h:outputText value="T1" />
+ <h:outputText value="T2" />
+ <h:outputText value="T3" />
+ <span>TS1</span> TT1
+ </f:facet>
+ myt1
+ <h:outputText value="myt1" />
+ <h:outputText value="myt2" />
+ <h:outputText value="myt3" />
+ <span>myt-S1</span> myt-T1
+ <br />
+ </rich:inplaceInput>
+
+ <rich:inplaceInput value="#{user.name}" showControls="true">
+ <f:facet name="controls">
+ WW1
+ <h:outputText value="FF1" />
+ <h:outputText value="FF2" />
+ <h:outputText value="FF3" />
+ <span>SS1</span> TT1
+ </f:facet>
+ </rich:inplaceInput>
+
+ </h:panelGrid>
+
+<h1> 15) rich:orderingList </h1>
+
+<h:panelGrid columns="3" styleClass="panel">
+
+<rich:orderingList value="#{user.list}" var="item" listHeight="300" listWidth="350">
+ <f:facet name="caption">
+ <h:outputText value="List Caption" />
+ </f:facet>
+ <rich:column width="180">
+ <f:facet name="header">
+ <h:outputText value="Song Name" />
+ </f:facet>
+ <h:outputText value="[You must be evil] #{item}"></h:outputText>
+ </rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Artist Name" />
+ </f:facet>
+ <h:outputText value="[Chris Rea] #{item}"></h:outputText>
+ </rich:column>
+ </rich:orderingList>
+
+ <rich:orderingList value="#{user.list}" var="item" controlsHorizontalAlign="left">
+ <f:facet name="heder">
+ CCCW1
+ <h:outputText value="CCCF1" />
+ <h:outputText value="CCCF2" />
+ <h:outputText value="CCCF3" />
+ <span>CCCS1</span> CCCT1
+ </f:facet>
+ <f:facet name="caption">
+ CCCW1
+ <h:outputText value="CCCF1" />
+ <h:outputText value="CCCF2" />
+ <h:outputText value="CCCF3" />
+ <span>CCCS1</span> CCCT1
+ </f:facet>
+ <rich:column>
+ <f:facet name="header">
+ W1
+ <h:outputText value="F1" />
+ <h:outputText value="F2" />
+ <h:outputText value="F3" />
+ <span>S1</span> T1
+ <h:outputText value="Song Name" />
+ </f:facet>
+ <h:outputText value="[You must be evil] #{item}"></h:outputText>
+ </rich:column>
+ <rich:column>
+ <f:facet name="footer">
+ WW1
+ <h:outputText value="FF1" />
+ <h:outputText value="FF2" />
+ <h:outputText value="FF3" />
+ <span>SS1</span> TT1
+ <h:outputText value="Artist Name" />
+ </f:facet>
+ <h:outputText value="[Chris Rea] #{item}"></h:outputText>
+ </rich:column>
+ </rich:orderingList>
+
+ <rich:orderingList value="#{user.list}" var="item" >
+ <f:facet name="topControl">
+ U1
+ <h:outputText value="UF1" />
+ <h:outputText value="UF2" />
+ <h:outputText value="UF3" />
+ <span>S1</span> T1
+ </f:facet>
+ <f:facet name="upControl">
+ UU1
+ <h:outputText value="UUFF1" />
+ <h:outputText value="UUFF2" />
+ <h:outputText value="UUFF3" />
+ <span>UUSS1</span> UUTT1
+ </f:facet>
+ <f:facet name="downControl">
+ D1
+ <h:outputText value="DF1" />
+ <h:outputText value="DF2" />
+ <h:outputText value="DF3" />
+ <span>DS1</span> DT1
+ </f:facet>
+ <f:facet name="bottomControl">
+ DDW1
+ <h:outputText value="DDF1" />
+ <h:outputText value="DDF2" />
+ <h:outputText value="DDF3" />
+ <span>DDS1</span> DDT1
+ </f:facet>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Song Name" />
+ </f:facet>
+ <h:outputText value="[You must be evil] #{item}"></h:outputText>
+ </rich:column>
+ <rich:column>
+ <f:facet name="footer">
+ WW1
+ <h:outputText value="FF1" />
+ <h:outputText value="FF2" />
+ <h:outputText value="FF3" />
+ <span>SS1</span> TT1
+ <h:outputText value="Artist Name" />
+ </f:facet>
+ <h:outputText value="[Chris Rea] #{item}"></h:outputText>
+ </rich:column>
+ </rich:orderingList>
+
+
+</h:panelGrid>
+
+<h1> 16) rich:progressBar </h1>
+
+<h:panelGrid columns="3" styleClass="panel">
+
+ <rich:progressBar value="67" style="color:red" styleClass="btn" mode="client"
+ id="progressBar">
+ <f:facet name="initial">
+ <h:outputText value="Process doesn't started yet" />
+ </f:facet>
+ <f:facet name="complete">
+ <h:outputText value="Process Done" />
+ </f:facet>
+ </rich:progressBar>
+
+ <rich:progressBar value="45">
+ <f:facet name="initial">
+ W1
+ <h:outputText value="F1" />
+ <h:outputText value="F2" />
+ <h:outputText value="F3" />
+ <span>S1</span> T1
+ </f:facet>
+ <f:facet name="complete">
+ WW1
+ <h:outputText value="FF1" />
+ <h:outputText value="FF2" />
+ <h:outputText value="FF3" />
+ <span>SS1</span> TT1
+ </f:facet>
+ </rich:progressBar>
+
+ <rich:progressBar value="30" label="Progres Bar" style="color:red" styleClass="btn" mode="client">
+ <f:facet name="complete">
+ WW1
+ <h:outputText value="FF1" />
+ <h:outputText value="FF2" />
+ <h:outputText value="FF3" />
+ <span>SS1</span> TT1
+ </f:facet>
+ <h:outputText> first text </h:outputText>
+ <h:outputText> Download speed 100 Mbit/s </h:outputText>
+ <h:outputText> last text </h:outputText>
+ </rich:progressBar>
+ <rich:progressBar value="30" >
+ </rich:progressBar>
+ <rich:progressBar value="45">
+ </rich:progressBar>
+</h:panelGrid> </f:view> </body> </html>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2012-06-22 10:47:22 UTC (rev 42174)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2012-06-22 16:55:27 UTC (rev 42175)
@@ -18,6 +18,7 @@
import org.jboss.tools.vpe.ui.bot.test.editor.InsertActionsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.MinMaxPanesTest;
import org.jboss.tools.vpe.ui.bot.test.editor.MultiSelectionTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.ScrollingSynchronizationTest;
import org.jboss.tools.vpe.ui.bot.test.editor.SelectionSynchronizationTest;
import org.jboss.tools.vpe.ui.bot.test.editor.StylesOnThePageTest;
import org.jboss.tools.vpe.ui.bot.test.editor.TextEditingActionsTest;
@@ -218,7 +219,8 @@
ExternalEditingTest.class,
VpeToolbarTest.class,
MultiSelectionTest.class,
- SelectionSynchronizationTest.class
+ SelectionSynchronizationTest.class,
+ ScrollingSynchronizationTest.class
})
public class VPEAllBotTests extends SWTBotTestCase{
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-06-22 10:47:22 UTC (rev 42174)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-06-22 16:55:27 UTC (rev 42175)
@@ -303,17 +303,13 @@
return controller.getSourceBuilder().getSourceDocument();
}
- protected String getPathToResources(String testPage) throws IOException {
- String filePath = FileLocator.toFileURL(
- Platform.getBundle(Activator.PLUGIN_ID).getEntry("/"))
- .getFile()
- + "resources/" + testPage; //$NON-NLS-1$//$NON-NLS-2$
+ protected String getPathToResources(String pagePathNextToPluginBundlePath) throws IOException {
+ String pluginBundlePath = FileLocator.toFileURL(
+ Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile(); //$NON-NLS-1$
+ String filePath = pluginBundlePath + "resources/" + pagePathNextToPluginBundlePath; //$NON-NLS-1$
File file = new File(filePath);
if (!file.exists()) {
- filePath = FileLocator
- .toFileURL(
- Platform.getBundle(Activator.PLUGIN_ID).getEntry(
- "/")).getFile() + testPage; //$NON-NLS-1$
+ filePath = pluginBundlePath + pagePathNextToPluginBundlePath;
}
return filePath;
}
@@ -431,8 +427,8 @@
protected void openPage(String pageName, String projectName) {
SWTBot innerBot = packageExplorer.show().bot();
SWTBotTree tree = innerBot.tree();
- tree.expandNode(projectName).expandNode("WebContent")
- .expandNode("pages").getNode(pageName).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$
+ tree.expandNode(projectName).expandNode("WebContent") //$NON-NLS-1$
+ .expandNode("pages").getNode(pageName).doubleClick(); //$NON-NLS-1$
bot.sleep(Timing.time3S());
}
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ScrollingSynchronizationTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ScrollingSynchronizationTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ScrollingSynchronizationTest.java 2012-06-22 16:55:27 UTC (rev 42175)
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2012 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swtbot.swt.finder.utils.Position;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarToggleButton;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.helper.FileHelper;
+import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
+import org.mozilla.interfaces.nsIDOMWindow;
+import org.mozilla.interfaces.nsIDOMWindowInternal;
+
+public class ScrollingSynchronizationTest extends VPEEditorTestCase {
+
+ private final String TOOL_TIP = "Synchronize scrolling between source and visual panes"; //$NON-NLS-1$
+ private static final String FACELETS_JSP = "facets.jsp"; //$NON-NLS-1$
+ private SWTBotExt botExt = null;
+ private SWTBotEditorExt jspEditor;
+ private SWTBotWebBrowser webBrowser;
+
+ public ScrollingSynchronizationTest() {
+ super();
+ botExt = new SWTBotExt();
+ }
+
+ public void testScrollingSynchronization() throws Throwable {
+ /*
+ * Copy big file
+ */
+ try {
+ FileHelper.copyFilesBinary(
+ new File(getPathToResources(IDELabel.JsfProjectTree.WEB_CONTENT + "/" + FACELETS_JSP)), //$NON-NLS-1$
+ new File(FileHelper.getProjectLocation(JBT_TEST_PROJECT_NAME, bot),
+ IDELabel.JsfProjectTree.WEB_CONTENT + "/" + IDELabel.JsfProjectTree.PAGES)); //$NON-NLS-1$
+ } catch (IOException ioe) {
+ throw new RuntimeException(
+ "Unable to copy necessary files from plugin's resources directory: ", //$NON-NLS-1$
+ ioe);
+ }
+ bot.menu(IDELabel.Menu.FILE).menu(IDELabel.Menu.REFRESH).click();
+ util.waitForAll();
+ eclipse.maximizeActiveShell();
+ util.sleep(TIME_1S);
+ /*
+ * Open big file
+ */
+ openPage(FACELETS_JSP);
+ util.waitForAll();
+ jspEditor = botExt.swtBotEditorExtByTitle(FACELETS_JSP);
+ setEditor(jspEditor);
+ setEditorText(jspEditor.getText());
+ webBrowser = new SWTBotWebBrowser(FACELETS_JSP, botExt);
+ /*
+ * Synchronize scrolling button
+ */
+ SWTBotToolbarToggleButton button = botExt.toolbarToggleButtonWithTooltip(TOOL_TIP);
+ if (!button.isEnabled()) {
+ button.click();
+ util.sleep(TIME_1S);
+ }
+ assertTrue("Toolbar button should be enabled", button.isEnabled()); //$NON-NLS-1$
+ Display d = bot.getDisplay();
+
+ /*
+ * Test initial position
+ */
+ jspEditor.deselectAndSetCursorPosition(0, 0);
+ util.sleep(TIME_1S);
+ Position cursorPosition = jspEditor.cursorPosition();
+ assertEquals("Source line position is wrong", 0, cursorPosition.line); //$NON-NLS-1$
+
+ nsIDOMWindow domWindow = webBrowser.getContentDOMWindow();
+ nsIDOMWindowInternal windowInternal = org.jboss.tools.vpe.xulrunner.util.XPCOM
+ .queryInterface(domWindow, nsIDOMWindowInternal.class);
+ /*
+ * Set source position -- visual part should be scrolled.
+ */
+ int scrollY = windowInternal.getScrollY();
+ int halfHeight = windowInternal.getScrollMaxY()/2;
+ assertEquals("Step 1. Initital visual position is wrong", 0, scrollY); //$NON-NLS-1$
+ /*
+ * Test the bottom position.
+ * Press CTRL+END to get to the end of the page.
+ */
+ jspEditor.setFocus();
+ KeyboardHelper.typeKeyCodeUsingSWT(d, SWT.END, SWT.CTRL);
+ util.sleep(TIME_1S);
+ cursorPosition = jspEditor.cursorPosition();
+ assertEquals("Source line position is wrong", 1307, cursorPosition.line); //$NON-NLS-1$
+ /*
+ * Press ARROW_UP several times to select element at the bottom
+ */
+ for (int i = 0; i < 5; i++) {
+ KeyboardHelper.pressKeyCode(d, SWT.ARROW_UP);
+ util.sleep(TIME_1S);
+ }
+ cursorPosition = jspEditor.cursorPosition();
+ assertEquals("Source line position is wrong", 1302, cursorPosition.line); //$NON-NLS-1$
+ scrollY = windowInternal.getScrollY();
+ assertTrue("Step 2. Visual scrolling should be at the bottom of the page,\ncurrent scrolling opstion is " //$NON-NLS-1$
+ + scrollY + ", but should be more than " + halfHeight, scrollY > halfHeight); //$NON-NLS-1$
+ /*
+ * Test custom scroll position in Visual Part
+ */
+ jspEditor.navigateTo(1260, 20);
+ KeyboardHelper.selectTextUsingSWTEvents(d, true, 3);
+ util.sleep(TIME_1S);
+ cursorPosition = jspEditor.cursorPosition();
+ assertEquals("Step 3. Source line position is wrong", 1260, cursorPosition.line); //$NON-NLS-1$
+
+ webBrowser.setFocus();
+ util.sleep(TIME_1S);
+ for (int i = 0; i < 14; i++) {
+ KeyboardHelper.pressKeyCode(d, SWT.ARROW_UP);
+ util.sleep(TIME_1S);
+ }
+ KeyboardHelper.pressKeyCode(d, SWT.ARROW_LEFT);
+ util.sleep(TIME_1S);
+ cursorPosition = jspEditor.cursorPosition();
+ assertEquals("Step 4. Source line position is wrong", 996, cursorPosition.line); //$NON-NLS-1$
+ }
+}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java 2012-06-22 10:47:22 UTC (rev 42174)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java 2012-06-22 16:55:27 UTC (rev 42175)
@@ -63,7 +63,6 @@
*/
webBrowser.setFocus();
nsIDOMNode node = webBrowser.getDomNodeByTagName("SPAN", 1); //$NON-NLS-1$
- webBrowser.setFocus();
webBrowser.selectDomNode(node, 0);
KeyboardHelper.pressKeyCode(d, SWT.ARROW_RIGHT);
KeyboardHelper.pressKeyCode(d, SWT.ARROW_RIGHT);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2012-06-22 10:47:22 UTC (rev 42174)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2012-06-22 16:55:27 UTC (rev 42175)
@@ -10,17 +10,11 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.bot.test.editor;
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.test.WidgetVariables;
-import org.jboss.tools.vpe.ui.bot.test.Activator;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
@@ -54,15 +48,26 @@
protected void closeUnuseDialogs() {
}
- @Override
- protected String getPathToResources(String testPage) throws IOException {
- String filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/editor/"+testPage; //$NON-NLS-1$ //$NON-NLS-2$
- File file = new File(filePath);
- if (!file.isFile()) {
- filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"editor/"+testPage; //$NON-NLS-1$//$NON-NLS-2$
- }
- return filePath;
- }
+// @Override
+// /**
+// * Path "trunk\vpe\tests\org.jboss.tools.vpe.ui.bot.test\editor\"
+// * does not exist. The code is obsolete.
+// * So there is no need in the overridden method.
+// */
+// protected String getPathToResources(String pagePathNextToPluginBundlePath) throws IOException {
+// String pluginBundlePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile();
+// String filePath = pluginBundlePath +"resources/editor/"+pagePathNextToPluginBundlePath; //$NON-NLS-1$
+// File file = new File(filePath);
+// /*
+// * Path "trunk\vpe\tests\org.jboss.tools.vpe.ui.bot.test\editor\"
+// * does not exist. The code is obsolete.
+// */
+// if (!file.isFile()) {
+// filePath = pluginBundlePath +"editor/"+testPage; //$NON-NLS-1$
+// file = new File(filePath);
+// }
+// return filePath;
+// }
protected void openPage(){
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
Deleted: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/facets.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/facets.jsp 2012-06-22 10:47:22 UTC (rev 42174)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/facets.jsp 2012-06-22 16:55:27 UTC (rev 42175)
@@ -1,1308 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-
-<html>
-<head>
-<title></title>
-<link href="/css/main.css" rel="stylesheet" type="text/css" />
-<style type="text/css">
-h1 {
- background-color: white;
-}
-
-.label {
- font-weight: bold;
-}
-
-.whiteLine {
- background-color: white;
- border: 1px solid black;
-}
-
-.panel {
- background-color: SteelBlue;
- border: 1px solid black;
- vertical-align: top;
-}
-
-.goldPanel {
- background-color: gold;
- border: 1px solid black;
-}
-
-.greenPanel {
- background-color: forestGreen;
- border: 1px solid black;
-}
-
-.indianRedPanel {
- background-color: IndianRed;
- border: 1px solid black;
-}
-
-.thistlePanel {
- background-color: thistle;
- border: 1px solid black;
-}
-
-.orangePanel {
- background-color: orange;
- border: 1px solid black;
-}
-
-.darkBluePanel {
- background-color: DarkSlateBlue;
- border: 1px solid black;
-}
-
-.darkVioletPanel {
- background-color: DarkViolet;
- border: 1px solid black;
-}
-</style>
-</head>
-<body>
-<f:view>
- <h1>1) h:panelGrid</h1>
-
- <h:panelGrid columns="2" styleClass="panel">
- <h:panelGrid columns="2" border="5" width="150" rules="all"
- frame="above" cellpadding="4" cellspacing="6" bgcolor="silver"
- style="COLOR: #ff0080; BACKGROUND-COLOR: #ffff00; TEXT-DECORATION: underline; FONT-STYLE: italic; FONT-WEIGHT: bold; FONT-SIZE: medium; FONT-FAMILY: 'Arial Black';"
- styleClass="goldPanel" captionClass="myStyle0" columnClasses=""
- rowClasses="" headerClass="" footerClass="">
- <f:facet name="footer">
- <h:commandButton value="CB">CB</h:commandButton>
- <p>part 111</p>
- <p>part 222</p>
- <input type="button" value="Input Button">Input Button</input>
- Just Text
- </f:facet>
- <h:outputText value="begin" />
-
- </h:panelGrid>
- <h:panelGrid columns="2" border="5" width="150" rules="all"
- frame="above" cellpadding="4" cellspacing="6" bgcolor="silver"
- style="COLOR: #ff0080; BACKGROUND-COLOR: green; TEXT-DECORATION: underline; FONT-STYLE: italic; FONT-WEIGHT: bold; FONT-SIZE: small; FONT-FAMILY: 'Arial Black';"
- styleClass="greenPanel" captionClass="myStyle0" columnClasses=""
- rowClasses="" headerClass="" footerClass="">
- <f:facet name="footer">
- <p>part 111</p>
- <p>part 222</p>
- <input type="button" value="Input Button">Input Button</input>
- Just Text
- </f:facet>
- <h:outputText value="begin" />
- </h:panelGrid>
- </h:panelGrid>
-
- <h1>2) h:dataTable</h1>
-
-<h:dataTable border="1">
- <f:facet name="header">
-<h:outputText value="AAAAAAA" />
-HHHHHHH1111Text111111
-<h:outputText value="BBBBBBBBBBBBBBB" />
-HHHHHHH222Text2222222
-</f:facet>
-</h:dataTable>
-
- <h:panelGrid columns="4" border="1" styleClass="panel">
- <h:panelGroup>
- <h:outputText styleClass="whiteLine"> Correct table </h:outputText>
- <h:dataTable value="#{user.list}" var="item" styleClass="goldPanel">
- <f:facet name="header">
- <h:outputText>Header</h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText>Footer</h:outputText>
- </f:facet>
- <f:facet name="caption">
- <h:outputText>Caption</h:outputText>
- </f:facet>
- <h:column>
- <h:outputText>Column 1</h:outputText>
- </h:column>
- </h:dataTable>
- </h:panelGroup>
-
- <h:panelGroup>
- <h:outputText styleClass="whiteLine">
- Plain HTML in facets with JSF tags
- <p></p>
- And plus the second jsf components in facets
- </h:outputText>
- <h:dataTable value="#{user.list}" var="item" border="1"
- styleClass="greenPanel">
- <f:facet name="header">
- <h:outputText>Header</h:outputText>
- <h:outputText>Header2</h:outputText>
- <p>Part 111</p>
- Some HTML text
- </f:facet>
- <f:facet name="footer">
- <h:outputText>Footer</h:outputText>
- <h:outputText>Footer2</h:outputText>
- <p>Part 111</p>
- Some HTML text
- </f:facet>
- <f:facet name="caption">
- <h:outputText>Caption</h:outputText>
- <p>Part 111</p>
- Some HTML text
- </f:facet>
- </h:dataTable>
- </h:panelGroup>
-
- <h:panelGroup>
- <h:outputText styleClass="whiteLine"> Only plain HTML in Caption </h:outputText>
- <h:dataTable value="#{user.list}" var="item" border="1"
- styleClass="indianRedPanel">
- <f:facet name="header">
- <h:outputText>Header1</h:outputText>
- <h:outputText>Header2</h:outputText>
- <h:outputText>Header3</h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText>Footer1</h:outputText>
- <h:outputText>Footer2</h:outputText>
- <h:outputText>Footer3</h:outputText>
- </f:facet>
- <f:facet name="caption">
- <p>Part 111</p>
- Some HTML text
- </f:facet>
- <h:column>
- <h:outputText>Column 1</h:outputText>
- </h:column>
- <h:column>
- <h:outputText>Column 2</h:outputText>
- </h:column>
- <h:column>
- <h:outputText>Column 3</h:outputText>
- </h:column>
- </h:dataTable>
- </h:panelGroup>
-
- <h:panelGroup>
- <h:outputText styleClass="whiteLine"> Only plain HTML in facets and columns </h:outputText>
- <h:dataTable value="#{user.list}" var="item"
- styleClass="thistlePanel">
- <f:facet name="header">
- <p>Part 111</p>
- Some HTML text
- </f:facet>
- <f:facet name="footer">
- <p>Part 111</p>
- Some HTML text
- </f:facet>
- <f:facet name="caption">
- <p>Part 111</p>
- Some HTML text
- </f:facet>
- <h:column>
- <h:outputText>Column 1</h:outputText>
- </h:column>
- <h:column>
- <h:outputText>Column 2</h:outputText>
- </h:column>
- <h:column>
- <h:outputText>Column 3</h:outputText>
- </h:column>
- </h:dataTable>
- </h:panelGroup>
-
- </h:panelGrid>
-
- <h1>3) h:column</h1>
- <h:outputText> Correct table </h:outputText>
- <h:dataTable value="#{user.list}" var="item" styleClass="panel"
- columnClasses="goldPanel">
- <f:facet name="header">
- <h:outputText>Table Header</h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText>Table Footer</h:outputText>
- </f:facet>
- <f:facet name="caption">
- <h:outputText styleClass="whiteLine">Table Caption</h:outputText>
- </f:facet>
- <h:column footerClass="greenPanel" headerClass="greenPanel">
- <f:facet name="header">
- <h:outputText>Col 1 header1</h:outputText>
- <h:outputText>Col 1 header2</h:outputText>
- <h:outputText>Col 1 header3</h:outputText>
- <span>COL1HEAD</span> C1HText
- </f:facet>
- <f:facet name="footer">
- <h:outputText>Col 1 footer1</h:outputText>
- <h:outputText>Col 1 footer2</h:outputText>
- <h:outputText>Col 1 footer3</h:outputText>
- <span>COL1FOOT</span> C1FText
- </f:facet>
- <h:outputText>[Column 1] </h:outputText>
- <h:outputText value="#{item}" />
- </h:column>
- <h:column footerClass="indianRedPanel" headerClass="indianRedPanel">
- <f:facet name="header">
- <span>COL2HEAD</span> C2FHead
- </f:facet>
- <f:facet name="footer">
- <span>COL2FOOT</span> C2FText
- </f:facet>
- <h:outputText>[Column 2] </h:outputText>
- <h:outputText value="#{item}" />
- </h:column>
- <h:column footerClass="thistlePanel" headerClass="thistlePanel">
- <f:facet name="header">
- <f:facet name="header">
- <span>COL3HEAD</span> C3FHead
- </f:facet>
- </f:facet>
- <f:facet name="footer">
- <h:outputText>Col 3 footer</h:outputText>
- </f:facet>
- <h:outputText>[Column 3] </h:outputText>
- <h:outputText value="#{item}" />
- </h:column>
- </h:dataTable>
-
- <h1>4) rich:panel</h1>
- <rich:panel>
- <f:facet name="header">
- PHead111
- <h:outputText>PanelHeader1</h:outputText>
- <h:outputText>PanelHeader2</h:outputText>
- <h:outputText>PanelHeader3</h:outputText>
- <span>P1Head</span> PHead
- </f:facet>
- <f:facet name="footer">
- <h:outputText>Col 1 footer3</h:outputText>
- <span>COL1FOOT</span> C1FText
- FooterFacet
- </f:facet>
- Panel Content
- </rich:panel>
-
- <h1>5) rich:simpleTogglePanel</h1>
- <rich:simpleTogglePanel id="simpleTogglePanel" switchType="client"
- label="STP LABEL">
- <f:facet name="header">
- STPHead111
- <h:outputText>STPHeader1</h:outputText>
- <h:outputText>STPHeader2</h:outputText>
- <h:outputText>STPHeader3</h:outputText>
- <span>STP1Head</span> STPHead
- </f:facet>
- <f:facet name="footer">
- STPFoot111
- <h:outputText>STPFooter1</h:outputText>
- <h:outputText>STPFooter2</h:outputText>
- <h:outputText>STPFooter3</h:outputText>
- <span>STP1Foot</span> STPFoot
- </f:facet>
- [rich:simpleTogglePanel CONTENT]
- </rich:simpleTogglePanel>
-
- <h1>6) rich:togglePanel</h1>
- <rich:togglePanel switchType="client" stateOrder="closed,tip1,tip2">
- <f:facet name="closed">
- <h:outputText value="Closed" />
- <rich:toggleControl>
- <rich:toggleControl switchToState="tip1" value="#{user.next}" />
- </rich:toggleControl>
- </f:facet>
- <f:facet name="tip1">
- <h:outputText value="TIP 1" />
- <h:panelGrid columns="2">
- <rich:toggleControl switchToState="closed" value="#{user.close}" />
- <rich:toggleControl switchToState="tip2" value="#{user.next}" />
- </h:panelGrid>
- </f:facet>
- <f:facet name="tip2">
- <h:outputText value="TIP 2" />
- <h:panelGrid columns="2">
- <rich:toggleControl switchToState="closed" value="#{user.close}" />
- <rich:toggleControl switchToState="tip1" value="#{user.previous}" />
- </h:panelGrid>
- </f:facet>
- </rich:togglePanel>
- <rich:togglePanel switchType="client" stateOrder="tip2,tip1,closed">
- <f:facet name="closed">
- STPFoot111
- <h:outputText>STPFooter1</h:outputText>
- <h:outputText>STPFooter2</h:outputText>
- <h:outputText>STPFooter3</h:outputText>
- <span>STP1Foot</span> STPFoot
- <h:outputText value="CLOSE" />
- </f:facet>
- <f:facet name="tip1">
- <h:panelGroup>
- <h:outputText value="TIPPPP111" />
- <rich:toggleControl switchToState="tip2" value="#{user.next}" />
- <h:outputText value="TIPPPP111" />
- </h:panelGroup>
- <h:outputText value="TIPPP222222" />
- </f:facet>
- <f:facet name="tip2">
- <h:outputText value="TIP 2" />
- </f:facet>
- </rich:togglePanel>
-
- <h1>7) tabPanel</h1>
- <h:panelGrid columns="3">
-
- <rich:tabPanel switchType="ajax">
- <rich:tab label="First">
- Here is tab #1
- </rich:tab>
- <rich:tab label="Second" disabled="true">
- Here is tab #2
- </rich:tab>
- <rich:tab label="Third">
- Here is tab #3
- </rich:tab>
- </rich:tabPanel>
-
- <rich:tabPanel switchType="ajax">
- <rich:tab label="First">
- <f:facet name="label">
- Tab Label 1
- <h:outputText>Tab Label 111</h:outputText>
- <h:outputText>Tab Label 222</h:outputText>
- <h:outputText>Tab Label 333</h:outputText>
- <span>TabLabelSpan1 </span> TabLabelSpan2
- </f:facet>
- Here is tab #1
- </rich:tab>
- <rich:tab disabled="true">
- <f:facet name="label">
- Tab Label 2
- <h:outputText>Tab Label 2-111</h:outputText>
- <h:outputText>Tab Label 2-222</h:outputText>
- <h:outputText>Tab Label 2-333</h:outputText>
- <span>TabLabelSpan2-1 </span> TabLabelSpan2-2
- </f:facet>
- Here is tab #2
- </rich:tab>
- <rich:tab label="Third">
- Here is tab #3
- </rich:tab>
- </rich:tabPanel>
- </h:panelGrid>
-
- <br></br>
- <h1>8) rich:dataTable</h1>
- <br></br>
-
- <h:panelGrid styleClass="panel" columns="3">
-
- <rich:dataTable var="row" value="#{user.list}" rowKeyVar="rowKey"
- rowClasses="goldPanel panel" columns="2">
- <f:facet name="header">
- <rich:columnGroup>
- <rich:column rowspan="2">
- <rich:spacer />
- </rich:column>
- <rich:column colspan="3">
- <h:outputText value="FIELDS" />
- </rich:column>
- <rich:column breakBefore="true">
- <h:outputText value="field1" />
- </rich:column>
- <rich:column>
- <h:outputText value="field2" />
- </rich:column>
- <rich:column>
- <h:outputText value="field3" />
- </rich:column>
- </rich:columnGroup>
- </f:facet>
-
-
- <rich:columnGroup>
- <rich:column>
- <h:outputText value="#{rowKey}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{row}">
- </h:outputText>
- </rich:column>
- <rich:column>
- <h:outputText value="#{row}">
- </h:outputText>
- </rich:column>
- <rich:column>
- <h:outputText value="#{row}">
- </h:outputText>
- </rich:column>
- </rich:columnGroup>
-
- <f:facet name="footer">
-
- <rich:columnGroup>
- <rich:column></rich:column>
- <rich:column>
- <h:outputText value="footer1" />
- </rich:column>
- <rich:column>
- <h:outputText value="footer2" />
- </rich:column>
- <rich:column>
- <h:outputText value="footer3" />
- </rich:column>
-
- </rich:columnGroup>
- </f:facet>
-
- </rich:dataTable>
-
- <rich:dataTable var="row" value="#{user.list}" rowKeyVar="rowKey"
- rowClasses="goldPanel panel">
- <f:facet name="caption">
- TableCaptionText
- <h:outputText>Caption 1</h:outputText>
- <h:outputText>Caption 2</h:outputText>
- <h:outputText>Caption 3</h:outputText>
- <span>TableCaption1</span> TableCaption2
- </f:facet>
- <f:facet name="header">
- Table1HText2
- <h:outputText>Table header1</h:outputText>
- <h:outputText>Table header2</h:outputText>
- <h:outputText>Table header3</h:outputText>
- <span>Table1HEAD</span> Table1HText2
- </f:facet>
- <f:facet name="footer">
- TableC1FText2
- <h:outputText>Table FOOTER1</h:outputText>
- <h:outputText>Table FOOTER2</h:outputText>
- <h:outputText>Table FOOTER3</h:outputText>
- <span>Table1FOOT</span> Table1FText2
- </f:facet>
-
- <rich:column>
- <h:outputText value="#{rowKey}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{row}">
- </h:outputText>
- </rich:column>
- <rich:column>
- <h:outputText value="#{row}">
- </h:outputText>
- </rich:column>
- <rich:column>
- <h:outputText value="#{row}">
- </h:outputText>
- </rich:column>
-
- </rich:dataTable>
- </h:panelGrid>
-
- <br></br>
- <h1>9) rich:column</h1>
-
- <h:panelGrid styleClass="panel" columns="3">
-
- <rich:dataTable var="row" value="#{user.list}" rowKeyVar="rowKey"
- rowClasses="greenPanel">
- <f:facet name="header">
- Table1HText2
- <h:outputText>Table header1</h:outputText>
- <h:outputText>Table header2</h:outputText>
- <h:outputText>Table header3</h:outputText>
- <span>Table1HEAD</span> Table1HText2
- </f:facet>
- <f:facet name="footer">
- TableC1FText2
- <h:outputText>Table FOOTER1</h:outputText>
- <h:outputText>Table FOOTER2</h:outputText>
- <h:outputText>Table FOOTER3</h:outputText>
- <span>Table1FOOT</span> Table1FText2
- </f:facet>
-
- <rich:column>
- <h:outputText value="#{rowKey}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText>Col 1 header1</h:outputText>
- <h:outputText>Col 1 header2</h:outputText>
- <h:outputText>Col 1 header3</h:outputText>
- <span>COL1HEAD</span> C1HText
- </f:facet>
- <f:facet name="footer">
- <h:outputText>Col 1 footer1</h:outputText>
- <h:outputText>Col 1 footer2</h:outputText>
- <h:outputText>Col 1 footer3</h:outputText>
- <span>COL1FOOT</span> C1FText
- </f:facet>
- <h:outputText value="[column 1] #{row}">
- </h:outputText>
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <span>COL2HEAD</span> C2FHead
- </f:facet>
- <f:facet name="footer">
- <span>COL2FOOT</span> C2FText
- </f:facet>
- <h:outputText value="[column 2] #{row}">
- </h:outputText>
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <span>COL3HEAD</span> C3Head
- <h:outputText value="[header 3]" />
- </f:facet>
- <f:facet name="footer">
- <span>COL3FOOT</span> C3Foot
- <h:outputText value="[footer 3]" />
- </f:facet>
- <h:outputText value="[column 3] #{row}">
- </h:outputText>
- </rich:column>
-
- </rich:dataTable>
- </h:panelGrid>
-
- <h1>10) rich:subTable</h1>
- <h:panelGrid columns="3" styleClass="panel">
- <rich:dataTable value="#{user.users}" var="users" border="1">
- <rich:column colspan="3" styleClass="orangePanel">
- <h:outputText value="#{users.name} #{users.lastName}" />
- </rich:column>
-
- <rich:subTable value="#{users.list}" var="book1"
- rowClasses="goldPanel, greenPanel">
- <rich:column>
- <h:outputText value="#{book1}" />
- </rich:column>
- <rich:column colspan="2" breakBefore="true">
- <h:outputText value="#{book1}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book1}" />
- </rich:column>
- </rich:subTable>
-
- <rich:subTable value="#{user.list}" var="book2"
- columnClasses="indianRedPanel, thistlePanel">
- <rich:column rowspan="2">
- <h:outputText value="#{book2}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book2}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book2}" />
- </rich:column>
- <rich:column breakBefore="true">
- <h:outputText value="#{book2}" />
- </rich:column>
- <rich:column rowspan="2">
- <h:outputText value="#{book2}" />
- </rich:column>
- <rich:column breakBefore="true">
- <h:outputText value="#{book2}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book2}" />
- </rich:column>
- <rich:column colspan="2" breakBefore="true">
- <h:outputText value="#{book2}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book2}" />
- </rich:column>
- </rich:subTable>
- </rich:dataTable>
-
- <rich:dataTable value="#{user.users}" var="users" border="1">
- <rich:column colspan="3" styleClass="orangePanel">
- <h:outputText value="#{users.name} #{users.lastName}" />
- </rich:column>
-
- <rich:subTable value="#{users.list}" var="book3"
- rowClasses="goldPanel, greenPanel" headerClass="darkVioletPanel"
- footerClass="darkBluePanel">
-
- <f:facet name="caption">
- TableCaptionText
- <h:outputText>Caption 1</h:outputText>
- <h:outputText>Caption 2</h:outputText>
- <h:outputText>Caption 3</h:outputText>
- <span>TableCaption1</span> TableCaption2
- </f:facet>
- <f:facet name="header">
- Table1HText2
- <h:outputText>Table header1</h:outputText>
- <h:outputText>Table header2</h:outputText>
- <h:outputText>Table header3</h:outputText>
- <span>Table1HEAD</span> Table1HText2
- </f:facet>
- <f:facet name="footer">
- TableC1FText2
- <h:outputText>Table FOOTER1</h:outputText>
- <h:outputText>Table FOOTER2</h:outputText>
- <h:outputText>Table FOOTER3</h:outputText>
- <span>Table1FOOT</span> Table1FText2
- </f:facet>
-
- <rich:column>
- <h:outputText value="#{book3}" />
- </rich:column>
- <rich:column colspan="2" breakBefore="true">
- <h:outputText value="#{book3}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book3}" />
- </rich:column>
- </rich:subTable>
-
- <rich:subTable value="#{user.list}" var="book4"
- columnClasses="indianRedPanel, thistlePanel"
- headerClass="darkVioletPanel" footerClass="darkBluePanel">
-
- <f:facet name="caption">
- TableCaptionText
- <h:outputText>Caption 1</h:outputText>
- <h:outputText>Caption 2</h:outputText>
- <h:outputText>Caption 3</h:outputText>
- <span>TableCaption1</span> TableCaption2
- </f:facet>
- <f:facet name="header">
- Table1HText2
- <h:outputText>Table header1</h:outputText>
- <h:outputText>Table header2</h:outputText>
- <h:outputText>Table header3</h:outputText>
- <span>Table1HEAD</span> Table1HText2
- </f:facet>
- <f:facet name="footer">
- TableC1FText2
- <h:outputText>Table FOOTER1</h:outputText>
- <h:outputText>Table FOOTER2</h:outputText>
- <h:outputText>Table FOOTER3</h:outputText>
- <span>Table1FOOT</span> Table1FText2
- </f:facet>
-
- <rich:column rowspan="2">
- <h:outputText value="#{book4}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book4}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book4}" />
- </rich:column>
- <rich:column breakBefore="true">
- <h:outputText value="#{book4}" />
- </rich:column>
- <rich:column rowspan="2">
- <h:outputText value="#{book4}" />
- </rich:column>
- <rich:column breakBefore="true">
- <h:outputText value="#{book4}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book4}" />
- </rich:column>
- <rich:column colspan="2" breakBefore="true">
- <h:outputText value="#{book4}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book4}" />
- </rich:column>
- </rich:subTable>
- </rich:dataTable>
-
- <rich:dataTable value="#{user.users}" var="users" border="1">
- <rich:column colspan="4" styleClass="orangePanel">
- <h:outputText value="#{users.name} #{users.lastName}" />
- </rich:column>
-
- <rich:subTable value="#{users.list}" var="book5"
- rowClasses="goldPanel, greenPanel">
- <rich:column headerClass="darkVioletPanel"
- footerClass="darkBluePanel">
- <f:facet name="header">
- <h:outputText>Col 111111111 header1</h:outputText>
- <h:outputText>Col 111111111 header2</h:outputText>
- <h:outputText>Col 111111111 header3</h:outputText>
- <span>COL1111111111HEAD</span> C1111111111HText
- </f:facet>
- <f:facet name="footer">
- <h:outputText>Col 1111111111 footer1</h:outputText>
- <h:outputText>Col 1111111111 footer2</h:outputText>
- <h:outputText>Col 1111111111 footer3</h:outputText>
- <span>COL1111111111FOOT</span> C1111111111FText
- </f:facet>
- <h:outputText value="#{book5}" />
- </rich:column>
- <rich:column colspan="2" breakBefore="true"
- headerClass="darkVioletPanel" footerClass="darkBluePanel">
- <f:facet name="header">
- <span>COL2HEAD</span> C2FHead
- </f:facet>
- <f:facet name="footer">
- <span>COL2FOOT</span> C2FText
- </f:facet>
-
- <h:outputText value="#{book5}" />
- </rich:column>
- <rich:column headerClass="darkVioletPanel"
- footerClass="darkBluePanel">
- <f:facet name="header">
- <span>COL3HEAD</span> C3Head
- <h:outputText value="[header 3]" />
- </f:facet>
- <f:facet name="footer">
- <span>COL3FOOT</span> C3Foot
- <h:outputText value="[footer 3]" />
- </f:facet>
- <h:outputText value="#{book5}" />
- </rich:column>
- </rich:subTable>
-
- <rich:subTable value="#{user.list}" var="book6"
- columnClasses="indianRedPanel, thistlePanel" headerClass="goldPanel"
- footerClass="thistlePanel">
- <rich:column rowspan="2" headerClass="darkVioletPanel"
- footerClass="darkBluePanel">
- <f:facet name="header">
- <h:outputText>Col 12222222 header1</h:outputText>
- <h:outputText>Col 12222222 header2</h:outputText>
- <h:outputText>Col 12222222 header3</h:outputText>
- <span>COL12222222HEAD</span> C12222222HText
- </f:facet>
- <f:facet name="footer">
- <h:outputText>Col 12222222 footer1</h:outputText>
- <h:outputText>Col 12222222 footer2</h:outputText>
- <h:outputText>Col 12222222 footer3</h:outputText>
- <span>COL12222222FOOT</span> C12222222FText
- </f:facet>
- <h:outputText value="#{book6}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <span>COL22222222HEAD</span> C22222222FHead
- </f:facet>
- <f:facet name="footer">
- <span>COL22222222FOOT</span> C22222222FText
- </f:facet>
- <h:outputText value="#{book6}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <span>COL32222222HEAD</span> C32222222Head
- <h:outputText value="[header 3]2222222" />
- </f:facet>
- <f:facet name="footer">
- <span>COL32222222FOOT</span> C32222222Foot
- <h:outputText value="[footer 3]" />
- </f:facet>
- <h:outputText value="#{book6}" />
- </rich:column>
- <rich:column breakBefore="true">
- <h:outputText value="#{book6}" />
- </rich:column>
- <rich:column rowspan="2">
- <h:outputText value="#{book6}" />
- </rich:column>
- <rich:column breakBefore="true">
- <h:outputText value="#{book6}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book6}" />
- </rich:column>
- <rich:column colspan="2" breakBefore="true">
- <h:outputText value="#{book6}" />
- </rich:column>
- <rich:column>
- <h:outputText value="#{book6}" />
- </rich:column>
- </rich:subTable>
- </rich:dataTable>
- </h:panelGrid>
-
- <h1>11) rich:extendedDataTable</h1>
- <h:panelGrid columns="3" styleClass="panel">
- <rich:extendedDataTable value="#{user.list}" var="item1" width="200px"
- height="200px">
- <rich:column>
- <f:facet name="header">
- <h:outputText>Header</h:outputText>
- </f:facet>
- <h:outputText value="#{item1}" />
- </rich:column>
- </rich:extendedDataTable>
-
- <rich:extendedDataTable value="#{user.list}" var="item" width="500px"
- height="200px">
- <rich:column sortable="false">
- <f:facet name="header">
- <h:outputText value="Flag" />
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="Footer1" />
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:column>
- <rich:column sortable="true">
- <f:facet name="header">
- <h:outputText value="State Name" />
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="Footer2" />
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="State Capital" />
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="Footer3" />
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:column>
- <rich:column sortable="false">
- <f:facet name="header">
- <h:outputText value="Time Zone" />
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="Footer4" />
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:column>
- </rich:extendedDataTable>
-
- <rich:extendedDataTable value="#{user.list}" var="item" width="600px"
- height="200px">
- <rich:column sortable="false">
- <f:facet name="header">
- <h:outputText value="F1" />
- <h:outputText value="F2" />
- <h:outputText value="F3" />
- <span>S1</span> T1
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="FF1" />
- <h:outputText value="FF2" />
- <h:outputText value="FF3" />
- <span>SS1</span> TT1
- </f:facet>
-
- <h:outputText value="#{item}" />
- </rich:column>
- <rich:column sortable="true">
- <f:facet name="header">
- <span>COL2HEAD</span> C2FHead
- </f:facet>
- <f:facet name="footer">
- <span>COL2FOOT</span> C2FText
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="State Capital" />
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:column>
- <rich:column sortable="false" width="300px">
- <f:facet name="header">
- <h:outputText value="Time Zone" />
- <span>COL3HEAD</span> C3Head
- <h:outputText value="[header 3]" />
- </f:facet>
- <f:facet name="footer">
- <span>COL3FOOT</span> C3Foot
- <h:outputText value="[footer 3]" />
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:column>
- </rich:extendedDataTable>
- </h:panelGrid>
-
- <h1>12) rich:dataGrid</h1>
-
- <h:panelGrid columns="2" styleClass="panel">
- <rich:dataGrid value="#{user.list}" var="item" columns="2"
- elements="4">
- <f:facet name="caption">
- <h:outputText value="Caption #{item}"></h:outputText>
- </f:facet>
- <f:facet name="header">
- <h:outputText value="Header #{item}"></h:outputText>
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:dataGrid>
-
- <rich:dataGrid value="#{user.list}" var="item" columns="3"
- elements="3">
- <f:facet name="caption">
- <p>Part 111</p>
- Some HTML text
- </f:facet>
- <f:facet name="header">
- <span>HEAD</span>
- <h:outputText value="#{item}"></h:outputText>
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:dataGrid>
-
- <rich:dataGrid value="#{user.list}" var="item" columns="2"
- elements="6">
- <f:facet name="header">
- HEAD
- <h:outputText value="#{item}"></h:outputText>
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:dataGrid>
-
- <rich:dataGrid value="#{user.list}" var="item" columns="2"
- elements="3">
- <f:facet name="caption">
- CText1
- <h:outputText value="C1" />
- <h:outputText value="C2" />
- <h:outputText value="C3" />
- <span>CapS1</span> CapT1
- </f:facet>
- <f:facet name="header">
- W1
- <h:outputText value="F1" />
- <h:outputText value="F2" />
- <h:outputText value="F3" />
- <span>S1</span> T1
- </f:facet>
- <f:facet name="footer">
- WW1
- <h:outputText value="FF1" />
- <h:outputText value="FF2" />
- <h:outputText value="FF3" />
- <span>SS1</span> TT1
- </f:facet>
- <h:outputText value="#{item}" />
- </rich:dataGrid>
- <rich:dataGrid value="#{user.list}" var="item" columns="2"
- elements="4">
- <h:outputText value="#{item}" />
- </rich:dataGrid>
- </h:panelGrid>
-
- <h1>13) rich:dataDefinitionList</h1>
-
- <h:panelGrid columns="3" styleClass="panel">
-
- <rich:dataDefinitionList var="car" value="#{user.list}" rows="3"
- first="2" title="Cars" styleClass="greenPanel">
- <f:facet name="term">
- <h:outputText value="#{car}"></h:outputText>
- </f:facet>
- <h:outputText value="Price:" styleClass="label"></h:outputText>
- <h:outputText value="#{car}" />
- <br />
- <h:outputText value="Mileage:" styleClass="label"></h:outputText>
- <h:outputText value="#{car}" />
- <br />
- </rich:dataDefinitionList>
-
- <rich:dataDefinitionList var="car" value="#{user.list}" rows="3"
- first="2" title="Cars" styleClass="greenPanel">
- <f:facet name="term">
- <h:outputText value="[term]"></h:outputText>
- </f:facet>
- <f:facet name="header">
- <h:outputText value="[header]"></h:outputText>
- </f:facet>
- <f:facet name="footer">
- <h:outputText value="[footer]"></h:outputText>
- </f:facet>
- <h:outputText value="Price:" styleClass="label"></h:outputText>
- <h:outputText value="#{car}" />
- <br />
- </rich:dataDefinitionList>
-
- <rich:dataDefinitionList var="car" value="#{user.list}" rows="3"
- first="2" title="Cars" styleClass="greenPanel">
- <f:facet name="caption">
- CText1
- <h:outputText value="C1" />
- <h:outputText value="C2" />
- <h:outputText value="C3" />
- <span>CapS1</span> CapT1
- </f:facet>
- <f:facet name="header">
- W1
- <h:outputText value="F1" />
- <h:outputText value="F2" />
- <h:outputText value="F3" />
- <span>S1</span> T1
- </f:facet>
- <f:facet name="term">
- Term1
- <h:outputText value="T1" />
- <h:outputText value="T2" />
- <h:outputText value="T3" />
- <span>TS1</span> TT1
- </f:facet>
- <f:facet name="myfacet">
- MYF1
- <h:outputText value="MYF-OUT-1" />
- <h:outputText value="MYF-OUT-2" />
- <h:outputText value="MYF-OUT-3" />
- <span>MYF-S1</span> MYF-T1
- </f:facet>
- <f:facet name="footer">
- WW1
- <h:outputText value="FF1" />
- <h:outputText value="FF2" />
- <h:outputText value="FF3" />
- <span>SS1</span> TT1
- </f:facet>
- <h:outputText value="Mileage:" styleClass="label"></h:outputText>
- <h:outputText value="#{car}" />
- myt1
- <h:outputText value="myt1" />
- <h:outputText value="myt2" />
- <h:outputText value="myt3" />
- <span>myt-S1</span> myt-T1
- <br />
- </rich:dataDefinitionList>
- </h:panelGrid>
-
- <h1>14) rich:inplaceInput</h1>
- <h:panelGrid columns="3" styleClass="panel">
- <rich:inplaceInput value="#{user.name}" showControls="true" />
- <rich:inplaceInput value="#{user.name}" showControls="true">
- <f:facet name="controls">
- <h:panelGroup>
- <h:commandButton value="Save" type="button" />
- <h:commandButton value="Close" type="button" />
- </h:panelGroup>
- </f:facet>
- </rich:inplaceInput>
-
- <rich:inplaceInput value="#{user.name}" showControls="true">
- <f:facet name="controls">
- <h:commandButton value="Save" type="button" />
- <h:commandButton value="Close" type="button" />
- </f:facet>
- </rich:inplaceInput>
-
- <rich:inplaceInput value="#{user.name}" showControls="true">
- <f:facet name="controls">
- <h:commandButton value="Save" type="button" />
- <h:commandButton value="Close" type="button" />
- </f:facet>
- myt1
- <h:outputText value="myt1" />
- <h:outputText value="myt2" />
- <h:outputText value="myt3" />
- <span>myt-S1</span> myt-T1
- <br />
- </rich:inplaceInput>
-
- <rich:inplaceInput value="#{user.name}" showControls="true">
- <f:facet name="controls">
- <h:commandButton value="Save" type="button" />
- <h:commandButton value="Close" type="button" />
- </f:facet>
- <f:facet name="header">
- W1
- <h:outputText value="F1" />
- <h:outputText value="F2" />
- <h:outputText value="F3" />
- <span>S1</span> T1
- </f:facet>
- <f:facet name="term">
- Term1
- <h:outputText value="T1" />
- <h:outputText value="T2" />
- <h:outputText value="T3" />
- <span>TS1</span> TT1
- </f:facet>
- myt1
- <h:outputText value="myt1" />
- <h:outputText value="myt2" />
- <h:outputText value="myt3" />
- <span>myt-S1</span> myt-T1
- <br />
- </rich:inplaceInput>
-
- <rich:inplaceInput value="#{user.name}" showControls="true">
- <f:facet name="controls">
- WW1
- <h:outputText value="FF1" />
- <h:outputText value="FF2" />
- <h:outputText value="FF3" />
- <span>SS1</span> TT1
- </f:facet>
- </rich:inplaceInput>
-
- </h:panelGrid>
-
-<h1> 15) rich:orderingList </h1>
-
-<h:panelGrid columns="3" styleClass="panel">
-
-<rich:orderingList value="#{user.list}" var="item" listHeight="300" listWidth="350">
- <f:facet name="caption">
- <h:outputText value="List Caption" />
- </f:facet>
- <rich:column width="180">
- <f:facet name="header">
- <h:outputText value="Song Name" />
- </f:facet>
- <h:outputText value="[You must be evil] #{item}"></h:outputText>
- </rich:column>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Artist Name" />
- </f:facet>
- <h:outputText value="[Chris Rea] #{item}"></h:outputText>
- </rich:column>
- </rich:orderingList>
-
- <rich:orderingList value="#{user.list}" var="item" controlsHorizontalAlign="left">
- <f:facet name="heder">
- CCCW1
- <h:outputText value="CCCF1" />
- <h:outputText value="CCCF2" />
- <h:outputText value="CCCF3" />
- <span>CCCS1</span> CCCT1
- </f:facet>
- <f:facet name="caption">
- CCCW1
- <h:outputText value="CCCF1" />
- <h:outputText value="CCCF2" />
- <h:outputText value="CCCF3" />
- <span>CCCS1</span> CCCT1
- </f:facet>
- <rich:column>
- <f:facet name="header">
- W1
- <h:outputText value="F1" />
- <h:outputText value="F2" />
- <h:outputText value="F3" />
- <span>S1</span> T1
- <h:outputText value="Song Name" />
- </f:facet>
- <h:outputText value="[You must be evil] #{item}"></h:outputText>
- </rich:column>
- <rich:column>
- <f:facet name="footer">
- WW1
- <h:outputText value="FF1" />
- <h:outputText value="FF2" />
- <h:outputText value="FF3" />
- <span>SS1</span> TT1
- <h:outputText value="Artist Name" />
- </f:facet>
- <h:outputText value="[Chris Rea] #{item}"></h:outputText>
- </rich:column>
- </rich:orderingList>
-
- <rich:orderingList value="#{user.list}" var="item" >
- <f:facet name="topControl">
- U1
- <h:outputText value="UF1" />
- <h:outputText value="UF2" />
- <h:outputText value="UF3" />
- <span>S1</span> T1
- </f:facet>
- <f:facet name="upControl">
- UU1
- <h:outputText value="UUFF1" />
- <h:outputText value="UUFF2" />
- <h:outputText value="UUFF3" />
- <span>UUSS1</span> UUTT1
- </f:facet>
- <f:facet name="downControl">
- D1
- <h:outputText value="DF1" />
- <h:outputText value="DF2" />
- <h:outputText value="DF3" />
- <span>DS1</span> DT1
- </f:facet>
- <f:facet name="bottomControl">
- DDW1
- <h:outputText value="DDF1" />
- <h:outputText value="DDF2" />
- <h:outputText value="DDF3" />
- <span>DDS1</span> DDT1
- </f:facet>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="Song Name" />
- </f:facet>
- <h:outputText value="[You must be evil] #{item}"></h:outputText>
- </rich:column>
- <rich:column>
- <f:facet name="footer">
- WW1
- <h:outputText value="FF1" />
- <h:outputText value="FF2" />
- <h:outputText value="FF3" />
- <span>SS1</span> TT1
- <h:outputText value="Artist Name" />
- </f:facet>
- <h:outputText value="[Chris Rea] #{item}"></h:outputText>
- </rich:column>
- </rich:orderingList>
-
-
-</h:panelGrid>
-
-<h1> 16) rich:progressBar </h1>
-
-<h:panelGrid columns="3" styleClass="panel">
-
- <rich:progressBar value="67" style="color:red" styleClass="btn" mode="client"
- id="progressBar">
- <f:facet name="initial">
- <h:outputText value="Process doesn't started yet" />
- </f:facet>
- <f:facet name="complete">
- <h:outputText value="Process Done" />
- </f:facet>
- </rich:progressBar>
-
- <rich:progressBar value="45">
- <f:facet name="initial">
- W1
- <h:outputText value="F1" />
- <h:outputText value="F2" />
- <h:outputText value="F3" />
- <span>S1</span> T1
- </f:facet>
- <f:facet name="complete">
- WW1
- <h:outputText value="FF1" />
- <h:outputText value="FF2" />
- <h:outputText value="FF3" />
- <span>SS1</span> TT1
- </f:facet>
- </rich:progressBar>
-
- <rich:progressBar value="30" label="Progres Bar" style="color:red" styleClass="btn" mode="client">
- <f:facet name="complete">
- WW1
- <h:outputText value="FF1" />
- <h:outputText value="FF2" />
- <h:outputText value="FF3" />
- <span>SS1</span> TT1
- </f:facet>
- <h:outputText> first text </h:outputText>
- <h:outputText> Download speed 100 Mbit/s </h:outputText>
- <h:outputText> last text </h:outputText>
- </rich:progressBar>
- <rich:progressBar value="30" >
- </rich:progressBar>
- <rich:progressBar value="45">
- </rich:progressBar>
-</h:panelGrid> </f:view> </body> </html>
\ No newline at end of file
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r42174 - trunk/build/publish.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-06-22 06:47:22 -0400 (Fri, 22 Jun 2012)
New Revision: 42174
Modified:
trunk/build/publish/publish.sh
Log:
Fix the case where more than 1 git repo are used to build
m2e-wtp and m2e-wtp-tests are in 2 git repos and build in the same job
/job/${JOB_NAME}/${BUILD_NUMBER}/api/xml?xpath=//lastBuiltRevision would fail because there are 2 nodes.
As a workaround, we take the 1st one we find :
/job/${JOB_NAME}/${BUILD_NUMBER}/api/xml?xpath=(//lastBuiltRevision)[1]
Modified: trunk/build/publish/publish.sh
===================================================================
--- trunk/build/publish/publish.sh 2012-06-22 10:44:16 UTC (rev 42173)
+++ trunk/build/publish/publish.sh 2012-06-22 10:47:22 UTC (rev 42174)
@@ -79,9 +79,9 @@
wgetParams="--timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response"
rl=${STAGINGDIR}/logs/REVISION
if [[ $(find ${WORKSPACE} -mindepth 2 -maxdepth 3 -name ".git") ]]; then
- # Track git source revision through hudson api: /job/${JOB_NAME}/${BUILD_NUMBER}/api/xml?xpath=//lastBuiltRevision
+ # Track git source revision through hudson api: /job/${JOB_NAME}/${BUILD_NUMBER}/api/xml?xpath=(//lastBuiltRevision)[1]
rl=${STAGINGDIR}/logs/GIT_REVISION
- rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/api/xml..." ${wgetParams}
+ rm -f ${rl}.txt ${rl}.xml; wget -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/api/xml..." ${wgetParams}
sed -e "s#<lastBuiltRevision><SHA1>\([a-f0-9]\+\)</SHA1><branch><SHA1>\([a-f0-9]\+\)</SHA1><name>\([^<>]\+\)</name></branch></lastBuiltRevision>#\3\@\1#g" ${rl}.xml | sed -e "s#<[^<>]\+>##g" > ${rl}.txt
elif [[ $(find ${WORKSPACE} -mindepth 2 -maxdepth 3 -name ".svn") ]]; then
# Track svn source revision through hudson api: /job/${JOB_NAME}/api/xml?wrapper=changeSet&depth=1&xpath=//build[1]/changeSet/revision
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r42173 - in trunk/tests: tests/org.jboss.tools.tests.test/src/org/jboss/tools/tests/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-06-22 06:44:16 -0400 (Fri, 22 Jun 2012)
New Revision: 42173
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java
trunk/tests/tests/org.jboss.tools.tests.test/src/org/jboss/tools/tests/tests/UtilsTest.java
Log:
renamed plugin test missed reference, also NPE
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2012-06-22 10:08:03 UTC (rev 42172)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2012-06-22 10:44:16 UTC (rev 42173)
@@ -59,7 +59,8 @@
} else {
project = ResourcesUtils.importProject(bundleName, projectPath, name, null);
}
- project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
+ if( project != null )
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
}
} catch (IOException e) {
throw new CoreException(new Status(Status.ERROR,bundleName,e.getMessage(),e));
Modified: trunk/tests/tests/org.jboss.tools.tests.test/src/org/jboss/tools/tests/tests/UtilsTest.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.test/src/org/jboss/tools/tests/tests/UtilsTest.java 2012-06-22 10:08:03 UTC (rev 42172)
+++ trunk/tests/tests/org.jboss.tools.tests.test/src/org/jboss/tools/tests/tests/UtilsTest.java 2012-06-22 10:44:16 UTC (rev 42173)
@@ -14,7 +14,7 @@
@Test
public void testProjectProvider() throws Exception {
TestProjectProvider provider = new TestProjectProvider(
- "org.jboss.tools.tests.tests", null, PROJECT_NAME, false);
+ "org.jboss.tools.tests.test", null, PROJECT_NAME, false);
IProject project = provider.getProject();
assertNotNull("Project is not imported: " + PROJECT_NAME, project);
assertTrue("Project doesn't exist: " + PROJECT_NAME, project.exists());
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r42172 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-06-22 06:08:03 -0400 (Fri, 22 Jun 2012)
New Revision: 42172
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/KeyboardHelper.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
Log:
https://issues.jboss.org/browse/JBIDE-12114 - BotTest to check selection in visual pane via left arrow + shift key.
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/KeyboardHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/KeyboardHelper.java 2012-06-22 09:59:16 UTC (rev 42171)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/KeyboardHelper.java 2012-06-22 10:08:03 UTC (rev 42172)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.ui.bot.ext.helper;
import java.awt.AWTException;
@@ -13,34 +23,64 @@
public class KeyboardHelper {
private static Robot robot = null;
+
+ public static void keyPressedEvent (Display display, int keyCode) {
+ Event keyPressed = new Event();
+ keyPressed.keyCode = keyCode;
+ keyPressed.type = SWT.KeyDown;
+ display.post(keyPressed);
+ }
+
+ public static void keyReleasedEvent (Display display, int keyCode) {
+ Event keyReleased = new Event();
+ keyReleased.keyCode = keyCode;
+ keyReleased.type = SWT.KeyUp;
+ display.post(keyReleased);
+ }
+
/**
* Simulate pressing of key with keyCode via SWT
* @param display
* @param keyCode
*/
- public static void pressKeyCode (Display display , int keyCode){
-
- Event keyPressed = new Event();
- keyPressed.keyCode = keyCode;
- keyPressed.type = SWT.KeyDown;
- display.post(keyPressed);
- Event keyReleased = new Event();
- keyReleased.keyCode = keyCode;
- keyReleased.type = SWT.KeyUp;
- display.post(keyReleased);
-
+ public static void pressKeyCode (Display display, int keyCode) {
+ keyPressedEvent(display, keyCode);
+ keyReleasedEvent(display, keyCode);
}
+
/**
* Simulate pressing of keys with keyCodes via SWT
* @param display
* @param keyCodes
*/
- public static void pressKeyCodes (Display display , byte[] keyCodes){
- for (byte keyCode : keyCodes){
- KeyboardHelper.pressKeyCode(display,keyCode);
- SWTUtils.sleep(Timing.time1S());
- }
+ public static void pressKeyCodes (Display display, byte[] keyCodes){
+ for (byte keyCode : keyCodes){
+ KeyboardHelper.pressKeyCode(display,keyCode);
+ SWTUtils.sleep(Timing.time1S());
+ }
}
+
+ public static void typeKeyCodeUsingSWT (Display display, int swtKeyCode , int... modifiers){
+ if (modifiers != null){
+ for (int modifierCode : modifiers){
+ KeyboardHelper.keyPressedEvent(display, modifierCode);
+ }
+ }
+ KeyboardHelper.pressKeyCode(display, swtKeyCode);
+ if (modifiers != null){
+ for (int modifierCode : modifiers){
+ KeyboardHelper.keyReleasedEvent(display, modifierCode);
+ }
+ }
+ }
+
+ public static void selectTextUsingSWTEvents (Display display, boolean forward, int selectionLength) {
+ int arrowCode = forward ? SWT.ARROW_RIGHT : SWT.ARROW_LEFT;
+ for (int index = 0 ; index < selectionLength; index ++){
+ typeKeyCodeUsingSWT(display, arrowCode, SWT.SHIFT);
+ }
+ }
+
/**
* Simulate pressing of key with keyCode via AWT
* @param awtKeyCode
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2012-06-22 09:59:16 UTC (rev 42171)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2012-06-22 10:08:03 UTC (rev 42172)
@@ -18,6 +18,7 @@
import org.jboss.tools.vpe.ui.bot.test.editor.InsertActionsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.MinMaxPanesTest;
import org.jboss.tools.vpe.ui.bot.test.editor.MultiSelectionTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.SelectionSynchronizationTest;
import org.jboss.tools.vpe.ui.bot.test.editor.StylesOnThePageTest;
import org.jboss.tools.vpe.ui.bot.test.editor.TextEditingActionsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.TextSelectionTest;
@@ -216,7 +217,8 @@
UnicodeCharacterDisplayingTest.class,
ExternalEditingTest.class,
VpeToolbarTest.class,
- MultiSelectionTest.class
+ MultiSelectionTest.class,
+ SelectionSynchronizationTest.class
})
public class VPEAllBotTests extends SWTBotTestCase{
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/SelectionSynchronizationTest.java 2012-06-22 10:08:03 UTC (rev 42172)
@@ -0,0 +1,107 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2012 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
+import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
+import org.mozilla.interfaces.nsIDOMNode;
+
+public class SelectionSynchronizationTest extends VPEEditorTestCase {
+
+ private SWTBotExt botExt = null;
+ private SWTBotEditorExt jspTextEditor;
+ private SWTBotWebBrowser webBrowser;
+ private final String SIMPLE_TEXT = "Some Plain Text Here"; //$NON-NLS-1$
+ private final int SELECTION_LENGTH = 7;
+
+ public SelectionSynchronizationTest() {
+ super();
+ botExt = new SWTBotExt();
+ }
+
+ public void testSelectionSynchronization() throws Throwable {
+ /*
+ * Open test page
+ */
+ openPage();
+ jspTextEditor = botExt.swtBotEditorExtByTitle(TEST_PAGE);
+ setEditor(jspTextEditor);
+ webBrowser = new SWTBotWebBrowser(TEST_PAGE, botExt);
+ setEditorText(getEditor().getText());
+ getEditor().setFocus();
+ Display d = bot.getDisplay();
+
+ jspTextEditor.setFocus();
+ jspTextEditor.navigateTo(13,0);
+ jspTextEditor.typeText(SIMPLE_TEXT);
+ jspTextEditor.navigateTo(13,0);
+
+ KeyboardHelper.selectTextUsingSWTEvents(d, true, SELECTION_LENGTH);
+ util.sleep(TIME_1S);
+ String selectionText = webBrowser.getSelectionText();
+ assertEquals("Step 1. Selected text in the Visual Part is wrong: ", "Some Pl", selectionText); //$NON-NLS-1$ //$NON-NLS-2$
+ KeyboardHelper.pressKeyCode(d, SWT.ARROW_RIGHT);
+ KeyboardHelper.pressKeyCode(d, SWT.ARROW_RIGHT);
+ KeyboardHelper.selectTextUsingSWTEvents(d, false, SELECTION_LENGTH);
+ util.sleep(TIME_1S);
+ selectionText = webBrowser.getSelectionText();
+ assertEquals("Step 2. Selected text in the Visual Part is wrong: ", "me Plai", selectionText); //$NON-NLS-1$ //$NON-NLS-2$
+ /*
+ * Select text in Web Browser
+ */
+ webBrowser.setFocus();
+ nsIDOMNode node = webBrowser.getDomNodeByTagName("SPAN", 1); //$NON-NLS-1$
+ webBrowser.setFocus();
+ webBrowser.selectDomNode(node, 0);
+ KeyboardHelper.pressKeyCode(d, SWT.ARROW_RIGHT);
+ KeyboardHelper.pressKeyCode(d, SWT.ARROW_RIGHT);
+
+ KeyboardHelper.selectTextUsingSWTEvents(d, true, SELECTION_LENGTH);
+ util.sleep(TIME_1S);
+ selectionText = jspTextEditor.getSelection();
+ assertEquals("Step 3. Selected text in the Source Part is wrong: ", "ome Pla", selectionText); //$NON-NLS-1$ //$NON-NLS-2$
+ KeyboardHelper.pressKeyCode(d, SWT.ARROW_RIGHT);
+ KeyboardHelper.pressKeyCode(d, SWT.ARROW_RIGHT);
+ KeyboardHelper.selectTextUsingSWTEvents(d, false, SELECTION_LENGTH);
+ util.sleep(TIME_1S);
+ selectionText = jspTextEditor.getSelection();
+ assertEquals("Step 4. Selected text in the Source Part is wrong: ", "e Plain", selectionText); //$NON-NLS-1$ //$NON-NLS-2$
+
+ /*
+ * Navigate to the text
+ */
+ jspTextEditor.setFocus();
+ jspTextEditor.navigateTo(11, 38);
+ util.sleep(TIME_1S);
+ jspTextEditor.navigateTo(11, 39);
+ util.sleep(TIME_1S);
+ /*
+ * Select some text to the right
+ */
+ KeyboardHelper.selectTextUsingSWTEvents(d, true, SELECTION_LENGTH);
+ util.sleep(TIME_1S);
+ selectionText = webBrowser.getSelectionText();
+ assertEquals("Step 5. Selected text in the Visual Part is wrong: ", "llo Dem", selectionText); //$NON-NLS-1$ //$NON-NLS-2$
+ jspTextEditor.navigateTo(11, 46);
+ util.sleep(TIME_1S);
+ jspTextEditor.navigateTo(11, 51);
+ util.sleep(TIME_1S);
+ KeyboardHelper.selectTextUsingSWTEvents(d, false, SELECTION_LENGTH);
+ util.sleep(TIME_1S);
+ selectionText = webBrowser.getSelectionText();
+ assertEquals("Step 6. Selected text in the Visual Part is wrong: ", "emo App", selectionText); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+}
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r42171 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-06-22 05:59:16 -0400 (Fri, 22 Jun 2012)
New Revision: 42171
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java
Log:
additional null pointer check
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2012-06-22 08:27:17 UTC (rev 42170)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2012-06-22 09:59:16 UTC (rev 42171)
@@ -53,7 +53,7 @@
public TestProjectProvider(String bundleName, String projectPath, String name, boolean makeCopy) throws CoreException {
try {
project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- if(!project.isAccessible()) {
+ if(project != null && !project.isAccessible()) {
if( null == projectPath ) {
project = ResourcesUtils.importProject(bundleName, "projects" + Path.SEPARATOR + name, null);
} else {
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r42170 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-06-22 04:27:17 -0400 (Fri, 22 Jun 2012)
New Revision: 42170
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
Log:
JBIDE-12217 : make javaee6 archetypes point at their latest release in Maven Central
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-06-22 07:37:05 UTC (rev 42169)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-06-22 08:27:17 UTC (rev 42170)
@@ -48,9 +48,9 @@
<mavenArchetype>
<archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId>
<archetypeArtifactId>jboss-javaee6-webapp-archetype</archetypeArtifactId>
- <archetypeVersion>7.1.1.Beta2-JBT</archetypeVersion>
+ <archetypeVersion>7.1.1.Beta3</archetypeVersion>
+ <!--
<archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
- <!--
<archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
-->
<groupId>org.jboss.tools.examples</groupId>
@@ -105,9 +105,9 @@
<mavenArchetype>
<archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId>
<archetypeArtifactId>jboss-javaee6-webapp-ear-archetype</archetypeArtifactId>
- <archetypeVersion>7.1.1.Beta2-JBT</archetypeVersion>
+ <archetypeVersion>7.1.1.Beta3</archetypeVersion>
+ <!--
<archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
- <!--
<archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
-->
<groupId>org.jboss.tools.example</groupId>
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r42169 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: uiutils and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-06-22 03:37:05 -0400 (Fri, 22 Jun 2012)
New Revision: 42169
Removed:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/ti/
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/RESTFullExplorer.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/RunOnServerDialog.java
Log:
new uiutils classes needed for ws bot tests
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/RESTFullExplorer.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/RESTFullExplorer.java 2012-06-22 01:33:18 UTC (rev 42168)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/RESTFullExplorer.java 2012-06-22 07:37:05 UTC (rev 42169)
@@ -1,46 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
package org.jboss.tools.ws.ui.bot.test.uiutils;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
+import org.jboss.tools.ws.ui.bot.test.rest.RESTFulAnnotations;
-public class RESTFullExplorer {
+public class RESTFullExplorer extends SWTTestExt {
- public RESTFullExplorer(String projectName) {
- // TODO Auto-generated constructor stub
+ private SWTBotTreeItem restFulExplorer;
+
+ public RESTFullExplorer(String wsProjectName) {
+ String[] pathToRestExplorer = {wsProjectName};
+ restFulExplorer = projectExplorer.selectTreeItem(
+ RESTFulAnnotations.REST_EXPLORER_LABEL.getLabel(),
+ pathToRestExplorer).expand().expand();
}
-
- public Object getRestServiceName(SWTBotTreeItem restService) {
- // TODO Auto-generated method stub
- return null;
+
+ /**
+ *
+ * @return
+ */
+ public SWTBotTreeItem[] getAllRestServices() {
+ return restFulExplorer.getItems();
}
-
- public String getPathForRestFulService(SWTBotTreeItem restService) {
- // TODO Auto-generated method stub
- return "";
+
+ public SWTBotTreeItem restService(String method) {
+ SWTBotTreeItem getMethod = null;
+ for (SWTBotTreeItem ti : getAllRestServices()) {
+ if (ti.getText().contains("GET")) {
+ getMethod = ti;
+ break;
+ }
+ }
+ return getMethod;
}
-
- public Object getConsumesInfo(SWTBotTreeItem restService) {
- // TODO Auto-generated method stub
- return null;
+
+ public RunOnServerDialog runOnServer(SWTBotTreeItem service) {
+ SWTBotTree tree = projectExplorer.bot().tree();
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree, service);
+ SWTBotMenu menu = new SWTBotMenu(ContextMenuHelper.
+ getContextMenu(tree, "Run As", false));
+ menu.menu("1 Run on Server").click();
+ return new RunOnServerDialog();
}
-
- public Object getProducesInfo(SWTBotTreeItem restService) {
- // TODO Auto-generated method stub
- return null;
+
+ /**
+ *
+ * @param restService
+ * @return
+ */
+ public SWTBotTreeItem[] getAllInfoAboutRestService(SWTBotTreeItem restService) {
+ restService.expand();
+ return restService.getItems();
}
-
- public SWTBotTreeItem[] getAllRestServices() {
- // TODO Auto-generated method stub
+
+ /**
+ *
+ * @param restService
+ * @return
+ */
+ public String getConsumesInfo(SWTBotTreeItem restService) {
+ for (SWTBotTreeItem ti: getAllInfoAboutRestService(restService)) {
+ if (ti.getText().contains("consumes:")) {
+ return ti.getText().split(" ")[1];
+ }
+ }
return null;
}
-
- public Object restService(String webService) {
- // TODO Auto-generated method stub
+
+ /**
+ *
+ * @param restService
+ * @return
+ */
+ public String getProducesInfo(SWTBotTreeItem restService) {
+ for (SWTBotTreeItem ti: getAllInfoAboutRestService(restService)) {
+ if (ti.getText().contains("produces:")) {
+ return ti.getText().split(" ")[1];
+ }
+ }
return null;
}
-
- public RunOnServerDialog runOnServer(Object restService) {
- // TODO Auto-generated method stub
- return null;
+
+ /**
+ *
+ * @param restService
+ * @return
+ */
+ public String getRestServiceName(SWTBotTreeItem restService) {
+ return restService.getText().split(" ")[0];
}
-
-}
+
+ /**
+ *
+ * @param restService
+ * @return
+ */
+ public String getPathForRestFulService(SWTBotTreeItem restService) {
+ return restService.getText().split(" ")[1];
+ }
+
+}
\ No newline at end of file
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/RunOnServerDialog.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/RunOnServerDialog.java 2012-06-22 01:33:18 UTC (rev 42168)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/RunOnServerDialog.java 2012-06-22 07:37:05 UTC (rev 42169)
@@ -1,22 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.ws.ui.bot.test.uiutils;
-public class RunOnServerDialog {
+import java.util.ArrayList;
+import java.util.List;
- public class Server1 {
- public class Server2 {
- public void finish() {
- }
- }
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
- public Server2 selectServer(String str) {
- return new Server2();
+/**
+ *
+ * @author jjankovi
+ *
+ */
+public class RunOnServerDialog {
- }
-
+ private SWTBotShell shell = null;
+ private SWTBot bot = null;
+ private final String DIALOG_TITLE = "Run On Server";
+
+ public RunOnServerDialog() {
+ shell = SWTBotFactory.getBot().shell(getDialogTitle());
+ bot = shell.bot();
}
- public Server1 chooseExistingServer() {
- return new Server1();
+ private String getDialogTitle() {
+ return DIALOG_TITLE;
}
-
-}
+
+ public RunOnServerDialog chooseExistingServer() {
+ bot.checkBox(0).select();
+ return this;
+ }
+
+ public List<String> getServers() {
+ List<String> servers = new ArrayList<String>();
+ for (SWTBotTreeItem server : bot.tree().getTreeItem("localhost").getItems()) {
+ servers.add(server.getText());
+ }
+ return servers;
+ }
+
+ public RunOnServerDialog selectServer(String server) {
+ for (String serverInDialog : getServers()) {
+ if (serverInDialog.contains(server)) {
+ bot.tree().getTreeItem("localhost")
+ .getNode(serverInDialog).select();
+ break;
+ }
+ }
+ return this;
+ }
+
+ public void finish() {
+ bot.button(IDELabel.Button.FINISH).click();
+ }
+
+ public void cancel() {
+ bot.button(IDELabel.Button.CANCEL).click();
+ }
+
+}
\ No newline at end of file
12 years, 6 months
- 1
- 0
JBoss Tools SVN: r42168 - trunk/documentation/jboss-tools-docs/index/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-06-21 21:33:18 -0400 (Thu, 21 Jun 2012)
New Revision: 42168
Modified:
trunk/documentation/jboss-tools-docs/index/en-US/master.xml
Log:
updated to remove SOA tools community books as believe they are causing an issue in the build
Modified: trunk/documentation/jboss-tools-docs/index/en-US/master.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/index/en-US/master.xml 2012-06-22 01:30:05 UTC (rev 42167)
+++ trunk/documentation/jboss-tools-docs/index/en-US/master.xml 2012-06-22 01:33:18 UTC (rev 42168)
@@ -186,7 +186,7 @@
</indexentry>
</index>
- <index>
+<!-- <index>
<title>JBoss Tools - SOA and Business Rules</title>
<indexentry>
@@ -237,5 +237,5 @@
</primaryie>
</indexentry>
- </index>
+</index> -->
</book>
12 years, 6 months
- 1
- 0