richfaces-svn-commits
September 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 338 discussions
JBoss Rich Faces SVN: r19165 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org: richfaces/tests/metamer/ftest and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-09-13 07:53:14 -0400 (Mon, 13 Sep 2010)
New Revision: 19165
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/LocatorReference.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/ReferencedLocator.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/AbstractModel.java
Log:
extended ReferencedLocator by ability to reference another ReferencedLocator (or any other ExtendedLocator deriving other type than own type)
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/LocatorReference.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/LocatorReference.java 2010-09-13 11:50:12 UTC (rev 19164)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/LocatorReference.java 2010-09-13 11:53:14 UTC (rev 19165)
@@ -27,7 +27,8 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*
- * @param <T> type of referenced locator
+ * @param <T>
+ * type of referenced locator
*/
public class LocatorReference<T extends Locator<?>> {
@@ -42,12 +43,12 @@
return reference;
}
- public void setLocator(T locator) {
- this.reference = locator;
+ public void setLocator(T root) {
+ this.reference = root;
}
-
+
@Override
public String toString() {
- return "ref@" + reference;
+ return "ref@" + reference;
}
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/ReferencedLocator.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/ReferencedLocator.java 2010-09-13 11:50:12 UTC (rev 19164)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/locator/reference/ReferencedLocator.java 2010-09-13 11:53:14 UTC (rev 19165)
@@ -22,9 +22,8 @@
package org.jboss.test.selenium.locator.reference;
import org.jboss.test.selenium.locator.AbstractElementLocator;
-import org.jboss.test.selenium.locator.CompoundableLocator;
import org.jboss.test.selenium.locator.ElementLocationStrategy;
-import org.jboss.test.selenium.locator.IterableLocator;
+import org.jboss.test.selenium.locator.ExtendedLocator;
import org.jboss.test.selenium.utils.text.SimplifiedFormat;
/**
@@ -34,33 +33,47 @@
* @param <T>
* type of referenced locator
*/
-public class ReferencedLocator<T extends IterableLocator<T> & CompoundableLocator<T>> extends AbstractElementLocator<T>
- implements IterableLocator<T>, CompoundableLocator<T> {
+public final class ReferencedLocator<T extends ExtendedLocator<T>> extends AbstractElementLocator<T> implements
+ ExtendedLocator<T> {
- private LocatorReference<T> reference;
+ private LocatorReference<ExtendedLocator<T>> reference;
private String addition;
- public ReferencedLocator(LocatorReference<T> reference, String locator) {
+ private ReferencedLocator(LocatorReference<ExtendedLocator<T>> reference, String addition) {
super("not-used");
this.reference = reference;
- this.addition = locator;
+ this.addition = addition;
}
- public static <N extends IterableLocator<N> & CompoundableLocator<N>> ReferencedLocator<N> ref(
- LocatorReference<N> reference, String locator) {
- return new ReferencedLocator<N>(reference, locator);
+ public static <N extends ExtendedLocator<N>> ReferencedLocator<N> ref(LocatorReference<N> reference, String locator) {
+ LocatorReference<ExtendedLocator<N>> castReference = (LocatorReference<ExtendedLocator<N>>) reference;
+ ReferencedLocator<N> result = new ReferencedLocator<N>(castReference, locator);
+ return result;
}
+ public static <N extends ExtendedLocator<N>> ReferencedLocator<N> referenceInferred(
+ LocatorReference<ExtendedLocator<N>> reference, String locator) {
+ ReferencedLocator<N> result = new ReferencedLocator<N>(reference, locator);
+ result.reference = reference;
+ return result;
+ }
+
public T getReferenced() {
- T referencedLocator = reference.getLocator();
+ ExtendedLocator<T> referencedLocator = reference.getLocator();
@SuppressWarnings("unchecked")
Class<T> tClass = (Class<T>) referencedLocator.getClass();
try {
+ if (tClass.isAssignableFrom(ReferencedLocator.class)) {
+ ReferencedLocator<T> ancestor = (ReferencedLocator<T>) referencedLocator;
+ referencedLocator = ancestor.getReferenced();
+ tClass = (Class<T>) referencedLocator.getClass();
+ }
+
T newInstance = tClass.getConstructor(String.class).newInstance(addition);
-
- return referencedLocator.getDescendant(newInstance);
+ T result = referencedLocator.getDescendant(newInstance);
+ return result;
} catch (Exception e) {
throw new IllegalStateException(e);
}
@@ -103,12 +116,11 @@
return getReferenced().getDescendants(elementLocator);
}
- @SuppressWarnings("unchecked")
public T format(Object... args) {
String newAddition = SimplifiedFormat.format(addition, args);
try {
- return (T) this.getClass().getConstructor(LocatorReference.class, String.class)
- .newInstance(reference, newAddition);
+ // TODO fix the <T> param cast
+ return (T) new ReferencedLocator<T>(this.reference, newAddition);
} catch (Exception e) {
throw new IllegalStateException(e);
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java 2010-09-13 11:50:12 UTC (rev 19164)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java 2010-09-13 11:53:14 UTC (rev 19165)
@@ -24,12 +24,17 @@
import org.jboss.test.selenium.dom.Event;
import org.jboss.test.selenium.framework.AjaxSelenium;
import org.jboss.test.selenium.framework.AjaxSeleniumProxy;
+import org.jboss.test.selenium.locator.Attribute;
import org.jboss.test.selenium.locator.AttributeLocator;
import org.jboss.test.selenium.locator.ElementLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
+import org.jboss.test.selenium.locator.ExtendedLocator;
+import org.jboss.test.selenium.locator.reference.LocatorReference;
+import org.jboss.test.selenium.locator.reference.ReferencedLocator;
import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp;
import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq;
+import static org.jboss.test.selenium.locator.reference.ReferencedLocator.referenceInferred;
/**
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
@@ -39,8 +44,17 @@
protected AjaxSelenium selenium = AjaxSeleniumProxy.getInstance();
- JQueryLocator propertyLocator = pjq("input[id$={0}Input]");
+ LocatorReference<ExtendedLocator<JQueryLocator>> root = new LocatorReference<ExtendedLocator<JQueryLocator>>(
+ pjq(""));
+ ReferencedLocator<JQueryLocator> propertyLocator = referenceInferred(root, "input[id$={0}Input]");
+ public AbstractComponentAttributes() {
+ }
+
+ public <T extends ExtendedLocator<JQueryLocator>> AbstractComponentAttributes(T root) {
+ this.root.setLocator(root);
+ }
+
protected String getProperty(String propertyName) {
final ElementLocator<?> locator = propertyLocator.format(propertyName);
return selenium.getValue(locator);
@@ -48,8 +62,7 @@
protected void setProperty(String propertyName, Object value) {
final ElementLocator<?> locator = propertyLocator.format(propertyName);
- final AttributeLocator<?> typeLocator = locator.getAttribute(new org.jboss.test.selenium.locator.Attribute(
- "type"));
+ final AttributeLocator<?> typeLocator = locator.getAttribute(Attribute.TYPE);
String inputType = selenium.getAttribute(typeLocator);
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/AbstractModel.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/AbstractModel.java 2010-09-13 11:50:12 UTC (rev 19164)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/AbstractModel.java 2010-09-13 11:53:14 UTC (rev 19165)
@@ -21,7 +21,7 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest.model;
-import org.jboss.test.selenium.locator.IterableLocator;
+import org.jboss.test.selenium.locator.ExtendedLocator;
import org.jboss.test.selenium.locator.reference.LocatorReference;
/**
@@ -33,7 +33,7 @@
* @param <T>
* the iterable locator type of root
*/
-public abstract class AbstractModel<T extends IterableLocator<T>> {
+public abstract class AbstractModel<T extends ExtendedLocator<T>> {
protected LocatorReference<T> root = new LocatorReference<T>(null);
private String name = this.getClass().getSimpleName();
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19164 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org: richfaces/tests/metamer/ftest and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-09-13 07:50:12 -0400 (Mon, 13 Sep 2010)
New Revision: 19164
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/cheiron/halt/XHRHalter.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/AbstracStatusTest.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerInTableFooter.java
Log:
fixed checkstyle violations
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/cheiron/halt/XHRHalter.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/cheiron/halt/XHRHalter.java 2010-09-13 03:16:25 UTC (rev 19163)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/cheiron/halt/XHRHalter.java 2010-09-13 11:50:12 UTC (rev 19164)
@@ -33,15 +33,11 @@
* @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
* @version $Revision$
*/
-public class XHRHalter {
+public final class XHRHalter {
- private static JavaScript isHandleAvailable = js("selenium.browserbot.getCurrentWindow().XHRHalter.isHandleAvailable()");
- private static JavaScript isWaitingForSend = js("selenium.browserbot.getCurrentWindow().XHRHalter.isWaitingForSend({0})");
- private static JavaScript getHandle = js("selenium.browserbot.getCurrentWindow().XHRHalter.getHandle()");
- private static JavaScript continueTo = js("selenium.browserbot.getCurrentWindow().XHRHalter.continueTo({0}, selenium.browserbot.getCurrentWindow().XHRHalter.STATE_{1})");
- private static JavaScript setEnabled = js("selenium.browserbot.getCurrentWindow().XHRHalter.setEnabled({0})");
+ private static AjaxSelenium selenium = AjaxSeleniumProxy.getInstance();
- private static final AbstractPageExtensions halterExtensions = new AbstractPageExtensions() {
+ private static final AbstractPageExtensions HALTER_EXTENSIONS = new AbstractPageExtensions() {
{
loadFromResource("javascript/cheiron/XHRHalter.js");
}
@@ -51,17 +47,21 @@
}
};
+ private static JavaScript isHandleAvailable = js("selenium.browserbot.getCurrentWindow().XHRHalter.isHandleAvailable()");
+ private static JavaScript isWaitingForSend = js("selenium.browserbot.getCurrentWindow().XHRHalter.isWaitingForSend({0})");
+ private static JavaScript getHandle = js("selenium.browserbot.getCurrentWindow().XHRHalter.getHandle()");
+ private static JavaScript continueTo = js("selenium.browserbot.getCurrentWindow().XHRHalter.continueTo({0}, selenium.browserbot.getCurrentWindow().XHRHalter.STATE_{1})");
+ private static JavaScript setEnabled = js("selenium.browserbot.getCurrentWindow().XHRHalter.setEnabled({0})");
+
int handle;
private XHRHalter(int handle) {
this.handle = handle;
}
- static AjaxSelenium selenium = AjaxSeleniumProxy.getInstance();
-
public static void enable() {
selenium.getPageExtensions().install();
- halterExtensions.install();
+ HALTER_EXTENSIONS.install();
selenium.getEval(setEnabled.parametrize(true));
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-09-13 03:16:25 UTC (rev 19163)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2010-09-13 11:50:12 UTC (rev 19164)
@@ -33,11 +33,9 @@
import org.jboss.test.selenium.locator.ElementLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.waiting.ajax.JavaScriptCondition;
-import org.richfaces.tests.metamer.Template;
import org.richfaces.tests.metamer.TemplatesList;
import org.richfaces.tests.metamer.ftest.annotations.Inject;
import org.richfaces.tests.metamer.ftest.annotations.Templates;
-import org.testng.ITestResult;
import org.testng.SkipException;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/AbstracStatusTest.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/AbstracStatusTest.java 2010-09-13 03:16:25 UTC (rev 19163)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/AbstracStatusTest.java 2010-09-13 11:50:12 UTC (rev 19164)
@@ -28,7 +28,6 @@
import org.jboss.test.selenium.locator.JQueryLocator;
import org.jboss.test.selenium.waiting.retrievers.TextRetriever;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
-import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
/**
@@ -66,8 +65,9 @@
selenium.click(button);
XHRHalter halt = getCurrentXHRHalter();
assertEquals(retrieveStatus.retrieve(), startStatusText);
+ retrieveStatus.initializeValue();
halt.complete();
- waitAjax.waitForChange(startStatusText, retrieveStatus);
+ waitAjax.waitForChange(retrieveStatus);
assertEquals(retrieveStatus.retrieve(), stopStatusText);
XHRHalter.disable();
}
Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerInTableFooter.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerInTableFooter.java 2010-09-13 03:16:25 UTC (rev 19163)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerInTableFooter.java 2010-09-13 11:50:12 UTC (rev 19164)
@@ -23,7 +23,6 @@
import javax.xml.bind.JAXBException;
-import org.richfaces.tests.metamer.ftest.annotations.Templates;
import org.richfaces.tests.metamer.ftest.annotations.Use;
import org.testng.annotations.Test;
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19163 - modules/docs/branches.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2010-09-12 23:16:25 -0400 (Sun, 12 Sep 2010)
New Revision: 19163
Removed:
modules/docs/branches/draft/
Log:
Removing old draft branch
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19162 - modules/docs/branches/M3_draft.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2010-09-12 19:48:14 -0400 (Sun, 12 Sep 2010)
New Revision: 19162
Modified:
modules/docs/branches/M3_draft/
Log:
Initialized merge tracking via "svnmerge" with revisions "1-19160" from
https://svn.jboss.org/repos/richfaces/modules/docs/trunk
Property changes on: modules/docs/branches/M3_draft
___________________________________________________________________
Name: svnmerge-integrated
+ /modules/docs/trunk:1-19160
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19161 - modules/docs/branches.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2010-09-12 19:32:02 -0400 (Sun, 12 Sep 2010)
New Revision: 19161
Added:
modules/docs/branches/M3_draft/
Log:
Recreating branch using svnmerge.py
Copied: modules/docs/branches/M3_draft (from rev 19160, modules/docs/trunk)
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19160 - trunk/examples/output-demo/src/main/webapp/WEB-INF and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-09-12 12:53:45 -0400 (Sun, 12 Sep 2010)
New Revision: 19160
Added:
trunk/ui/output/api/src/main/java/org/richfaces/HeaderAlignment.java
trunk/ui/output/api/src/main/java/org/richfaces/HeaderPosition.java
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/actlefttab_bg.gif
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/actrighttab_bg.gif
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab2_bg.gif
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab2_bottom_bg.gif
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab_bg.gif
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab_bottom_bg.gif
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/close.gif
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/close_act.gif
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/ico.gif
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/lefttab_bg.gif
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss
Modified:
branches/RF-7944/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java
branches/RF-7944/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java
trunk/examples/output-demo/src/main/webapp/WEB-INF/faces-config.xml
trunk/examples/output-demo/src/main/webapp/templates/template.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java
trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
Log:
Tab Panel Renderer
Modified: branches/RF-7944/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java
===================================================================
--- branches/RF-7944/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2010-09-12 09:15:34 UTC (rev 19159)
+++ branches/RF-7944/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabPanelRenderer.java 2010-09-12 16:53:45 UTC (rev 19160)
@@ -23,6 +23,10 @@
package org.richfaces.renderkit.html;
import org.richfaces.component.AbstractTabPanel;
+import org.richfaces.component.AbstractTogglePanelTitledItem;
+import org.richfaces.component.html.HtmlTab;
+import org.richfaces.component.util.HtmlUtil;
+import org.richfaces.renderkit.RenderKitUtils;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
@@ -31,6 +35,9 @@
import javax.faces.context.ResponseWriter;
import java.io.IOException;
+import static org.richfaces.component.util.HtmlUtil.concatClasses;
+import static org.richfaces.renderkit.RenderKitUtils.renderPassThroughAttributes;
+
/**
* @author akolonitsky
* @since 2010-08-24
@@ -40,17 +47,163 @@
@ResourceDependency(name = "jquery.js"),
@ResourceDependency(name = "richfaces.js"),
@ResourceDependency(name = "richfaces-base-component.js"),
- @ResourceDependency(name = "script/TabPanel.js") })
+ @ResourceDependency(library = "org.richfaces", name = "tabPanel.ecss"),
+ @ResourceDependency(library = "org.richfaces", name = "TogglePanel.js"),
+ @ResourceDependency(library = "org.richfaces", name = "script/TabPanel.js") })
public class TabPanelRenderer extends TogglePanelRenderer {
+ private static final RenderKitUtils.Attributes HEADER_ATTRIBUTES = RenderKitUtils.attributes()
+ .generic("style", HtmlTab.PropertyKeys.headerStyle.toString())
+ .generic("onclick", HtmlTab.PropertyKeys.onheaderclick.toString(), "headerclick")
+ .generic("ondblclick", HtmlTab.PropertyKeys.onheaderdblclick.toString(), "headerdblclick")
+ .generic("onmousedown", HtmlTab.PropertyKeys.onheadermousedown.toString(), "headermousedown")
+ .generic("onmousemove", HtmlTab.PropertyKeys.onheadermousemove.toString(), "headermousemove")
+ .generic("onmouseup", HtmlTab.PropertyKeys.onheadermouseup.toString(), "headermouseup");
+
+ private static final String DIV = "div";
+ private static final String STYLE = "style";
+ private static final String CLASS = "class";
+
@Override
- protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
- super.doEncodeBegin(writer, context, component);
+ protected void doEncodeBegin(ResponseWriter w, FacesContext context, UIComponent comp) throws IOException {
+// super.doEncodeBegin(writer, context, component);
+
+ // TODO id, class, user styles :) (inherit form toogle panel)
+ w.startElement(DIV, comp);
+ w.writeAttribute(STYLE, "width: 100%;", null);
+
+ w.startElement(DIV, comp);
+ w.writeAttribute(CLASS, "rftp_toptab_tabline_vis", null);
+
+ w.startElement("table", comp);
+ w.writeAttribute("class", "rftp_toptab_tabs", null);
+ w.startElement("tbody", comp);
+ w.startElement("tr", comp);
+
+ writeTopTabFirstSpacer(w, comp);
+ writeTopTabHeader(w, comp, "Tab name 1", true);
+ writeTopTabSpacer(w, comp);
+ writeTopTabHeader(w, comp, "Tab name 2", false);
+ writeTopTabSpacer(w, comp);
+ writeTopTabLastSpacer(w, comp);
+
+ w.endElement("tr");
+ w.endElement("tbody");
+ w.endElement("table");
+
+ writeTopTabsControl(w, comp, "rftp_toptab_scroll_left rftp_hidden", "«");
+ writeTopTabsControl(w, comp, "rftp_toptab_tabslist rftp_hidden", "↓");
+ writeTopTabsControl(w, comp, "rftp_toptab_scroll_right rftp_hidden", "»");
+
+ w.endElement("div");
+
+ w.startElement("div", comp);
+ w.writeAttribute("class", "rftp_toptab_border", null);
+ w.endElement("div");
}
+ private void encodeTabHeader(FacesContext context, UIComponent component, ResponseWriter writer) throws IOException {
+
+ writer.startElement("div", component);
+ writer.writeAttribute("class", concatClasses("rf-tab-hdr", attributeAsString(component, HtmlTab.PropertyKeys.headerClass)), null);
+ writer.writeAttribute("id", component.getClientId() + ":header", null);
+ renderPassThroughAttributes(context, component, HEADER_ATTRIBUTES);
+
+ AbstractTogglePanelTitledItem titledItem = (AbstractTogglePanelTitledItem) component;
+ boolean isActive = titledItem.isActive();
+ boolean isDisabled = titledItem.isDisabled();
+ encodeTabHeader(context, titledItem, writer, AbstractTogglePanelTitledItem.HeaderStates.inactive, !isActive && !isDisabled);
+ encodeTabHeader(context, titledItem, writer, AbstractTogglePanelTitledItem.HeaderStates.active, isActive && !isDisabled);
+ encodeTabHeader(context, titledItem, writer, AbstractTogglePanelTitledItem.HeaderStates.disable, isDisabled);
+
+ writer.endElement("div");
+ }
+
+ private void encodeTabHeader(FacesContext facesContext, AbstractTogglePanelTitledItem component, ResponseWriter writer,
+ AbstractTogglePanelTitledItem.HeaderStates state, Boolean isDisplay) throws IOException {
+
+ writer.startElement("div", component);
+
+ if (!isDisplay) {
+ writer.writeAttribute("style", "display : none", null);
+ }
+
+ String name = "headerClass" + capitalize(state.toString());
+ writer.writeAttribute("class", concatClasses("rf-tab-hdr-" + state.abbreviation(), attributeAsString(component, name)), null);
+
+ UIComponent headerFacet = component.getHeaderFacet(state);
+ if (headerFacet != null && headerFacet.isRendered()) {
+ headerFacet.encodeAll(facesContext);
+ } else {
+ Object headerText = component.getAttributes().get("header");
+ if (headerText != null && !headerText.equals("")) {
+ writer.writeText(headerText, null);
+ }
+ }
+
+ writer.endElement("div");
+ }
+
+
+
+ private void writeTopTabsControl(ResponseWriter w, UIComponent comp, String styles, String text) throws IOException {
+ w.startElement("div", comp);
+ w.writeAttribute("class", styles, null);
+ w.writeText(text, null);
+ w.endElement("div");
+ }
+
+ private void writeTopTabHeader(ResponseWriter w, UIComponent comp, String text, boolean active) throws IOException {
+ w.startElement("td", comp);
+ w.writeAttribute("class", HtmlUtil.concatClasses("rftp_toptab", active ? "rftp_active_top" : ""), null);
+ w.startElement("div", comp);
+ w.writeAttribute("style", "white-space: nowrap;", null);
+
+ writeTopTabIcon(w, comp, "rftp_icon", "ico.gif");
+
+ w.startElement("span", comp);
+ w.writeAttribute("class", "rftp_label", null);
+ w.writeText(text, null);
+ w.endElement("span");
+
+ writeTopTabIcon(w, comp, "rftp_close", "close_act.gif");
+
+ w.endElement("div");
+ w.endElement("td");
+ }
+
+ private void writeTopTabIcon(ResponseWriter w, UIComponent comp, String styleClass, String image) throws IOException {
+ w.startElement("img", comp);
+ w.writeAttribute("width", 16, null);
+ w.writeAttribute("height", 16, null);
+ w.writeAttribute("class", styleClass, null);
+ w.writeAttribute("src", image, null);
+ }
+
+ private void writeTopTabFirstSpacer(ResponseWriter w, UIComponent comp) throws IOException {
+ writeTopTabSpacer_(w, comp, "padding-left: 5px;", "rftp_toptab_spacer");
+ }
+
+ private void writeTopTabSpacer(ResponseWriter w, UIComponent comp) throws IOException {
+ writeTopTabSpacer_(w, comp, "", "rftp_toptab_spacer rftp_horizonttab_tabspacer_width");
+ }
+
+ private void writeTopTabLastSpacer(ResponseWriter w, UIComponent comp) throws IOException {
+ writeTopTabSpacer_(w, comp, "padding-right: 5px; width: 100%;", "rftp_toptab_spacer");
+ }
+
+ private void writeTopTabSpacer_(ResponseWriter w, UIComponent comp, String style, String classStyle) throws IOException {
+ w.startElement("td", comp);
+ w.writeAttribute(STYLE, style, null);
+ w.writeAttribute(CLASS, classStyle, null);
+ w.startElement("br", comp);
+ w.endElement("td");
+ }
+
@Override
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
- super.doEncodeEnd(writer, context, component);
+ writer.endElement("div");
+// super.doEncodeEnd(writer, context, component);
}
@Override
Modified: branches/RF-7944/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java
===================================================================
--- branches/RF-7944/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java 2010-09-12 09:15:34 UTC (rev 19159)
+++ branches/RF-7944/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TabRenderer.java 2010-09-12 16:53:45 UTC (rev 19160)
@@ -22,7 +22,9 @@
package org.richfaces.renderkit.html;
+import org.ajax4jsf.javascript.JSObject;
import org.richfaces.component.AbstractTogglePanelTitledItem;
+import org.richfaces.renderkit.HtmlConstants;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
@@ -30,7 +32,10 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import java.io.IOException;
+import java.util.Map;
+import static org.richfaces.component.util.HtmlUtil.concatClasses;
+
/**
* @author akolonitsky
* @since 2010-08-24
@@ -40,20 +45,71 @@
@ResourceDependency(name = "jquery.js"),
@ResourceDependency(name = "richfaces.js"),
@ResourceDependency(name = "richfaces-base-component.js"),
- @ResourceDependency(name = "script/Tab.js") })
+ @ResourceDependency(library = "org.richfaces", name = "script/Tab.js") })
public class TabRenderer extends TogglePanelItemRenderer {
@Override
protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
super.doEncodeBegin(writer, context, component);
+
+ encodeContentBegin(component, writer);
}
@Override
+ protected String getStyleClass(UIComponent component) {
+ return concatClasses("rf-tab", attributeAsString(component, "styleClass"));
+ }
+
+ @Override
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
+ encodeContentEnd(component, writer);
+
super.doEncodeEnd(writer, context, component);
}
@Override
+ protected void writeJavaScript(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
+ Object script = getScriptObject(context, component);
+ if (script == null) {
+ return;
+ }
+
+ writer.startElement(HtmlConstants.SCRIPT_ELEM, component);
+ writer.writeAttribute(HtmlConstants.TYPE_ATTR, "text/javascript", "type");
+ writer.writeText(script, null);
+ writer.endElement(HtmlConstants.SCRIPT_ELEM);
+ }
+
+ private void encodeContentBegin(UIComponent component, ResponseWriter writer) throws IOException {
+ writer.startElement("div", component);
+ writer.writeAttribute("class", concatClasses("rf-tab-cnt", attributeAsString(component, "contentClass")), null);
+ writer.writeAttribute("id", component.getClientId() + ":content", null);
+
+ AbstractTogglePanelTitledItem item = (AbstractTogglePanelTitledItem) component;
+ if (!item.isActive() || item.isDisabled()) {
+ writer.writeAttribute("style", "display: none", null);
+ }
+ }
+
+ private void encodeContentEnd(UIComponent component, ResponseWriter responseWriter) throws IOException {
+ responseWriter.endElement("div");
+ }
+
+ @Override
+ protected JSObject getScriptObject(FacesContext context, UIComponent component) {
+ return new JSObject("RichFaces.ui.Tab", component.getClientId(),
+ getScriptObjectOptions(context, component));
+ }
+
+ @Override
+ protected Map<String, Object> getScriptObjectOptions(FacesContext context, UIComponent component) {
+ Map<String, Object> res = super.getScriptObjectOptions(context, component);
+ res.put("disabled", ((AbstractTogglePanelTitledItem) component).isDisabled());
+
+ return res;
+ }
+
+ @Override
protected Class<? extends UIComponent> getComponentClass() {
return AbstractTogglePanelTitledItem.class;
}
Modified: trunk/examples/output-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/WEB-INF/faces-config.xml 2010-09-12 09:15:34 UTC (rev 19159)
+++ trunk/examples/output-demo/src/main/webapp/WEB-INF/faces-config.xml 2010-09-12 16:53:45 UTC (rev 19160)
@@ -38,6 +38,10 @@
<from-outcome>collapsiblePanel</from-outcome>
<to-view-id>/examples/collapsiblePanel.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>tabPanel</from-outcome>
+ <to-view-id>/examples/tabPanel.xhtml</to-view-id>
+ </navigation-case>
<!-- QUnit -->
<navigation-case>
@@ -60,5 +64,9 @@
<from-outcome>qunit/collapsiblePanel</from-outcome>
<to-view-id>/qunit/collapsiblePanel.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>qunit/tabPanel</from-outcome>
+ <to-view-id>/qunit/tabPanel.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
</faces-config>
Modified: trunk/examples/output-demo/src/main/webapp/templates/template.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/templates/template.xhtml 2010-09-12 09:15:34 UTC (rev 19159)
+++ trunk/examples/output-demo/src/main/webapp/templates/template.xhtml 2010-09-12 16:53:45 UTC (rev 19160)
@@ -204,6 +204,12 @@
<li><h:commandLink value="Collapsible Panel" action="collapsiblePanel" /></li>
</ul>
</li>
+ <li>
+ <p>Tab Panel</p>
+ <ul>
+ <li><h:commandLink value="Tab Panel" action="tabPanel" /></li>
+ </ul>
+ </li>
</ul>
<p>QUnit</p>
<ul>
@@ -212,6 +218,7 @@
<li><h:commandLink value="accordion" action="qunit/accordion" /></li>
<li><h:commandLink value="accordionHeaders" action="qunit/accordionHeaders" /></li>
<li><h:commandLink value="collapsiblePanel" action="qunit/collapsiblePanel" /></li>
+ <li><h:commandLink value="tabPanel" action="qunit/tabPanel" /></li>
</ul>
</h:form>
</td>
Added: trunk/ui/output/api/src/main/java/org/richfaces/HeaderAlignment.java
===================================================================
--- trunk/ui/output/api/src/main/java/org/richfaces/HeaderAlignment.java (rev 0)
+++ trunk/ui/output/api/src/main/java/org/richfaces/HeaderAlignment.java 2010-09-12 16:53:45 UTC (rev 19160)
@@ -0,0 +1,9 @@
+package org.richfaces;
+
+/**
+ * @author akolonitsky
+ * @since Aug 24, 2010
+ */
+public enum HeaderAlignment {
+ left, center, right, bottom, top
+}
Added: trunk/ui/output/api/src/main/java/org/richfaces/HeaderPosition.java
===================================================================
--- trunk/ui/output/api/src/main/java/org/richfaces/HeaderPosition.java (rev 0)
+++ trunk/ui/output/api/src/main/java/org/richfaces/HeaderPosition.java 2010-09-12 16:53:45 UTC (rev 19160)
@@ -0,0 +1,9 @@
+package org.richfaces;
+
+/**
+ * @author akolonitsky
+ * @since Aug 24, 2010
+ */
+public enum HeaderPosition {
+ top, left, right, bottom
+}
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2010-09-12 09:15:34 UTC (rev 19159)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2010-09-12 16:53:45 UTC (rev 19160)
@@ -218,7 +218,7 @@
return null;
}
- public Map<String, Object> getHandledVisualOptions(AbstractPopupPanel panel) {
+ public Map<String, Object> getHandledVisualOptions(AbstractPopupPanel panel) {
String options = panel.getVisualOptions();
Map<String, Object> result;
result = prepareVisualOptions(options, panel);
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-09-12 09:15:34 UTC (rev 19159)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-09-12 16:53:45 UTC (rev 19160)
@@ -11,6 +11,16 @@
</behavior>
<component>
+ <component-type>org.richfaces.TabPanel</component-type>
+ <component-class>org.richfaces.component.html.HtmlTabPanel</component-class>
+ </component>
+
+ <component>
+ <component-type>org.richfaces.Tab</component-type>
+ <component-class>org.richfaces.component.html.HtmlTab</component-class>
+ </component>
+
+ <component>
<component-type>org.richfaces.CollapsiblePanel</component-type>
<component-class>org.richfaces.component.html.HtmlCollapsiblePanel</component-class>
<property>
@@ -683,7 +693,18 @@
<renderer-type>org.richfaces.AccordionItem</renderer-type>
<renderer-class>org.richfaces.renderkit.html.AccordionItemRenderer</renderer-class>
</renderer>
+
<renderer>
+ <component-family>org.richfaces.TabPanel</component-family>
+ <renderer-type>org.richfaces.TabPanel</renderer-type>
+ <renderer-class>org.richfaces.renderkit.html.TabPanelRenderer</renderer-class>
+ </renderer>
+ <renderer>
+ <component-family>org.richfaces.TogglePanelTitledItem</component-family>
+ <renderer-type>org.richfaces.Tab</renderer-type>
+ <renderer-class>org.richfaces.renderkit.html.TabRenderer</renderer-class>
+ </renderer>
+ <renderer>
<component-family>org.richfaces.Panel</component-family>
<renderer-type>org.richfaces.PanelRenderer</renderer-type>
<renderer-class>org.richfaces.renderkit.html.PanelRenderer</renderer-class>
Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-09-12 09:15:34 UTC (rev 19159)
+++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-09-12 16:53:45 UTC (rev 19160)
@@ -29,6 +29,192 @@
</tag>
<tag>
+ <tag-name>tabPanel</tag-name>
+ <component>
+ <component-type>org.richfaces.TabPanel</component-type>
+ <renderer-type>org.richfaces.TabPanel</renderer-type>
+
+ </component>
+ <attribute>
+ <description></description>
+ <name>cycledSwitching</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>switchType</name>
+ <type>org.richfaces.component.SwitchType</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>activeItem</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>bypassUpdates</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>limitToList</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>data</name>
+ <type>java.lang.Object</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>status</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>execute</name>
+ <type>java.lang.Object</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>render</name>
+ <type>java.lang.Object</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>immediate</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>itemChangeListener</name>
+ <type>javax.el.MethodExpression</type>
+ </attribute>
+ <attribute>
+ <description>Long long text</description>
+ <name>id</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description>binding description</description>
+ <name>binding</name>
+ <type>javax.faces.component.UIComponent</type>
+ </attribute>
+ <attribute>
+ <description>I don't know maybe some thing strange</description>
+ <name>rendered</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>headerPosition</name>
+ <type>org.richfaces.HeaderPosition</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>headerAlignment</name>
+ <type>org.richfaces.HeaderAlignment</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>tabHeaderClassActive</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>tabHeaderClassDisabled</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>tabHeaderClassInactive</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>tabContentClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>tabHeaderClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onitemchange</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onbeforeitemchange</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>lang</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>title</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>style</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>styleClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>dir</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>ondblclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onmousedown</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onmousemove</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onmouseout</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onmouseover</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onmouseup</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ </tag>
+
+
+ <tag>
<tag-name>collapsiblePanel</tag-name>
<component>
<component-type>org.richfaces.CollapsiblePanel</component-type>
@@ -882,6 +1068,176 @@
<name>onmouseup</name>
<type>java.lang.String</type>
</attribute>
+ </tag>
+
+ <tag>
+ <tag-name>tab</tag-name>
+ <component>
+ <component-type>org.richfaces.TogglePanelTitledItem</component-type>
+ <renderer-type>org.richfaces.Tab</renderer-type>
+ </component>
+ <attribute>
+ <description></description>
+ <name>disabled</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>header</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>name</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>switchType</name>
+ <type>org.richfaces.component.SwitchType</type>
+ </attribute>
+ <attribute>
+ <description>Long long text</description>
+ <name>id</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description>binding description</description>
+ <name>binding</name>
+ <type>javax.faces.component.UIComponent</type>
+ </attribute>
+ <attribute>
+ <description>I don't know maybe some thing strange</description>
+ <name>rendered</name>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>headerClassActive</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>headerClassDisabled</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>headerClassInactive</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>headerClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>headerStyle</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>contentClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onheaderclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onheaderdblclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onheadermousedown</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onheadermousemove</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onheadermouseup</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onenter</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onleave</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>lang</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>title</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>style</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>styleClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>dir</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>ondblclick</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onmousedown</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onmousemove</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onmouseout</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onmouseover</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute>
+ <description></description>
+ <name>onmouseup</name>
+ <type>java.lang.String</type>
+ </attribute>
</tag>
+
+
</facelet-taglib>
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/actlefttab_bg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/actlefttab_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/actrighttab_bg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/actrighttab_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab2_bg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab2_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab2_bottom_bg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab2_bottom_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab_bg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab_bottom_bg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/acttab_bottom_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/close.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/close.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/close_act.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/close_act.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/ico.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/ico.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/lefttab_bg.gif
===================================================================
(Binary files differ)
Property changes on: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/lefttab_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss (rev 0)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss 2010-09-12 16:53:45 UTC (rev 19160)
@@ -0,0 +1,78 @@
+*{font-family : verdana /*generalFamilyFont*/}
+.rftp_bottomtab {border : 1px solid #A6A6A6 /*panelBorderColor*/; vertical-align : top; background : url(#{resource['org.richfaces:tab_bg.gif']})/*gradient - from generalBackgroundColor to tabBackgroundColor*/ top repeat-x #DAE7F5 /*tabBackgroundColor*/;}
+.rftp_active_bottom {border-top : 0px; font-weight : bold; vertical-align : top; background : url(#{resource['org.richfaces:acttab_bottom_bg.gif']})/*gradient - from tabBackgroundColor to generalBackgroundColor*/ top repeat-x #C9DBEF /*additionalBackgroundColor*/;}
+
+.rftp_bottomtab_tabline_vis {padding-bottom : 2px; overflow : hidden; height : 25px; white-space : nowrap; position : relative;}
+.rftp_bottomtab_tabs {border : 0px; width : 100%; height : 100%;}
+.rftp_bottomtab_spacer {border-top : 1px solid #A6A6A6 /*panelBorderColor*/;}
+
+.rftp_bottomtab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-bottom : 0px; height : 2px; background : #C9DBEF /*additionalBackgroundColor*/ /*tabBackgroundColor*/;}
+.rftp_bottomtab_content {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-bottom : 0px; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding : 10px; background : #ffffff /*generalBackgroundColor*/;}
+
+.rftp_bottomtab_scroll_left {background : url(#{resource['org.richfaces:acttab_bg.gif']})/*gradient - from tabBackgroundColor to generalBackgroundColor*/ bottom repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; bottom : 1px; left : 1px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding-top : 6px;}
+.rftp_bottomtab_scroll_right {background : url(#{resource['org.richfaces:acttab_bg.gif']})/*gradient - from tabBackgroundColor to generalBackgroundColor*/ bottom repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; bottom : 1px; right : 17px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding-top : 6px;}
+.rftp_bottomtab_tabslist {background : url(#{resource['org.richfaces:acttab_bg.gif']})/*gradient - from tabBackgroundColor to generalBackgroundColor*/ bottom repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; bottom : 1px; right : 1px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 14px; padding-top : 2px;}
+
+
+
+.rftp_toptab {border : 1px solid #A6A6A6 /*panelBorderColor*/; vertical-align : top; background : url(#{resource['org.richfaces:tab_bg.gif']})/*gradient - from generalBackgroundColor to tabBackgroundColor*/ top repeat-x #DAE7F5 /*tabBackgroundColor*/;}
+.rftp_active_top {border-bottom : 0px; font-weight : bold; vertical-align : top; background : url(#{resource['org.richfaces:acttab_bg.gif']})/*gradient - from tabBackgroundColor to generalBackgroundColor*/ top repeat-x #C9DBEF /*additionalBackgroundColor*/;}
+
+.rftp_toptab_tabline_vis {padding-top : 2px; overflow : hidden; height : 25px; white-space : nowrap; position : relative;}
+.rftp_toptab_tabs {border : 0px; width : 100%; height : 100%;}
+.rftp_toptab_spacer {border-bottom : 1px solid #A6A6A6 /*panelBorderColor*/;}
+
+.rftp_horizonttab_tabspacer_width {padding-left : 1px;}
+
+.rftp_icon {position : absolute; top : 4px; left : 4px}
+.rftp_close {position : absolute; top : 4px; right : 4px}
+.rftp_label {white-space : nowrap; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/;}
+
+.rftp_label_container {position : relative; padding : 5px 37px 0px 22px;}
+
+.rftp_toptab_scroll_left {background : url(#{resource['org.richfaces:acttab_bg.gif']}) top repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; top : 1px; left : 1px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding-top : 6px;}
+.rftp_toptab_scroll_right {background : url(#{resource['org.richfaces:acttab_bg.gif']}) top repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; top : 1px; right : 17px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding-top : 6px;}
+.rftp_toptab_tabslist {background : url(#{resource['org.richfaces:acttab_bg.gif']}) top repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; top : 1px; right : 1px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 14px; padding-top : 2px;}
+
+.rftp_toptab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-top : 0px; height : 2px; background : #C9DBEF /*additionalBackgroundColor*/;}
+.rf-tab-cnt {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-top : 0px; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding : 10px; background : #ffffff /*generalBackgroundColor*/;}
+.rftp_hidden {display : none}
+
+
+.rftp_topmultitab_tabline_vis {border-bottom : 0px; padding-top : 2px; white-space : nowrap; position : relative;}
+.rftp_topmultitab_tabs_first { border : 0px; width : 100%; height : 100%; height : 25px}
+.rftp_topmultitab_tabs { border : 0px; width : 100%; height : 100%; height : 25px; margin-bottom : -1px;}
+.rftp_topmultitab_spacer {border-bottom : 0px;}
+.rftp_topmultitab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-top : 0px; height : 3px; background : #C9DBEF /*additionalBackgroundColor*/;}
+
+.rftp_multitab_line_1 {width : 17%}
+.rftp_multitab_line_2 {width : 50%}
+
+
+.rftp_bottommultitab_tabline_vis {border : 1px solid #A6A6A6 /*panelBorderColor*/; background :url(#{resource['org.richfaces:tabline_bg.gif']}) top repeat-x #EEF4FB; border-top : 0px; padding-bottom : 2px; white-space : nowrap; position : relative;}
+.rftp_bottommultitab_tabs_first { border : 0px; width : 100%; height : 100%; height : 25px}
+.rftp_bottommultitab_tabs { border : 0px; width : 100%; height : 100%; height : 25px; margin-top : -1px;}
+.rftp_bottommultitab_spacer {border-top : 0px;}
+.rftp_bottommultitab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-bottom : 0px; height : 3px; background : #C9DBEF /*additionalBackgroundColor*/;}
+
+
+.rftp_label_vert {white-space : nowrap; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding : 5px 0px 5px 0px;}
+.rftp_label_container_vert {position : relative; padding : 0px 37px 0px 22px;}
+
+
+
+.rftp_lefttab {border : 1px solid #A6A6A6 /*panelBorderColor*/; padding : 2px 0px 2px 0px; vertical-align : middle; background : url(#{resource['org.richfaces:tab_bg.gif']}) top right repeat-x #DAE7F5; margin-right : -1px}
+.rftp_lefttab_active {border-right : 0px; font-weight : bold; vertical-align : middle; background : url(#{resource['org.richfaces:actlefttab_bg.gif']}) top left repeat-y #C9DBEF /*additionalBackgroundColor*/; width : 100%;}
+.rftp_verttab_spacer {padding-top : 1px;}
+
+.rftp_lefttab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; padding-left : 2px; background : #C9DBEF /*additionalBackgroundColor*/;}
+.rftp_lefttab_content {width : 100%; border : 1px solid #A6A6A6 /*panelBorderColor*/; border-left : 0px; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding : 10px; background : #ffffff /*generalBackgroundColor*/; vertical-align : top;}
+
+
+.rftp_righttab {border : 1px solid #A6A6A6 /*panelBorderColor*/; padding : 2px 0px 2px 0px; vertical-align : middle; background : url(#{resource['org.richfaces:tab_bg.gif']}) top right repeat-x #DAE7F5; margin-left : -1px}
+.rftp_righttab_active {border-left : 0px; font-weight : bold; vertical-align : middle; background : url(#{resource['org.richfaces:actrighttab_bg.gif']}) top right repeat-y #C9DBEF /*additionalBackgroundColor*/; width : 100%;}
+.rftp_righttab_spacer {padding-top : 1px;}
+
+.rftp_righttab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; padding-right : 2px; background : #C9DBEF /*additionalBackgroundColor*/;}
+.rftp_righttab_content {width : 100%; border : 1px solid #A6A6A6 /*panelBorderColor*/; border-right : 0px; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding : 10px; background : #ffffff /*generalBackgroundColor*/; vertical-align : top;}
+
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19159 - in trunk: cdk/parent and 24 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-09-12 05:15:34 -0400 (Sun, 12 Sep 2010)
New Revision: 19159
Added:
trunk/core/impl/richfaces-suppressions.xml
Removed:
trunk/core/impl/checkstyle-suppressions.xml
Modified:
trunk/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNotTreeNode.java
trunk/cdk/parent/pom.xml
trunk/core/api/pom.xml
trunk/core/impl/pom.xml
trunk/core/impl/src/test/java/org/richfaces/resource/CachedResourceImplTest.java
trunk/core/parent/pom.xml
trunk/core/pom.xml
trunk/examples/parent/pom.xml
trunk/parent/pom.xml
trunk/ui/common/api/pom.xml
trunk/ui/common/ui/pom.xml
trunk/ui/core/api/pom.xml
trunk/ui/core/ui/pom.xml
trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java
trunk/ui/input/api/pom.xml
trunk/ui/input/ui/pom.xml
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteDivLayoutStrategy.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteListLayoutStrategy.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteTableLayoutStrategy.java
trunk/ui/input/ui/src/main/java/org/richfaces/view/facelets/AutocompleteHandler.java
trunk/ui/iteration/api/pom.xml
trunk/ui/iteration/ui/pom.xml
trunk/ui/misc/ui/pom.xml
trunk/ui/output/api/pom.xml
trunk/ui/output/ui/pom.xml
trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelBaseRenderer.java
trunk/ui/parent/pom.xml
Log:
RFPL-721 Try Maven 3 for project build and resolve possible problems
RFPL-677 Create global checkstyle suppressions
RFPL-595 moving to new checkstyle version
RF-9077 Checkstyle suppressions should only contain suppressions for the enclosed module
Modified: trunk/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNotTreeNode.java
===================================================================
--- trunk/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNotTreeNode.java 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/el/node/AstNotTreeNode.java 2010-09-12 09:15:34 UTC (rev 19159)
@@ -19,11 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
-
package org.richfaces.cdk.templatecompiler.el.node;
-
import org.jboss.el.parser.Node;
import org.richfaces.cdk.templatecompiler.el.ELNodeConstants;
import org.richfaces.cdk.templatecompiler.el.ELVisitor;
@@ -33,7 +30,6 @@
* This class extend AbstractTreeNode and wrap AstNot node.
*
* @author amarkhel
- *
*/
public class AstNotTreeNode extends AbstractTreeNode {
public AstNotTreeNode(Node node) {
@@ -44,11 +40,11 @@
public void visit(StringBuilder sb, ELVisitor visitor) throws ParsingException {
sb.append(ELNodeConstants.LEFT_BRACKET);
sb.append(ELNodeConstants.EXCLAMATION_MARK);
- String childOutput = coerceToBoolean(getChildOutput(0, visitor), visitor);
+ String childOutput = coerceToBoolean(getChildOutput(0, visitor), visitor);
sb.append(childOutput);
sb.append(ELNodeConstants.RIGHT_BRACKET);
-
+
//variable type has been already set by getChildOuput()
}
-
+
}
Modified: trunk/cdk/parent/pom.xml
===================================================================
--- trunk/cdk/parent/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/cdk/parent/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -350,10 +350,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.5</version>
<configuration>
- <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml
- </configLocation>
- <suppressionsLocation>checkstyle-suppressions.xml
- </suppressionsLocation>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
</configuration>
</plugin>
</plugins>
Modified: trunk/core/api/pom.xml
===================================================================
--- trunk/core/api/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/core/api/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -70,7 +70,15 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/core/api</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/core/api</developerConnection>
Deleted: trunk/core/impl/checkstyle-suppressions.xml
===================================================================
--- trunk/core/impl/checkstyle-suppressions.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/core/impl/checkstyle-suppressions.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.0//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
-
-<!-- NOTE: Because of issues with maven checkstyle plugin each suppression
- file must have all suppressions defined.
-
- See RF-9077 for details. -->
-<suppressions>
- <suppress checks="DoubleCheckedLocking" files="MultipartRequestRegistry.java" />
- <suppress checks="FallThrough" files="JSMin.java" />
- <suppress checks="IllegalCatch" files="UISwitchablePanel.java" />
- <suppress checks="ModifiedControlVariable" files="MultipartRequest.java" />
- <suppress checks="IllegalCatch" files="StagingServer.java" />
- <suppress checks="IllegalCatch" files="PartialViewContextImpl.java" />
- <suppress checks="FallThrough" files="StagingServer.java" />
- <suppress checks="ModifiedControlVariable" files="Cookie.java" />
- <suppress checks="IllegalCatch" files="CacheManager.java" />
- <suppress checks="MissingSwitchDefault" files="JSONTokener.java" />
- <suppress checks="IllegalCatch" files="AjaxViewRoot.java" />
- <suppress checks="FallThrough" files="XMLTokener.java" />
- <suppress checks="IllegalCatch" files="ResourceHandlerImpl.java" />
- <suppress checks="IllegalThrows" files="AbstractThreadedTest.java" />
- <suppress checks="ModifiedControlVariable" files="URLCodec.java" />
-
- <!-- TODO it is hot fix for building process, this files belong to the test-base module,
- and must be removed from here -->
- <suppress checks="IllegalCatch" files="AbstractThreadedTest.java" />
- <suppress checks="IllegalCatch" files="StagingServer.java" />
-
- <!-- TODO it is hot fix for building process, this files belong to the ui/output/trunk/panela/ui module,
- and must be removed from here -->
- <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" />
-</suppressions>
Modified: trunk/core/impl/pom.xml
===================================================================
--- trunk/core/impl/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/core/impl/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -116,7 +116,7 @@
<!-- Checkstyle only required here because suppressions needed -->
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+ <suppressionsLocation>${project.basedir}/richfaces-suppressions.xml</suppressionsLocation>
</configuration>
</plugin>
Copied: trunk/core/impl/richfaces-suppressions.xml (from rev 19152, trunk/core/impl/checkstyle-suppressions.xml)
===================================================================
--- trunk/core/impl/richfaces-suppressions.xml (rev 0)
+++ trunk/core/impl/richfaces-suppressions.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+ <suppress checks="DoubleCheckedLocking" files="MultipartRequestRegistry.java" />
+ <suppress checks="FallThrough" files="JSMin.java" />
+ <suppress checks="IllegalCatch" files="UISwitchablePanel.java" />
+ <suppress checks="ModifiedControlVariable" files="MultipartRequest.java" />
+ <suppress checks="IllegalCatch" files="StagingServer.java" />
+ <suppress checks="IllegalCatch" files="PartialViewContextImpl.java" />
+ <suppress checks="FallThrough" files="StagingServer.java" />
+ <suppress checks="IllegalCatch" files="CacheManager.java" />
+ <suppress checks="IllegalCatch" files="ResourceHandlerImpl.java" />
+ <suppress checks="IllegalThrows" files="AbstractThreadedTest.java" />
+ <suppress checks="ModifiedControlVariable" files="URLCodec.java" />
+</suppressions>
Modified: trunk/core/impl/src/test/java/org/richfaces/resource/CachedResourceImplTest.java
===================================================================
--- trunk/core/impl/src/test/java/org/richfaces/resource/CachedResourceImplTest.java 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/core/impl/src/test/java/org/richfaces/resource/CachedResourceImplTest.java 2010-09-12 09:15:34 UTC (rev 19159)
@@ -84,7 +84,8 @@
}
private CachedResourceImpl createCachedResource(Map<String, String> headers, InputStream stream)
- throws IOException {
+ throws IOException {
+
MockHeadersResourceImpl mockResource = new MockHeadersResourceImpl(headers, stream);
CachedResourceImpl cachedResource = new MockCachedResourceImpl();
Modified: trunk/core/parent/pom.xml
===================================================================
--- trunk/core/parent/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/core/parent/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -45,14 +45,6 @@
</dependencies>
</dependencyManagement>
- <build>
- <plugins>
- <!-- Trigger checkstyle checking for this module -->
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/core/parent</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/core/parent</developerConnection>
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/core/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -24,7 +24,7 @@
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10</version>
-<relativePath>../build/parent/pom.xml</relativePath>
+ <relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.core</groupId>
Modified: trunk/examples/parent/pom.xml
===================================================================
--- trunk/examples/parent/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/examples/parent/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -100,10 +100,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<configuration>
- <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml
- </configLocation>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <violationSeverity>error</violationSeverity>
</configuration>
<executions>
<execution>
Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/parent/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -163,10 +163,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<configuration>
- <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml
- </configLocation>
+ <configLocation>richfaces-checkstyle/richfaces-checkstyle.xml</configLocation>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <violationSeverity>error</violationSeverity>
</configuration>
<executions>
<execution>
Modified: trunk/ui/common/api/pom.xml
===================================================================
--- trunk/ui/common/api/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/common/api/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -33,4 +33,13 @@
<artifactId>richfaces-ui-common-api</artifactId>
<name>Richfaces UI Components: Common API</name>
<packaging>jar</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
Modified: trunk/ui/common/ui/pom.xml
===================================================================
--- trunk/ui/common/ui/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/common/ui/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -55,7 +55,7 @@
<!-- Checkstyle only required here because suppressions needed -->
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+ <suppressionsLocation>${project.basedir}/richfaces-suppressions.xml</suppressionsLocation>
</configuration>
</plugin>
</plugins>
Modified: trunk/ui/core/api/pom.xml
===================================================================
--- trunk/ui/core/api/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/core/api/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -30,6 +30,14 @@
<name>Richfaces UI Components: Core API</name>
<packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<!-- runtime -->
<dependency>
Modified: trunk/ui/core/ui/pom.xml
===================================================================
--- trunk/ui/core/ui/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/core/ui/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -54,9 +54,12 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
-
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/core/ui
</connection>
Modified: trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-09-12 09:15:34 UTC (rev 19159)
@@ -59,8 +59,8 @@
if (isMyFaces) {
//TODO - RF M3 workaround for https://jira.jboss.org/browse/RF-9025 / https://issues.apache.org/jira/browse/MYFACES-2888
- LOGGER.warn("MyFaces implementation of JavaServer Faces detected. " +
- "Wrapping of components using RichFaces behaviors (a4j:ajax etc.) won't work!");
+ LOGGER.warn("MyFaces implementation of JavaServer Faces detected. "
+ + "Wrapping of components using RichFaces behaviors (a4j:ajax etc.) won't work!");
}
} else {
LOGGER.warn("Cannot detect Mojarra vs MyFaces implementation of JavaServer Faces");
Modified: trunk/ui/input/api/pom.xml
===================================================================
--- trunk/ui/input/api/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/input/api/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -34,6 +34,14 @@
<name>Richfaces UI Components: Input API</name>
<packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<!-- runtime -->
<dependency>
Modified: trunk/ui/input/ui/pom.xml
===================================================================
--- trunk/ui/input/ui/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/input/ui/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -40,6 +40,9 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteDivLayoutStrategy.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteDivLayoutStrategy.java 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteDivLayoutStrategy.java 2010-09-12 09:15:34 UTC (rev 19159)
@@ -52,7 +52,7 @@
}
public void encodeItemBegin(FacesContext facesContext, UIComponent component) throws IOException {
- ResponseWriter writer = facesContext.getResponseWriter();
+ ResponseWriter writer = facesContext.getResponseWriter();
writer.startElement(HtmlConstants.DIV_ELEM, component);
}
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteListLayoutStrategy.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteListLayoutStrategy.java 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteListLayoutStrategy.java 2010-09-12 09:15:34 UTC (rev 19159)
@@ -31,7 +31,7 @@
}
public void encodeItemBegin(FacesContext facesContext, UIComponent component) throws IOException {
- ResponseWriter writer = facesContext.getResponseWriter();
+ ResponseWriter writer = facesContext.getResponseWriter();
writer.startElement(HtmlConstants.LI_ELEMENT, component);
}
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteRendererBase.java 2010-09-12 09:15:34 UTC (rev 19159)
@@ -59,11 +59,10 @@
/**
* @author Nick Belaevski
- *
*/
-@ResourceDependencies({
+@ResourceDependencies({
@ResourceDependency(library = "org.richfaces", name = "ajax.reslib"),
- @ResourceDependency(library = "org.richfaces", name = "base-component.reslib"),
+ @ResourceDependency(library = "org.richfaces", name = "base-component.reslib"),
@ResourceDependency(name = "jquery.position.js"), @ResourceDependency(name = "richfaces-event.js"),
@ResourceDependency(name = "richfaces-selection.js"),
@ResourceDependency(library = "org.richfaces", name = "AutocompleteBase.js"),
@@ -75,17 +74,17 @@
public JSFunctionDefinition getClientFilterFunction(UIComponent component) {
AbstractAutocomplete autocomplete = (AbstractAutocomplete) component;
- String clientFilter = (String)autocomplete.getAttributes().get("clientFilter");
+ String clientFilter = (String) autocomplete.getAttributes().get("clientFilter");
if (clientFilter != null && clientFilter.length() != 0) {
JSFunctionDefinition clientFilterFunction = new JSFunctionDefinition("subString");
clientFilterFunction.addParameter("value");
clientFilterFunction.addToBody(clientFilter);
return clientFilterFunction;
}
-
+
return null;
}
-
+
public String getScriptOptions(UIComponent component) {
Map<String, Object> attributes = component.getAttributes();
Map<String, Object> options = new HashMap<String, Object>();
@@ -104,9 +103,9 @@
utils.addToScriptHash(options, "onbeforedomupdate", attributes.get("onbeforedomupdate"));
utils.addToScriptHash(options, "onchange", attributes.get("onchange"));
utils.addToScriptHash(options, "filterFunction", getClientFilterFunction(component));
- String mode = (String)attributes.get("mode");
+ String mode = (String) attributes.get("mode");
if (mode != null) {
- if (mode.equals("ajax")){
+ if (mode.equals("ajax")) {
utils.addToScriptHash(options, "isCachedAjax", false, "true");
} else if (mode.equals("client") || mode.equals("lazyClient")) {
utils.addToScriptHash(options, "ajaxMode", false, "true");
@@ -121,6 +120,7 @@
}
// TODO nick - handle parameter
+
@SuppressWarnings("unchecked")
private DataModel<Object> getItems(FacesContext facesContext, AbstractAutocomplete component) {
Object itemsObject = null;
@@ -132,16 +132,16 @@
try {
// String value = getInputValue(facesContext, component);
- itemsObject = autocompleteMethod.invoke(facesContext.getELContext(), new Object[] { facesContext,
- component, value });
+ itemsObject = autocompleteMethod.invoke(facesContext.getELContext(), new Object[]{facesContext,
+ component, value});
} catch (ELException e) {
try {
autocompleteMethod = facesContext
.getApplication()
.getExpressionFactory()
.createMethodExpression(facesContext.getELContext(), autocompleteMethod.getExpressionString(),
- Void.class, new Class[] { String.class });
- itemsObject = autocompleteMethod.invoke(facesContext.getELContext(), new Object[] { value });
+ Void.class, new Class[]{String.class});
+ itemsObject = autocompleteMethod.invoke(facesContext.getELContext(), new Object[]{value});
} catch (ELException ee) {
ee.printStackTrace();
}
@@ -214,10 +214,10 @@
// TODO use converter
if (comboBox.getItemConverter() != null) {
fetchValues.add(comboBox.getItemConverter().getAsString(facesContext, component, nextItem));
- } else{
+ } else {
fetchValues.add(nextItem);
- }
-
+ }
+
}
}
@@ -233,7 +233,7 @@
protected void encodeItemsContainer(FacesContext facesContext, UIComponent component) throws IOException {
AutocompleteEncodeStrategy strategy = getStrategy(component);
Object mode = component.getAttributes().get("mode");
- if (mode!= null && mode.equals("client")) {
+ if (mode != null && mode.equals("client")) {
List<Object> fetchValues = new ArrayList<Object>();
this.encodeItems(facesContext, component, fetchValues);
} else {
@@ -244,10 +244,11 @@
}
}
- public void encodeItem(FacesContext facesContext, AbstractAutocomplete comboBox, Object item, AutocompleteEncodeStrategy strategy) throws IOException {
+ public void encodeItem(FacesContext facesContext, AbstractAutocomplete comboBox, Object item,
+ AutocompleteEncodeStrategy strategy) throws IOException {
strategy.encodeItemBegin(facesContext, comboBox);
ResponseWriter writer = facesContext.getResponseWriter();
-
+
writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-au-option rf-au-font rf-au-input", null);
if (comboBox.getChildCount() > 0) {
@@ -269,7 +270,7 @@
}
strategy.encodeItemEnd(facesContext, comboBox);
}
-
+
private AutocompleteEncodeStrategy getStrategy(UIComponent component) {
AbstractAutocomplete comboBox = (AbstractAutocomplete) component;
if (comboBox.getLayout() != null) {
@@ -288,21 +289,21 @@
@Override
protected void doDecode(FacesContext context, UIComponent component) {
- AbstractAutocomplete autocomplete = (AbstractAutocomplete)component;
- if (InputUtils.isDisabled(autocomplete)) {
+ AbstractAutocomplete autocomplete = (AbstractAutocomplete) component;
+ if (InputUtils.isDisabled(autocomplete)) {
return;
}
Map<String, String> requestParameters = context.getExternalContext().getRequestParameterMap();
Object value = requestParameters.get(component.getClientId(context) + "Value");
if (value != null) {
- if(autocomplete.getConverter() != null){
+ if (autocomplete.getConverter() != null) {
value = autocomplete.getConverter().getAsObject(context, component, value.toString());
}
autocomplete.setSubmittedValue(value);
}
super.doDecode(context, component);
-
+
if (requestParameters.get(component.getClientId(context) + ".ajax") != null) {
PartialViewContext pvc = context.getPartialViewContext();
pvc.getRenderIds().add(
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteTableLayoutStrategy.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteTableLayoutStrategy.java 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/AutocompleteTableLayoutStrategy.java 2010-09-12 09:15:34 UTC (rev 19159)
@@ -34,7 +34,7 @@
}
public void encodeItemBegin(FacesContext facesContext, UIComponent component) throws IOException {
- ResponseWriter writer = facesContext.getResponseWriter();
+ ResponseWriter writer = facesContext.getResponseWriter();
writer.startElement(HtmlConstants.TR_ELEMENT, component);
writer.startElement(HtmlConstants.TD_ELEM, component);
}
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/view/facelets/AutocompleteHandler.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/view/facelets/AutocompleteHandler.java 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/view/facelets/AutocompleteHandler.java 2010-09-12 09:15:34 UTC (rev 19159)
@@ -38,7 +38,6 @@
/**
* @author Nick Belaevski
- *
*/
//TODO nick - this should be generated by CDK
public class AutocompleteHandler extends ComponentHandler {
@@ -47,11 +46,11 @@
@Override
public Metadata applyRule(String name, TagAttribute attribute,
- MetadataTarget meta) {
+ MetadataTarget meta) {
if (meta.isTargetInstanceOf(AbstractAutocomplete.class)) {
if ("autocompleteMethod".equals(name)) {
return new MethodMetadata(attribute, FacesContext.class,
- UIComponent.class, String.class) {
+ UIComponent.class, String.class) {
public void applyMetadata(FaceletContext ctx, Object instance) {
((AbstractAutocomplete) instance).setAutocompleteMethod(getMethodExpression(ctx));
}
@@ -62,8 +61,8 @@
return new ConverterMetadata(attribute) {
public void applyMetadata(FaceletContext ctx, Object instance) {
((AbstractAutocomplete) instance).setConverter(this.getConverter(ctx,
- (AbstractAutocomplete) instance,
- this.getAttr().getValueExpression(ctx, Converter.class)));
+ (AbstractAutocomplete) instance,
+ this.getAttr().getValueExpression(ctx, Converter.class)));
}
};
}
@@ -72,8 +71,8 @@
return new ConverterMetadata(attribute) {
public void applyMetadata(FaceletContext ctx, Object instance) {
((AbstractAutocomplete) instance).setItemConverter(this.getConverter(ctx,
- (AbstractAutocomplete) instance,
- this.getAttr().getValueExpression(ctx, Converter.class)));
+ (AbstractAutocomplete) instance,
+ this.getAttr().getValueExpression(ctx, Converter.class)));
}
};
}
@@ -85,7 +84,7 @@
};
public AutocompleteHandler(ComponentConfig config) {
- super(config);
+ super(config);
}
@Override
@@ -108,7 +107,7 @@
}
public Converter getConverter(FaceletContext ctx,
- AbstractAutocomplete component, ValueExpression converter) {
+ AbstractAutocomplete component, ValueExpression converter) {
ValueExpression ve = null;
Converter c = null;
if (converter != null) {
@@ -116,7 +115,7 @@
try {
c = (Converter) ve.getValue(ctx);
} catch (Exception e) {
- // ok
+ // ok
}
}
@@ -124,8 +123,8 @@
c = this.createConverter(ctx, component);
}
if (c == null) {
- // throw new TagException(this.getTag(), "No Converter was
- // created");
+ // throw new TagException(this.getTag(), "No Converter was
+ // created");
}
return c;
}
@@ -135,9 +134,9 @@
}
private Converter createConverter(FaceletContext ctx,
- AbstractAutocomplete component) {
+ AbstractAutocomplete component) {
return ctx.getFacesContext().getApplication().createConverter(
- getConverterId(ctx));
+ getConverterId(ctx));
}
}
Modified: trunk/ui/iteration/api/pom.xml
===================================================================
--- trunk/ui/iteration/api/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/iteration/api/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -34,6 +34,14 @@
<name>Richfaces UI Components: Iteration API</name>
<packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.richfaces.ui.core</groupId>
Modified: trunk/ui/iteration/ui/pom.xml
===================================================================
--- trunk/ui/iteration/ui/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/iteration/ui/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -53,9 +53,12 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
</plugin>
- </plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
-
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/ui/iteration/datas...</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trunk/ui/iteration/datascro...</developerConnection>
Modified: trunk/ui/misc/ui/pom.xml
===================================================================
--- trunk/ui/misc/ui/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/misc/ui/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -40,6 +40,9 @@
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
Modified: trunk/ui/output/api/pom.xml
===================================================================
--- trunk/ui/output/api/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/output/api/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -34,6 +34,14 @@
<name>Richfaces UI Components: Output API</name>
<packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<!-- runtime -->
<dependency>
Modified: trunk/ui/output/ui/pom.xml
===================================================================
--- trunk/ui/output/ui/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/output/ui/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -38,11 +38,10 @@
<build>
<plugins>
<plugin>
- <!-- Checkstyle only required here because suppressions needed -->
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
- </configuration>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <suppressionsLocation>${project.basedir}/richfaces-suppressions.xml</suppressionsLocation>
+ </configuration>
</plugin>
<plugin>
<groupId>org.richfaces.cdk</groupId>
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/behavior/ToggleControl.java 2010-09-12 09:15:34 UTC (rev 19159)
@@ -125,4 +125,4 @@
// setTargetPanel((String) value);
// }
}
-}
\ No newline at end of file
+}
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelBaseRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelBaseRenderer.java 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PanelBaseRenderer.java 2010-09-12 09:15:34 UTC (rev 19159)
@@ -21,15 +21,14 @@
package org.richfaces.renderkit.html;
-import java.io.IOException;
+import org.richfaces.component.UIPanel;
+import org.richfaces.renderkit.RendererBase;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import java.io.IOException;
-import org.richfaces.component.UIPanel;
-import org.richfaces.renderkit.RendererBase;
-
/**
* @author amarkhel
* @since Jun 14, 2010
@@ -39,12 +38,12 @@
public PanelBaseRenderer() {
}
-
+
public void renderHeaderFacet(FacesContext context, UIComponent component) throws IOException {
- UIComponent headerFacet = component.getFacet("header");
- headerFacet.encodeAll(context);
+ UIComponent headerFacet = component.getFacet("header");
+ headerFacet.encodeAll(context);
}
-
+
@Override
protected Class<? extends UIComponent> getComponentClass() {
return UIPanel.class;
Modified: trunk/ui/parent/pom.xml
===================================================================
--- trunk/ui/parent/pom.xml 2010-09-11 09:42:13 UTC (rev 19158)
+++ trunk/ui/parent/pom.xml 2010-09-12 09:15:34 UTC (rev 19159)
@@ -71,9 +71,6 @@
<plugins>
<!-- Trigger checkstyle checking for this module -->
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.0-beta-1</version>
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19158 - management/design-4x/inplaceEditor.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2010-09-11 05:42:13 -0400 (Sat, 11 Sep 2010)
New Revision: 19158
Modified:
management/design-4x/inplaceEditor/inplaceSelect.html
Log:
Modified: management/design-4x/inplaceEditor/inplaceSelect.html
===================================================================
--- management/design-4x/inplaceEditor/inplaceSelect.html 2010-09-10 19:01:25 UTC (rev 19157)
+++ management/design-4x/inplaceEditor/inplaceSelect.html 2010-09-11 09:42:13 UTC (rev 19158)
@@ -11,50 +11,45 @@
.insel_default_state{ display : inline-block; position : relative; white-space : nowrap; background-color : #f1f1f1/*editorBackgroundColor*/; border-bottom : 1px dashed #000000/*generalTextColor*/; padding-left : 3px; padding-right : 3px;}
-.insel_changed_state{ background-image:url(images/mark_changed.gif); background-position : top left; background-repeat : no-repeat;}
+.insel_changed_state{ display : inline-block; background-image:url(images/mark_changed.gif); background-position : top left; background-repeat : no-repeat;}
-.insel_edit_state{ position : absolute; top : 0px; left : 0px; width : 100px; display : inline-block;}
-.insel_field{ background : #FBFF8E/*editBackgroundColor*/; padding : 0px 0px 0px 0px; border : 0px; margin : 0px; width : 112px; background-image:url(images/mark_list.gif); background-position : center right; background-repeat : no-repeat;}
+.insel_edit_state{ display : block; position : absolute; top : 0px; left : 0px; width : 100px; background : green; background : #FBFF8E/*editBackgroundColor*/;}
+.insel_field{ ; padding : 0px 0px 0px 0px; border : 0px; margin : 0px; width : 112px; background : url(images/mark_list.gif) center right no-repeat #FBFF8E/*editBackgroundColor*/;}
.insel_btn{
background : url(images/bg_btn.png) top repeat-x #C7D7EC; /*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/
border : 1px outset #BED6F8; /*panelBorderColor*/
- padding : 0px;
+ padding : 3px;
margin : 0px;}
.insel_btn_press{
background : url(images/bg_press.png) top repeat-x #C7D7EC; /*gradient - from tabBackgroundColor to generalBackgroundColor, background-color - tabBackgroundColor*/
border : 1px inset #BED6F8; /*panelBorderColor*/
- padding : 0px;
+ padding : 3px;
margin : 0px;}
.insel_btn_set{ position : absolute; top:0px; left : 112px; white-space : nowrap}
-.insel_list_cord{ position : relative; font-size : 0px;d@isplay : none}/*DDL is hidden!!!!!*/
-.insel_list_position{ position : absolute; top: 0px; left: -1px; }
-.insel_list_decoration{ border : 1px solid #A6A6A6 /*panelBorderColor*/; padding : 0px; background : #FBFF8E; /*editorBackgroundColor*/}
-.insel_list_scroll{ overflow : auto; overflow-x : hidden; height : 100px;}
-.insel_option{ padding : 2px; white-space : nowrap; background : #FBFF8E /*editorBackgroundColor*/; cursor : default;}
-.insel_select{ padding : 1px; width : 100%; background-color: #DFE8F6; border : 1px dotted #a3bae9;/*generalTextColor*/}
+.insel_list_cord{ display : block; position : relative; font-size : 0px;d@isplay : none}/*DDL is hidden!!!!!*/
+.insel_list_position{ display : block; position : absolute; top: 0px; left: -1px;}
+.insel_list_decoration{ display : block; border : 1px solid #A6A6A6 /*panelBorderColor*/; padding : 0px; background : #FBFF8E; /*editorBackgroundColor*/}
+.insel_list_scroll{ display : block; overflow : auto; overflow-x : hidden; height : 100px;}
+.insel_option{ display : block; padding : 2px; white-space : nowrap; background : #FBFF8E /*editorBackgroundColor*/; cursor : default;}
+.insel_select{ display : block; padding : 1px; width : 100%; background-color: #DFE8F6; border : 1px dotted #a3bae9;/*generalTextColor*/}
.insel_width_list{ width : 250px;}
-.insel_list_cord{ position : relative; font-size : 0px;d@isplay : none}/*DDL is hidden!!!!!*/
-.insel_list_decoration{ border : 1px solid #A6A6A6 /*panelBorderColor*/; padding : 0px; background : #FFFFFF; /*tableBackgroundColor*/}
-.insel_list_scroll{ overflow : auto; overflow-x : hidden;}
-.insel_option{ padding : 2px; white-space : nowrap; cursor : default;}
-.insel_select{ padding : 1px; width : 100%; background-color: #DFE8F6; border : 1px dotted #a3bae9;/*generalTextColor*/}
-.insel_btn_preposition { position : absolute; top : 0px; right : 0px; wigth : 1px; height : 1px;}
-.insel_btn_position { position : absolute; top : 0px; left : 0px; white-space : nowrap;}
+.insel_btn_preposition { display : block; position : absolute; top : -4px; right : 0px; wigth : 1px; height : 1px;}
+.insel_btn_position { display : block; position : absolute; top : 0px; left : 0px; white-space : nowrap;}
-.insel_btn_shadow {position: relative; padding : 6px 6px 6px 6px; top : -6px; right : -6px;}
-.insel_shadow {position: relative; padding : 6px 6px 6px 6px; top : -6px; left : -6px;}
+.insel_btn_shadow { display : block;position: relative; padding : 6px 6px 6px 6px; top : -6px; right : -6px;}
+.insel_shadow { display : block;position: relative; padding : 6px 6px 6px 6px; top : -6px; left : -6px;}
-.insel_shadow_t {background: url(images/bg_shadow.png) top left; position: absolute; width: 6px; top: 0px; bottom: 6px; left : 0px}
-.insel_shadow_l {background: url(images/bg_shadow.png) bottom left; position: absolute; height: 6px; bottom: 0px; left: 0px; right: 6px;}
-.insel_shadow_r {background: url(images/bg_shadow.png) bottom right; position: absolute; width: 6px; top: 6px; bottom: 0px; right: 0px;}
-.insel_shadow_b {background: url(images/bg_shadow.png) right top; position: absolute; height: 6px; top: 0px; left: 6px; right: 0px;}
+.insel_shadow_t { display : block;background: url(images/bg_shadow.png) top left; position: absolute; width: 6px; top: 0px; bottom: 6px; left : 0px}
+.insel_shadow_l { display : block;background: url(images/bg_shadow.png) bottom left; position: absolute; height: 6px; bottom: 0px; left: 0px; right: 6px;}
+.insel_shadow_r { display : block;background: url(images/bg_shadow.png) bottom right; position: absolute; width: 6px; top: 6px; bottom: 0px; right: 0px;}
+.insel_shadow_b { display : block;background: url(images/bg_shadow.png) right top; position: absolute; height: 6px; top: 0px; left: 6px; right: 0px;}
</style>
</head>
@@ -62,80 +57,80 @@
<body>
<fieldset><legend>Default State</legend><br><br>
-<div style="width : 300px;">
+<span style="width : 300px;">
Fresh off his victory in the Florida primary, Sen. John McCain is poised to take another big prize. Former
- <div class="insel_default_state">New York</div> Mayor Rudy Giuliani plans to drop out and endorse McCain, two GOP sources said. That would give McCain added momentum heading into a debate Wednesday and next week's Super Tuesday contests
-</div>
+ <span class="insel_default_state">New York</span> Mayor Rudy Giuliani plans to drop out and endorse McCain, two GOP sources said. That would give McCain added momentum heading into a debate Wednesday and next week's Super Tuesday contests
+</span>
</fieldset>
<fieldset><legend>Edit State</legend><br><br>
-<div style="width : 300px;">
+<span style="width : 300px;">
Fresh off his victory in the Florida primary, Sen. John McCain is poised to take another big prize. Former
- <div class="insel_default_state">New York
- <div class="insel_edit_state">
+ <span class="insel_default_state">New York
+ <span class="insel_edit_state">
<input readonly="readonly" type="Text" value="New York" class="insel_field">
- <div class="insel_btn_preposition">
- <div class="insel_btn_position">
- <div class="insel_btn_shadow">
- <div class="insel_shadow_t"></div>
- <div class="insel_shadow_l"></div>
- <div class="insel_shadow_r"></div>
- <div class="insel_shadow_b"></div>
+ <span class="insel_btn_preposition">
+ <span class="insel_btn_position">
+ <span class="insel_btn_shadow">
+ <span class="insel_shadow_t"></span>
+ <span class="insel_shadow_l"></span>
+ <span class="insel_shadow_r"></span>
+ <span class="insel_shadow_b"></span>
- <div style="position : relative">
+ <span style="position : relative">
<input type="image" src="images/ico_ok.gif" class="insel_btn" onmousedown="this.className='insel_btn_press'" onmouseout="this.className='insel_btn'" onmouseup="this.className='insel_btn'"><input type="image" src="images/ico_cancel.gif" class="insel_btn" onmousedown="this.className='insel_btn_press'" onmouseout="this.className='insel_btn'" onmouseup="this.className='insel_btn'"><br>
- </div>
- </div>
- </div>
- </div>
+ </span>
+ </span>
+ </span>
+ </span>
- <div class="insel_list_cord">
- <div class="insel_list_position insel_width_list">
- <div class="insel_shadow">
- <div class="insel_shadow_t"></div>
- <div class="insel_shadow_l"></div>
- <div class="insel_shadow_r"></div>
- <div class="insel_shadow_b"></div>
+ <span class="insel_list_cord">
+ <span class="insel_list_position insel_width_list">
+ <span class="insel_shadow">
+ <span class="insel_shadow_t"></span>
+ <span class="insel_shadow_l"></span>
+ <span class="insel_shadow_r"></span>
+ <span class="insel_shadow_b"></span>
- <div class="insel_list_decoration">
- <div class="insel_list_scroll">
- <div class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 1</div>
- <div class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 2</div>
- <div class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 3</div>
- <div class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 4</div>
- <div class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 6</div>
- <div class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 7</div>
- <div class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 8</div>
- <div class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 9</div>
- <div class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 0</div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
+ <span class="insel_list_decoration">
+ <span class="insel_list_scroll">
+ <span class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 1</span>
+ <span class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 2</span>
+ <span class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 3</span>
+ <span class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 4</span>
+ <span class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 6</span>
+ <span class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 7</span>
+ <span class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 8</span>
+ <span class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 9</span>
+ <span class="insel_option insel_font" onmouseout="this.className='insel_option insel_font'" onmouseover="this.className='insel_option insel_font insel_select'">Option 0</span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
Mayor Rudy Giuliani plans to drop out and endorse McCain, two GOP sources said. That would give McCain added momentum heading into a debate Wednesday and next week's Super Tuesday contests
-</div>
+</span>
</fieldset>
<fieldset><legend>Changed State</legend><br><br>
-<div style="width : 300px;">
+<span style="width : 300px;">
Fresh off his victory in the Florida primary, Sen. John McCain is poised to take another big prize. Former
<span class="insel_default_state insel_changed_state"><a href="#"><span style="width : 1px; height : 1px; position : relative"></span></a>New York</span> Mayor Rudy Giuliani plans to drop out and endorse McCain, two GOP sources said. That would give McCain added momentum heading into a debate Wednesday and next week's Super Tuesday contests
-</div>
+</span>
</fieldset>
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19157 - in trunk/ui/core/ui/src/main/java/org/richfaces: renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-09-10 15:01:25 -0400 (Fri, 10 Sep 2010)
New Revision: 19157
Modified:
trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractPoll.java
trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java
Log:
RF-9272
Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractPoll.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractPoll.java 2010-09-10 19:00:58 UTC (rev 19156)
+++ trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractPoll.java 2010-09-10 19:01:25 UTC (rev 19157)
@@ -47,7 +47,19 @@
public static final String TIMER = "timer";
public static final String ON_TIMER = "ontimer";
+
+ public static final String BEGIN = "begin";
+ public static final String ON_BEGIN = "onbegin";
+
+ public static final String COMPLETE = "complete";
+
+ public static final String ON_COMPLETE = "oncomplete";
+
+ public static final String BEFOREDOMUPDATE = "beforedomupdate";
+
+ public static final String ON_BEFOREDOMUPDATE = "onbeforedomupdate";
+
@Attribute(defaultValue = "1000")
public abstract int getInterval();
Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2010-09-10 19:00:58 UTC (rev 19156)
+++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/AjaxPollRenderer.java 2010-09-10 19:01:25 UTC (rev 19157)
@@ -95,6 +95,12 @@
HandlersChain handlersChain = new HandlersChain(context, poll);
handlersChain.addInlineHandlerFromAttribute(AbstractPoll.ON_TIMER);
handlersChain.addBehaviors(AbstractPoll.TIMER);
+ handlersChain.addInlineHandlerFromAttribute(AbstractPoll.ON_BEGIN);
+ handlersChain.addBehaviors(AbstractPoll.BEGIN);
+ handlersChain.addInlineHandlerFromAttribute(AbstractPoll.ON_COMPLETE);
+ handlersChain.addBehaviors(AbstractPoll.COMPLETE);
+ handlersChain.addInlineHandlerFromAttribute(AbstractPoll.ON_BEFOREDOMUPDATE);
+ handlersChain.addBehaviors(AbstractPoll.BEFOREDOMUPDATE);
handlersChain.addAjaxSubmitFunction();
String handler = handlersChain.toScript();
13 years, 8 months
- 1
- 0
JBoss Rich Faces SVN: r19156 - in trunk/ui/output/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-09-10 15:00:58 -0400 (Fri, 10 Sep 2010)
New Revision: 19156
Modified:
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js
Log:
* RF-9148
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2010-09-10 16:23:58 UTC (rev 19155)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java 2010-09-10 19:00:58 UTC (rev 19156)
@@ -199,19 +199,26 @@
utils.addToScriptHash(options, "resizeable", panel.isResizeable(), "false");
utils.addToScriptHash(options, "overlapEmbedObjects", panel.isOverlapEmbedObjects(), "false");
utils.addToScriptHash(options, "visualOptions", writeVisualOptions(context, panel));
- utils.addToScriptHash(options, "onresize", attributes.get("onresize"));
- utils.addToScriptHash(options, "onmove", attributes.get("onmove"));
- utils.addToScriptHash(options, "onshow", attributes.get("onshow"));
- utils.addToScriptHash(options, "onhide", attributes.get("onhide"));
- utils.addToScriptHash(options, "onbeforeshow", attributes.get("onbeforeshow"));
- utils.addToScriptHash(options, "onbeforehide", attributes.get("onbeforehide"));
+ utils.addToScriptHash(options, "onresize", buildEventFunction(attributes.get("onresize")));
+ utils.addToScriptHash(options, "onmove", buildEventFunction(attributes.get("onmove")));
+ utils.addToScriptHash(options, "onshow", buildEventFunction(attributes.get("onshow")));
+ utils.addToScriptHash(options, "onhide", buildEventFunction(attributes.get("onhide")));
+ utils.addToScriptHash(options, "onbeforeshow", buildEventFunction(attributes.get("onbeforeshow")));
+ utils.addToScriptHash(options, "onbeforehide", buildEventFunction(attributes.get("onbeforehide")));
result.append(ScriptUtils.toScript(options));
result.append(");");
return result.toString();
}
- public Map<String, Object> getHandledVisualOptions(AbstractPopupPanel panel) {
+ private Object buildEventFunction(Object eventFunction) {
+ if(eventFunction != null && eventFunction.toString().length() > 0) {
+ return "new Function(\"" + eventFunction.toString() + "\");";
+ }
+ return null;
+ }
+
+ public Map<String, Object> getHandledVisualOptions(AbstractPopupPanel panel) {
String options = panel.getVisualOptions();
Map<String, Object> result;
result = prepareVisualOptions(options, panel);
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2010-09-10 16:23:58 UTC (rev 19155)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2010-09-10 19:00:58 UTC (rev 19156)
@@ -68,6 +68,7 @@
this.cdiv = $(richfaces.getDomElement(id + "_container"));
this.contentDiv = $(richfaces.getDomElement(id + "_content"));
this.shadowDiv = $(richfaces.getDomElement(id + "_shadow"));
+ this.shadeDiv = $(richfaces.getDomElement(id + "_shade"));
this.scrollerDiv = $(richfaces.getDomElement(id + "_content_scroller"));
this.borders = new Array();
@@ -215,9 +216,10 @@
},
show: function(event, opts) {
+ var element = this.cdiv;
if(!this.shown && this.invokeEvent("beforeshow",event,null,element)) {
this.preventFocus();
- var element = this.div;
+
if (!this.domReattached) {
this.parent = element.parent();
@@ -243,7 +245,9 @@
if (newParent != this.parent) {
this.saveInputValues(element);
- element.insertBefore(newParent.firstChild);
+ this.shadeDiv.insertAfter(newParent.lastChild);
+ this.shadowDiv.insertAfter(newParent.lastChild);
+ this.cdiv.insertAfter(newParent.lastChild);
this.domReattached = true;
} else {
this.parent.show();
@@ -475,7 +479,7 @@
},
hide: function(event, opts) {
- var element = this.id;
+ var element = this.cdiv;
this.restoreFocus();
if (this.shown && this.invokeEvent("beforehide",event,null,element)) {
@@ -487,7 +491,8 @@
if (this.parent) {
if (this.domReattached) {
this.saveInputValues(element);
-
+ this.parent.append(this.shadeDiv);
+ this.parent.append(this.shadowDiv);
this.parent.append(element);
this.domReattached = false;
@@ -510,7 +515,7 @@
}
this.shown = false;
-
+ this.invokeEvent("hide",event,null,element)
}
},
@@ -748,7 +753,7 @@
invokeEvent: function(eventName, event, value, element) {
- var eventFunction = this.options['on'+eventName];
+ var eventFunction = eval(this.options['on'+eventName]);
var result;
if (eventFunction) {
13 years, 8 months
- 1
- 0