JBoss Tools SVN: r12891 - trunk/as/docs/reference/en/modules.
by jbosstools-commits@lists.jboss.org
Author: ochikvina
Date: 2009-01-06 06:46:39 -0500 (Tue, 06 Jan 2009)
New Revision: 12891
Modified:
trunk/as/docs/reference/en/modules/perspective.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-439 - updating the 'Project Archives View' section;
Modified: trunk/as/docs/reference/en/modules/perspective.xml
===================================================================
--- trunk/as/docs/reference/en/modules/perspective.xml 2009-01-06 11:44:49 UTC (rev 12890)
+++ trunk/as/docs/reference/en/modules/perspective.xml 2009-01-06 11:46:39 UTC (rev 12891)
@@ -598,13 +598,13 @@
<section id="Project_archivesView" role="updated">
<title>Project Archives View</title>
<para>Every application, whether Plain Old Java, J2EE, or some other language altogether,
- needs to be packaged in some way. In Java-related projects, many people use ANT. JBoss
- Tools comes with our own Archives tool with a bit easier and less-verbose XML and a
- handy user interface. The Project Archives plugin consists primarily of a view, that is
- <property>Project Archives View</property>, to set up each packaging
- configuration.</para>
+ needs to be packaged in some way. In Java-related projects, many people use ANT.
+ <property>JBoss Tools</property> comes with our own Archives tool with a bit easier
+ and less-verbose XML and a handy user interface. The Project Archives plugin consists
+ primarily of a view, that is <property>Project Archives view</property>, to set up each
+ packaging configuration.</para>
<para>So far, let's look through all functionality that the <property>Project
- Archives View</property> provides.</para>
+ Archives view</property> provides.</para>
<section id="archives_overview">
<title>Overview</title>
@@ -625,11 +625,9 @@
</mediaobject>
</figure>
- <para>A project's configuration contains archives. On the image above there is
- only one archive, but a project can contain many. Inside the archive folders
- (testFolder), filesets, or other internal archives can be located. Internal archives
- and filesets may be directly inside of an archive, or in some sub-folder of that
- archive.</para>
+ <para>A project's configuration contains archives. As you can see on the image
+ above a project can contain more than one archive. Internal archives and filesets
+ can be directly inside of an archive, or in some sub-folder of that archive.</para>
<para>In the upper right corner of the view you can see an icon which, when clicked,
will build the selected top-level archive. Additionally, you can select <emphasis>
@@ -642,13 +640,24 @@
<section id="Creating_Archive">
<title>Creating an Archive</title>
- <para>When creating a new archive, you have some different options at your disposal. If
- the project has no <emphasis>
- <property>.packages</property>
- </emphasis> file, your options will be presented to you all at once to choose from.
- Otherwise you will right-click inside the view and select <emphasis>
+
+ <para>When you open the <property>Project archives view</property> for the first time,
+ it asks you to select the project for what you want to create an archive.</para>
+
+ <figure>
+ <title>Archives View</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/perspective_21a.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>When creating a new archive for selected project, you have some different options
+ at your disposal. You need right-click inside the view and select <emphasis>
<property>New Archive</property>
</emphasis> to see your archive type options.</para>
+
<figure>
<title>Create an Archive</title>
<mediaobject>
@@ -669,6 +678,7 @@
<para><property>JAR</property> is the standard archive type, and does very little
configuration, leaving most of the work up to you. You can customize the name, add
folders, filesets, and inner jars to it.</para>
+
<para>The other types, for the most part, simply start off with a default setting,
usually the jar with some specific children based on an expected structure of the
project. For example, if the project is a Dynamic Web Project, and you create a
@@ -676,9 +686,9 @@
filesets relevant to the known structure of the project.</para>
<para>Here is the first page of all New archive wizards. It is the same for any archive
- type and the only page in the <property>New Jar Wizard</property>.</para>
+ type and the only page in the <property>New Jar wizard</property>.</para>
<figure>
- <title>New JAR Wizard</title>
+ <title>New WAR Wizard</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/perspective/perspective_23.png"/>
@@ -686,17 +696,61 @@
</mediaobject>
</figure>
- <para>The page is pretty simple. All it asks for is the name of your new archive, a
- destination, which we'll get to in a moment, and whether the archive is exploded or
- packaged up.</para>
- <para>The destination of an archive can be anywhere on the filesystem, anywhere in the
+ <para>The page is pretty simple. First it asks is setting the name of your new archive
+ and a destination.</para>
+
+ <para>The destination of an archive can be anywhere on the file system, anywhere in the
workspace, inside some other archive, or inside a folder declared inside an archive.
- You can browse to workspace or filesystem destinations by clicking on their
+ Select the necessary checkbox (either <emphasis>
+ <property>workspace</property>
+ </emphasis> or <emphasis>
+ <property> file system</property>
+ </emphasis>) for marking the destination as related to either workspace or file
+ system. You can browse to workspace or filesystem destinations by clicking on their
respective buttons. To select a destination inside some other archive, you'll need
to press the <emphasis>
- <property>Workspace...</property>
+ <property>Workspace</property>
</emphasis> button. At the bottom of the list, you'll see archives that
have been declared in the workspace.</para>
+
+ <figure>
+ <title>Selecting the destination in the workspace</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/perspective_23a.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>Also in the wizard for creating a new archive you can choose whether an archive to
+ be compressed or exploded into a folder (without compression). You need just select
+ proper chechbox in the <emphasis>
+ <property>Archive type</property>
+ </emphasis> section.</para>
+
+ <para>In the <property>Package Explorer</property> you can observe the created
+ archive.</para>
+ <figure>
+ <title>The Archive in the Package Explorer</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/perspective_23b.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>If you use the exploded type of archiving, instead of a single file archive the result put into a
+ folder is displayed in the <property>Package
+ Explorer</property>.</para>
+ <figure>
+ <title>The Exploded Archive in the Package Explorer</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/perspective_23c.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<section id="CreatingaFolder">
<title>Creating a Folder</title>
<para>Creating a folder is much easier. You simply right-click on an archive or
@@ -707,9 +761,8 @@
<title>Creating a FileSet</title>
<para>To create a new fileset, you click on an available target location such as an
archive, a nested archive, or a folder within an archive, and select <emphasis>
- <property>New Fileset</property>
- </emphasis>.</para>
- <para>The <property>New Fileset Wizard</property> requires a destination (where the
+ <property>New Fileset</property>. </emphasis></para>
+ <para>The <property>New Fileset wizard</property> requires a destination (where the
files will go), and a root directory (or where the files are coming from). The
source can be anywhere in the workspace or from the filesystem at large.</para>
@@ -725,8 +778,21 @@
<para>Below that, the fileset requires only an includes pattern and an excludes
pattern. As you type in either of these fields, the preview viewer should update
itself with which files are matched.</para>
+
+ <para>You can create a Fileset with flattenning or without it. Look at the difference on the figure below.</para>
+
+ <figure>
+ <title>The FileSet with flattenning and without it</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/perspective_24a.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
</section>
</section>
+
<section id="View_Actions">
<title>Archive Actions</title>
<figure>
@@ -805,6 +871,16 @@
</entry>
</row>
+ <row>
+ <entry>
+ <para>Edit publish settings</para>
+ </entry>
+
+ <entry>
+ <para>Gives possibility to edit an archive publish settings</para>
+ </entry>
+ </row>
+
</tbody>
</tgroup>
</table>
@@ -814,8 +890,7 @@
<title>Publishing to Server</title>
<para>Finally, you'll need to publish your application to a server. Here, we
show you how to do it with the help of <emphasis>
- <property>Archives View</property>
- </emphasis>.</para>
+ <property>Archives View</property>. </emphasis></para>
<figure>
<title>Context Menu on the Item</title>
@@ -826,9 +901,8 @@
</mediaobject>
</figure>
<para>The dialog above appears after selecting <emphasis>
- <property>Publish To Server</property>
- </emphasis>. To simply publish once, you just select the server(s) that you want,
- and finish. If you want the <emphasis>
+ <property>Publish To Server</property>. </emphasis> To simply publish once, you
+ just select the server(s) that you want, and finish. If you want the <emphasis>
<property>Publish to Server</property>
</emphasis> action on that particular Archive to publish always to that set of
servers, then check the appropriate checkbox. And finally, to enable automatic
@@ -839,13 +913,18 @@
server, it might be easier to have the archive's destination folder be the deploy
folder of the server.</para>
</section>
- <section>
+ <section id="rel_res_links_archiving">
<title>Relevant Resources Links</title>
<para>Refer to <ulink url="http://ant.apache.org/manual/index.html">Ant manual</ulink>
to find more on how to build your applications with help of Ant.</para>
+ <para>We also recommend you to watch the <ulink
+ url="http://docs.jboss.org/tools/movies/demos/archiving/archiving.htm"
+ >movie</ulink> which demonstrates a powerful archiving functionality in
+ <property>JBoss Tools</property>.</para>
+
<para>At this point, you are guessed to be familiar with <property>JBoss AS
- Perspective</property> and your next step now is to explore how to work with
+ perspective</property> and your next step now is to explore how to work with
different kinds of projects.</para>
</section>
15 years, 2 months
JBoss Tools SVN: r12890 - trunk/as/docs/reference/en/images/perspective.
by jbosstools-commits@lists.jboss.org
Author: ochikvina
Date: 2009-01-06 06:44:49 -0500 (Tue, 06 Jan 2009)
New Revision: 12890
Modified:
trunk/as/docs/reference/en/images/perspective/perspective_21.png
trunk/as/docs/reference/en/images/perspective/perspective_22.png
trunk/as/docs/reference/en/images/perspective/perspective_23.png
trunk/as/docs/reference/en/images/perspective/perspective_24.png
trunk/as/docs/reference/en/images/perspective/perspective_25.png
trunk/as/docs/reference/en/images/perspective/perspective_26.png
Log:
https://jira.jboss.org/jira/browse/JBDS-439 - updating the screens;
Modified: trunk/as/docs/reference/en/images/perspective/perspective_21.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_22.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_23.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_24.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_25.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en/images/perspective/perspective_26.png
===================================================================
(Binary files differ)
15 years, 2 months
JBoss Tools SVN: r12889 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: javabean/model and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2009-01-06 04:20:30 -0500 (Tue, 06 Jan 2009)
New Revision: 12889
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AbstractAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
Log:
JBIDE-3207
Fix some bugs for X2J analyzer
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AbstractAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AbstractAnalyzer.java 2009-01-06 09:19:01 UTC (rev 12888)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/AbstractAnalyzer.java 2009-01-06 09:20:30 UTC (rev 12889)
@@ -152,8 +152,8 @@
AbstractResourceConfig abstractResourceConfig = iterator.next();
if (abstractResourceConfig instanceof ResourceConfigType) {
ResourceConfigType rct = (ResourceConfigType) abstractResourceConfig;
- if (isResourceConfigUsed(rct))
- continue;
+// if (isResourceConfigUsed(rct))
+// continue;
String beanId = getBeanIDFromParam(rct);
if (selector.equals(beanId)) {
resourceConfig = rct;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2009-01-06 09:19:01 UTC (rev 12888)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2009-01-06 09:20:30 UTC (rev 12889)
@@ -11,9 +11,11 @@
package org.jboss.tools.smooks.javabean.model;
import java.beans.PropertyDescriptor;
+import java.lang.reflect.GenericDeclaration;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -29,7 +31,7 @@
public class JavaBeanModel implements IValidatable {
private String beanClassString = null;
-
+
public void setBeanClassString(String beanClassString) {
this.beanClassString = beanClassString;
}
@@ -47,7 +49,7 @@
private boolean collection = false;
private boolean isPrimitive = false;
-
+
private boolean hasGenericType = false;
private Class<? extends Object> beanClass = null;
@@ -60,7 +62,7 @@
private Class parentClass = null;
-// private boolean isRoot = false;
+ // private boolean isRoot = false;
private boolean isRootClassModel = false;
@@ -79,15 +81,15 @@
this.isRootClassModel = isRootClassModel;
}
-// /**
-// * @return the isRoot
-// */
-// public boolean isRoot() {
-// return isRoot;
-// }
+ // /**
+ // * @return the isRoot
+ // */
+ // public boolean isRoot() {
+ // return isRoot;
+ // }
public String getBeanClassString() {
- if(beanClassString != null && beanClassString.length() != 0){
+ if (beanClassString != null && beanClassString.length() != 0) {
return this.beanClassString;
}
Class clazz = this.getBeanClass();
@@ -106,8 +108,7 @@
* @param isRoot
* the isRoot to set
*/
-// public void setRoot(boolean isRoot) {ois
-
+ // public void setRoot(boolean isRoot) {ois
private boolean isList = false;
private Class componentClass = null;
@@ -115,7 +116,8 @@
private boolean lazyLoadProperties = true;
public boolean isList() {
- if(beanClass == null) return false;
+ if (beanClass == null)
+ return false;
if (Collection.class.isAssignableFrom(beanClass)) {
if (this.propertyDescriptor != null) {
Method rmethod = propertyDescriptor.getReadMethod();
@@ -157,11 +159,10 @@
this.name = beanName;
if (beanClass == null)
return;
- if(this.name == null){
+ if (this.name == null) {
this.name = beanClass.getSimpleName();
}
-
-
+
if (propertyDescriptor == null)
setRootClassModel(true);
this.propertyDescriptor = propertyDescriptor;
@@ -233,7 +234,8 @@
}
public boolean isArray() {
- if(beanClass == null) return false;
+ if (beanClass == null)
+ return false;
if (beanClass.isArray()) {
Class beanType = beanClass.getComponentType();
setMany(true);
@@ -242,8 +244,8 @@
}
return many;
}
-
- public Class getGenericType(){
+
+ public Class getGenericType() {
return componentClass;
}
@@ -251,21 +253,21 @@
this.many = many;
}
-// public boolean isCollection() {
-// return collection;
-// }
-//
-// public void setCollection(boolean collection) {
-// this.collection = collection;
-// }
+ // public boolean isCollection() {
+ // return collection;
+ // }
+ //
+ // public void setCollection(boolean collection) {
+ // this.collection = collection;
+ // }
-// public Class getTypeRef() {
-// return typeRef;
-// }
-//
-// public void setTypeRef(Class typeRef) {
-// this.typeRef = typeRef;
-// }
+ // public Class getTypeRef() {
+ // return typeRef;
+ // }
+ //
+ // public void setTypeRef(Class typeRef) {
+ // this.typeRef = typeRef;
+ // }
public String getName() {
return name;
@@ -285,11 +287,12 @@
private List properties;
public List getProperties() {
-
+
if (properties == null) {
properties = new ArrayList();
- if(isPrimitive()) return properties;
-
+ if (isPrimitive())
+ return properties;
+
Class beanType = beanClass;
if (this.componentClass != null) {
if (isArray() || isList()) {
@@ -303,13 +306,30 @@
return properties;
}
}
- if(beanType == null) return null;
- PropertyDescriptor[] pds = JavaPropertyUtils.getPropertyDescriptor(beanType);
+ if (beanType == null)
+ return null;
+ PropertyDescriptor[] pds = JavaPropertyUtils
+ .getPropertyDescriptor(beanType);
for (int i = 0; i < pds.length; i++) {
PropertyDescriptor pd = pds[i];
if ("class".equals(pd.getName())) //$NON-NLS-1$
continue;
+ if (Collection.class.isAssignableFrom(pd.getPropertyType())) {
+ Method rmethod = pd.getReadMethod();
+ if (rmethod != null) {
+ Type returnType = rmethod.getGenericReturnType();
+ if (returnType instanceof ParameterizedType) {
+ Type[] types = ((ParameterizedType) returnType)
+ .getActualTypeArguments();
+ if(types == null || types.length == 0){
+ continue;
+ }
+ }else{
+ continue;
+ }
+ }
+ }
JavaBeanModel jbm = new JavaBeanModel(pd.getPropertyType(), pd
.getName(), pd, beanClass, this.lazyLoadProperties);
addProperty(jbm);
@@ -363,9 +383,11 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- StringBuffer buffer = new StringBuffer(Messages.getString("JavaBeanModel.JavaBeanName") + name); //$NON-NLS-1$
+ StringBuffer buffer = new StringBuffer(Messages
+ .getString("JavaBeanModel.JavaBeanName") + name); //$NON-NLS-1$
if (beanClass != null)
- buffer.append(Messages.getString("JavaBeanModel.ClassIs") + this.beanClass.getName()); //$NON-NLS-1$
+ buffer
+ .append(Messages.getString("JavaBeanModel.ClassIs") + this.beanClass.getName()); //$NON-NLS-1$
if (this.properties != null) {
buffer.append("\n"); //$NON-NLS-1$
for (Iterator iterator = properties.iterator(); iterator.hasNext();) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2009-01-06 09:19:01 UTC (rev 12888)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2009-01-06 09:20:30 UTC (rev 12889)
@@ -68,16 +68,16 @@
}
public static AbstractXMLObject getRootTagXMLObject(AbstractXMLObject xmlObj) {
+ if(xmlObj == null) return null;
AbstractXMLObject parent = xmlObj.getParent();
+ if(parent == null) return null;
+ if(parent instanceof TagList) return xmlObj;
while (true) {
AbstractXMLObject p = parent.getParent();
if (p instanceof TagList)
break;
parent = p;
}
-// if (parent instanceof TagList) {
-// parent = ((TagList) parent).getRootTag();
-// }
return parent;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2009-01-06 09:19:01 UTC (rev 12888)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2009-01-06 09:20:30 UTC (rev 12889)
@@ -12,8 +12,10 @@
import java.beans.PropertyChangeListener;
import java.io.ByteArrayInputStream;
+import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
import java.util.List;
@@ -47,6 +49,8 @@
public static final String WORKSPACE_PRIX = "Workspace:/"; //$NON-NLS-1$
+ public static final String RESOURCE = "Resource:/";
+
private String parmaKey = ""; //$NON-NLS-1$
public AbstractXMLModelAnalyzer(String paramKey) {
@@ -103,9 +107,15 @@
TagList document = new TagList();
if (path != null) {
path = parseFilePath(path);
- XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer();
try {
- FileInputStream stream = new FileInputStream(path);
+ InputStream stream = null;
+ if (!new File(path).exists()) {
+ // maybe it's resource path:
+ stream = getClass().getResourceAsStream(path);
+ } else {
+ stream = new FileInputStream(path);
+ }
+ XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer();
document = objectBuilder.analyze(stream, null);
if (viewer != null && viewer instanceof PropertyChangeListener) {
document
@@ -145,8 +155,8 @@
new String[] { "xsl-value-of" });
if (tag != null) {
if (viewer instanceof PropertyChangeListener) {
- document.addNodePropetyChangeListener(
- (PropertyChangeListener) viewer);
+ document
+ .addNodePropetyChangeListener((PropertyChangeListener) viewer);
hookNodes(
tag,
(PropertyChangeListener) viewer);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2009-01-06 09:19:01 UTC (rev 12888)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2009-01-06 09:20:30 UTC (rev 12889)
@@ -240,20 +240,37 @@
protected String getSelectorIDViaXMLObject(AbstractXMLObject sourceModel,
AbstractXMLObject currentRoot, String resourceConfigSelector) {
+ boolean isChild = false;
String name = sourceModel.getName();
if (sourceModel instanceof TagPropertyObject) {
name = "@" + name;
}
AbstractXMLObject parent = sourceModel.getParent();
- while (parent != null && parent.getName() != null) {
- if (parent == currentRoot)
+ while (parent != null && parent.getName() != null && !(parent instanceof TagList)) {
+ if (parent == currentRoot){
+ isChild = true;
break;
+ }
name = parent.getName() + SPACE_SPLITER + name;
parent = parent.getParent();
}
if (resourceConfigSelector != null) {
name = resourceConfigSelector + SPACE_SPLITER + name;
}
+ // if the node is not the child of current root node , reload the name
+ if(!isChild){
+ name = sourceModel.getName();
+ if (sourceModel instanceof TagPropertyObject) {
+ name = "@" + name;
+ }
+ parent = sourceModel.getParent();
+ if(parent == null) return name;
+ while(!(parent instanceof TagList)){
+ name = name + SPACE_SPLITER + parent.getName();
+ parent = parent.getParent();
+ }
+ }
+
return name;
}
@@ -528,6 +545,7 @@
return;
AbstractXMLObject newRoot = findXMLNodeWithSelector(newSelector,
root);
+ // find the node from the root
if (newRoot == null) {
newRoot = findXMLNodeWithSelector(newSelector, root, true,
false);
@@ -581,6 +599,7 @@
firstName = selector;
AbstractXMLObject current = findXMLNodeWithSelector(firstName, parent,
false, false);
+ // if can't find the node , to search it from the root node
if (current == null) {
current = findXMLNodeWithSelector(firstName, parent, true, false);
}
15 years, 2 months
JBoss Tools SVN: r12888 - in trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test: java2java and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2009-01-06 04:19:01 -0500 (Tue, 06 Jan 2009)
New Revision: 12888
Added:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/AbstractXML2JavaTestCase.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/ClassicX2JTestCase.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/Header.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/One2ManyTestCase.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/Order.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/OrderItem.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/SimpleX2JTestCase.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/classic-x2j.smooks
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/classic-x2j.smooks.graph
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/one-many-mapping-x2j.smooks
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-arrays.smooks
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-arrays.smooks.graph
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-sax.smooks
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-sax.smooks.graph
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-update.smooks
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-update.smooks.graph
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config.smooks
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config.smooks.graph
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01.xml
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/simple_x2j.smooks
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/AbstractModelTestCase.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJavaBeanModel.java
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/FreeMarkerTest.java
Log:
JBIDE-3479
add new x2j test cases and some x2j examples
Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/AbstractModelTestCase.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/AbstractModelTestCase.java 2009-01-05 22:19:23 UTC (rev 12887)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/AbstractModelTestCase.java 2009-01-06 09:19:01 UTC (rev 12888)
@@ -88,6 +88,13 @@
}
public AbstractModelTestCase() {
+ }
+
+
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
adapterFactory = new ComposedAdapterFactory(
ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
adapterFactory
@@ -102,7 +109,6 @@
smooksResource = new SmooksResourceFactoryImpl().createResource(null);
graphResource = new XMLResourceFactoryImpl().createResource(null);
-
loadResources();
}
Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJavaBeanModel.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJavaBeanModel.java 2009-01-05 22:19:23 UTC (rev 12887)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/AbstractJavaBeanModel.java 2009-01-06 09:19:01 UTC (rev 12888)
@@ -6,12 +6,14 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
+import java.util.List;
/**
* @author Dart
*
*/
public class AbstractJavaBeanModel {
+
private String stringProperty;
private Date dateProperty;
private Boolean booleanProperty;
@@ -21,6 +23,15 @@
private Float floatProperty;
private BigDecimal bigDecimalProperty;
private BigInteger bigIntegerProperty;
+ // ignore list
+ private List testList;
+ public List getTestList() {
+ return testList;
+ }
+ public void setTestList(List testList) {
+ this.testList = testList;
+ }
+
public String getStringProperty() {
return stringProperty;
}
Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/FreeMarkerTest.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/FreeMarkerTest.java 2009-01-05 22:19:23 UTC (rev 12887)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml/FreeMarkerTest.java 2009-01-06 09:19:01 UTC (rev 12888)
@@ -17,6 +17,7 @@
* @Date : Sep 25, 2008
*/
public class FreeMarkerTest extends TestCase {
+ public void testNull(){}
// public void testParse() throws DocumentException, IOException {
// Reader reader = new InputStreamReader(FreeMarkerTest.class
// .getResourceAsStream("test.flt"));
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/AbstractXML2JavaTestCase.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/AbstractXML2JavaTestCase.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/AbstractXML2JavaTestCase.java 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,167 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.test.xml2java;
+
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
+
+import org.jboss.tools.smooks.analyzer.IMappingAnalyzer;
+import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
+import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
+import org.jboss.tools.smooks.graphical.GraphInformations;
+import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer;
+import org.jboss.tools.smooks.model.DocumentRoot;
+import org.jboss.tools.smooks.model.SmooksResourceListType;
+import org.jboss.tools.smooks.test.AbstractModelTestCase;
+import org.jboss.tools.smooks.test.java2java.NormalJ2JConfigFileAnalyzerTester;
+import org.jboss.tools.smooks.xml2java.analyzer.XML2JavaAnalyzer;
+import org.jboss.tools.smooks.xml2java.analyzer.XMLSourceModelAnalyzer;
+
+/**
+ * @author Dart
+ *
+ */
+public abstract class AbstractXML2JavaTestCase extends AbstractModelTestCase {
+
+ protected Object source;
+ protected Object target;
+ protected MappingResourceConfigList mappingResourceConfigList;
+
+ public Object getSource() {
+ return source;
+ }
+
+ public void setSource(Object source) {
+ this.source = source;
+ }
+
+ public Object getTarget() {
+ return target;
+ }
+
+ public void setTarget(Object target) {
+ this.target = target;
+ }
+
+ public MappingResourceConfigList getMappingResourceConfigList() {
+ return mappingResourceConfigList;
+ }
+
+ public void setMappingResourceConfigList(
+ MappingResourceConfigList mappingResourceConfigList) {
+ this.mappingResourceConfigList = mappingResourceConfigList;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.tools.smooks.test.AbstractModelTestCase#loadResources()
+ */
+ @Override
+ public void loadResources() throws RuntimeException {
+ ClassLoader classLoader = NormalJ2JConfigFileAnalyzerTester.class
+ .getClassLoader();
+ InputStream stream1 = classLoader
+ .getResourceAsStream(getSmooksConfigFilePath());
+ InputStream stream2 = classLoader
+ .getResourceAsStream(getSmooksConfigGraphFilePath());
+ try {
+ graphResource.load(stream2, Collections.EMPTY_MAP);
+
+ graph = (GraphInformations) graphResource.getContents().get(0);
+
+ smooksResource.load(stream1, Collections.EMPTY_MAP);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public MappingResourceConfigList analyzeSmooksConfigFile()
+ throws InvocationTargetException {
+ ClassLoader classLoader = AbstractXML2JavaTestCase.class
+ .getClassLoader();
+ SmooksResourceListType listType = ((DocumentRoot) smooksResource
+ .getContents().get(0)).getSmooksResourceList();
+ ((JavaBeanAnalyzer) targetModelAnalyzer)
+ .setCurrentClassLoader(classLoader);
+ MappingResourceConfigList configList = connectionsAnalyzer
+ .analyzeMappingSmooksModel(listType, getSource(), getTarget());
+ return configList;
+ }
+
+ public Object loadSource() throws InvocationTargetException {
+ SmooksResourceListType listType = ((DocumentRoot) smooksResource
+ .getContents().get(0)).getSmooksResourceList();
+
+ Object source = sourceModelAnalyzer.buildSourceInputObjects(graph,
+ listType, null, null);
+ return source;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see junit.framework.TestCase#setUp()
+ */
+ public void setUp() throws Exception{
+ super.setUp();
+ setSource(loadSource());
+ setTarget(loadTarget());
+ setMappingResourceConfigList(analyzeSmooksConfigFile());
+ }
+
+ public Object loadTarget() throws InvocationTargetException {
+ ClassLoader classLoader = AbstractXML2JavaTestCase.class
+ .getClassLoader();
+ SmooksResourceListType listType = ((DocumentRoot) smooksResource
+ .getContents().get(0)).getSmooksResourceList();
+ ((JavaBeanAnalyzer) targetModelAnalyzer)
+ .setCurrentClassLoader(classLoader);
+ Object target = targetModelAnalyzer.buildTargetInputObjects(graph,
+ listType, null, null);
+ return target;
+ }
+
+ protected abstract String getSmooksConfigFilePath();
+
+ protected abstract String getSmooksConfigGraphFilePath();
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.test.AbstractModelTestCase#newConnectionModelAnalyzer
+ * ()
+ */
+ @Override
+ protected IMappingAnalyzer newConnectionModelAnalyzer() {
+ return new XML2JavaAnalyzer();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.test.AbstractModelTestCase#newSourceModelAnalyzer
+ * ()
+ */
+ @Override
+ protected ISourceModelAnalyzer newSourceModelAnalyzer() {
+ return new XMLSourceModelAnalyzer();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.test.AbstractModelTestCase#newTargetModelAnalyzer
+ * ()
+ */
+ @Override
+ protected ITargetModelAnalyzer newTargetModelAnalyzer() {
+ return new JavaBeanAnalyzer();
+ }
+
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/AbstractXML2JavaTestCase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/ClassicX2JTestCase.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/ClassicX2JTestCase.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/ClassicX2JTestCase.java 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,163 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.test.xml2java.order;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.jboss.tools.smooks.analyzer.MappingModel;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
+import org.jboss.tools.smooks.test.xml2java.AbstractXML2JavaTestCase;
+import org.jboss.tools.smooks.xml.model.AbstractXMLObject;
+import org.jboss.tools.smooks.xml.model.TagList;
+import org.jboss.tools.smooks.xml.model.TagObject;
+import org.jboss.tools.smooks.xml.model.TagPropertyObject;
+
+/**
+ * @author Dart
+ *
+ */
+public class ClassicX2JTestCase extends AbstractXML2JavaTestCase {
+ public ClassicX2JTestCase() {
+ super();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.test.xml2java.AbstractXML2JavaTestCase#
+ * getSmooksConfigFilePath()
+ */
+ @Override
+ protected String getSmooksConfigFilePath() {
+ return "org/jboss/tools/smooks/test/xml2java/order/classic-x2j.smooks";
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.test.xml2java.AbstractXML2JavaTestCase#
+ * getSmooksConfigGraphFilePath()
+ */
+ @Override
+ protected String getSmooksConfigGraphFilePath() {
+ return "org/jboss/tools/smooks/test/xml2java/order/classic-x2j.smooks.graph";
+ }
+
+ public void testGraph() throws Exception {
+ MappingResourceConfigList configList = getMappingResourceConfigList();
+ List<MappingModel> mappingModelList = configList.getMappingModelList();
+ // there are 9 connections
+ Assert.assertEquals(9, mappingModelList.size());
+
+ // check the target connection cout
+ checkTargetConnectionCount(mappingModelList);
+ }
+
+ protected void checkTargetConnectionCount(
+ List<MappingModel> mappingModelList) throws Exception {
+ HashMap map = new HashMap();
+ for (Iterator iterator = mappingModelList.iterator(); iterator
+ .hasNext();) {
+ MappingModel mappingModel = (MappingModel) iterator.next();
+ String exsit = (String) map.get(mappingModel.getTarget());
+ if (exsit != null)
+ throw new Exception(
+ "Don't allow multiple connection have same target object");
+ map.put(mappingModel.getTarget(), "Exist");
+ }
+ }
+
+ public void testSourceModel() {
+ TagList source = (TagList) getSource();
+ // check model value
+ checkXMLNodeModelValue(source);
+
+ List<TagObject> tagList = source.getRootTagList();
+ // there is only one tag object
+ Assert.assertEquals(1, tagList.size());
+
+ // check the namespace
+ checkNameSpace(tagList.get(0));
+ }
+
+ protected void checkNameSpace(TagObject tag){
+ checkTagURL(tag, new String[] { "date" }, "http://x");
+ TagObject dateTag = findTag(tag, "date");
+ Assert.assertEquals("http://y", dateTag.getNamespaceURL());
+ }
+
+ public void checkXMLNodeModelValue(AbstractXMLObject tag) {
+ Assert.assertNotNull(tag.getName());
+ if (!(tag instanceof TagList))
+ Assert.assertNotNull(tag.getParent());
+ else
+ Assert.assertNull(tag.getParent());
+ if (tag instanceof TagObject) {
+ List<AbstractXMLObject> children = ((TagObject) tag).getChildren();
+ for (Iterator iterator = children.iterator(); iterator.hasNext();) {
+ AbstractXMLObject abstractXMLObject = (AbstractXMLObject) iterator
+ .next();
+ checkXMLNodeModelValue(abstractXMLObject);
+ }
+
+ List<TagPropertyObject> properties = ((TagObject) tag)
+ .getProperties();
+ for (Iterator iterator = properties.iterator(); iterator.hasNext();) {
+ TagPropertyObject tagPropertyObject = (TagPropertyObject) iterator
+ .next();
+ checkXMLNodeModelValue(tagPropertyObject);
+ }
+ }
+
+ if (tag instanceof TagList) {
+ List<TagObject> list = ((TagList) tag).getRootTagList();
+ for (Iterator iterator = list.iterator(); iterator.hasNext();) {
+ TagObject tagObject = (TagObject) iterator.next();
+ checkXMLNodeModelValue(tagObject);
+ }
+ }
+
+ }
+
+ protected TagObject findTag(TagObject tag, String name) {
+ if (name.equalsIgnoreCase(tag.getName())) {
+ return tag;
+ }
+ List list = tag.getChildren();
+ for (Iterator iterator = list.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if (object instanceof TagObject) {
+ TagObject child = findTag((TagObject) object, name);
+ if (child != null)
+ return child;
+ }
+ }
+ return null;
+ }
+
+ protected void checkTagURL(TagObject tag, String[] ignoreTagName,
+ String equalsUrl) {
+ for (int i = 0; i < ignoreTagName.length; i++) {
+ String ignoreName = ignoreTagName[i];
+ if (ignoreName.equals(tag.getName())) {
+ return;
+ }
+ }
+ Assert.assertEquals(equalsUrl, tag.getNamespaceURL());
+ List<AbstractXMLObject> children = tag.getChildren();
+ for (Iterator<AbstractXMLObject> iterator = children.iterator(); iterator
+ .hasNext();) {
+ AbstractXMLObject abstractXMLObject = (AbstractXMLObject) iterator
+ .next();
+ if (abstractXMLObject instanceof TagObject) {
+ checkTagURL((TagObject) abstractXMLObject, ignoreTagName,
+ equalsUrl);
+ }
+ }
+ }
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/ClassicX2JTestCase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/Header.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/Header.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/Header.java 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,55 @@
+package org.jboss.tools.smooks.test.xml2java.order;
+
+import java.util.Date;
+
+
+/**
+ * @author
+ */
+public class Header {
+ private Date date;
+ private Long customerNumber;
+ private String customerName;
+ private boolean privatePerson;
+ private Order order;
+
+ public Date getDate() {
+ return date;
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+ public Long getCustomerNumber() {
+ return customerNumber;
+ }
+
+ public void setCustomerNumber(Long customerNumber) {
+ this.customerNumber = customerNumber;
+ }
+
+ public String getCustomerName() {
+ return customerName;
+ }
+
+ public void setCustomerName(String customerName) {
+ this.customerName = customerName;
+ }
+
+ public boolean getPrivatePerson() {
+ return privatePerson;
+ }
+
+ public void setPrivatePerson(boolean privatePerson ) {
+ this.privatePerson = privatePerson;
+ }
+
+ public Order getOrder() {
+ return order;
+ }
+
+ public void setOrder(Order order) {
+ this.order = order;
+ }
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/Header.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/One2ManyTestCase.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/One2ManyTestCase.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/One2ManyTestCase.java 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,53 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.test.xml2java.order;
+
+import java.util.Iterator;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.jboss.tools.smooks.analyzer.MappingModel;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
+import org.jboss.tools.smooks.xml.model.TagList;
+import org.jboss.tools.smooks.xml.model.TagObject;
+
+/**
+ * @author Dart
+ *
+ */
+public class One2ManyTestCase extends ClassicX2JTestCase {
+
+ @Override
+ protected String getSmooksConfigFilePath() {
+ return "org/jboss/tools/smooks/test/xml2java/order/one-many-mapping-x2j.smooks";
+ }
+
+ @Override
+ public void testGraph() throws Exception {
+ MappingResourceConfigList configList = this.getMappingResourceConfigList();
+ List<MappingModel> mappingList = configList.getMappingModelList();
+ // there are 8 connections here
+ Assert.assertEquals(8, mappingList.size());
+
+ this.checkTargetConnectionCount(mappingList);
+ int rootSourceconnection = 0;
+ TagList tagList = (TagList)getSource();
+ TagObject root = tagList.getRootTagList().get(0);
+ for (Iterator iterator = mappingList.iterator(); iterator.hasNext();) {
+ MappingModel mappingModel = (MappingModel) iterator.next();
+ if(mappingModel.getSource() == root){
+ rootSourceconnection ++;
+ }
+ }
+ Assert.assertEquals(4, rootSourceconnection);
+ }
+
+ @Override
+ public void testSourceModel() {
+ TagList tagList = (TagList) this.getSource();
+ Assert.assertEquals(1, tagList.getRootTagList().size());
+ this.checkXMLNodeModelValue(tagList.getRootTagList().get(0));
+ }
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/One2ManyTestCase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/Order.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/Order.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/Order.java 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,38 @@
+package org.jboss.tools.smooks.test.xml2java.order;
+
+import java.util.List;
+
+/**
+ * @author
+ */
+public class Order {
+ private Header header;
+ private List<OrderItem> orderItems;
+ private OrderItem[] orderItemsArray;
+
+ private long id;
+
+ public Header getHeader() {
+ return header;
+ }
+
+ public void setHeader(Header header) {
+ this.header = header;
+ }
+
+ public List<OrderItem> getOrderItems() {
+ return orderItems;
+ }
+
+ public void setOrderItems(List<OrderItem> orderItems) {
+ this.orderItems = orderItems;
+ }
+
+ public void setOrderItems(OrderItem[] orderItems) {
+ this.orderItemsArray = orderItems;
+ }
+
+ public OrderItem[] getOrderItemsArray() {
+ return orderItemsArray;
+ }
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/Order.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/OrderItem.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/OrderItem.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/OrderItem.java 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,45 @@
+package org.jboss.tools.smooks.test.xml2java.order;
+
+/**
+ * @author
+ */
+public class OrderItem {
+ private long productId;
+ private Integer quantity;
+ private double price;
+ private Order order;
+
+ public long getProductId() {
+ return productId;
+ }
+
+ public void setProductId(long productId) {
+ this.productId = productId;
+ }
+
+ public Integer getQuantity() {
+ return quantity;
+ }
+
+ public void setQuantity(Integer quantity) {
+ this.quantity = quantity;
+ }
+
+ public double getPrice() {
+ return price;
+ }
+
+ public void setPrice(double price) {
+ this.price = price;
+ }
+
+ public Order getOrder() {
+ return order;
+ }
+
+ public void setOrder(Order order) {
+ this.order = order;
+ }
+
+
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/OrderItem.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/SimpleX2JTestCase.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/SimpleX2JTestCase.java (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/SimpleX2JTestCase.java 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,24 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.test.xml2java.order;
+
+/**
+ * @author Dart
+ *
+ */
+public class SimpleX2JTestCase extends ClassicX2JTestCase {
+
+ @Override
+ protected String getSmooksConfigFilePath() {
+ return "org/jboss/tools/smooks/test/xml2java/order/simple_x2j.smooks";
+ }
+
+ @Override
+ public void testGraph() {
+ // do nothing
+ }
+
+
+
+}
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/SimpleX2JTestCase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/classic-x2j.smooks
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/classic-x2j.smooks (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/classic-x2j.smooks 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+ <resource-config selector="global-parameters">
+ <param name="stream.filter.type">SAX</param>
+ </resource-config>
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">Order</param>
+ <param name="beanClass">org.jboss.tools.smooks.test.xml2java.order.Order</param>
+ <param name="bindings">
+ <binding property="header" selector="${header}" />
+ <binding property="orderItems" selector="${orderItems}" />
+ </param>
+ </resource-config>
+ <resource-config selector="header">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">header</param>
+ <param name="beanClass">org.jboss.tools.smooks.test.xml2java.order.Header
+ </param>
+ <param name="bindings">
+ <binding property="customerName" selector="header customer" />
+ <binding property="customerNumber" selector="header customer @number"
+ type="Long" />
+ </param>
+ </resource-config>
+ <resource-config selector="order-items">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">orderItems</param>
+ <param name="beanClass">java.util.ArrayList</param>
+ <param name="bindings">
+ <binding selector="${OrderItem}" />
+ </param>
+ </resource-config>
+ <resource-config selector="order-item">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">OrderItem</param>
+ <param name="beanClass">org.jboss.tools.smooks.test.xml2java.order.OrderItem
+ </param>
+ <param name="bindings">
+ <binding property="price" selector="order-item price" type="Double" />
+ <binding property="productId" selector="order-item product"
+ type="Long" />
+ <binding property="quantity" selector="order-item quantity"
+ type="Integer" />
+ </param>
+ </resource-config>
+</smooks-resource-list>
\ No newline at end of file
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/classic-x2j.smooks.graph
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/classic-x2j.smooks.graph (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/classic-x2j.smooks.graph 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ASCII"?>
+<GraphInformations xmlns="http://www.jboss.org/tools/smooks/graphicalInformation">
+ <mappingType targetTypeID="org.jboss.tools.smooks.ui.viewerInitor.javabean" sourceTypeID="org.jboss.tools.smooks.xml.viewerInitor.xml"/>
+ <params>
+ <param name="sourceDataPath" value="File://org/jboss/tools/smooks/test/xml2java/order/order-01.xml"/>
+ </params>
+</GraphInformations>
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/one-many-mapping-x2j.smooks
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/one-many-mapping-x2j.smooks (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/one-many-mapping-x2j.smooks 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+ <resource-config selector="global-parameters">
+ <param name="stream.filter.type">SAX</param>
+ </resource-config>
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">Order</param>
+ <param name="beanClass">org.jboss.tools.smooks.test.xml2java.order.Order</param>
+ <param name="bindings">
+ <binding property="header" selector="${header}"
+ selector-namespace="http://x" />
+ <binding property="orderItems" selector="${orderItems}" />
+ <binding property="orderItemsArray" selector="${orderItemsArray}" />
+ </param>
+ </resource-config>
+ <resource-config selector="header" selector-namespace="http://x">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">header</param>
+ <param name="beanClass">org.jboss.tools.smooks.test.xml2java.order.Header
+ </param>
+ <param name="bindings">
+ <binding property="customerNumber" selector="header customer @number"
+ type="Long" />
+ <binding property="date" selector="header date"
+ selector-namespace="http://y" type="OrderDateLong" />
+ <binding property="order" selector="${order}" />
+ <binding property="privatePerson" selector="header privatePerson"
+ type="Boolean" />
+ </param>
+ </resource-config>
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">orderItems</param>
+ <param name="beanClass">java.util.ArrayList</param>
+ <param name="bindings" />
+ </resource-config>
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">orderItemsArray</param>
+ <param name="beanClass">org.jboss.tools.smooks.test.xml2java.order.OrderItem[]
+ </param>
+ <param name="bindings" />
+ </resource-config>
+ <resource-config selector="decorat:OrderDateLong1">
+ <resource>org.milyn.javabean.decoders.DateDecoder
+ </resource>
+ <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+ <param name="locale-country">IE</param>
+ <param name="locale-language">en</param>
+ </resource-config>
+</smooks-resource-list>
\ No newline at end of file
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-arrays.smooks
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-arrays.smooks (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-arrays.smooks 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">order</param>
+ <param name="beanClass">example.order.Order</param>
+ <param name="bindings">
+ <binding selector="${header}" />
+ <binding selector="${orderItems}" />
+ </param>
+ </resource-config>
+
+ <resource-config selector="header" selector-namespace="http://x">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanClass">example.order.Header</param>
+ <param name="bindings">
+ <binding selector="${order}" />
+
+ <binding property="date" type="OrderDateLong" selector="header date" selector-namespace="http://y" />
+ <binding property="customerNumber" type="Long" selector="header customer @number" />
+ <binding property="customerName" selector="header customer" />
+ <binding property="privatePerson" type="Boolean" selector="header privatePerson" default="true" />
+ </param>
+ </resource-config>
+
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">orderItems</param>
+ <param name="beanClass">example.order.OrderItem[]</param>
+ <param name="bindings">
+ <binding selector="${orderItem}" />
+ </param>
+ </resource-config>
+
+ <resource-config selector="order-item">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">orderItem</param>
+ <param name="beanClass">example.order.OrderItem</param>
+ <param name="bindings">
+ <binding property="productId" type="Long" selector="order-item product" />
+ <binding property="quantity" type="Integer" selector="order-item quantity" />
+ <binding property="price" type="Double" selector="order-item price" />
+ </param>
+ </resource-config>
+
+ <resource-config selector="decoder:OrderDateLong">
+ <resource>org.milyn.javabean.decoders.DateDecoder</resource>
+ <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+ <param name="locale-language">en</param>
+ <param name="locale-country">IE</param>
+ </resource-config>
+
+</smooks-resource-list>
\ No newline at end of file
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-arrays.smooks.graph
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-arrays.smooks.graph (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-arrays.smooks.graph 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<GraphInformations xmlns="http://www.jboss.org/tools/smooks/graphicalInformation">
+ <mappingType targetTypeID="org.jboss.tools.smooks.ui.viewerInitor.javabean" sourceTypeID="org.jboss.tools.smooks.xml.viewerInitor.xml"/>
+ <params>
+ <param name="sourceDataPath" value="Workspace://smooks_example_project/src_xml2java/example/order/order-01.xml"/>
+ </params>
+</GraphInformations>
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-sax.smooks
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-sax.smooks (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-sax.smooks 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+ <resource-config selector="global-parameters">
+ <param name="stream.filter.type">SAX</param>
+ </resource-config>
+ <import file="classpath:/src_xml2java/example/order/order-01-smooks-config.smooks"/>
+</smooks-resource-list>
\ No newline at end of file
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-sax.smooks.graph
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-sax.smooks.graph (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-sax.smooks.graph 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<GraphInformations xmlns="http://www.jboss.org/tools/smooks/graphicalInformation">
+ <mappingType targetTypeID="org.jboss.tools.smooks.ui.viewerInitor.javabean" sourceTypeID="org.jboss.tools.smooks.xml.viewerInitor.xml"/>
+ <params>
+ <param name="sourceDataPath" value="Workspace://smooks_example_project/src_xml2java/example/order/order-01.xml"/>
+ </params>
+</GraphInformations>
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-update.smooks
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-update.smooks (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-update.smooks 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">order</param>
+ <param name="beanClass">example.order.Order</param>
+ <param name="create">false</param>
+ <param name="bindings">
+ <binding property="header" selector="${header}" />
+ <binding property="orderItems" selector="${orderItemList}" />
+ </param>
+ </resource-config>
+
+ <resource-config selector="header">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanClass">example.order.Header</param>
+ <param name="create">false</param>
+ <param name="bindings">
+ <binding property="order" selector="${order}" />
+
+ <binding property="date" type="OrderDateLong" selector="header date" selector-namespace="http://y" />
+ <binding property="customerNumber" type="Long" selector="header customer @number" />
+ <binding property="customerName" selector="header customer" />
+ <binding property="privatePerson" type="Boolean" selector="header privatePerson" default="true" />
+ </param>
+ </resource-config>
+
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">orderItemList</param>
+ <param name="beanClass">java.util.ArrayList</param>
+ <param name="create">false</param>
+ <param name="bindings">
+ <binding selector="${orderItem}" />
+ </param>
+ </resource-config>
+
+ <resource-config selector="order-item">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanClass">example.order.OrderItem</param>
+ <param name="bindings">
+ <binding property="order" selector="${order}" />
+
+ <binding property="productId" type="Long" selector="order-item product" />
+ <binding property="quantity" type="Integer" selector="order-item quantity" />
+ <binding property="price" type="Double" selector="order-item price" />
+ </param>
+ </resource-config>
+
+ <resource-config selector="decoder:OrderDateLong">
+ <resource>org.milyn.javabean.decoders.DateDecoder</resource>
+ <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+ <param name="locale-language">en</param>
+ <param name="locale-country">IE</param>
+ </resource-config>
+
+</smooks-resource-list>
\ No newline at end of file
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-update.smooks.graph
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-update.smooks.graph (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config-update.smooks.graph 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<GraphInformations xmlns="http://www.jboss.org/tools/smooks/graphicalInformation">
+ <mappingType targetTypeID="org.jboss.tools.smooks.ui.viewerInitor.javabean" sourceTypeID="org.jboss.tools.smooks.xml.viewerInitor.xml"/>
+ <params>
+ <param name="sourceDataPath" value="Workspace://smooks_example_project/src_xml2java/example/order/order-01.xml"/>
+ </params>
+</GraphInformations>
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config.smooks
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config.smooks (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config.smooks 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+ <resource-config selector="decoder:OrderDateLong">
+ <resource>org.milyn.javabean.decoders.DateDecoder
+ </resource>
+ <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+ <param name="locale-language">en</param>
+ <param name="locale-country">IE</param>
+ </resource-config>
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">Order</param>
+ <param name="beanClass">example.order.Order</param>
+ <param name="bindings"><binding property="header" selector="${header}" selector-namespace="http://x"/><binding property="orderItems" selector="${orderItems}"/></param>
+ </resource-config>
+ <resource-config selector="header" selector-namespace="http://x">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">header</param>
+ <param name="beanClass">example.order.Header</param>
+ <param name="bindings"><binding property="customerName" selector="header customer"/><binding property="customerNumber" selector="header customer @number" type="Long"/><binding property="date" selector="header date" type="OrderDateLong" selector-namespace="http://y"/><binding property="order" selector="${order}"/><binding property="privatePerson" selector="header privatePerson" type="Boolean" default="true"/></param>
+ </resource-config>
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">orderItems</param>
+ <param name="beanClass">java.util.ArrayList</param>
+ <param name="bindings"><binding selector="${OrderItem}"/></param>
+ </resource-config>
+ <resource-config selector="order-item">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">OrderItem</param>
+ <param name="beanClass">example.order.OrderItem</param>
+ <param name="bindings"><binding property="order" selector="${order}"/><binding property="price" selector="order-item price" type="Double"/><binding property="productId" selector="order-item product" type="Long"/><binding property="quantity" selector="order-item quantity" type="Integer"/></param>
+ </resource-config>
+ <resource-config selector="global-parameters">
+ <param name="stream.filter.type"/>
+ </resource-config>
+</smooks-resource-list>
\ No newline at end of file
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config.smooks.graph
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config.smooks.graph (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01-smooks-config.smooks.graph 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<GraphInformations xmlns="http://www.jboss.org/tools/smooks/graphicalInformation">
+ <mappingType targetTypeID="org.jboss.tools.smooks.ui.viewerInitor.javabean" sourceTypeID="org.jboss.tools.smooks.xml.viewerInitor.xml"/>
+ <params>
+ <param name="sourceDataPath" value="Workspace://smooks_example_project/src_xml2java/example/order/order-01.xml"/>
+ </params>
+</GraphInformations>
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01.xml (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01.xml 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,19 @@
+<order xmlns="http://x">
+ <header>
+ <y:date xmlns:y="http://y">Wed Nov 15 13:45:28 EST 2006</y:date>
+ <customer number="123123">Joe</customer>
+ <privatePerson></privatePerson>
+ </header>
+ <order-items>
+ <order-item>
+ <product>111</product>
+ <quantity>2</quantity>
+ <price>8.90</price>
+ </order-item>
+ <order-item>
+ <product>222</product>
+ <quantity>7</quantity>
+ <price>5.20</price>
+ </order-item>
+ </order-items>
+</order>
\ No newline at end of file
Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/order-01.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/simple_x2j.smooks
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/simple_x2j.smooks (rev 0)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/xml2java/order/simple_x2j.smooks 2009-01-06 09:19:01 UTC (rev 12888)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+ <resource-config selector="global-parameters">
+ <param name="stream.filter.type" />
+ </resource-config>
+ <resource-config selector="order">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">Order</param>
+ <param name="beanClass">org.jboss.tools.smooks.test.xml2java.order.Order</param>
+ <param name="bindings">
+ <binding property="header" selector="${header}" />
+ <binding property="orderItems" selector="${orderItems}" />
+ </param>
+ </resource-config>
+ <resource-config selector="header">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">header</param>
+ <param name="beanClass">org.jboss.tools.smooks.test.xml2java.order.Header
+ </param>
+ <param name="bindings">
+ <binding property="customerNumber" selector="header customer @number"
+ type="Long" />
+ <binding property="date" selector="header date" type="Date" />
+ <binding property="privatePerson" selector="header privatePerson"
+ type="Boolean" />
+ </param>
+ </resource-config>
+ <resource-config selector="order-items">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">orderItems</param>
+ <param name="beanClass">java.util.ArrayList</param>
+ <param name="bindings">
+ <binding selector="${OrderItem}" />
+ </param>
+ </resource-config>
+ <resource-config selector="order-item">
+ <resource>org.milyn.javabean.BeanPopulator
+ </resource>
+ <param name="beanId">OrderItem</param>
+ <param name="beanClass">org.jboss.tools.smooks.test.xml2java.order.OrderItem
+ </param>
+ <param name="bindings">
+ <binding property="price" selector="order-item price" type="Double" />
+ <binding property="productId" selector="order-item product"
+ type="Long" />
+ <binding property="quantity" selector="order-item quantity"
+ type="Integer" />
+ </param>
+ </resource-config>
+</smooks-resource-list>
\ No newline at end of file
15 years, 2 months
JBoss Tools SVN: r12887 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: editor and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-01-05 17:19:23 -0500 (Mon, 05 Jan 2009)
New Revision: 12887
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
Log:
JBIDE-3415 - -1 in server editor
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-01-05 19:49:10 UTC (rev 12886)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-01-05 22:19:23 UTC (rev 12887)
@@ -218,6 +218,7 @@
public static String EditorJNDIPort;
public static String EditorWebPort;
public static String EditorAutomaticallyDetectPort;
+ public static String EditorPortInvalid;
public static String EditorChangeJNDICommandName;
public static String EditorChangeWebCommandName;
public static String EditorChangeUsernameCommandName;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-01-05 19:49:10 UTC (rev 12886)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-01-05 22:19:23 UTC (rev 12887)
@@ -196,6 +196,7 @@
EditorJNDIPort=JNDI Port
EditorWebPort=Web Port
EditorAutomaticallyDetectPort=Automatically detect
+EditorPortInvalid=One or more ports have an invalid value. This may adversely affect the tooling's ability to interact with the server.
EditorChangeJNDICommandName=Change JNDI Port Details
EditorChangeWebCommandName=Change Web Port Details
EditorChangeUsernameCommandName=Change Username
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2009-01-05 19:49:10 UTC (rev 12886)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2009-01-05 22:19:23 UTC (rev 12887)
@@ -1,14 +1,17 @@
package org.jboss.ide.eclipse.as.ui.editor;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FormAttachment;
@@ -28,6 +31,7 @@
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.ui.editor.ServerEditorSection;
import org.eclipse.wst.server.ui.internal.command.ServerCommand;
@@ -48,9 +52,11 @@
*/
public class PortSection extends ServerEditorSection {
- /* Load the various port editor pieces */
- private static ArrayList<IPortEditorExtension> sectionList = new ArrayList<IPortEditorExtension>();
- static {
+ private ArrayList<IPortEditorExtension> sectionList = new ArrayList<IPortEditorExtension>();
+ protected ServerAttributeHelper helper;
+ public void init(IEditorSite site, IEditorInput input) {
+ super.init(site, input);
+ helper = new ServerAttributeHelper(server.getOriginal(), server);
IExtensionRegistry registry = Platform.getExtensionRegistry();
IConfigurationElement[] cf = registry.getConfigurationElementsFor(JBossServerUIPlugin.PLUGIN_ID, "ServerEditorPortSection");
for( int i = 0; i < cf.length; i++ ) {
@@ -62,14 +68,6 @@
}
}
-
- protected ServerAttributeHelper helper;
-
- public void init(IEditorSite site, IEditorInput input) {
- super.init(site, input);
- helper = new ServerAttributeHelper(server.getOriginal(), server);
- }
-
public void createSection(Composite parent) {
super.createSection(parent);
createUI(parent);
@@ -77,8 +75,9 @@
public static interface IPortEditorExtension {
public void setServerAttributeHelper(ServerAttributeHelper helper);
- public void setSection(ServerEditorSection section);
+ public void setSection(PortSection section);
public Control createControl(Composite parent);
+ public String getValue();
}
public static class JNDIPortEditorExtension extends PortEditorExtension {
@@ -135,7 +134,7 @@
protected String currentXPath;
protected ServerAttributeHelper helper;
protected Listener listener;
- protected ServerEditorSection section;
+ protected PortSection section;
public PortEditorExtension(String labelText, String currentXPathKey, String detectXPathKey, String defaultXPath) {
this.labelText = labelText;
this.currentXPathKey = currentXPathKey;
@@ -145,7 +144,7 @@
public void setServerAttributeHelper(ServerAttributeHelper helper) {
this.helper = helper;
}
- public void setSection(ServerEditorSection section) {
+ public void setSection(PortSection section) {
this.section = section;
}
public Control createControl(Composite parent) {
@@ -198,7 +197,7 @@
text.setEditable(!shouldDetect);
currentXPath = helper.getAttribute(currentXPathKey, defaultXPath);
if( shouldDetect )
- text.setText(findPort(new Path(currentXPath)));
+ text.setText(findPort(helper.getServer(), new Path(currentXPath)));
else
text.setText(helper.getAttribute(IJBossServerConstants.JNDI_PORT, ""));
}
@@ -231,19 +230,12 @@
}
protected abstract ChangePortDialogInfo getDialogInfo();
- protected String findPort(IPath path) {
- XPathQuery query = XPathModel.getDefault().getQuery(helper.getServer(), path);
- if(query!=null) {
- String result = query.getFirstResult();
- if( result != null ) {
- return result;
- }
- }
- return "-1";
- }
protected /* abstract */ ServerCommand getCommand() {
return null;
}
+ public String getValue() {
+ return text.getText();
+ }
}
protected void createUI(Composite parent) {
@@ -265,6 +257,7 @@
addUIAdditions(composite, description);
toolkit.paintBordersFor(composite);
section.setClient(composite);
+ getSaveStatus();
}
private void addUIAdditions(Composite parent, Control top) {
@@ -317,6 +310,7 @@
Listener listener;
String xpath;
Link link;
+ PortSection pSection;
public SetPortCommand(IServerWorkingCopy server, ServerAttributeHelper helper, String name,
String textAttribute, String overrideAttribute, String overridePathAttribute,
String pathDefault, PortEditorExtension ext) { //Text text, Button button, String xpath, Listener listener) {
@@ -331,12 +325,13 @@
this.listener = ext.listener;
this.xpath = ext.currentXPath;
this.link = ext.link;
+ pSection = ext.section;
}
public void execute() {
preText = helper.getAttribute(textAttribute, (String)null);
if( preText == null )
- preText = findPort(new Path(defaultPath));
+ preText = findPort(helper.getServer(), new Path(defaultPath));
prePath = helper.getAttribute(overridePathAttribute, (String)defaultPath);
preOverride = helper.getAttribute(overrideAttribute, true);
helper.setAttribute(textAttribute, text.getText());
@@ -348,9 +343,10 @@
text.setEditable(!button.getSelection());
if( button.getSelection() ) {
text.removeListener(SWT.Modify, listener);
- text.setText(findPort(new Path(xpath)));
+ text.setText(findPort(helper.getServer(), new Path(xpath)));
text.addListener(SWT.Modify, listener);
}
+ pSection.getSaveStatus();
}
public void undo() {
@@ -370,18 +366,45 @@
text.setEditable(!preOverride);
button.addListener(SWT.Selection, listener);
text.addListener(SWT.Modify, listener);
+
+ pSection.getSaveStatus();
}
+ }
- protected String findPort(IPath path) {
- XPathQuery query = XPathModel.getDefault().getQuery(helper.getServer(), path);
- if(query!=null) {
- String result = query.getFirstResult();
- if( result != null ) {
- return result;
- }
+ protected static String findPort(IServer server, IPath path) {
+ XPathQuery query = XPathModel.getDefault().getQuery(server, path);
+ String result = "";
+ if(query!=null) {
+ query.refresh();
+ result = query.getFirstResult();
+ result = result == null ? "" : result;
+ try {
+ return new Integer(Integer.parseInt(result)).toString();
+ } catch(NumberFormatException nfe) {
}
- return "-1";
}
+ return result;
}
+
+ public IStatus[] getSaveStatus() {
+ Iterator<IPortEditorExtension> i = sectionList.iterator();
+ IPortEditorExtension ext1;
+ int temp;
+ boolean errorFound = false;
+ while(i.hasNext()) {
+ ext1 = i.next();
+ try {
+ temp = Integer.parseInt(ext1.getValue());
+ if( temp < 0 )
+ errorFound = true;
+ } catch(NumberFormatException nfe) {
+ errorFound = true;
+ }
+ }
+ setErrorMessage(errorFound ? Messages.EditorPortInvalid : null);
+ return errorFound ?
+ new IStatus[] { new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, Messages.EditorPortInvalid)}
+ : new IStatus[]{};
+ }
}
15 years, 2 months
JBoss Tools SVN: r12886 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/handlers.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2009-01-05 14:49:10 -0500 (Mon, 05 Jan 2009)
New Revision: 12886
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/handlers/FindSeamHandler.java
Log:
JBIDE-3483 NPEs in the FindSeamHandler class
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/handlers/FindSeamHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/handlers/FindSeamHandler.java 2009-01-05 17:49:39 UTC (rev 12885)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/handlers/FindSeamHandler.java 2009-01-05 19:49:10 UTC (rev 12886)
@@ -61,7 +61,10 @@
abstract public class FindSeamHandler extends AbstractHandler implements ISelectionListener{
public FindSeamHandler(){
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().addSelectionListener(this);
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if (window != null) {
+ window.getSelectionService().addSelectionListener(this);
+ }
}
/**
15 years, 2 months
JBoss Tools SVN: r12885 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441 and 5 other directories.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2009-01-05 12:49:39 -0500 (Mon, 05 Jan 2009)
New Revision: 12885
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/JBIDE-3441-1.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/JBIDE-3441-2.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java
Removed:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/Jbide3441.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java
Log:
CODING IN PROGRESS - issue JBIDE-3441: VPE - Preferences - change size of VE pane - press OK - Preview will show empty page.
https://jira.jboss.org/jira/browse/JBIDE-3441
JUnit test of JBIDE-3441 has been moved to the project org.jboss.tools.jsf.vpe.jsf.test .
Copied: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/JBIDE-3441-1.html (from rev 12882, trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/JBIDE-3441-1.html)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/JBIDE-3441-1.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/JBIDE-3441-1.html 2009-01-05 17:49:39 UTC (rev 12885)
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head id="head-1">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Insert title here</title>
+<style type="text/css">
+table {
+ background-color: black;
+ table-layout: fixed;
+}
+td {
+ background-color: white;
+}
+td div {
+ width: 100px;
+ height: 100px;
+}
+</style>
+</head>
+<body>
+ <table>
+ <tr>
+ <td><div><input type="button" value="Draggable" style=" width : 85px;">dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div id="tagged-div">tagged div content</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ </table>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/JBIDE-3441-1.html
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/JBIDE-3441-2.html (from rev 12882, trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/JBIDE-3441-2.html)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/JBIDE-3441-2.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/JBIDE-3441-2.html 2009-01-05 17:49:39 UTC (rev 12885)
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head id="head-2">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Insert title here</title>
+<style type="text/css">
+table {
+ background-color: black;
+ table-layout: fixed;
+}
+td {
+ background-color: white;
+}
+td div {
+ width: 100px;
+ height: 100px;
+}
+</style>
+</head>
+<body>
+ <table>
+ <tr>
+ <td><div><input type="button" value="Draggable" style=" width : 85px;">dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div id="tagged-div">tagged div content</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ </table>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3441/JBIDE-3441-2.html
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-01-05 17:38:28 UTC (rev 12884)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-01-05 17:49:39 UTC (rev 12885)
@@ -46,6 +46,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3163Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3376Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3396Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3441Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
@@ -76,6 +77,7 @@
// $JUnit-BEGIN$
suite.addTestSuite(JsfComponentTest.class);
suite.addTestSuite(Jsf20ComponentContentTest.class);
+ suite.addTestSuite(JBIDE3441Test.class);
suite.addTestSuite(JsfJbide1467Test.class);
suite.addTestSuite(JsfJbide1501Test.class);
suite.addTestSuite(JBIDE1484Test.class);
Copied: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java (from rev 12882, trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/Jbide3441.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java 2009-01-05 17:49:39 UTC (rev 12885)
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.jsf.vpe.jsf.test.jbide;
+
+import junit.framework.Assert;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+
+/**
+ * Test for JIRA Issue JBIDE-3441 ( https://jira.jboss.org/jira/browse/JBIDE-3441 ):
+ * "VPE - Preferences - change size of VE pane - press OK - Preview will show empty page"
+ *
+ * @author yradtsevich
+ *
+ */
+public class JBIDE3441Test extends VpeTest {
+ private static final String TAGGED_DIV_ID = "tagged-div"; //$NON-NLS-1$
+ private static final String TAGGED_DIV_CONTENT = "tagged div content"; //$NON-NLS-1$
+ private static final String TEST_PAGE_NAME_1 = "JBIDE/3441/JBIDE-3441-1.html"; //$NON-NLS-1$
+ private static final String TEST_PAGE_NAME_2 = "JBIDE/3441/JBIDE-3441-2.html"; //$NON-NLS-1$
+
+ public JBIDE3441Test(String name) {
+ super(name);
+ }
+
+ /**
+ * Try to open two pages in VPE and refresh them n times.
+ */
+ public void testVisualRefresh() throws Throwable {
+ setException(null);
+
+ VpeController controller1 = openPageInVpe(TEST_PAGE_NAME_1);
+ VpeController controller2 = openPageInVpe(TEST_PAGE_NAME_2);
+
+ Display display = Display.getCurrent();
+ for (int i = 0; i < 20; i++) {
+ controller1.visualRefresh();
+ controller2.visualRefresh();
+ while(display.readAndDispatch());
+ TestUtil.waitForJobs();
+ Thread.sleep(500);
+
+ checkTaggedDivValue(controller1, i);
+ checkTaggedDivValue(controller2, i);
+ }
+
+ if (getException() != null) {
+ throw getException();
+ }
+ }
+
+ private void checkTaggedDivValue(VpeController controller, int i) {
+ nsIDOMElement taggedDiv = controller.getXulRunnerEditor().getDOMDocument().getElementById(TAGGED_DIV_ID);
+ assertNotNull("taggedDiv should be not null", taggedDiv); //$NON-NLS-1$
+ nsIDOMNode innerSpan = taggedDiv.getFirstChild();
+ assertNotNull("taggedDiv should have inner span", innerSpan); //$NON-NLS-1$
+ nsIDOMNode taggedDivTextNode = innerSpan.getFirstChild();
+ assertNotNull("taggedDiv should have inner span with text node inside", taggedDivTextNode); //$NON-NLS-1$
+ String taggedDivTextValue = taggedDivTextNode.getNodeValue();
+ Assert.assertEquals("body of taggedDiv should be equal to \'" + TAGGED_DIV_CONTENT //$NON-NLS-1$
+ + "\', but it is \'" + taggedDivTextValue + "\'", //$NON-NLS-1$ //$NON-NLS-2$
+ taggedDivTextValue, TAGGED_DIV_CONTENT);
+ }
+
+ private VpeController openPageInVpe(final String pageName) throws CoreException,
+ PartInitException {
+ IFile elementPageFile = (IFile) TestUtil.getComponentPath(
+ pageName, JsfAllTests.IMPORT_PROJECT_NAME);
+ IEditorInput input = new FileEditorInput(elementPageFile);
+
+ JSPMultiPageEditor editor = (JSPMultiPageEditor) PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().openEditor(input,
+ EDITOR_ID, true);
+ assertNotNull(editor);
+
+ VpeController controller = TestUtil.getVpeController(editor);
+ return controller;
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java 2009-01-05 17:38:28 UTC (rev 12884)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java 2009-01-05 17:49:39 UTC (rev 12885)
@@ -12,17 +12,15 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Arrays;
import junit.framework.Test;
import junit.framework.TestSuite;
+
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.tests.ImportBean;
-import org.jboss.tools.vpe.ui.test.jbide.Jbide3441;
import org.osgi.framework.Bundle;
/**
@@ -45,14 +43,6 @@
IExtensionRegistry extensionRepository = Platform
.getExtensionRegistry();
- // Create test suite for vpeTest project related tests
- final TestSuite vpeTestProjectSuite = new TestSuite();
- vpeTestProjectSuite.addTestSuite(Jbide3441.class);
- final ImportBean vpeTestProjectBean = new ImportBean();
- vpeTestProjectBean.setImportProjectName(VPE_TEST_PROJECT_NAME);
- vpeTestProjectBean.setImportProjectPath(VPETestPlugin.getPluginResourcePath());
- result.addTest( new VpeTestSetup(vpeTestProjectSuite, Arrays.asList(vpeTestProjectBean)) );
-
IExtensionPoint extensionPoint = extensionRepository
.getExtensionPoint(VPE_TEST_EXTENTION_POINT_ID);
IExtension[] extensions = extensionPoint.getExtensions();
Deleted: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/Jbide3441.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/Jbide3441.java 2009-01-05 17:38:28 UTC (rev 12884)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/Jbide3441.java 2009-01-05 17:49:39 UTC (rev 12885)
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2009 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.vpe.ui.test.jbide;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.vpe.editor.VpeController;
-import org.jboss.tools.vpe.ui.test.TestUtil;
-import org.jboss.tools.vpe.ui.test.VpeAllTests;
-import org.jboss.tools.vpe.ui.test.VpeTest;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
-
-/**
- * Test for JIRA Issue JBIDE-3441 ( https://jira.jboss.org/jira/browse/JBIDE-3441 ):
- * "VPE - Preferences - change size of VE pane - press OK - Preview will show empty page"
- *
- * @author yradtsevich
- *
- */
-public class Jbide3441 extends VpeTest {
- private static final String TAGGED_DIV_ID = "tagged-div"; //$NON-NLS-1$
- private static final String TAGGED_DIV_CONTENT = "tagged div content"; //$NON-NLS-1$
- private static final String TEST_PAGE_NAME_1 = "JBIDE/JBIDE-3441-1.html"; //$NON-NLS-1$
- private static final String TEST_PAGE_NAME_2 = "JBIDE/JBIDE-3441-2.html"; //$NON-NLS-1$
-
- public Jbide3441(String name) {
- super(name);
- }
-
- /**
- * Try to open two pages in VPE and refresh them n times.
- */
- public void testVisualRefresh() throws Throwable {
- setException(null);
-
- VpeController controller1 = openPageInVpe(TEST_PAGE_NAME_1);
- VpeController controller2 = openPageInVpe(TEST_PAGE_NAME_2);
-
- Display display = Display.getCurrent();
- for (int i = 0; i < 20; i++) {
- controller1.visualRefresh();
- controller2.visualRefresh();
- while(display.readAndDispatch());
- TestUtil.waitForJobs();
- Thread.sleep(500);
-
- checkTaggedDivValue(controller1, i);
- checkTaggedDivValue(controller2, i);
- }
-
- if (getException() != null) {
- throw getException();
- }
- }
-
- private void checkTaggedDivValue(VpeController controller, int i) {
- nsIDOMElement taggedDiv = controller.getXulRunnerEditor().getDOMDocument().getElementById(TAGGED_DIV_ID);
- assertNotNull("taggedDiv should be not null", taggedDiv); //$NON-NLS-1$
- nsIDOMNode innerSpan = taggedDiv.getFirstChild();
- assertNotNull("taggedDiv should have inner span", innerSpan); //$NON-NLS-1$
- nsIDOMNode taggedDivTextNode = innerSpan.getFirstChild();
- assertNotNull("taggedDiv should have inner span with text node inside", taggedDivTextNode); //$NON-NLS-1$
- String taggedDivTextValue = taggedDivTextNode.getNodeValue();
- Assert.assertEquals("body of taggedDiv should be equal to \'" + TAGGED_DIV_CONTENT //$NON-NLS-1$
- + "\', but it is \'" + taggedDivTextValue + "\'", //$NON-NLS-1$ //$NON-NLS-2$
- taggedDivTextValue, TAGGED_DIV_CONTENT);
- }
-
- private VpeController openPageInVpe(final String pageName) throws CoreException,
- PartInitException {
- IFile elementPageFile = (IFile) TestUtil.getComponentPath(
- pageName, VpeAllTests.VPE_TEST_PROJECT_NAME);
- IEditorInput input = new FileEditorInput(elementPageFile);
-
- JSPMultiPageEditor editor = (JSPMultiPageEditor) PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage().openEditor(input,
- EDITOR_ID, true);
- assertNotNull(editor);
-
- VpeController controller = TestUtil.getVpeController(editor);
- return controller;
- }
-}
15 years, 2 months
JBoss Tools SVN: r12884 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits@lists.jboss.org
Author: abogachuk
Date: 2009-01-05 12:38:28 -0500 (Mon, 05 Jan 2009)
New Revision: 12884
Modified:
trunk/jsf/docs/userguide/en/modules/palette.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-527
Modified: trunk/jsf/docs/userguide/en/modules/palette.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/palette.xml 2009-01-05 17:22:31 UTC (rev 12883)
+++ trunk/jsf/docs/userguide/en/modules/palette.xml 2009-01-05 17:38:28 UTC (rev 12884)
@@ -317,7 +317,7 @@
</itemizedlist>
- <para>If you have changed any abject in the tree view and you don't like the final result you can always use the <emphasis><property>Restore Defaults</property></emphasis> button. Click on it will restore defaults for the object selected and for its children. Please remember that the button will only restore data for objects defined in the default palette. If selected object is created by you, the button will be disabled. Child objects added by you will not be removed.</para>
+ <para>If you have changed any abject in the tree view and you don't like the final result you can always use the <emphasis><property>Restore Defaults</property></emphasis> button. Click on it will restore defaults for the object selected and for its children elements. Please remember that the button will only restore data for objects defined in the default palette. If selected object is created by you, the button will be disabled. Child objects added by you will not be removed.</para>
<para>When updating JBoss Tools the palette content is not updated.</para>
</section>
<section id="show_hide">
15 years, 2 months
JBoss Tools SVN: r12883 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits@lists.jboss.org
Author: abogachuk
Date: 2009-01-05 12:22:31 -0500 (Mon, 05 Jan 2009)
New Revision: 12883
Modified:
trunk/jsf/docs/userguide/en/modules/palette.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-527
Modified: trunk/jsf/docs/userguide/en/modules/palette.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/palette.xml 2009-01-05 17:21:46 UTC (rev 12882)
+++ trunk/jsf/docs/userguide/en/modules/palette.xml 2009-01-05 17:22:31 UTC (rev 12883)
@@ -58,7 +58,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>By default the Palette is represented in Web Development Perspective with four groups. If
+ <para>By default the Palette is represented in Web Development Perspective with five groups. If
you can't see it, select <emphasis>
<property>Window > Show View Other... > JBoss Tools Web > JBoss
Tools Palette</property>
@@ -206,7 +206,7 @@
editor or the <emphasis>
<property>Edit...</property>
</emphasis> option, like it was mentioned before. In order to remove the
- group, right click on the group that you wish to remove and chose the <emphasis>
+ group, right click on the group that you wish to remove and choose the <emphasis>
<property>Delete</property>
</emphasis> option or click the <emphasis>
<property>Delete</property>
@@ -316,6 +316,9 @@
</listitem>
</itemizedlist>
+
+ <para>If you have changed any abject in the tree view and you don't like the final result you can always use the <emphasis><property>Restore Defaults</property></emphasis> button. Click on it will restore defaults for the object selected and for its children. Please remember that the button will only restore data for objects defined in the default palette. If selected object is created by you, the button will be disabled. Child objects added by you will not be removed.</para>
+ <para>When updating JBoss Tools the palette content is not updated.</para>
</section>
<section id="show_hide">
<?dbhtml filename="Show/Hide.html"?>
15 years, 2 months
JBoss Tools SVN: r12882 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.test: resources and 6 other directories.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2009-01-05 12:21:46 -0500 (Mon, 05 Jan 2009)
New Revision: 12882
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/.project
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/JBIDE-3441-1.html
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/JBIDE-3441-2.html
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/Jbide3441.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VPETestPlugin.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java
Log:
CODING IN PROGRESS - issue JBIDE-3441: VPE - Preferences - change size of VE pane - press OK - Preview will show empty page.
https://jira.jboss.org/jira/browse/JBIDE-3441
JUnit test of JBIDE-3441 has been added.
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/.project
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/.project (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/.project 2009-01-05 17:21:46 UTC (rev 12882)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>vpeTest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/JBIDE-3441-1.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/JBIDE-3441-1.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/JBIDE-3441-1.html 2009-01-05 17:21:46 UTC (rev 12882)
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head id="head-1">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Insert title here</title>
+<style type="text/css">
+table {
+ background-color: black;
+ table-layout: fixed;
+}
+td {
+ background-color: white;
+}
+td div {
+ width: 100px;
+ height: 100px;
+}
+</style>
+</head>
+<body>
+ <table>
+ <tr>
+ <td><div><input type="button" value="Draggable" style=" width : 85px;">dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div id="tagged-div">tagged div content</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ </table>
+</body>
+</html>
\ No newline at end of file
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/JBIDE-3441-2.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/JBIDE-3441-2.html (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/pages/JBIDE/JBIDE-3441-2.html 2009-01-05 17:21:46 UTC (rev 12882)
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head id="head-2">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Insert title here</title>
+<style type="text/css">
+table {
+ background-color: black;
+ table-layout: fixed;
+}
+td {
+ background-color: white;
+}
+td div {
+ width: 100px;
+ height: 100px;
+}
+</style>
+</head>
+<body>
+ <table>
+ <tr>
+ <td><div><input type="button" value="Draggable" style=" width : 85px;">dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div id="tagged-div">tagged div content</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ <tr>
+ <td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td><td><div>dddddd</div></td>
+ </tr>
+ </table>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VPETestPlugin.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VPETestPlugin.java 2009-01-05 16:40:33 UTC (rev 12881)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VPETestPlugin.java 2009-01-05 17:21:46 UTC (rev 12882)
@@ -10,7 +10,12 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.test;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
import org.jboss.tools.common.log.BaseUIPlugin;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
/**
@@ -57,4 +62,15 @@
return plugin;
}
+ public static String getPluginResourcePath() {
+ Bundle bundle = Platform.getBundle(PLUGIN_ID);
+ URL url = null;
+ try {
+ url = bundle == null ? null : FileLocator.resolve(bundle
+ .getEntry("/resources")); // $NON-NLS-1$
+ } catch (Exception e) {
+ url = bundle.getEntry("/resources"); // $NON-NLS-1$
+ }
+ return (url == null) ? null : url.getPath();
+ }
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java 2009-01-05 16:40:33 UTC (rev 12881)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeAllTests.java 2009-01-05 17:21:46 UTC (rev 12882)
@@ -12,6 +12,8 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.Arrays;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -19,6 +21,8 @@
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.tests.ImportBean;
+import org.jboss.tools.vpe.ui.test.jbide.Jbide3441;
import org.osgi.framework.Bundle;
/**
@@ -33,6 +37,7 @@
public static final String TEST_SUITE_PARAM = "testSuite"; //$NON-NLS-1$
public static final String METHOD_SUITE_NAME = "suite"; //$NON-NLS-1$
+ public static final String VPE_TEST_PROJECT_NAME = "vpeTest"; //$NON-NLS-1$
public static Test suite() {
@@ -40,6 +45,14 @@
IExtensionRegistry extensionRepository = Platform
.getExtensionRegistry();
+ // Create test suite for vpeTest project related tests
+ final TestSuite vpeTestProjectSuite = new TestSuite();
+ vpeTestProjectSuite.addTestSuite(Jbide3441.class);
+ final ImportBean vpeTestProjectBean = new ImportBean();
+ vpeTestProjectBean.setImportProjectName(VPE_TEST_PROJECT_NAME);
+ vpeTestProjectBean.setImportProjectPath(VPETestPlugin.getPluginResourcePath());
+ result.addTest( new VpeTestSetup(vpeTestProjectSuite, Arrays.asList(vpeTestProjectBean)) );
+
IExtensionPoint extensionPoint = extensionRepository
.getExtensionPoint(VPE_TEST_EXTENTION_POINT_ID);
IExtension[] extensions = extensionPoint.getExtensions();
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/Jbide3441.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/Jbide3441.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/jbide/Jbide3441.java 2009-01-05 17:21:46 UTC (rev 12882)
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.vpe.ui.test.jbide;
+
+import junit.framework.Assert;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeAllTests;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+
+/**
+ * Test for JIRA Issue JBIDE-3441 ( https://jira.jboss.org/jira/browse/JBIDE-3441 ):
+ * "VPE - Preferences - change size of VE pane - press OK - Preview will show empty page"
+ *
+ * @author yradtsevich
+ *
+ */
+public class Jbide3441 extends VpeTest {
+ private static final String TAGGED_DIV_ID = "tagged-div"; //$NON-NLS-1$
+ private static final String TAGGED_DIV_CONTENT = "tagged div content"; //$NON-NLS-1$
+ private static final String TEST_PAGE_NAME_1 = "JBIDE/JBIDE-3441-1.html"; //$NON-NLS-1$
+ private static final String TEST_PAGE_NAME_2 = "JBIDE/JBIDE-3441-2.html"; //$NON-NLS-1$
+
+ public Jbide3441(String name) {
+ super(name);
+ }
+
+ /**
+ * Try to open two pages in VPE and refresh them n times.
+ */
+ public void testVisualRefresh() throws Throwable {
+ setException(null);
+
+ VpeController controller1 = openPageInVpe(TEST_PAGE_NAME_1);
+ VpeController controller2 = openPageInVpe(TEST_PAGE_NAME_2);
+
+ Display display = Display.getCurrent();
+ for (int i = 0; i < 20; i++) {
+ controller1.visualRefresh();
+ controller2.visualRefresh();
+ while(display.readAndDispatch());
+ TestUtil.waitForJobs();
+ Thread.sleep(500);
+
+ checkTaggedDivValue(controller1, i);
+ checkTaggedDivValue(controller2, i);
+ }
+
+ if (getException() != null) {
+ throw getException();
+ }
+ }
+
+ private void checkTaggedDivValue(VpeController controller, int i) {
+ nsIDOMElement taggedDiv = controller.getXulRunnerEditor().getDOMDocument().getElementById(TAGGED_DIV_ID);
+ assertNotNull("taggedDiv should be not null", taggedDiv); //$NON-NLS-1$
+ nsIDOMNode innerSpan = taggedDiv.getFirstChild();
+ assertNotNull("taggedDiv should have inner span", innerSpan); //$NON-NLS-1$
+ nsIDOMNode taggedDivTextNode = innerSpan.getFirstChild();
+ assertNotNull("taggedDiv should have inner span with text node inside", taggedDivTextNode); //$NON-NLS-1$
+ String taggedDivTextValue = taggedDivTextNode.getNodeValue();
+ Assert.assertEquals("body of taggedDiv should be equal to \'" + TAGGED_DIV_CONTENT //$NON-NLS-1$
+ + "\', but it is \'" + taggedDivTextValue + "\'", //$NON-NLS-1$ //$NON-NLS-2$
+ taggedDivTextValue, TAGGED_DIV_CONTENT);
+ }
+
+ private VpeController openPageInVpe(final String pageName) throws CoreException,
+ PartInitException {
+ IFile elementPageFile = (IFile) TestUtil.getComponentPath(
+ pageName, VpeAllTests.VPE_TEST_PROJECT_NAME);
+ IEditorInput input = new FileEditorInput(elementPageFile);
+
+ JSPMultiPageEditor editor = (JSPMultiPageEditor) PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage().openEditor(input,
+ EDITOR_ID, true);
+ assertNotNull(editor);
+
+ VpeController controller = TestUtil.getVpeController(editor);
+ return controller;
+ }
+}
15 years, 2 months