JBoss Tools SVN: r11802 - workspace/jgraham.
by jbosstools-commits＠lists.jboss.org
Author: john.graham(a)jboss.org
Date: 2008-11-14 16:18:49 -0500 (Fri, 14 Nov 2008)
New Revision: 11802
Added:
workspace/jgraham/plugins/
Log:
Create initial folders
17 years, 5 months
JBoss Tools SVN: r11801 - workspace.
by jbosstools-commits＠lists.jboss.org
Author: john.graham(a)jboss.org
Date: 2008-11-14 16:18:20 -0500 (Fri, 14 Nov 2008)
New Revision: 11801
Added:
workspace/jgraham/
Log:
Create workspace folder
17 years, 5 months
JBoss Tools SVN: r11800 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-14 15:25:06 -0500 (Fri, 14 Nov 2008)
New Revision: 11800
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
JBIDE-3144
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-11-14 19:53:25 UTC (rev 11799)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-11-14 20:25:06 UTC (rev 11800)
@@ -116,6 +116,11 @@
targetVisualElement);
// get atribute's offset
+
+ //mareshkau because it's node can be a proxy, see JBIDE-3144
+ outputAttr = (Attr) ((((Attr)outputAttr).getOwnerElement()).getAttributes().getNamedItem(outputAttr.getLocalName()));
+
+
int offset = ((IDOMAttr) outputAttr)
.getValueRegionStartOffset();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-11-14 19:53:25 UTC (rev 11799)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-11-14 20:25:06 UTC (rev 11800)
@@ -80,7 +80,6 @@
import org.mozilla.interfaces.nsIDOMAttr;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMHTMLInputElement;
import org.mozilla.interfaces.nsIDOMMouseEvent;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIDOMNodeList;
17 years, 5 months
JBoss Tools SVN: r11799 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui/preferences and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-14 14:53:25 -0500 (Fri, 14 Nov 2008)
New Revision: 11799
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
Log:
JBIDE-3130 Seam 2.1 support: Facet and Runtime
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-11-14 19:53:17 UTC (rev 11798)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-11-14 19:53:25 UTC (rev 11799)
@@ -106,6 +106,9 @@
<wizard-pages action="jst.seam.2.0.install">
<page class="org.jboss.tools.seam.ui.internal.project.facet.SeamInstallWizardPage"/>
</wizard-pages>
+ <wizard-pages action="jst.seam.2.1.install">
+ <page class="org.jboss.tools.seam.ui.internal.project.facet.SeamInstallWizardPage"/>
+ </wizard-pages>
</extension>
<extension
point="org.eclipse.ui.views">
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-11-14 19:53:17 UTC (rev 11798)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java 2008-11-14 19:53:25 UTC (rev 11799)
@@ -920,6 +920,9 @@
if(vs.matches(SeamVersion.SEAM_2_0.toString().replace(".", "\\.") + ".*")) {
return SeamVersion.SEAM_2_0;
}
+ if(vs.matches(SeamVersion.SEAM_2_1.toString().replace(".", "\\.") + ".*")) {
+ return SeamVersion.SEAM_2_1;
+ }
return null;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2008-11-14 19:53:17 UTC (rev 11798)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2008-11-14 19:53:25 UTC (rev 11799)
@@ -472,11 +472,13 @@
SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2,
Arrays.asList(new String[] {
SeamVersion.SEAM_1_2.toString(),
- SeamVersion.SEAM_2_0.toString()}),
+ SeamVersion.SEAM_2_0.toString(),
+ SeamVersion.SEAM_2_1.toString()}),
SeamVersion.SEAM_1_2.toString(), false);
this.validSeamVersions = new ArrayList<SeamVersion>();
this.validSeamVersions.add(SeamVersion.SEAM_1_2);
this.validSeamVersions.add(SeamVersion.SEAM_2_0);
+ this.validSeamVersions.add(SeamVersion.SEAM_2_1);
} else {
this.version = IFieldEditorFactory.INSTANCE.createComboEditor(
SRT_VERSION,
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-11-14 19:53:17 UTC (rev 11798)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-11-14 19:53:25 UTC (rev 11799)
@@ -213,6 +213,8 @@
creator = new SeamProjectCreator(model, project);
} else if(seamVersion == SeamVersion.SEAM_2_0) {
creator = new Seam2ProjectCreator(model, project);
+ } else if(seamVersion == SeamVersion.SEAM_2_1) {
+ creator = new Seam2ProjectCreator(model, project);
} else {
throw new RuntimeException("Can't get seam version from seam facet model");
}
17 years, 5 months
JBoss Tools SVN: r11798 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-14 14:53:17 -0500 (Fri, 14 Nov 2008)
New Revision: 11798
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
Log:
JBIDE-3130 Seam 2.1 support: Facet and Runtime
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2008-11-14 19:53:13 UTC (rev 11797)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2008-11-14 19:53:17 UTC (rev 11798)
@@ -196,6 +196,8 @@
creator = new SeamProjectCreator(config, proj);
} else if(seamVersion == SeamVersion.SEAM_2_0) {
creator = new Seam2ProjectCreator(config, proj);
+ } else if(seamVersion == SeamVersion.SEAM_2_1) {
+ creator = new Seam2ProjectCreator(config, proj);
} else {
throw new RuntimeException("Can't get seam version from seam facet model");
}
17 years, 5 months
JBoss Tools SVN: r11797 - in trunk/seam/plugins/org.jboss.tools.seam.core: src/org/jboss/tools/seam/core/project/facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-14 14:53:13 -0500 (Fri, 14 Nov 2008)
New Revision: 11797
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
Log:
JBIDE-3130 Seam 2.1 support: Facet and Runtime
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-11-14 19:20:25 UTC (rev 11796)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2008-11-14 19:53:13 UTC (rev 11797)
@@ -105,6 +105,36 @@
</or>
</constraint>
</project-facet-version>
+ <project-facet-version
+ facet="jst.seam"
+ version="2.1">
+ <constraint>
+ <or>
+ <requires
+ facet="jst.ear"
+ version="[5.0">
+ </requires>
+ <requires
+ facet="jst.ejb"
+ version="[3.0">
+ </requires>
+ <and>
+ <requires
+ facet="jst.web"
+ version="[2.5">
+ </requires>
+ <requires
+ facet="jst.jsf"
+ version="[1.2">
+ </requires>
+ <requires
+ facet="jst.java"
+ version="5.0">
+ </requires>
+ </and>
+ </or>
+ </constraint>
+ </project-facet-version>
<action
facet="jst.seam"
id="jst.seam.1.2.install"
@@ -131,6 +161,18 @@
</action>
<action
facet="jst.seam"
+ id="jst.seam.2.1.install"
+ type="install"
+ version="2.1">
+ <delegate
+ class="org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate">
+ </delegate>
+ <config-factory
+ class="org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider">
+ </config-factory>
+ </action>
+ <action
+ facet="jst.seam"
id="jst.seam.1.2.uninstall"
type="uninstall"
version="1.2">
@@ -215,6 +257,17 @@
Configures a Dynamic Web application to use Seam v2.0
</description>
</static-preset>
+ <static-preset
+ id="jst.seam21.preset">
+ <label>Dynamic Web Project with Seam 2.1</label>
+ <facet id="jst.java" version="5.0"/>
+ <facet id="jst.web" version="2.5"/>
+ <facet id="jst.jsf" version="1.2"/>
+ <facet id="jst.seam" version="2.1"/>
+ <description>
+ Configures a Dynamic Web application to use Seam v2.1
+ </description>
+ </static-preset>
</extension>
<extension
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java 2008-11-14 19:20:25 UTC (rev 11796)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamVersion.java 2008-11-14 19:53:13 UTC (rev 11797)
@@ -27,8 +27,13 @@
/**
* Seam versions 2.0.X
*/
- SEAM_2_0("2.0"); //$NON-NLS-1$ //$NON-NLS-2$
+ SEAM_2_0("2.0"), //$NON-NLS-1$ //$NON-NLS-2$
+ /**
+ * Seam versions 2.1.X
+ */
+ SEAM_2_1("2.1"); //$NON-NLS-1$
+
String version = ""; //$NON-NLS-1$
SeamVersion(String version) {
@@ -45,7 +50,7 @@
return version;
}
- public static SeamVersion[] ALL_VERSIONS = new SeamVersion[]{SEAM_1_2, SEAM_2_0};
+ public static SeamVersion[] ALL_VERSIONS = new SeamVersion[]{SEAM_1_2, SEAM_2_0, SEAM_2_1};
/**
* Get enumeration by string
@@ -61,6 +66,8 @@
return SEAM_1_2;
} else if (SEAM_2_0.toString().equals(version)) {
return SEAM_2_0;
+ } else if (SEAM_2_1.toString().equals(version)) {
+ return SEAM_2_1;
}
throw new IllegalArgumentException(NLS.bind(
"Seam version ''{0}'' is not supported", version)); //$NON-NLS-1$ //$NON-NLS-2$
@@ -80,6 +87,8 @@
return SEAM_1_2;
} else if (SEAM_2_0.toString().equals(version)) {
return SEAM_2_0;
+ } else if (SEAM_2_1.toString().equals(version)) {
+ return SEAM_2_1;
}
return null;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-11-14 19:20:25 UTC (rev 11796)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2008-11-14 19:53:13 UTC (rev 11797)
@@ -63,13 +63,15 @@
.include("jboss-seam-pdf\\.jar") //$NON-NLS-1$
.include("jboss-seam-remoting\\.jar") //$NON-NLS-1$
.include("jboss-seam-ui\\.jar") //$NON-NLS-1$
+ .include("jboss-seam-excel\\.jar") //$NON-NLS-1$
.include("jboss-seam\\.jar") //$NON-NLS-1$
.include("jbpm.*\\.jar") //$NON-NLS-1$
.include("jsf-facelets\\.jar") //$NON-NLS-1$
.include("oscache.*\\.jar") //$NON-NLS-1$
.include("stringtemplate.*\\.jar") //$NON-NLS-1$
.include("mvel.*\\.jar") //$NON-NLS-1$
- .include("jboss-el.jar"); //$NON-NLS-1$
+ .include("jboss-el.jar") //$NON-NLS-1$
+ .include("jxl\\.jar"); //$NON-NLS-1$
public static final AntCopyUtils.FileSet JBOSS_WAR_LIB_FILESET_EAR_CONFIG = new AntCopyUtils.FileSet()
.include("richfaces-impl\\.jar") //$NON-NLS-1$
@@ -82,6 +84,8 @@
.include("jboss-seam-pdf\\.jar") //$NON-NLS-1$
.include("jboss-seam-remoting\\.jar") //$NON-NLS-1$
.include("jboss-seam-ui\\.jar") //$NON-NLS-1$
+ .include("jboss-seam-excel\\.jar") //$NON-NLS-1$
+ .include("jxl\\.jar") //$NON-NLS-1$
.include("jsf-facelets\\.jar"); //$NON-NLS-1$
public static String DROOLS_LIB_SEAM_RELATED_PATH = "lib"; //$NON-NLS-1$
17 years, 5 months
JBoss Tools SVN: r11796 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-11-14 14:20:25 -0500 (Fri, 14 Nov 2008)
New Revision: 11796
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
CODING IN PROGRESS - issue JBIDE-2877: <rich:dataTable>, <rich:column> interaction
https://jira.jboss.org/jira/browse/JBIDE-2877
Item #4 has been fixed: "Incorrect size of header and footer paths of <rich:dataTable> when using <rich:subTable> (see screenshot-5)".
Part 2.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-11-14 18:23:53 UTC (rev 11795)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-11-14 19:20:25 UTC (rev 11796)
@@ -93,6 +93,12 @@
public static final String ATTR_SCOPE = "scope"; //$NON-NLS-1$
public static final String ATTR_SPAN = "span"; //$NON-NLS-1$
+ /**Use this constant if you have to span a column to entire row.*/
+ /* While in HTML 4.01 standard "colspan='0'" should be used for this purpose,
+ * it will not work with documents without DOCTYPE. It is the reason
+ * why the value '100' is used.*/
+ public static final String VALUE_COLSPAN_ALL = "100"; //$NON-NLS-1$
+
public static final String VALUE_ALIGN_TOP = "top"; //$NON-NLS-1$
public static final String VALUE_ALIGN_RIGHT = "right"; //$NON-NLS-1$
public static final String VALUE_ALIGN_MIDDLE = "middle"; //$NON-NLS-1$
17 years, 5 months
JBoss Tools SVN: r11795 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-11-14 13:23:53 -0500 (Fri, 14 Nov 2008)
New Revision: 11795
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
Log:
CODING IN PROGRESS - issue JBIDE-2877: <rich:dataTable>, <rich:column> interaction
https://jira.jboss.org/jira/browse/JBIDE-2877
Item #4 has been fixed: "Incorrect size of header and footer paths of <rich:dataTable> when using <rich:subTable> (see screenshot-5)".
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java 2008-11-14 17:56:14 UTC (rev 11794)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableChildrenEncoder.java 2008-11-14 18:23:53 UTC (rev 11795)
@@ -167,8 +167,8 @@
final nsIDOMElement tr = this.visualDocument.createElement(HTML.TAG_TR);
table.appendChild(tr);
final nsIDOMElement td = this.visualDocument.createElement(HTML.TAG_TD);
- // COLSPAN="0" means the cell spans the entire row
- td.setAttribute(HTML.ATTR_COLSPAN, "0"); //NON-NLS$1
+
+ td.setAttribute(HTML.ATTR_COLSPAN, HTML.VALUE_COLSPAN_ALL);
tr.appendChild(td);
final VpeChildrenInfo childInfo = new VpeChildrenInfo(td);
childInfo.addSourceChild(node);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-11-14 17:56:14 UTC (rev 11794)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-11-14 18:23:53 UTC (rev 11795)
@@ -209,9 +209,9 @@
td.setAttribute(HTML.ATTR_CLASS, styleClass);
}
- if (columns>0) {
- td.setAttribute(HTML.ATTR_COLSPAN, String.valueOf(columns));
- }
+ // the cell spans the entire row
+ td.setAttribute(HTML.ATTR_COLSPAN, HTML.VALUE_COLSPAN_ALL);
+
td.setAttribute(HTML.ATTR_SCOPE, "colgroup"); //$NON-NLS-1$
VpeChildrenInfo child = new VpeChildrenInfo(td);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-11-14 17:56:14 UTC (rev 11794)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2008-11-14 18:23:53 UTC (rev 11795)
@@ -684,10 +684,8 @@
td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass);
}
- if (columns > 0) {
- td.setAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN, String
- .valueOf(columns));
- }
+ // the cell spans the entire row
+ td.setAttribute(HTML.ATTR_COLSPAN, HTML.VALUE_COLSPAN_ALL);
td.setAttribute(HtmlComponentUtil.HTML_SCOPE_ATTR,
HtmlComponentUtil.HTML_TAG_COLGROUP);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-11-14 17:56:14 UTC (rev 11794)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesScrollableDataTableTemplate.java 2008-11-14 18:23:53 UTC (rev 11795)
@@ -20,6 +20,7 @@
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Element;
@@ -365,10 +366,9 @@
td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass);
}
- if (columns > 0) {
- td.setAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN, String
- .valueOf(columns));
- }
+ // the cell spans the entire row
+ td.setAttribute(HTML.ATTR_COLSPAN, HTML.VALUE_COLSPAN_ALL);
+
td.setAttribute(HtmlComponentUtil.HTML_SCOPE_ATTR,
HtmlComponentUtil.HTML_TAG_COLGROUP);
17 years, 5 months
JBoss Tools SVN: r11794 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-11-14 12:56:14 -0500 (Fri, 14 Nov 2008)
New Revision: 11794
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java
Log:
JUnit tests for RF InplaceInput and InplaceSelect components were updated.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java 2008-11-14 17:56:08 UTC (rev 11793)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesAbstractInplaceTemplate.java 2008-11-14 17:56:14 UTC (rev 11794)
@@ -158,8 +158,14 @@
// if(!(this.showControls && this.isToggle)){
rootSpan.setAttribute(VPE_USER_TOGGLE_ID_ATTR, String.valueOf(this.isToggle));
// }
- final String rootClass = MessageFormat.format(defaultStyleClasses.get("rootSpan"), getRootSpanClasses()); //$NON-NLS-1$
- rootSpan.setAttribute(HTML.ATTR_CLASS, rootClass);
+// final String rootClass = MessageFormat.format(defaultStyleClasses.get("rootSpan"), getRootSpanClasses()); //$NON-NLS-1$
+ String rootStyleClass = "rich-inplace" + getCssStylesSuffix(); //$NON-NLS-1$
+ for (String sc : getRootSpanClasses()) {
+ if (ComponentUtil.isNotBlank(sc)) {
+ rootStyleClass += " " + sc; //$NON-NLS-1$
+ }
+ }
+ rootSpan.setAttribute(HTML.ATTR_CLASS, rootStyleClass);
String style = ""; //$NON-NLS-1$
if (this.isToggle) {
style = "position: relative;"; //$NON-NLS-1$
@@ -196,7 +202,7 @@
*
* @return the root span classes
*/
- protected abstract Object[] getRootSpanClasses();
+ protected abstract String[] getRootSpanClasses();
/**
* Gets the value.
@@ -231,7 +237,7 @@
*/
protected void initDefaultStyleClasses() {
if (defaultStyleClasses.isEmpty()) {
- defaultStyleClasses.put("rootSpan", "rich-inplace" + getCssStylesSuffix() + " {0} {1} {2}"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ defaultStyleClasses.put("rootSpan", "rich-inplace" + getCssStylesSuffix() + " {0} {1}"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java 2008-11-14 17:56:08 UTC (rev 11793)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceInputTemplate.java 2008-11-14 17:56:14 UTC (rev 11794)
@@ -146,7 +146,7 @@
*
* @return the root span classes
*/
- protected Object[] getRootSpanClasses() {
+ protected String[] getRootSpanClasses() {
String[] rst = new String[3];
String clazz = ""; //$NON-NLS-1$
@@ -154,14 +154,15 @@
rst[0] = "rich-inplace-edit"; //$NON-NLS-1$
if (ComponentUtil.isNotBlank(this.editClass)) {
clazz = this.editClass;
+ rst[1] = clazz;
}
} else {
rst[0] = "rich-inplace-view"; //$NON-NLS-1$
if (ComponentUtil.isNotBlank(this.viewClass)) {
clazz = this.viewClass;
+ rst[1] = clazz;
}
}
- rst[1] = clazz;
if (ComponentUtil.isNotBlank(this.styleClass)) {
rst[2] = this.styleClass;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java 2008-11-14 17:56:08 UTC (rev 11793)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java 2008-11-14 17:56:14 UTC (rev 11794)
@@ -261,7 +261,7 @@
* RichFacesAbstractInplaceTemplate#getRootSpanClasses()
*/
@Override
- protected Object[] getRootSpanClasses() {
+ protected String[] getRootSpanClasses() {
String[] result = new String[2];
String clazz = "";
17 years, 5 months
JBoss Tools SVN: r11793 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-11-14 12:56:08 -0500 (Fri, 14 Nov 2008)
New Revision: 11793
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesInplaceInputTemplateTestCase.java
Log:
JUnit tests for RF InplaceInput and InplaceSelect components were updated.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml.xml 2008-11-14 17:33:34 UTC (rev 11792)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml.xml 2008-11-14 17:56:08 UTC (rev 11793)
@@ -1,6 +1,6 @@
<tests>
<test id="inplaceSelect">
- <SPAN VPE-USER-TOGGLE-ID="false" CLASS="rich-inplace rich-inplace-select-view"
+ <SPAN VPE-USER-TOGGLE-ID="false" CLASS="rich-inplace-select rich-inplace-select-view"
STYLE="display: inline;"> Click here to edit</SPAN>
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesInplaceInputTemplateTestCase.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesInplaceInputTemplateTestCase.java 2008-11-14 17:33:34 UTC (rev 11792)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesInplaceInputTemplateTestCase.java 2008-11-14 17:56:08 UTC (rev 11793)
@@ -18,6 +18,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
@@ -92,9 +93,10 @@
}
if(element.getFirstChild().getNodeValue()!=null){
- second = element.getFirstChild().getNodeValue();
+ second = element.getFirstChild().getNodeValue().trim();
}
- assertEquals("Text value should be equals 'null'", first, second); //$NON-NLS-1$
+
+ assertEquals("Text value should be empty string", first, second); //$NON-NLS-1$
assertTrue("Style class should be equals " + styleClass, element.getAttribute(HTML.ATTR_CLASS).contains(styleClass)); //$NON-NLS-1$
}
@@ -106,7 +108,7 @@
* @throws Throwable the throwable
*/
public void testInplaceInputWithoutAttributes() throws CoreException, Throwable {
- baseCheck(TEMPLATE_WITH_EMPTY_TAG, null, RICH_INPLACE_VIEW);
+ baseCheck(TEMPLATE_WITH_EMPTY_TAG, Constants.EMPTY, RICH_INPLACE_VIEW);
}
17 years, 5 months