JBoss Tools SVN: r15628 - trunk/jmx/releng/psfs.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-06-01 18:16:45 -0400 (Mon, 01 Jun 2009)
New Revision: 15628
Added:
trunk/jmx/releng/psfs/jmx.subclipse.psf
trunk/jmx/releng/psfs/jmx.subversive.psf
Log:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=278687 new generated .psfs from .map
Added: trunk/jmx/releng/psfs/jmx.subclipse.psf
===================================================================
--- trunk/jmx/releng/psfs/jmx.subclipse.psf (rev 0)
+++ trunk/jmx/releng/psfs/jmx.subclipse.psf 2009-06-01 22:16:45 UTC (rev 15628)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<psf version="2.0">
+<provider id="org.tigris.subversion.subclipse.core.svnnature">
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/features/org...."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/features/org...."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/features/org...."/>
+
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/plugins/org.j..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/plugins/org.j..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/tests/org.jbo..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/tests/org.jbo..."/>
+ <project reference="0.9.3,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/tests/org.jbo..."/>
+</provider>
+</psf>
Property changes on: trunk/jmx/releng/psfs/jmx.subclipse.psf
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jmx/releng/psfs/jmx.subversive.psf
===================================================================
--- trunk/jmx/releng/psfs/jmx.subversive.psf (rev 0)
+++ trunk/jmx/releng/psfs/jmx.subversive.psf 2009-06-01 22:16:45 UTC (rev 15628)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<psf version="2.0">
+<provider id="org.eclipse.team.svn.core.svnnature">
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/features/org...."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/features/org...."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/features/org...."/>
+
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/plugins/org.j..."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/plugins/org.j..."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/tests/org.jbo..."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/tests/org.jbo..."/>
+ <project reference="1.0.1,http://anonsvn.jboss.org/repos///jbosstools/trunk/jmx/tests/org.jbo..."/>
+</provider>
+</psf>
Property changes on: trunk/jmx/releng/psfs/jmx.subversive.psf
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 6 months
JBoss Tools SVN: r15627 - trunk/jmx.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-06-01 15:05:56 -0400 (Mon, 01 Jun 2009)
New Revision: 15627
Removed:
trunk/jmx/test/
Log:
omit from version control
15 years, 6 months
JBoss Tools SVN: r15626 - trunk/jmx/test.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-06-01 15:04:26 -0400 (Mon, 01 Jun 2009)
New Revision: 15626
Removed:
trunk/jmx/test/org.eclipse.ant.optional.junit/
trunk/jmx/test/org.eclipse.test/
Log:
omit from version control
15 years, 6 months
JBoss Tools SVN: r15624 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui/refactoring and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-06-01 11:22:44 -0400 (Mon, 01 Jun 2009)
New Revision: 15624
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamContextVariableRenameHandler.java
Log:
Seam Context Variable Refactoring https://jira.jboss.org/jira/browse/JBIDE-1077
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-06-01 14:26:50 UTC (rev 15623)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2009-06-01 15:22:44 UTC (rev 15624)
@@ -545,7 +545,7 @@
locationURI="popup:#CompilationUnitEditorContext?after=org.eclipse.jdt.ui.refactoring.menu">
<menu
id="java.editor.seam.popup.menu"
- label="Seam">
+ label="Seam Refactor">
<command
commandId="org.jboss.tools.seam.ui.refactoring.component"
id="org.jboss.tools.seam.ui.open.component.submenu"
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamContextVariableRenameHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamContextVariableRenameHandler.java 2009-06-01 14:26:50 UTC (rev 15623)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/refactoring/SeamContextVariableRenameHandler.java 2009-06-01 15:22:44 UTC (rev 15624)
@@ -67,6 +67,8 @@
* ExecutionEvent)
*/
public Object execute(ExecutionEvent event) throws ExecutionException {
+ boolean status = false;
+
IEditorPart editor = HandlerUtil.getActiveEditor(event);
Shell activeShell = HandlerUtil.getActiveShell(event);
@@ -83,6 +85,8 @@
selectedText = selection.getText();
System.out.println("Selection text - "+selectedText);
+ System.out.println("Selection offset - "+selection.getOffset());
+ System.out.println("Selection length - "+selection.getLength());
FileEditorInput input = (FileEditorInput)editor.getEditorInput();
@@ -96,17 +100,23 @@
SeamCorePlugin.getPluginLog().logError(e);
return null;
}
+
if(JAVA_EXT.equalsIgnoreCase(ext)){
- findContextVariableInJava(file, content, selection);
+ status = findContextVariableInJava(file, content, selection);
} else if(XML_EXT.equalsIgnoreCase(ext) || XHTML_EXT.equalsIgnoreCase(ext) || JSP_EXT.equalsIgnoreCase(ext))
- findContextVariableInDOM(file, content, selection);
+ status = findContextVariableInDOM(file, content, selection);
else if(PROPERTIES_EXT.equalsIgnoreCase(ext))
- findContextVariableInProperties(file, content, selection);
+ status = findContextVariableInProperties(file, content, selection);
}
+ if(status){
+
+ }
+
+ System.out.println("Status - "+status);
return null;
}
- private void findContextVariableInJava(IFile file, String content, TextSelection selection){
+ private boolean findContextVariableInJava(IFile file, String content, TextSelection selection){
try {
FastJavaPartitionScanner scaner = new FastJavaPartitionScanner();
Document document = new Document(content);
@@ -116,9 +126,11 @@
if(IJavaPartitions.JAVA_STRING.equals(token.getData())) {
int length = scaner.getTokenLength();
int offset = scaner.getTokenOffset();
- String value = document.get(offset, length);
- if(value.indexOf('{')>-1) {
- scanString(file, value, offset);
+ if(offset <= selection.getOffset() && (offset+length) >= (selection.getOffset()+selection.getLength())){
+ String value = document.get(offset, length);
+ if(value.indexOf('{')>-1) {
+ return scanString(file, value, offset, selection);
+ }
}
}
token = scaner.nextToken();
@@ -126,9 +138,10 @@
} catch (BadLocationException e) {
SeamCorePlugin.getDefault().logError(e);
}
+ return false;
}
- private void scanString(IFile file, String string, int offset) {
+ private boolean scanString(IFile file, String string, int offset, TextSelection selection) {
int startEl = string.indexOf("#{"); //$NON-NLS-1$
if(startEl>-1) {
ELParser parser = ELParserUtil.getJbossFactory().createParser();
@@ -137,11 +150,13 @@
for(ELInvocationExpression ie : instance.getExpression().getInvocations()){
ELPropertyInvocation pi = findComponentReference(ie);
if(pi != null){
-
+ if(offset+pi.getStartPosition() == selection.getOffset() && pi.getLength() == selection.getLength())
+ return true;
}
}
}
}
+ return false;
}
private ELPropertyInvocation findComponentReference(ELInvocationExpression invocationExpression){
@@ -160,10 +175,10 @@
return null;
}
- private void findContextVariableInDOM(IFile file, String content, TextSelection selection){
+ private boolean findContextVariableInDOM(IFile file, String content, TextSelection selection){
IModelManager manager = StructuredModelManager.getModelManager();
if(manager == null) {
- return;
+ return false;
}
IStructuredModel model = null;
try {
@@ -182,10 +197,11 @@
model.releaseFromRead();
}
}
+ return false;
}
- private void findContextVariableInProperties(IFile file, String content, TextSelection selection){
-
+ private boolean findContextVariableInProperties(IFile file, String content, TextSelection selection){
+ return false;
}
15 years, 6 months
JBoss Tools SVN: r15623 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-06-01 10:26:50 -0400 (Mon, 01 Jun 2009)
New Revision: 15623
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4381, attributes processing was added to rich:page, junits were updated.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css 2009-06-01 14:18:36 UTC (rev 15622)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/page/page-basic.css 2009-06-01 14:26:50 UTC (rev 15623)
@@ -23,14 +23,11 @@
}
.rich-page-sidebar {
- float: left;
position: relative;
width: 12.3077em;
}
.rich-page-main {
- float: right;
- margin-left: -30em;
width: 100%;
}
@@ -38,7 +35,6 @@
float: none;
width: auto;
position: static;
- margin-left: 13.3077em;
}
.rich-page-footer {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java 2009-06-01 14:18:36 UTC (rev 15622)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java 2009-06-01 14:26:50 UTC (rev 15623)
@@ -1,11 +1,14 @@
package org.jboss.tools.jsf.vpe.richfaces.template;
+import java.math.BigDecimal;
+
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -18,7 +21,6 @@
private static final String CSS_SIMPLE_THEME_STYLE_PATH = "page/page-theme_simple.css"; //$NON-NLS-1$
private static final String COMPONENT_NAME = "richFacesPage"; //$NON-NLS-1$
-// private static final String FACET_NAME_PAGE_HEADER = "pageHeader"; //$NON-NLS-1$
private static final String FACET_NAME_SUBHEADER = "subheader"; //$NON-NLS-1$
private static final String FACET_NAME_SIDEBAR = "sidebar"; //$NON-NLS-1$
@@ -33,6 +35,12 @@
private static final String CSS_PAGE_FOOTER = "rich-page-footer"; //$NON-NLS-1$
private static final String CSS_PAGE_FOOTER_CONTENT = "rich-page-footer-content"; //$NON-NLS-1$
+ private static final String STYLE_SIDEBAR_LEFT = "float: left;"; //$NON-NLS-1$
+ private static final String STYLE_PAGE_MAIN_RIGHT = "float: right;margin-left: -30em;"; //$NON-NLS-1$
+
+ private static final String STYLE_SIDEBAR_RIGHT = "float: right;"; //$NON-NLS-1$
+ private static final String STYLE_PAGE_MAIN_LEFT = "float: left;margin-right: -30em;"; //$NON-NLS-1$
+
/**
* Constructor
*/
@@ -71,19 +79,37 @@
creationData = new VpeCreationData(pageDiv);
/*
- * Add basic style classes.
+ * Add basic style classes and attributes.
*/
String styleClass = CSS_PAGE;
if (ComponentUtil.isNotBlank(attrs.getStyleClass())) {
- styleClass += attrs.getStyleClass();
+ styleClass += Constants.WHITE_SPACE + attrs.getStyleClass();
}
+ pageDiv.setAttribute(HTML.ATTR_CLASS, styleClass);
+ String style = Constants.EMPTY;
+ /*
+ * Page's width in 'em' does not affect its size in VPE,
+ * so width should be set in 'px' to come into effect.
+ */
+ if (ComponentUtil.isNotBlank(attrs.getWidth())) {
+ style += Constants.WHITE_SPACE + "; width: " + attrs.getWidth() + "px;"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
if (ComponentUtil.isNotBlank(attrs.getStyle())) {
- pageDiv.setAttribute(HTML.ATTR_STYLE, attrs.getStyle());
+ style += Constants.WHITE_SPACE + attrs.getStyle();
}
- pageDiv.setAttribute(HTML.ATTR_CLASS, styleClass);
+ pageDiv.setAttribute(HTML.ATTR_STYLE, style);
+ if (ComponentUtil.isNotBlank(attrs.getDir())) {
+ pageDiv.setAttribute(HTML.ATTR_DIR, attrs.getDir());
+ }
+
pageContentDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_CONTENT);
pageMainDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_MAIN);
- pageBodyDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_BODY);
+ String bodyClass = CSS_PAGE_BODY;
+ if (ComponentUtil.isNotBlank(attrs.getBodyClass())) {
+ bodyClass += Constants.WHITE_SPACE + attrs.getBodyClass();
+ }
+ pageBodyDiv.setAttribute(HTML.ATTR_CLASS, bodyClass);
/*
* 1)
@@ -94,10 +120,14 @@
if(headerFacet != null) {
pageHeaderDiv = visualDocument.createElement(HTML.TAG_DIV);
pageHeaderContentDiv = visualDocument.createElement(HTML.TAG_DIV);
-
- pageHeaderDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_HEADER);
+
+ String headerClass = CSS_PAGE_HEADER;
+ if (ComponentUtil.isNotBlank(attrs.getHeaderClass())) {
+ headerClass += Constants.WHITE_SPACE + attrs.getHeaderClass();
+ }
+ pageHeaderDiv.setAttribute(HTML.ATTR_CLASS, headerClass);
pageHeaderContentDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_HEADER_CONTENT);
-
+
pageHeaderDiv.appendChild(pageHeaderContentDiv);
pageDiv.appendChild(pageHeaderDiv);
@@ -114,7 +144,11 @@
Element subHeaderFacet = ComponentUtil.getFacet(sourceElement, FACET_NAME_SUBHEADER);
if(subHeaderFacet != null) {
pageSubHeaderDiv = visualDocument.createElement(HTML.TAG_DIV);
- pageSubHeaderDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_SUBHEADER);
+ String subheaderClass = CSS_PAGE_SUBHEADER;
+ if (ComponentUtil.isNotBlank(attrs.getSubHeaderClass())) {
+ subheaderClass += Constants.WHITE_SPACE + attrs.getSubHeaderClass();
+ }
+ pageSubHeaderDiv.setAttribute(HTML.ATTR_CLASS, subheaderClass);
pageDiv.appendChild(pageSubHeaderDiv);
VpeChildrenInfo subHeaderInfo = new VpeChildrenInfo(pageSubHeaderDiv);
@@ -136,9 +170,49 @@
Element sidebarFacet = ComponentUtil.getFacet(sourceElement, FACET_NAME_SIDEBAR);
if(sidebarFacet != null) {
pageSidebarDiv = visualDocument.createElement(HTML.TAG_DIV);
- pageSidebarDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_SIDEBAR);
+ String sidebarClass = CSS_PAGE_SIDEBAR;
+ if (ComponentUtil.isNotBlank(attrs.getSiderbarClass())) {
+ sidebarClass += Constants.WHITE_SPACE + attrs.getSiderbarClass();
+ }
+ pageSidebarDiv.setAttribute(HTML.ATTR_CLASS, sidebarClass);
pageContentDiv.appendChild(pageSidebarDiv);
+
+ /*
+ * Processing attributes for sidebar style, width and position.
+ */
+ String sidebarStyle = Constants.EMPTY;
+ String pageMainDivStyle = Constants.EMPTY;
+ String pageBodyStyle = Constants.EMPTY;
+ double widthDouble = parseWidth(attrs.getSidebarWidth());
+ if (widthDouble != -1) {
+ sidebarStyle += Constants.WHITE_SPACE + "; width: " + widthDouble + "em;"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ /*
+ * If sidebar position 'right' is specified explicitly
+ * add 'float: right' style to the sidebar,
+ * otherwise default 'left' position will be used.
+ */
+ if (ComponentUtil.isNotBlank(attrs.getSidebarPosition())
+ && RichFaces.VALUE_RIGHT.equalsIgnoreCase(attrs
+ .getSidebarPosition())) {
+ sidebarStyle += Constants.WHITE_SPACE + STYLE_SIDEBAR_RIGHT;
+ pageMainDivStyle += Constants.WHITE_SPACE + STYLE_PAGE_MAIN_LEFT;
+ if (widthDouble != -1) {
+ pageBodyStyle += Constants.WHITE_SPACE + ";margin-right: " + widthDouble + "em;"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ } else {
+ sidebarStyle += Constants.WHITE_SPACE + STYLE_SIDEBAR_LEFT;
+ pageMainDivStyle += Constants.WHITE_SPACE + STYLE_PAGE_MAIN_RIGHT;
+ if (widthDouble != -1) {
+ pageBodyStyle += Constants.WHITE_SPACE + ";margin-left: " + widthDouble + "em;"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
+
+ pageSidebarDiv.setAttribute(HTML.ATTR_STYLE, sidebarStyle);
+ pageMainDiv.setAttribute(HTML.ATTR_STYLE, pageMainDivStyle);
+ pageBodyDiv.setAttribute(HTML.ATTR_STYLE, pageBodyStyle);
+
VpeChildrenInfo sidebarInfo = new VpeChildrenInfo(pageSidebarDiv);
sidebarInfo.addSourceChild(sidebarFacet);
creationData.addChildrenInfo(sidebarInfo);
@@ -166,8 +240,11 @@
if(footerFacet != null) {
pageFooterDiv = visualDocument.createElement(HTML.TAG_DIV);
pageFooterContentDiv = visualDocument.createElement(HTML.TAG_DIV);
-
- pageFooterDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_FOOTER);
+ String footerClass = CSS_PAGE_FOOTER;
+ if (ComponentUtil.isNotBlank(attrs.getFooterClass())) {
+ footerClass += Constants.WHITE_SPACE + attrs.getFooterClass();
+ }
+ pageFooterDiv.setAttribute(HTML.ATTR_CLASS, footerClass);
pageFooterContentDiv.setAttribute(HTML.ATTR_CLASS, CSS_PAGE_FOOTER_CONTENT);
pageFooterDiv.appendChild(pageFooterContentDiv);
@@ -181,6 +258,36 @@
return creationData;
}
+ /**
+ * Parses string width value from 'px' into 'em'.
+ *
+ * @param widthAttribute width attribute value.
+ * @return width value in 'em' or -1 if the value wasn't parsed.
+ */
+ private double parseWidth(String widthAttribute) {
+ double widthDouble = -1;
+ if (ComponentUtil.isNotBlank(widthAttribute)) {
+ try {
+ int widthInt = Integer.parseInt(widthAttribute);
+ /*
+ * Parse 'px' to 'em'.
+ */
+ widthDouble = widthInt / 13.33333;
+ /*
+ * Set Double fraction precision to 5 numbers.
+ */
+ BigDecimal b = new BigDecimal(widthDouble).setScale(5,
+ BigDecimal.ROUND_HALF_UP);
+ widthDouble = b.doubleValue();
+ } catch (NumberFormatException e) {
+ /*
+ * Do nothing, default width will be applied.
+ */
+ }
+ }
+ return widthDouble;
+ }
+
class Attributes {
/*
@@ -190,26 +297,29 @@
private final String CONTENT_CLASS = "contentClass"; //$NON-NLS-1$
private final String FOOTER_CLASS = "footerClass"; //$NON-NLS-1$
private final String HEADER_CLASS = "headerClass"; //$NON-NLS-1$
+ private final String SUBHEADER_CLASS = "subheaderClass"; //$NON-NLS-1$
private final String LANG = "lang"; //$NON-NLS-1$
private final String MARKUP_TYPE = "markupType"; //$NON-NLS-1$
private final String NAMESPACE = "namespace"; //$NON-NLS-1$
private final String PAGE_TITLE = "pageTitle"; //$NON-NLS-1$
private final String SIDERBAR_CLASS = "siderbarClass"; //$NON-NLS-1$
- private final String SIDERBAR_POSITION = "siderbarPosition"; //$NON-NLS-1$
- private final String SIDERBAR_WIDTH = "siderbarWidth"; //$NON-NLS-1$
+ private final String SIDEBAR_POSITION = "sidebarPosition"; //$NON-NLS-1$
+ private final String SIDEBAR_WIDTH = "sidebarWidth"; //$NON-NLS-1$
private final String THEME = "theme"; //$NON-NLS-1$
private String bodyClass;
private String contentClass;
private String footerClass;
private String headerClass;
+ private String subheaderClass;
+ private String dir;
private String lang;
private String markupType;
private String namespace;
private String pageTitle;
private String siderbarClass;
- private String siderbarPosition;
- private String siderbarWidth;
+ private String sidebarPosition;
+ private String sidebarWidth;
private String style;
private String styleClass;
private String theme;
@@ -220,13 +330,15 @@
contentClass = sourceElement.getAttribute(CONTENT_CLASS);
footerClass = sourceElement.getAttribute(FOOTER_CLASS);
headerClass = sourceElement.getAttribute(HEADER_CLASS);
+ subheaderClass = sourceElement.getAttribute(SUBHEADER_CLASS);
+ dir = sourceElement.getAttribute(HTML.ATTR_DIR);
lang = sourceElement.getAttribute(LANG);
markupType = sourceElement.getAttribute(MARKUP_TYPE);
namespace = sourceElement.getAttribute(NAMESPACE);
pageTitle = sourceElement.getAttribute(PAGE_TITLE);
siderbarClass = sourceElement.getAttribute(SIDERBAR_CLASS);
- siderbarPosition = sourceElement.getAttribute(SIDERBAR_POSITION);
- siderbarWidth = sourceElement.getAttribute(SIDERBAR_WIDTH);
+ sidebarPosition = sourceElement.getAttribute(SIDEBAR_POSITION);
+ sidebarWidth = sourceElement.getAttribute(SIDEBAR_WIDTH);
style = sourceElement.getAttribute(HTML.ATTR_STYLE);
styleClass = sourceElement.getAttribute(RichFaces.ATTR_STYLE_CLASS);
theme = sourceElement.getAttribute(THEME);
@@ -257,7 +369,15 @@
public String getHeaderClass() {
return headerClass;
}
+
+ public String getSubHeaderClass() {
+ return subheaderClass;
+ }
+ public String getDir() {
+ return dir;
+ }
+
public String getMarkupType() {
return markupType;
}
@@ -274,12 +394,12 @@
return siderbarClass;
}
- public String getSiderbarPosition() {
- return siderbarPosition;
+ public String getSidebarPosition() {
+ return sidebarPosition;
}
- public String getSiderbarWidth() {
- return siderbarWidth;
+ public String getSidebarWidth() {
+ return sidebarWidth;
}
public String getStyle() {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml 2009-06-01 14:18:36 UTC (rev 15622)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml 2009-06-01 14:26:50 UTC (rev 15623)
@@ -1,7 +1,7 @@
<tests>
<test id="id1">
- <DIV STYLE="background-color: white;" CLASS="rich-pagesomeClass">
+ <DIV STYLE="background-color: white;" CLASS="rich-page someClass">
<DIV CLASS="rich-page-header">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml
===================================================================
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml 2009-06-01 14:18:36 UTC (rev 15622)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml 2009-06-01 14:26:50 UTC (rev 15623)
@@ -1,27 +1,28 @@
<tests>
<test id="id1">
- <DIV STYLE="background-color: white;" CLASS="rich-pagesomeClass">
- <DIV CLASS="rich-page-header">
+
+ <DIV CLASS="rich-page someClass" STYLE="width: 800px; background-color: white;">
+ <DIV CLASS="rich-page-header headerClass">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
HEADER
</SPAN>
</DIV>
</DIV>
- <DIV CLASS="rich-page-subheader">
+ <DIV CLASS="rich-page-subheader subheaderClass">
<SPAN STYLE="font-size: 2em;">
SUBHEADER
- </SPAN>
+ </SPAN>
</DIV>
<DIV CLASS="rich-page-content">
- <DIV CLASS="rich-page-sidebar">
+ <DIV CLASS="rich-page-sidebar" STYLE="width: 15em; float: right;">
<SPAN STYLE="font-size: 2em;">
SIDEBAR
</SPAN>
</DIV>
- <DIV CLASS="rich-page-main">
- <DIV CLASS="rich-page-body">
+ <DIV CLASS="rich-page-main" STYLE="float: left; margin-right: -30em;">
+ <DIV CLASS="rich-page-body bodyClass" STYLE="margin-right: 15em;">
<H1 STYLE="-moz-user-modify: read-write;">
<SPAN CLASS="vpe-text">
BODY START
@@ -31,7 +32,7 @@
<DIV WIDTH="100%" STYLE="width: 100%;">
<SPAN CLASS="vpe-text">
TOP PANEL
- </SPAN>
+ </SPAN>
</DIV>
<DIV WIDTH="50%" STYLE="width: 50%; float: left;">
<SPAN CLASS="vpe-text">
@@ -56,7 +57,7 @@
</DIV>
</DIV>
</DIV>
- <DIV CLASS="rich-page-footer">
+ <DIV CLASS="rich-page-footer footerClass">
<DIV CLASS="rich-page-footer-content">
<SPAN STYLE="font-size: 2em;">
FOOTER
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml 2009-06-01 14:18:36 UTC (rev 15622)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml 2009-06-01 14:26:50 UTC (rev 15623)
@@ -1,6 +1,6 @@
<tests>
<test id="id1">
- <DIV STYLE="background-color: white;" CLASS="rich-pagesomeClass">
+ <DIV STYLE="width: 600px; background-color: white;" CLASS="rich-page someClass">
<DIV CLASS="rich-page-header">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
15 years, 6 months
JBoss Tools SVN: r15622 - in trunk: birt/docs/en and 15 other directories.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-06-01 10:18:36 -0400 (Mon, 01 Jun 2009)
New Revision: 15622
Modified:
trunk/as/docs/reference/en/master.xml
trunk/birt/docs/en/master.xml
trunk/drools/docs/guvnor_ref/en/master.xml
trunk/drools/docs/reference/en/master.xml
trunk/esb/docs/esb_ref_guide/en/master.xml
trunk/hibernatetools/docs/reference/en/master.xml
trunk/jbpm/docs/converter_ref/en/master.xml
trunk/jbpm/docs/reference/en/master.xml
trunk/jmx/docs/reference/en/master.xml
trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml
trunk/jsf/docs/jsf_tools_tutorial/en/master.xml
trunk/portlet/docs/reference/en/master.xml
trunk/seam/docs/reference/en/master.xml
trunk/smooks/docs/reference/en/master.xml
trunk/struts/docs/struts_tools_ref_guide/en/master.xml
trunk/struts/docs/struts_tools_tutorial/en/master.xml
trunk/ws/docs/reference/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-739 versions of guides are updated
Modified: trunk/as/docs/reference/en/master.xml
===================================================================
--- trunk/as/docs/reference/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/as/docs/reference/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -51,7 +51,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 2.0.0.GA
+ Version: 2.1.0.M1
</releaseinfo>
<abstract>
<title/>
Modified: trunk/birt/docs/en/master.xml
===================================================================
--- trunk/birt/docs/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/birt/docs/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -34,7 +34,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.0.0.GA
+ Version: 1.1.0.M1
</releaseinfo>
Modified: trunk/drools/docs/guvnor_ref/en/master.xml
===================================================================
--- trunk/drools/docs/guvnor_ref/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/drools/docs/guvnor_ref/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -44,9 +44,9 @@
<year>2009</year>
<holder>JBoss, a division of Red Hat</holder>
</copyright>
- <!--releaseinfo>
- Version: 5.0.0.M5
- </releaseinfo-->
+ <releaseinfo>
+ Version: 3.1.0.M1
+ </releaseinfo>
<abstract>
<title/>
<para>
Modified: trunk/drools/docs/reference/en/master.xml
===================================================================
--- trunk/drools/docs/reference/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/drools/docs/reference/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -46,7 +46,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 5.0.0.CR1
+ Version: 5.0.1.GA
</releaseinfo>
<abstract>
<title/>
Modified: trunk/esb/docs/esb_ref_guide/en/master.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/esb/docs/esb_ref_guide/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -44,7 +44,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.1.1.GA
+ Version: 1.3.0.M1
</releaseinfo>
<abstract>
Modified: trunk/hibernatetools/docs/reference/en/master.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/hibernatetools/docs/reference/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -49,7 +49,7 @@
</copyright>
<releaseinfo>
- Version: 3.2.4.GA
+ Version: 3.3.0.M1
</releaseinfo>
Modified: trunk/jbpm/docs/converter_ref/en/master.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/jbpm/docs/converter_ref/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -29,7 +29,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.0.0.GA
+ Version: 1.1.0.M1
</releaseinfo>
<abstract>
<title/>
Modified: trunk/jbpm/docs/reference/en/master.xml
===================================================================
--- trunk/jbpm/docs/reference/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/jbpm/docs/reference/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -69,7 +69,7 @@
<year>2009</year>
<holder>JBoss, a division of Red Hat</holder>
</copyright>
- <releaseinfo> Version: 3.1.7.GA</releaseinfo>
+ <releaseinfo> Version: 3.1.8.GA</releaseinfo>
<abstract>
<title/>
Modified: trunk/jmx/docs/reference/en/master.xml
===================================================================
--- trunk/jmx/docs/reference/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/jmx/docs/reference/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -48,7 +48,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.0.0.GA
+ Version: 1.1.0.M1
</releaseinfo>
<abstract>
<title/>
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/jsf/docs/jsf_tools_ref_guide/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -50,7 +50,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.0.1.GA
+ Version: 3.1.0.M1
</releaseinfo>
<abstract>
Modified: trunk/jsf/docs/jsf_tools_tutorial/en/master.xml
===================================================================
--- trunk/jsf/docs/jsf_tools_tutorial/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/jsf/docs/jsf_tools_tutorial/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -51,7 +51,7 @@
</copyright>
<releaseinfo>
- Version: 3.0.1.GA
+ Version: 3.1.0.M1
</releaseinfo>
Modified: trunk/portlet/docs/reference/en/master.xml
===================================================================
--- trunk/portlet/docs/reference/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/portlet/docs/reference/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -48,7 +48,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.0.1.GA
+ Version: 1.1.0.M1
</releaseinfo>
<abstract>
Modified: trunk/seam/docs/reference/en/master.xml
===================================================================
--- trunk/seam/docs/reference/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/seam/docs/reference/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -60,7 +60,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.0.1.GA
+ Version: 3.1.0.M1
</releaseinfo>
<abstract>
Modified: trunk/smooks/docs/reference/en/master.xml
===================================================================
--- trunk/smooks/docs/reference/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/smooks/docs/reference/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -35,7 +35,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.0.0.GA
+ Version: 1.1.0.M1
</releaseinfo>
<abstract>
Modified: trunk/struts/docs/struts_tools_ref_guide/en/master.xml
===================================================================
--- trunk/struts/docs/struts_tools_ref_guide/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/struts/docs/struts_tools_ref_guide/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -52,7 +52,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.0.0.GA
+ Version: 3.1.0.M1
</releaseinfo>
<abstract>
Modified: trunk/struts/docs/struts_tools_tutorial/en/master.xml
===================================================================
--- trunk/struts/docs/struts_tools_tutorial/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/struts/docs/struts_tools_tutorial/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -49,7 +49,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 3.0.0.GA
+ Version: 3.1.0.M1
</releaseinfo>
<abstract>
Modified: trunk/ws/docs/reference/en/master.xml
===================================================================
--- trunk/ws/docs/reference/en/master.xml 2009-06-01 10:48:38 UTC (rev 15621)
+++ trunk/ws/docs/reference/en/master.xml 2009-06-01 14:18:36 UTC (rev 15622)
@@ -33,7 +33,7 @@
<holder>JBoss, a division of Red Hat</holder>
</copyright>
<releaseinfo>
- Version: 1.0.1.GA
+ Version: 1.1.0.M1
</releaseinfo>
<abstract>
<title/>
15 years, 6 months
JBoss Tools SVN: r15621 - in trunk/jst/tests/org.jboss.tools.jst.web.test: src/org/jboss/tools/jst/web/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-06-01 06:48:38 -0400 (Mon, 01 Jun 2009)
New Revision: 15621
Added:
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/KbModelTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2009-06-01 08:20:10 UTC (rev 15620)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2009-06-01 10:48:38 UTC (rev 15621)
@@ -6,6 +6,7 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jboss.tools.jst.web,
+ org.jboss.tools.jst.web.kb,
org.junit,
org.jboss.tools.common.test,
org.eclipse.core.resources,
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2009-06-01 08:20:10 UTC (rev 15620)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/JstWebAllTests.java 2009-06-01 10:48:38 UTC (rev 15621)
@@ -18,6 +18,7 @@
public static Test suite() {
TestSuite suite = new TestSuite(JstWebAllTests.class.getName());
suite.addTest(WebContentAssistProviderTest.suite());
+ suite.addTestSuite(KbModelTest.class);
return suite;
}
}
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/KbModelTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/KbModelTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/KbModelTest.java 2009-06-01 10:48:38 UTC (rev 15621)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.jst.web.test;
+
+import org.eclipse.core.resources.IProject;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+import junit.framework.TestCase;
+
+public class KbModelTest extends TestCase {
+
+ TestProjectProvider provider = null;
+ IProject project = null;
+ boolean makeCopy = true;
+
+ public KbModelTest() {}
+
+ public void setUp() throws Exception {
+
+ }
+
+ public void testXMLScanner() {
+
+ }
+
+ public void testKbProjectObjects() {
+
+ }
+
+ public void testXMLSerialization() {
+
+ }
+
+ public void testCleanBuild() {
+
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+}
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/KbModelTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 6 months
JBoss Tools SVN: r15620 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: resources/richFacesTest/WebContent/pages/components/page and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-06-01 04:20:10 -0400 (Mon, 01 Jun 2009)
New Revision: 15620
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageEmpty.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageEmpty.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4381, JUnits were added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml 2009-06-01 08:20:10 UTC (rev 15620)
@@ -0,0 +1,42 @@
+<tests>
+ <test id="id1">
+
+ <DIV STYLE="background-color: white;" CLASS="rich-pagesomeClass">
+ <DIV CLASS="rich-page-header">
+ <DIV CLASS="rich-page-header-content">
+ <SPAN STYLE="font-size: 2em;">
+ HEADER
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-page-subheader">
+ <SPAN STYLE="font-size: 2em;">
+ SUBHEADER
+ </SPAN>
+ </DIV>
+ <DIV CLASS="rich-page-content">
+ <DIV CLASS="rich-page-sidebar">
+ <SPAN STYLE="font-size: 2em;">
+ SIDEBAR
+ </SPAN>
+ </DIV>
+ <DIV CLASS="rich-page-main">
+ <DIV CLASS="rich-page-body">
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ BODY START
+ </SPAN>
+ </H1>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-page-footer">
+ <DIV CLASS="rich-page-footer-content">
+ <SPAN STYLE="font-size: 2em;">
+ FOOTER
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageEmpty.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageEmpty.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageEmpty.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageEmpty.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageEmpty.xhtml.xml 2009-06-01 08:20:10 UTC (rev 15620)
@@ -0,0 +1,17 @@
+<tests>
+ <test id="id1">
+ <DIV CLASS="rich-page">
+ <DIV CLASS="rich-page-content">
+ <DIV CLASS="rich-page-main">
+ <DIV CLASS="rich-page-body">
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ BODY START
+ </SPAN>
+ </H1>
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageEmpty.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml 2009-06-01 08:20:10 UTC (rev 15620)
@@ -0,0 +1,113 @@
+<tests>
+
+ <test id="id1">
+ <DIV STYLE="background-color: white;" CLASS="rich-pagesomeClass">
+ <DIV CLASS="rich-page-header">
+ <DIV CLASS="rich-page-header-content">
+ <SPAN STYLE="font-size: 2em;">
+ HEADER
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-page-subheader">
+ <SPAN STYLE="font-size: 2em;">
+ SUBHEADER
+ </SPAN>
+ </DIV>
+ <DIV CLASS="rich-page-content">
+ <DIV CLASS="rich-page-sidebar">
+ <SPAN STYLE="font-size: 2em;">
+ SIDEBAR
+ </SPAN>
+ </DIV>
+ <DIV CLASS="rich-page-main">
+ <DIV CLASS="rich-page-body">
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ BODY START
+ </SPAN>
+ </H1>
+ <DIV STYLE="border: 1px solid black;">
+ <DIV WIDTH="100%" STYLE="width: 100%;">
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN STYLE="font-size: 2em;">
+ CENTER PANEL
+ </SPAN>
+ </DIV>
+ <DIV>
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-page-footer">
+ <DIV CLASS="rich-page-footer-content">
+ <SPAN STYLE="font-size: 2em;">
+ FOOTER
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+ </test>
+
+ <test id="id2">
+ <DIV STYLE="border: 1px solid black;" >
+ <DIV WIDTH="100%" STYLE="width: 100%;">
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN STYLE="font-size: 2em;">
+ CENTER PANEL
+ </SPAN>
+ </DIV>
+ <DIV>
+ <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ </test>
+
+ <test id="id3">
+ <DIV WIDTH="100%" STYLE="width: 100%;" >
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ </test>
+
+ <test id="id4">
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;" >
+ <SPAN STYLE="font-size: 2em;">
+ CENTER PANEL
+ </SPAN>
+ </DIV>
+ </test>
+
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml 2009-06-01 08:20:10 UTC (rev 15620)
@@ -0,0 +1,242 @@
+<tests>
+ <test id="id1">
+ <DIV STYLE="background-color: white;" CLASS="rich-pagesomeClass">
+ <DIV CLASS="rich-page-header">
+ <DIV CLASS="rich-page-header-content">
+ <SPAN STYLE="font-size: 2em;">
+ HEADER
+ </SPAN>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-page-subheader">
+ <SPAN STYLE="font-size: 2em;">
+ SUBHEADER
+ </SPAN>
+ </DIV>
+ <DIV CLASS="rich-page-content">
+ <DIV CLASS="rich-page-sidebar">
+ <SPAN STYLE="font-size: 2em;">
+ SIDEBAR
+ </SPAN>
+ </DIV>
+ <DIV CLASS="rich-page-main">
+ <DIV CLASS="rich-page-body">
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ BODY START
+ </SPAN>
+ </H1>
+ <DIV STYLE="border: 1px solid black; background-color: white;"
+ >
+ <DIV WIDTH="100%" STYLE="width: 100%;">
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ CENTER PANEL 1
+ </SPAN>
+ </H1>
+ <DIV STYLE="border: 1px solid black;">
+ <DIV WIDTH="100%" STYLE="width: 100%;">
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="25%" STYLE="width: 25%; float: left;">
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="75%" STYLE="width: 75%; float: left;">
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ CENTER PANEL 2
+ </SPAN>
+ </H1>
+ <DIV STYLE="border: 1px solid black;">
+ <DIV WIDTH="100%" STYLE="width: 100%;">
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN STYLE="font-size: 2em;">
+ CENTER PANEL 3
+ </SPAN>
+ </DIV>
+ <DIV>
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV>
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV>
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-page-footer">
+ <DIV CLASS="rich-page-footer-content">
+ <SPAN STYLE="font-size: 2em;">
+ FOOTER
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+ </test>
+ <test id="id2">
+ <DIV STYLE="border: 1px solid black;">
+ <DIV WIDTH="100%" STYLE="width: 100%;">
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="25%" STYLE="width: 25%; float: left;">
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="75%" STYLE="width: 75%; float: left;">
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ CENTER PANEL 2
+ </SPAN>
+ </H1>
+ <DIV STYLE="border: 1px solid black;">
+ <DIV WIDTH="100%" STYLE="width: 100%;">
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN STYLE="font-size: 2em;">
+ CENTER PANEL 3
+ </SPAN>
+ </DIV>
+ <DIV>
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV>
+ <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+</test>
+ <test id="id3">
+
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;" >
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ CENTER PANEL 1
+ </SPAN>
+ </H1>
+ <DIV STYLE="border: 1px solid black;" >
+ <DIV WIDTH="100%" STYLE="width: 100%;">
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="25%" STYLE="width: 25%; float: left;">
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="75%" STYLE="width: 75%; float: left;">
+ <H1 STYLE="-moz-user-modify: read-write;">
+ <SPAN CLASS="vpe-text">
+ CENTER PANEL 2
+ </SPAN>
+ </H1>
+ <DIV STYLE="border: 1px solid black;">
+ <DIV WIDTH="100%" STYLE="width: 100%;">
+ <SPAN CLASS="vpe-text">
+ TOP PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN CLASS="vpe-text">
+ LEFT PANEL
+ </SPAN>
+ </DIV>
+ <DIV WIDTH="50%" STYLE="width: 50%; float: left;">
+ <SPAN STYLE="font-size: 2em;">
+ CENTER PANEL 3
+ </SPAN>
+ </DIV>
+ <DIV>
+ <DIV
+ STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV>
+ <DIV STYLE="display: block; height: 0pt; clear: both; visibility: hidden;">
+ .
+ </DIV>
+ <SPAN CLASS="vpe-text">
+ BOTTOM PANEL
+ </SPAN>
+ </DIV>
+ </DIV>
+ </DIV>
+</test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2009-05-31 09:54:14 UTC (rev 15619)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2009-06-01 08:20:10 UTC (rev 15620)
@@ -331,7 +331,23 @@
public void testDataTableSpacerDataScroller() throws Throwable {
performContentTest("components/dataTable&Spacer&DataScroller.xhtml");//$NON-NLS-1$
}
+
+ public void testPageEmpty() throws Throwable {
+ performContentTest("components/page/pageEmpty.xhtml");//$NON-NLS-1$
+ }
+ public void testPageAllFacets() throws Throwable {
+ performContentTest("components/page/pageAllFacets.xhtml");//$NON-NLS-1$
+ }
+
+ public void testPageWithLayout() throws Throwable {
+ performContentTest("components/page/pageWithLayout.xhtml");//$NON-NLS-1$
+ }
+
+ public void testPageWithNestedLayouts() throws Throwable {
+ performContentTest("components/page/pageWithNestedLayouts.xhtml");//$NON-NLS-1$
+ }
+
@Override
protected String getTestProjectName() {
return RichFacesAllTests.IMPORT_PROJECT_NAME;
15 years, 6 months