richfaces-svn-commits
October 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 409 discussions
JBoss Rich Faces SVN: r19737 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: model and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-10-28 12:03:36 -0400 (Thu, 28 Oct 2010)
New Revision: 19737
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AutocompleteAttributes.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocomplete.java
Log:
rich:autocompletion initial tests (selectFirst + autofill support)
Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/Autocomplete.java 2010-10-28 16:03:36 UTC (rev 19737)
@@ -0,0 +1,160 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.ftest.model;
+
+import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq;
+import static org.jboss.test.selenium.locator.LocatorFactory.jq;
+import static org.jboss.test.selenium.javascript.JQueryScript.jqScript;
+import static org.jboss.test.selenium.javascript.JQueryScript.jqObject;
+
+import java.awt.event.KeyEvent;
+
+import org.jboss.test.selenium.RequestTypeModelGuard.Model;
+import org.jboss.test.selenium.dom.Event;
+import org.jboss.test.selenium.encapsulated.JavaScript;
+import org.jboss.test.selenium.framework.AjaxSelenium;
+import org.jboss.test.selenium.framework.AjaxSeleniumProxy;
+import org.jboss.test.selenium.locator.JQueryLocator;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+public class Autocomplete implements Model {
+
+ private static String KEY_ENTER = "13";
+ private static String KEY_UP = "38";
+ private static String KEY_DOWN = "40";
+
+ AjaxSelenium selenium = AjaxSeleniumProxy.getInstance();
+
+ JQueryLocator input = pjq("input.rf-au-inp[id$=autocompleteInput]");
+
+ JQueryLocator items = jq("div.rf-au-lst-cord[id$=autocompleteList] div[id$=autocompleteItems]");
+ JQueryLocator selection = items.getDescendant(jq("div.rf-au-sel"));
+ JQueryLocator option = jq("div.rf-au-opt");
+ JQueryLocator labeledOption = jq("div.rf-au-opt:contains('{0}')");
+
+ public void typeKeys(String keys) {
+ for (int i = 0; i < keys.length(); i++) {
+ final String key = String.valueOf(keys.charAt(i));
+ selenium.focus(input);
+ selenium.keyPress(input, key);
+ selenium.fireEvent(input, Event.KEYDOWN);
+ }
+ }
+
+ public void confirmByKeys() {
+ pressEnter();
+ }
+
+ public void selectByKeys(String label) {
+ int labeledIndex = getLabeledOptionIndex(label);
+ while (getSelectedOptionIndex() < labeledIndex) {
+ pressDown();
+ }
+ while (getSelectedOptionIndex() > labeledIndex) {
+ pressUp();
+ }
+ }
+
+ public boolean isLabeledOptionAvailable(String label) {
+ return selenium.isElementPresent(getLabeledOption(label));
+ }
+
+ public int getLabeledOptionIndex(String label) {
+ String index = selenium.getEval(jqScript(getLabeledOption(label), "index()"));
+ return Integer.valueOf(index);
+ }
+
+ public int getSelectedOptionIndex() {
+ JavaScript script = jqScript(option, "index({0})").parametrize(jqObject(selection));
+ String index = selenium.getEval(script);
+ return Integer.valueOf(index);
+ }
+
+ public String getSelectedOptionText() {
+ return selenium.getText(selection);
+ }
+
+ public String getInputText() {
+ return selenium.getValue(input);
+ }
+
+ private JQueryLocator getLabeledOption(String label) {
+ return labeledOption.format(label);
+ }
+
+ public void pressBackspace() {
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_BACK_SPACE));
+ }
+
+ public void pressUp() {
+ selenium.keyDown(input, KEY_UP);
+ }
+
+ public void pressDown() {
+ selenium.keyDown(input, KEY_DOWN);
+ }
+
+ public void pressEnter() {
+ selenium.keyDown(input, KEY_ENTER);
+ }
+
+ public void pressLeft() {
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_LEFT));
+ }
+
+ public void pressRight() {
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_RIGHT));
+ }
+
+ public void pressDelete() {
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_DELETE));
+ }
+
+ public void textSelectionLeft(int size) {
+ selenium.keyDownNative(String.valueOf(KeyEvent.VK_SHIFT));
+ for (int i = 0; i < size; i++) {
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_LEFT));
+ }
+ selenium.keyUpNative(String.valueOf(KeyEvent.VK_SHIFT));
+ }
+
+ public void textSelectionRight(int size) {
+ selenium.keyDownNative(String.valueOf(KeyEvent.VK_SHIFT));
+ for (int i = 0; i < size; i++) {
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_RIGHT));
+ }
+ selenium.keyUpNative(String.valueOf(KeyEvent.VK_SHIFT));
+ }
+
+ public void textSelectAll() {
+ selenium.keyDownNative(String.valueOf(KeyEvent.VK_CONTROL));
+ selenium.keyPressNative(String.valueOf(KeyEvent.VK_A));
+ selenium.keyDownNative(String.valueOf(KeyEvent.VK_CONTROL));
+ }
+
+ public boolean isCompletionVisible() {
+ return selenium.isElementPresent(option);
+ }
+}
Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AutocompleteAttributes.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AutocompleteAttributes.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/AutocompleteAttributes.java 2010-10-28 16:03:36 UTC (rev 19737)
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.ftest.richAutocomplete;
+
+import org.jboss.test.selenium.encapsulated.JavaScript;
+import org.richfaces.tests.metamer.ftest.AbstractComponentAttributes;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+public class AutocompleteAttributes extends AbstractComponentAttributes {
+ public void setAutofill(Boolean autofill) {
+ setProperty("autofill", autofill);
+ }
+
+ public void setClientFilter(JavaScript clientFilter) {
+ setProperty("clientFilter", clientFilter);
+ }
+
+ public void setDisabled(Boolean disabled) {
+ setProperty("disabled", disabled);
+ }
+
+ public void setImmediate(Boolean immediate) {
+ setProperty("immediate", immediate);
+ }
+
+ public void setMinChars(int minChars) {
+ setProperty("minChars", minChars);
+ }
+
+ public void setMode(Mode mode) {
+ setProperty("mode", mode);
+ }
+
+ public void setRendered(Boolean rendered) {
+ setProperty("rendered", rendered);
+ }
+
+ public void setRequired(Boolean required) {
+ setProperty("required", required);
+ }
+
+ public void setSelectFirst(Boolean selectFirst) {
+ setProperty("selectFirst", selectFirst);
+ }
+
+ public void setShowButton(Boolean showButton) {
+ setProperty("showButton", showButton);
+ }
+
+ public void setTokens(String tokens) {
+ setProperty("tokens", tokens);
+ }
+
+ public enum Mode {
+ AJAX, CACHED_AJAX, CLIENT
+ }
+}
Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocomplete.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocomplete.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocomplete.java 2010-10-28 16:03:36 UTC (rev 19737)
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *******************************************************************************/
+package org.richfaces.tests.metamer.ftest.richAutocomplete;
+
+import static org.jboss.test.selenium.utils.URLUtils.buildUrl;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.jboss.test.selenium.RequestTypeModelGuard.guardXhr;
+
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.bind.JAXBException;
+
+import org.richfaces.tests.metamer.bean.Model;
+import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
+import org.richfaces.tests.metamer.ftest.annotations.Inject;
+import org.richfaces.tests.metamer.ftest.annotations.Use;
+import org.richfaces.tests.metamer.ftest.model.Autocomplete;
+import org.richfaces.tests.metamer.model.Capital;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+public class TestAutocomplete extends AbstractMetamerTest {
+
+ final static Boolean[] booleanValues = new Boolean[] { true, false };
+
+ AutocompleteAttributes attributes = new AutocompleteAttributes();
+ Autocomplete autocomplete = new Autocomplete();
+
+ @Override
+ public URL getTestUrl() {
+ return buildUrl(contextPath, "faces/components/richAutocomplete/autocompleteValidation.xhtml");
+ }
+
+ @Inject
+ @Use("booleanValues")
+ Boolean autofill;
+
+ @Inject
+ @Use("booleanValues")
+ Boolean selectFirst;
+
+ List<Capital> capitals;
+
+ StringBuilder partialInput;
+
+ {
+ try {
+ capitals = Model.unmarshallCapitals();
+ } catch (JAXBException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ @BeforeMethod
+ public void prepareProperties() {
+ attributes.setAutofill(autofill);
+ attributes.setSelectFirst(selectFirst);
+ if (autofill == null) {
+ autofill = false;
+ }
+ if (selectFirst == null) {
+ selectFirst = false;
+ }
+ }
+
+ @Test
+ public void testConditions() {
+
+ assertFalse(autocomplete.isCompletionVisible());
+
+ typePrefix("ala");
+
+ deleteAll();
+ }
+
+ public void deleteAll() {
+ partialInput = new StringBuilder();
+
+ autocomplete.textSelectAll();
+ guardXhr(autocomplete).pressBackspace();
+
+ assertEquals(autocomplete.getInputText(), getExpectedStateForPrefix());
+ assertEquals(autocomplete.getSelectedOptionIndex(), getExpectedSelectedOptionIndex());
+ }
+
+ public void typePrefix(String wholeInput) {
+ partialInput = new StringBuilder(autocomplete.getInputText());
+
+ for (int i = 0; i < wholeInput.length(); i++) {
+ String chr = String.valueOf(wholeInput.charAt(i));
+
+ guardXhr(autocomplete).typeKeys(chr);
+ partialInput.append(chr);
+
+ assertEquals(autocomplete.getInputText(), getExpectedStateForPrefix());
+ assertEquals(autocomplete.getSelectedOptionIndex(), getExpectedSelectedOptionIndex());
+ }
+ }
+
+ public String getExpectedStateForPrefix() {
+ if (selectFirst && autofill && partialInput.length() > 0) {
+ return getStatesByPrefix(partialInput.toString()).get(0).toLowerCase();
+ }
+
+ return partialInput.toString();
+ }
+
+ public int getExpectedSelectedOptionIndex() {
+ return (selectFirst) ? 0 : -1;
+ }
+
+ public List<String> getStatesByPrefix(String prefix) {
+ List<String> states = new LinkedList<String>();
+
+ for (Capital cap : capitals) {
+ if (cap.getState().toLowerCase().startsWith(prefix)) {
+ states.add(cap.getState());
+ }
+ }
+
+ return states;
+ }
+}
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r19736 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-10-28 12:02:47 -0400 (Thu, 28 Oct 2010)
New Revision: 19736
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java
Log:
added support for enumeration based attributes
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-10-28 16:02:09 UTC (rev 19735)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java 2010-10-28 16:02:47 UTC (rev 19736)
@@ -21,6 +21,8 @@
*******************************************************************************/
package org.richfaces.tests.metamer.ftest;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.WordUtils;
import org.jboss.test.selenium.dom.Event;
import org.jboss.test.selenium.framework.AjaxSelenium;
import org.jboss.test.selenium.framework.AjaxSeleniumProxy;
@@ -44,7 +46,7 @@
protected AjaxSelenium selenium = AjaxSeleniumProxy.getInstance();
LocatorReference<ExtendedLocator<JQueryLocator>> root = new LocatorReference<ExtendedLocator<JQueryLocator>>(
- pjq(""));
+ pjq(""));
ReferencedLocator<JQueryLocator> propertyLocator = referenceInferred(root, "input[id*={0}Input]{1}");
public AbstractComponentAttributes() {
@@ -73,15 +75,24 @@
if (value == null) {
value = "";
}
+
String valueAsString = value.toString();
+ if (value.getClass().isEnum()) {
+ valueAsString = valueAsString.toLowerCase();
+ valueAsString = WordUtils.capitalizeFully(valueAsString, new char[] { '_' });
+ valueAsString = valueAsString.replace("_", "");
+ valueAsString = StringUtils.uncapitalize(valueAsString);
+ }
+
if ("text".equals(inputType)) {
applyText(locator, valueAsString);
} else if ("checkbox".equals(inputType)) {
boolean checked = Boolean.valueOf(valueAsString);
applyCheckbox(locator, checked);
} else if ("radio".equals(inputType)) {
- locator = propertyLocator.format(propertyName, "[value=" + ("".equals(value) ? "null" : value) + "]");
+ locator = propertyLocator.format(propertyName, "[value="
+ + ("".equals(valueAsString) ? "null" : valueAsString) + "]");
guardHttp(selenium).click(locator);
}
}
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r19735 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/javascript.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-10-28 12:02:09 -0400 (Thu, 28 Oct 2010)
New Revision: 19735
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/javascript/JQueryScript.java
Log:
added support for creating jQuery scripts manipulating with page easily
Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/javascript/JQueryScript.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/javascript/JQueryScript.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/javascript/JQueryScript.java 2010-10-28 16:02:09 UTC (rev 19735)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.selenium.javascript;
+
+import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.jboss.test.selenium.encapsulated.JavaScript;
+import org.jboss.test.selenium.locator.JQueryLocator;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+public class JQueryScript extends JavaScript {
+
+ public JQueryScript(String selector) {
+ super(format("jQuery('{0}', selenium.browserbot.getCurrentWindow().document)",
+ StringEscapeUtils.escapeJavaScript(selector)));
+ }
+
+ public JQueryScript(String selector, String jqueryScript) {
+ super(format("jQuery('{0}', selenium.browserbot.getCurrentWindow().document).{1}",
+ StringEscapeUtils.escapeJavaScript(selector), jqueryScript));
+ }
+
+ public JQueryScript(JQueryLocator jQueryLocator) {
+ super(format("jQuery('{0}', selenium.browserbot.getCurrentWindow().document)",
+ StringEscapeUtils.escapeJavaScript(jQueryLocator.getRawLocator())));
+ }
+
+ public JQueryScript(JQueryLocator jQueryLocator, String jqueryScript) {
+ super(format("jQuery('{0}', selenium.browserbot.getCurrentWindow().document).{1}",
+ StringEscapeUtils.escapeJavaScript(jQueryLocator.getRawLocator()), jqueryScript));
+ }
+
+ public static JQueryScript jqObject(String selector) {
+ return new JQueryScript(selector);
+ }
+
+ public static JQueryScript jqObject(JQueryLocator jQueryLocator) {
+ return new JQueryScript(jQueryLocator);
+ }
+
+ public static JQueryScript jqScript(String selector, String jqueryScript) {
+ return new JQueryScript(selector, jqueryScript);
+ }
+
+ public static JQueryScript jqScript(JQueryLocator jQueryLocator, String jqueryScript) {
+ return new JQueryScript(jQueryLocator, jqueryScript);
+ }
+}
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r19734 - in modules/tests/metamer/trunk/ftest-source: src/main/java/org/jboss/test/selenium and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: lfryc(a)redhat.com
Date: 2010-10-28 12:01:29 -0400 (Thu, 28 Oct 2010)
New Revision: 19734
Added:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/RequestTypeModelGuard.java
Modified:
modules/tests/metamer/trunk/ftest-source/pom.xml
Log:
added request type guard for non-atomic selenium operations over model
Modified: modules/tests/metamer/trunk/ftest-source/pom.xml
===================================================================
--- modules/tests/metamer/trunk/ftest-source/pom.xml 2010-10-28 15:26:57 UTC (rev 19733)
+++ modules/tests/metamer/trunk/ftest-source/pom.xml 2010-10-28 16:01:29 UTC (rev 19734)
@@ -60,6 +60,11 @@
<version>${project.version}</version>
<classifier>classes</classifier>
</dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.12.1.GA</version>
+ </dependency>
</dependencies>
<build>
Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/RequestTypeModelGuard.java
===================================================================
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/RequestTypeModelGuard.java (rev 0)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/RequestTypeModelGuard.java 2010-10-28 16:01:29 UTC (rev 19734)
@@ -0,0 +1,129 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.selenium;
+
+import java.lang.reflect.Method;
+
+import javassist.util.proxy.MethodHandler;
+import javassist.util.proxy.ProxyFactory;
+import javassist.util.proxy.ProxyObject;
+
+import org.jboss.test.selenium.guard.request.RequestTypeGuard;
+import org.jboss.test.selenium.request.RequestType;
+
+/**
+ * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a>
+ * @version $Revision$
+ */
+public class RequestTypeModelGuard implements MethodHandler {
+ private RequestTypeGuard guard;
+
+ private RequestTypeModelGuard(RequestTypeGuard guard) {
+ this.guard = guard;
+ }
+
+ @SuppressWarnings("unchecked")
+ private static <T extends Model> T guard(T model, RequestType requestExpected, boolean interlayed) {
+ RequestTypeGuard guard = new RequestTypeGuard(requestExpected, interlayed);
+
+ ProxyFactory f = new ProxyFactory();
+ f.setSuperclass(model.getClass());
+ Class<T> c = f.createClass();
+
+ T newInstance;
+ try {
+ newInstance = (T) c.newInstance();
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ ((ProxyObject) newInstance).setHandler(new RequestTypeModelGuard(guard));
+ return newInstance;
+ }
+
+ @Override
+ public Object invoke(Object self, Method method, Method proceed, Object[] args) throws Throwable {
+ guard.doBeforeCommand();
+ Object result = proceed.invoke(self, args);
+ guard.doAfterCommand();
+
+ return result;
+ }
+
+ /**
+ * Shortcut for registering a XMLHttpRequest on given selenium object.
+ *
+ * @param selenium
+ * where should be registered XMLHttpRequest guard
+ * @return the selenium guarded to use XMLHttpRequest
+ */
+ public static <T extends Model> T guardXhr(T model) {
+ return guard(model, RequestType.XHR, false);
+ }
+
+ /**
+ * Shortcut for registering a regular HTTP request on given selenium object.
+ *
+ * @param selenium
+ * where should be registered regular HTTP request guard
+ * @return the selenium guarded to use regular HTTP requests
+ */
+ public static <T extends Model> T guardHttp(T selenium) {
+ return guard(selenium, RequestType.HTTP, false);
+ }
+
+ /**
+ * Shortcut for registering a guard for no request on given selenium object.
+ *
+ * @param selenium
+ * where should be registered no request guard
+ * @return the selenium guarded to use no request during interaction
+ */
+ public static <T extends Model> T guardNoRequest(T selenium) {
+ return guard(selenium, RequestType.NONE, false);
+ }
+
+ /**
+ * Shortcut for registering guard waiting for interception of XHR type request
+ *
+ * @param selenium
+ * where should be the guard registered
+ * @return the selenium waiting for interception of XHR type request
+ */
+ public static <T extends Model> T waitXhr(T selenium) {
+ return guard(selenium, RequestType.XHR, true);
+ }
+
+ /**
+ * Shortcut for registering guard waiting for interception of HTTP type request
+ *
+ * @param selenium
+ * selenium where should be the guard registered
+ * @return the selenium waitinf for interception of HTTP type request
+ */
+ public static <T extends Model> T waitHttp(T selenium) {
+ return guard(selenium, RequestType.HTTP, true);
+ }
+
+ public interface Model {
+ }
+
+}
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r19733 - in modules: build/resources/trunk and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-10-28 11:26:57 -0400 (Thu, 28 Oct 2010)
New Revision: 19733
Added:
modules/build/resources/trunk/ide-prefs/
modules/build/resources/trunk/ide-prefs/eclipse-formatting-rules.xml
modules/build/resources/trunk/ide-prefs/idea-code-style.xml
modules/build/resources/trunk/scripts/
modules/build/resources/trunk/scripts/change_version.sh
Removed:
modules/build/resources/trunk/change_version.sh
modules/build/resources/trunk/checkout.sh
modules/build/resources/trunk/clean_install.sh
modules/build/resources/trunk/eclipse-formatting-rules.xml
modules/build/resources/trunk/idea-code-style.xml
modules/build/resources/trunk/release.sh
modules/build/resources/trunk/svn_external_cmds.txt
modules/deployRelease.sh
modules/pom.xml
Log:
RF-9280 cleaned up old scripts, and source
Deleted: modules/build/resources/trunk/change_version.sh
===================================================================
--- modules/build/resources/trunk/change_version.sh 2010-10-28 15:14:58 UTC (rev 19732)
+++ modules/build/resources/trunk/change_version.sh 2010-10-28 15:26:57 UTC (rev 19733)
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-usage()
-{
-cat << EOF
-usage: $0 options
-
-This script will search all pom.xml and change <version>ORIG</version> to <version>NEW</version>
-
-BASIC OPTIONS:
- -h Show this message
- -d Destination directory, otherwise the PWD is used
- -o Version to replace - such as 4-SNAPSHOT
- -n Version to replace with - such as 5
-
- BUGS: This is traverse into tags as well, so some may need to be reverted
-
-EOF
-}
-
-work()
-{
-
-if [ -d "$DESTINATION" ]
-then
- echo "Beginning version update from base directory: $DESTINATION"
-else
- echo "Base directory does not exist, can not update version from: $DESTINATION"
- exit 1;
-fi
-
- echo
- echo =================================
- echo "Changing <version>$ORIG_VERSION</version> into <version>$NEW_VERSION</version>"
-
- find $DESTINATION -name "pom.xml" -path *trunk/* | xargs perl -pi -e "s/<version>$ORIG_VERSION<\/version>/<version>$NEW_VERSION<\/version>/"
-
- echo =================================
-
-}
-
-DESTINATION=`pwd`
-WORK=1
-ORIG_VERSION=
-NEW_VERSION=
-
-while getopts "n:o:d:h" OPTION
-do
- case $OPTION in
- n)
- NEW_VERSION=$OPTARG
- ;;
- o)
- ORIG_VERSION=$OPTARG
- ;;
- d)
- DESTINATION=$OPTARG
- ;;
- h)
- usage
- WORK=0
- ;;
- [?])
- usage;
- WORK=0
- ;;
- esac
-done
-
-if [ "$WORK" -eq "1" ] || [ "$#" -eq "0" ]
-then
- work;
-fi
\ No newline at end of file
Deleted: modules/build/resources/trunk/checkout.sh
===================================================================
--- modules/build/resources/trunk/checkout.sh 2010-10-28 15:14:58 UTC (rev 19732)
+++ modules/build/resources/trunk/checkout.sh 2010-10-28 15:26:57 UTC (rev 19733)
@@ -1,198 +0,0 @@
-#!/bin/sh
-
-usage()
-{
-cat << EOF
-usage: $0 options
-
-This script will check out RichFaces 4.0 modules. By default this will checkout only the primary project modules.
-
-MODULE OPTIONS
- -c Include cdk modules
- -t Include tests, and docs modules
- -e Include examples, and archetype modules
- -s Include sandbox modules
- -a Include all of the above
-
-BASIC OPTIONS:
- -h Show this message
- -d Destination directory, otherwise the PWD is used
- -r Checkout in readonly mode from anonsvn
- -v Be more verbose
-EOF
-}
-
-work()
-{
-
-if [ "$READONLY" -eq "1" ]
-then
- SVNBASE="http://anonsvn.jboss.org/repos/richfaces/root"
-else
- SVNBASE="https://svn.jboss.org/repos/richfaces/root"
-fi
-
-if [ "$VERBOSE" -eq "0" ]
-then
- SVNARGS="--quiet"
-fi
-
-if [ -d "$DESTINATION" ]
-then
- echo "Checking out to $DESTINATION"
-else
- echo "Creating directory $DESTINATION to checkout to"
- mkdir $DESTINATION
-fi
-
-FINAL_LIST=( ${MAIN_MODULE_ARRAY[@]} )
-
-if [ "$INCL_CDK" -eq "1" ]
-then
- FINAL_LIST=( ${FINAL_LIST[@]} ${CDK_MODULE_ARRAY[@]} )
-fi
-
-if [ "$INCL_DOCS_TESTS" -eq "1" ]
-then
- FINAL_LIST=( ${FINAL_LIST[@]} ${DOC_QE_MODULE_ARRAY[@]} )
-fi
-
-if [ "$INCL_EXAMPLES_ARCHETYPE" -eq "1" ]
-then
- FINAL_LIST=( ${FINAL_LIST[@]} ${EXAMPLE_ARCHETYPE_MODULE_ARRAY[@]} )
-fi
-
-if [ "$INCL_SANDBOX" -eq "1" ]
-then
- FINAL_LIST=( ${FINAL_LIST[@]} ${SANDBOX_MODULE_ARRAY[@]} )
-fi
-
-for module in "${FINAL_LIST[@]}"
-do
- url="$SVNBASE/$module"
- moduledir=$DESTINATION/$module/trunk
-
- echo
- echo =================================
-
- if [ -d "$moduledir" ]
- then
- echo "Updating $module"
- svncmd="svn up $SVNARGS $moduledir"
- else
- echo "Checking out $module"
- svncmd="svn co $SVNARGS $url $moduledir"
- fi
-
- echo =================================
-
- $svncmd
-
-done
-
-}
-
-DESTINATION=`pwd`
-READONLY=0
-VERBOSE=0
-SVNBASE=
-SVNARGS=
-WORK=1
-INCL_CDK=0
-INCL_DOCS_TESTS=0
-INCL_EXAMPLES_ARCHETYPE=0
-INCL_SANDBOX=0
-
-# Listing of all modules to be checked out
-# $1 = path to module ( before trunk/tag/branch )
-MAIN_MODULE_ARRAY=(
- "build/parent/trunk"
- "build/bom/trunk"
- "build/resources/trunk"
- "commons/trunk"
- "core/trunk"
- "dist/trunk"
- "ui/core/trunk"
- "ui/dist/trunk"
- "ui/misc/trunk"
- "ui/iteration/trunk"
- )
-
-CDK_MODULE_ARRAY=(
- "cdk/trunk"
- )
-
-DOC_QE_MODULE_ARRAY=(
- "docs"
- "tests"
- )
-
-EXAMPLE_ARCHETYPE_MODULE_ARRAY=(
- # For each example
- # "examples/<example>"
- "examples"
- # TODO - Clean up examples so it does not need root aggregator
-
- # For each archetype
- # "archetype/<archetype>"
- "archetype"
- # TODO - Clean up archetype so it does not need root aggregator
-
- )
-
-SANDBOX_MODULE_ARRAY=(
- # cdk sandbox
- "cdk-sandbox/trunk"
-
- # For each example in sandbox
- # "examples-sandbox/<example>"
-
- # For each component in sandbox
- # "ui-sandbox/<component>"
- )
-
-while getopts "tecsahrd:v" OPTION
-do
- case $OPTION in
- t)
- INCL_DOCS_TESTS=1
- ;;
- e)
- INCL_EXAMPLES_ARCHETYPE=1
- ;;
- c)
- INCL_CDK=1
- ;;
- s)
- INCL_SANDBOX=1
- ;;
- a)
- INCL_CDK=1
- INCL_DOCS_TESTS=1
- INCL_EXAMPLES_ARCHETYPE=1
- INCL_SANDBOX=1
- ;;
- h)
- usage
- WORK=0
- ;;
- d)
- DESTINATION=$OPTARG
- ;;
- r)
- READONLY=1
- ;;
- v)
- VERBOSE=1
- ;;
- [?])
- usage;
- WORK=0
- ;;
- esac
-done
-
-if [ "$WORK" -eq "1" ] || [ "$#" -eq "0" ]
-then
- work;
-fi
\ No newline at end of file
Deleted: modules/build/resources/trunk/clean_install.sh
===================================================================
--- modules/build/resources/trunk/clean_install.sh 2010-10-28 15:14:58 UTC (rev 19732)
+++ modules/build/resources/trunk/clean_install.sh 2010-10-28 15:26:57 UTC (rev 19733)
@@ -1,202 +0,0 @@
-#!/bin/sh
-
-usage()
-{
-cat << EOF
-usage: $0 options
-
-This script will execute "mvn clean install" on all modules in RichFaces 4.0. With the the various options below.
-
-MODULE OPTIONS
- -t Include tests, and docs modules (NOT FUNCTIONAL)
- -e Include examples, and archetype modules (NOT FUNCTIONAL)
- -s Include sandbox modules
- -a Include all of the above
-
-BASIC OPTIONS:
- -h Show this message
- -d Root directory, otherwise the PWD is used
- -x Use mvn -X option
- -y Skip enforcement rules - this is needed if using cdk plugin snapshots
-
-TODO Add options for skip test, skip check style etc...
-EOF
-}
-
-work()
-{
-
-if [ "$DEBUG" -eq "1" ]
-then
- MVNARGS="-X"
-fi
-
-if [ "$SKIP_ENFORCE" -eq "1" ]
-then
- MVNARGS="$MVNARGS -Dskip-enforce"
-fi
-
-if [ -d "$DESTINATION" ]
-then
- echo "Beginning build from base directory: $DESTINATION"
-else
- echo "Base directory does not exist, can not build from: $DESTINATION"
- exit 1;
-fi
-
-FINAL_LIST=( ${MAIN_MODULE_ARRAY[@]} )
-
-if [ "$INCL_DOCS_TESTS" -eq "1" ]
-then
- FINAL_LIST=( ${FINAL_LIST[@]} ${DOC_QE_MODULE_ARRAY[@]} )
-fi
-
-if [ "$INCL_EXAMPLES_ARCHETYPE" -eq "1" ]
-then
- FINAL_LIST=( ${FINAL_LIST[@]} ${EXAMPLE_ARCHETYPE_MODULE_ARRAY[@]} )
-fi
-
-if [ "$INCL_SANDBOX" -eq "1" ]
-then
- FINAL_LIST=( ${FINAL_LIST[@]} ${SANDBOX_MODULE_ARRAY[@]} )
-fi
-
-for module in "${FINAL_LIST[@]}"
-do
- moduledir="$DESTINATION/$module"
- command="mvn $MVNARGS clean install"
- echo
- echo =================================
- echo "Moving into module directory : $moduledir"
- if [ -d "$moduledir" ]
- then
- echo "Executing command : $command"
- cd $moduledir
- $command
- else
- echo "Module directory does not exist, can not execute command: $command"
- echo =================================
- exit 1;
- fi
-
- echo =================================
-
-done
-
-}
-
-DESTINATION=`pwd`
-DEBUG=0
-SKIP_ENFORCE=0
-MVNARGS=
-WORK=1
-INCL_DOCS_TESTS=0
-INCL_EXAMPLES_ARCHETYPE=0
-INCL_SANDBOX=0
-
-# Listing of all modules to be checked out
-# $1 = path to module ( before trunk/tag/branch )
-MAIN_MODULE_ARRAY=(
- # Non-Released Modules
- #"build/parent/trunk"
- #"build/resources/trunk/checkstyle"
- #"build/resources/trunk/faces-shade-transformers"
- "build/bom/trunk"
- "commons/trunk"
- "cdk/trunk"
- "core/trunk"
- "ui/core/trunk"
- "ui/misc/trunk"
- "ui/iteration/trunk"
- "ui/dist/trunk"
- "archetypes/richfaces-archetype-simpleapp/trunk"
- "examples/core-demo/trunk"
- "examples/richfaces-showcase/trunk"
- "docs/trunk"
- "dist/trunk"
- )
-
-DOC_QE_MODULE_ARRAY=(
- # "docs/trunk"
- # "tests/trunk"
- )
-
-EXAMPLE_ARCHETYPE_MODULE_ARRAY=(
- # For each example
- # "examples/<example-name>"
- "examples"
-
- # TODO for now these can not be build alone
- # "examples/core-demo"
- # "examples/repeater-demo"
- # "examples/richfaces-showcase"
- # "examples/dist"
-
- # For each archetype
- # "archetype/archetype-name"
- # TODO - populate after we have archetypes
- )
-
-SANDBOX_MODULE_ARRAY=(
- # For each example in sandbox
- # "examples-sandbox/<example-name>"
-
- # For each component in sandbox
- # "ui-sandbox/<component-name>"
- "ui-sandbox/tables/trunk"
- "ui-sandbox/datascroller/trunk"
- "ui-sandbox/componentControl/trunk"
-
- # These exist but are just shells
- # "ui-sandbox/calendar"
- # "ui-sandbox/datafilterslider"
- # "ui-sandbox/drag-drop"
- # "ui-sandbox/fileupload"
- # "ui-sandbox/numberinputs"
- # "ui-sandbox/selects"
- # "ui-sandbox/togglepanels"
- # "ui-sandbox/tree"
- # "ui-sandbox/tree-model"
- )
-
-while getopts "tesahd:xy" OPTION
-do
- case $OPTION in
- t)
- INCL_DOCS_TESTS=1
- ;;
- e)
- INCL_EXAMPLES_ARCHETYPE=1
- ;;
- s)
- INCL_SANDBOX=1
- ;;
- a)
- INCL_DOCS_TESTS=1
- INCL_EXAMPLES_ARCHETYPE=1
- INCL_SANDBOX=1
- ;;
- h)
- usage
- WORK=0
- ;;
- d)
- DESTINATION=$OPTARG
- ;;
- x)
- DEBUG=1
- ;;
- y)
- SKIP_ENFORCE=1
- ;;
- [?])
- usage;
- WORK=0
- ;;
- esac
-done
-
-if [ "$WORK" -eq "1" ] || [ "$#" -eq "0" ]
-then
- work;
-fi
\ No newline at end of file
Deleted: modules/build/resources/trunk/eclipse-formatting-rules.xml
===================================================================
--- modules/build/resources/trunk/eclipse-formatting-rules.xml 2010-10-28 15:14:58 UTC (rev 19732)
+++ modules/build/resources/trunk/eclipse-formatting-rules.xml 2010-10-28 15:26:57 UTC (rev 19733)
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="Richfaces" version="11">
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-</profile>
-</profiles>
Copied: modules/build/resources/trunk/ide-prefs/eclipse-formatting-rules.xml (from rev 19725, modules/build/resources/trunk/eclipse-formatting-rules.xml)
===================================================================
--- modules/build/resources/trunk/ide-prefs/eclipse-formatting-rules.xml (rev 0)
+++ modules/build/resources/trunk/ide-prefs/eclipse-formatting-rules.xml 2010-10-28 15:26:57 UTC (rev 19733)
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="11">
+<profile kind="CodeFormatterProfile" name="Richfaces" version="11">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>
Copied: modules/build/resources/trunk/ide-prefs/idea-code-style.xml (from rev 19725, modules/build/resources/trunk/idea-code-style.xml)
===================================================================
--- modules/build/resources/trunk/ide-prefs/idea-code-style.xml (rev 0)
+++ modules/build/resources/trunk/ide-prefs/idea-code-style.xml 2010-10-28 15:26:57 UTC (rev 19733)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<code_scheme name="Richfaces">
+ <option name="LINE_SEPARATOR" value=" " />
+ <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+ <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+ <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="15" />
+ <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="5" />
+ <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="java">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="js">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="xml">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+</code_scheme>
+
Deleted: modules/build/resources/trunk/idea-code-style.xml
===================================================================
--- modules/build/resources/trunk/idea-code-style.xml 2010-10-28 15:14:58 UTC (rev 19732)
+++ modules/build/resources/trunk/idea-code-style.xml 2010-10-28 15:26:57 UTC (rev 19733)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<code_scheme name="Richfaces">
- <option name="LINE_SEPARATOR" value=" " />
- <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
- <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
- <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="15" />
- <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="5" />
- <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="8" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="8" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="java">
- <option name="INDENT_SIZE" value="4" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="js">
- <option name="INDENT_SIZE" value="4" />
- <option name="CONTINUATION_INDENT_SIZE" value="8" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
- <option name="INDENT_SIZE" value="4" />
- <option name="CONTINUATION_INDENT_SIZE" value="8" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- </ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="xml">
- <option name="INDENT_SIZE" value="4" />
- <option name="CONTINUATION_INDENT_SIZE" value="8" />
- <option name="TAB_SIZE" value="4" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- </ADDITIONAL_INDENT_OPTIONS>
-</code_scheme>
-
Deleted: modules/build/resources/trunk/release.sh
===================================================================
--- modules/build/resources/trunk/release.sh 2010-10-28 15:14:58 UTC (rev 19732)
+++ modules/build/resources/trunk/release.sh 2010-10-28 15:26:57 UTC (rev 19733)
@@ -1,205 +0,0 @@
-#!/bin/sh
-
-usage()
-{
-cat << EOF
-usage: $0 options
-
-** WARNING: DO NOT USE UNLESS FOLLOWING PROJECT PROCESS **
-
-This script will release all modules in RichFaces 4.0 distributions. WARNING: DO NOT USE UNLESS FOLLOWING PROJECT PROCESS
-
-BASIC OPTIONS:
- -h Show this message
- -b Root directory, otherwise the PWD is used
- -x Use mvn -X option
-
-Rules:
-- Modules should only import other modules bom's for versions, not set specific version themselves
-- All interproject versions must be set with variables in the for of: <version_prop>.version
- - Example: "org.richfaces.commons.version"
- - <version_prop> is set in the array below
-- All sub-modules of a single t/b/t module must share versions
- - Setting <autoVersionSubmodules> to true
-- <parent> references within the same module must use <relativePath>
- - This is needed because during release prepare the module parent is not installed
- - For example: commons-api must reference commons-parent as ../parent/pom.xml
- - Note: this is not needed for referencing parents outside of module
- - Such as richfaces-parent - it is released already
-
-EOF
-}
-
-work()
-{
-
-if [ "$DEBUG" -eq "1" ]
-then
- MVNARGS="-X"
-fi
-
-if [ -d "$BASE" ]
-then
- echo "$ECHO_MARK Beginning build from base directory: $BASE"
-else
- echo "$ECHO_MARK Base directory does not exist, can not build from: $BASE"
- exit 1;
-fi
-
-for module_meta in "${MAIN_MODULE_ARRAY[@]}"
-do
- set -- $module_meta
- #for each module I need
- MODULE_PATH=$1
- REL_VER=$2
- DEV_VER=$3
- TAG_BASE=$4
- VER_PROP_BASE=$5
-
- #derived variables
- TAG_NAME="$TAG_BASE-$REL_VER"
- MODULE_BASE=$BASE/$1
- MODULE_TRUNK=$MODULE_BASE/$TRUNK_EXT
- MODULE_TAG=$MODULE_BASE/tags/$TAG_NAME
- MVN_PREPARE_CMD="mvn $MVNARGS release:prepare --batch-mode -DdevelopmentVersion=$DEV_VER -DreleaseVersion=$REL_VER -Dtag=$TAG_NAME"
- MVN_PERFORM_CMD="mvn $MVNARGS --batch-mode release:perform"
- VER_PROP="$VER_PROP_BASE.version"
-
- echo
- echo "================================= START"
- echo "$ECHO_MARK Releasing $VER_PROP_BASE "
- echo "$ECHO_MARK Module Path : $MODULE_BASE"
- echo "$ECHO_MARK Module Trunk Path : $MODULE_TRUNK"
- echo "$ECHO_MARK Module Tag Path : $MODULE_TAG"
- echo "$ECHO_MARK Development Version : $DEV_VER"
- echo "$ECHO_MARK Release Version : $REL_VER"
- echo "$ECHO_MARK Tag Name : $TAG_NAME"
- echo "$ECHO_MARK Version Prop : $VER_PROP"
- echo ----------------------------------
- echo "$ECHO_MARK Moving into $MODULE_TRUNK"
-
- if [ -d "$MODULE_TRUNK" ]
- then
- cd $MODULE_TRUNK
-
- echo "$ECHO_MARK Excuting Maven Release Prepare Command: $MVN_PREPARE_CMD"
- $MVN_PREPARE_CMD
- if [ $? -eq "0" ]
- then
- echo "$ECHO_MARK Maven Release Prepare Command Completed"
- else
- echo "$ECHO_MARK Maven Release Prepare Command Failed"
- exit 1;
- fi
-
- # NOTE: This might not be needed, because all modules in a project share a version
- # echo "$ECHO_MARK Fixing maven-release-plugin error with updating import versions in tag: $TAG_NAME"
- # TODO - Need to verify next dev version gets updated correctly by plugin
- # find $MODULE_TAG -name "pom.xml" | xargs perl -pi -e "s/<$VER_PROP>.+<\/$VER_PROP>/<$VER_PROP>$REL_VER<\/$VER_PROP>/"
- # svn ci $MODULE_TAG -m "[RichFaces Release Script] Checking in release-plugin fix for import version updates"
- # echo "$ECHO_MARK Fixing maven-release-plugin error complete"
-
- echo "$ECHO_MARK Executing Maven Release Perform Command: $MVN_PERFORM_CMD"
- $MVN_PERFORM_CMD
- if [ $? -eq "0" ]
- then
- echo "$ECHO_MARK Maven Release Perform Command Completed"
- else
- echo "$ECHO_MARK Maven Release Perform Command Failed"
- exit 1;
- fi
-
- echo "$ECHO_MARK Updating Intermodule Module Version References"
- echo "$ECHO_MARK $ECHO_MARK Replacing $VER_PROP properties to: $REL_VER in all modules"
-
- # Only replace in pom.xml that are in a trunk, not in a tag, or branch
- # - This is because only modules that have not released yet should be referring to this
- find $BASE -name "pom.xml" -path *trunk/* | xargs perl -pi -e "s/<$VER_PROP>.+<\/$VER_PROP>/<$VER_PROP>$REL_VER<\/$VER_PROP>/"
- if [ $? -eq "0" ]
- then
- echo "$ECHO_MARK Version References Updated"
- else
- echo "$ECHO_MARK Version Reference Update Failed"
- exit 1;
- fi
-
- svn ci $BASE . -m "[RichFaces Release Script] Updated intermodule version of $VER_PROP properties to: $REL_VER"
- if [ $? -eq "0" ]
- then
- echo "$ECHO_MARK Commit of Version References Update Completed"
- else
- echo "$ECHO_MARK Commit of Version References Update Failed"
- exit 1;
- fi
-
- # TODO need to handle changing these to next $DEV_VER after release is complete
- # - Will have to populate an array with data for this.
-
- echo "================================= END"
- else
- # TODO someday create an automatic rollback
- echo "$ECHO_MARK Module directory does not exist, can not execute release - you must now rollback previous changes"
- echo =================================
- exit 1;
- fi
-
-done
-
-}
-
-BASE=`pwd`
-TRUNK_EXT="trunk"
-ECHO_MARK="==> "
-DEBUG=0
-MVNARGS=
-WORK=1
-
-# Listing of all modules to be released
-# TODO might be read from prop file
-# http://tldp.org/LDP/abs/html/arrays.html#SCRIPTARRAY
-# $1 = path to module trunk/head
-# $2 = release version
-# $3 = dev version
-# $4 = tag name base - "-<release version" appended
-# $5 = version property - required for updating intermodule dependencies modules
-MAIN_MODULE_ARRAY=(
- "build/bom 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-bom org.richfaces.bom"
- "commons 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-commons org.richfaces.commons"
- "core 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-core org.richfaces.core"
- "cdk 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-cdk org.richfaces.cdk"
- "ui/core 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-ui-core org.richfaces.ui.core"
- "ui/misc 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-ui-misc org.richfaces.ui.misc"
- "ui/iteration 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-ui-iteration org.richfaces.ui.iteration"
- "ui/output 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-ui-output org.richfaces.ui.output"
- "ui/dist 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-ui-dist org.richfaces.ui"
- "archetypes/richfaces-archetype-simpleapp 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-archetype-simpleapp org.richfaces.archetypes.richfaces-archetype-simpleapp"
- "examples/core-demo 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-core-demo org.richfaces.examples.core-demo"
- "examples/richfaces-showcase 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-showcase org.richfaces.examples.richfaces-showcase"
- "docs 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-docs org.richfaces.docs"
- "dist 4.0.0.20100713-M1 4.0.0-SNAPSHOT richfaces-dist org.richfaces.dist"
- )
-
-while getopts "hb:x" OPTION
-do
- case $OPTION in
- h)
- usage
- WORK=0
- ;;
- b)
- BASE=$OPTARG
- ;;
- x)
- DEBUG=1
- ;;
- [?])
- usage;
- WORK=0
- ;;
- esac
-done
-
-if [ "$WORK" -eq "1" ] || [ "$#" -eq "0" ]
-then
- work;
-fi
\ No newline at end of file
Copied: modules/build/resources/trunk/scripts/change_version.sh (from rev 19725, modules/build/resources/trunk/change_version.sh)
===================================================================
--- modules/build/resources/trunk/scripts/change_version.sh (rev 0)
+++ modules/build/resources/trunk/scripts/change_version.sh 2010-10-28 15:26:57 UTC (rev 19733)
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+usage()
+{
+cat << EOF
+usage: $0 options
+
+This script will search all pom.xml and change <version>ORIG</version> to <version>NEW</version>
+
+BASIC OPTIONS:
+ -h Show this message
+ -d Destination directory, otherwise the PWD is used
+ -o Version to replace - such as 4-SNAPSHOT
+ -n Version to replace with - such as 5
+
+ BUGS: This is traverse into tags as well, so some may need to be reverted
+
+EOF
+}
+
+work()
+{
+
+if [ -d "$DESTINATION" ]
+then
+ echo "Beginning version update from base directory: $DESTINATION"
+else
+ echo "Base directory does not exist, can not update version from: $DESTINATION"
+ exit 1;
+fi
+
+ echo
+ echo =================================
+ echo "Changing <version>$ORIG_VERSION</version> into <version>$NEW_VERSION</version>"
+
+ find $DESTINATION -name "pom.xml" -path *trunk/* | xargs perl -pi -e "s/<version>$ORIG_VERSION<\/version>/<version>$NEW_VERSION<\/version>/"
+
+ echo =================================
+
+}
+
+DESTINATION=`pwd`
+WORK=1
+ORIG_VERSION=
+NEW_VERSION=
+
+while getopts "n:o:d:h" OPTION
+do
+ case $OPTION in
+ n)
+ NEW_VERSION=$OPTARG
+ ;;
+ o)
+ ORIG_VERSION=$OPTARG
+ ;;
+ d)
+ DESTINATION=$OPTARG
+ ;;
+ h)
+ usage
+ WORK=0
+ ;;
+ [?])
+ usage;
+ WORK=0
+ ;;
+ esac
+done
+
+if [ "$WORK" -eq "1" ] || [ "$#" -eq "0" ]
+then
+ work;
+fi
\ No newline at end of file
Deleted: modules/build/resources/trunk/svn_external_cmds.txt
===================================================================
--- modules/build/resources/trunk/svn_external_cmds.txt 2010-10-28 15:14:58 UTC (rev 19732)
+++ modules/build/resources/trunk/svn_external_cmds.txt 2010-10-28 15:26:57 UTC (rev 19733)
@@ -1,5 +0,0 @@
-build/parent https://svn.jboss.org/repos/richfaces/modules/build/parent/tags/richfaces...
-build/checkstyle https://svn.jboss.org/repos/richfaces/modules/build/resources/tags/richfa...
-build/faces-shade-transformers https://svn.jboss.org/repos/richfaces/modules/build/resources/tags/richfa...
-
-
Deleted: modules/deployRelease.sh
===================================================================
--- modules/deployRelease.sh 2010-10-28 15:14:58 UTC (rev 19732)
+++ modules/deployRelease.sh 2010-10-28 15:26:57 UTC (rev 19733)
@@ -1,4 +0,0 @@
-PROJECT_DIR=`pwd`
-SETTINGS_XML=`cygpath --windows ~/.m2t/settings.xml`
-
-mvn -s $SETTINGS_XML -P local,release,trunk clean deploy
Deleted: modules/pom.xml
===================================================================
--- modules/pom.xml 2010-10-28 15:14:58 UTC (rev 19732)
+++ modules/pom.xml 2010-10-28 15:26:57 UTC (rev 19733)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>5</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces</groupId>
- <artifactId>root-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Richfaces Root</name>
-
- <modules>
- <!--<module>build/parent/trunk</module>-->
- <!--<module>build/resources/trunk</module>-->
- <module>sandbox/examples</module>
- <module>sandbox/ui</module>
- <module>trunk</module>
- </modules>
-</project>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r19732 - in sandbox/trunk/ui/calendar/ui/src/main: java/org/richfaces/renderkit/html/images and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-10-28 11:14:58 -0400 (Thu, 28 Oct 2010)
New Revision: 19732
Modified:
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml
Log:
add calendarIcon rendering, fix template
Modified: sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-10-28 15:14:24 UTC (rev 19731)
+++ sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-10-28 15:14:58 UTC (rev 19732)
@@ -141,7 +141,11 @@
public static final String MIN_DAYS_IN_FIRST_WEEK = "minDaysInFirstWeek";
+ public static final String CALENDAR_ICON_RESOURCE_NAME = "calendarIcon.png";
+ public static final String CALENDAR_DISABLE_ICON_RESOURCE_NAME = "disabledCalendarIcon.png";
+
+
protected static final Map<String, ComponentAttribute> CALENDAR_INPUT_HANDLER_ATTRIBUTES = Collections.unmodifiableMap(ComponentAttribute.createMap(
@@ -229,13 +233,21 @@
String buttonIcon = (String)component.getAttributes().get("buttonIcon");
if(disable) {
buttonIcon = (String)component.getAttributes().get("buttonIconDisabled");
- }
- //TODO: add default icon
- return (buttonIcon != null && !"".equals(buttonIcon)) ? getResourcePath(facesContext, buttonIcon) : "";
+ }
+
+ if(buttonIcon != null && buttonIcon.trim().length() != 0) {
+ buttonIcon = ViewUtil.getResourceURL(buttonIcon, facesContext);
+ } else {
+ buttonIcon = disable ? CALENDAR_ICON_RESOURCE_NAME: CALENDAR_ICON_RESOURCE_NAME;
+ buttonIcon = RenderKitUtils.getResourcePath(facesContext, "org.richfaces.images",buttonIcon);
+ }
+
+ return buttonIcon;
}
- public Object getSelectedDate(FacesContext facesContext, AbstractCalendar calendar) throws IOException {
+ public Object getSelectedDate(FacesContext facesContext, UIComponent component) throws IOException {
Object returnValue = null;
+ AbstractCalendar calendar = (AbstractCalendar)component;
if(calendar.isValid()) {
Date date;
Object value = calendar.getValue();
@@ -268,7 +280,8 @@
return formatDate(date);
}
- public String getCurrentDateAsString(FacesContext context, AbstractCalendar calendar) throws IOException {
+ public String getCurrentDateAsString(FacesContext context, UIComponent component) throws IOException {
+ AbstractCalendar calendar = (AbstractCalendar)component;
Format formatter = new SimpleDateFormat("MM/yyyy");
Date currentDate = calendar.getCurrentDateOrDefault();
@@ -549,10 +562,6 @@
writer.write(scriptBuffer.toString());
}
- protected String getResourcePath(FacesContext facesContext, String source) {
- return (source != null && !"".equals(source)) ? ViewUtil.getResourceURL(source, facesContext) :"" ;
- }
-
public boolean isUseIcons(FacesContext facesContext, UIComponent component) {
Object label = component.getAttributes().get("buttonLabel");
return (label == null || ((String)label).trim().length() == 0);
Modified: sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java
===================================================================
--- sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java 2010-10-28 15:14:24 UTC (rev 19731)
+++ sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/html/images/CalendarIcon.java 2010-10-28 15:14:58 UTC (rev 19732)
@@ -45,8 +45,8 @@
FacesContext context = FacesContext.getCurrentInstance();
Skin skin = SkinFactory.getInstance(context).getSkin(context);
- this.headerTextColor = skin.getColorParameter(context, Skin.HEAD_TEXT_COLOR);
- this.headerBackgroundColor = skin.getColorParameter(context, Skin.HEADER_BACKGROUND_COLOR);
+ this.headerTextColor = skin.getColorParameter(context, Skin.HEADER_BACKGROUND_COLOR);
+ this.headerBackgroundColor = skin.getColorParameter(context, Skin.SELECT_CONTROL_COLOR);
}
Modified: sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties
===================================================================
--- sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2010-10-28 15:14:24 UTC (rev 19731)
+++ sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2010-10-28 15:14:58 UTC (rev 19732)
@@ -1,6 +1,6 @@
-org.richfaces.images\:calendarSeparator.png=org.richfaces.renderkit.html.iconimages.CalendarSeparator
-org.richfaces.images\:calendarIcon.png=org.richfaces.renderkit.html.iconimages.CalendarIcon
-org.richfaces.images\:disabledCalendarIcon.png=org.richfaces.renderkit.html.iconimages.DisabledCalendarIcon
+org.richfaces.images\:calendarSeparator.png=org.richfaces.renderkit.html.images.CalendarSeparator
+org.richfaces.images\:calendarIcon.png=org.richfaces.renderkit.html.images.CalendarIcon
+org.richfaces.images\:disabledCalendarIcon.png=org.richfaces.renderkit.html.images.DisabledCalendarIcon
org.richfaces.images\:calendarButtonUp.png=org.richfaces.renderkit.html.BaseGradient\
{width=8, height=18, baseColorParam=generalBackgroundColor, gradientColorParam=tabBackgroundColor}
org.richfaces.images\:calendarButtonDown.png=org.richfaces.renderkit.html.BaseGradient\
Modified: sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml
===================================================================
--- sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml 2010-10-28 15:14:24 UTC (rev 19731)
+++ sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml 2010-10-28 15:14:58 UTC (rev 19732)
@@ -59,7 +59,7 @@
</c:choose>
</c:otherwise>
</c:choose>
- <input type="hidden" id="#{clientId}InputCurrentDate" style="display:none" autocomplete="off" name="#{clientId}InputCurrentDate" value="getCurrentDateAsString(facesContext, component)" />
+ <input type="hidden" id="#{clientId}InputCurrentDate" style="display:none" autocomplete="off" name="#{clientId}InputCurrentDate" value="#{getCurrentDateAsString(facesContext, component)}" />
</span>
<div style="display: none;" id="#{clientId}"></div>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r19731 - management/design-4x/fileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2010-10-28 11:14:24 -0400 (Thu, 28 Oct 2010)
New Revision: 19731
Modified:
management/design-4x/fileUpload/fileUpload.html
Log:
Modified: management/design-4x/fileUpload/fileUpload.html
===================================================================
--- management/design-4x/fileUpload/fileUpload.html 2010-10-28 14:52:37 UTC (rev 19730)
+++ management/design-4x/fileUpload/fileUpload.html 2010-10-28 15:14:24 UTC (rev 19731)
@@ -8,19 +8,21 @@
<style>
body{margin : 20px}
-.rf_upd_font{font-family : verdana /*generalFamilyFont*/ ; font-size : 11px/*generalSizeFont*/;}
+.rf_upd_font{ font-family : verdana /*generalFamilyFont*/ ; font-size : 11px/*generalSizeFont*/;}
-#rf_upd_tbl{width : 100%}
-#rf_upd_tbl td{border-bottom:1px solid #c0c0c0 /*tableBorderColor*/;white-space : nowrap;}
+.rf_upd_itm{border-bottom:1px solid #c0c0c0 /*tableBorderColor*/;}
.rf_upd_lst_width{ width:400px;}
.rf_upd_lst_decor{ border:1px solid #c0c0c0 /*tableBorderColor*/; background : #FFFFFF /*tableBackgroundColor*/;}
.rf_upd_lst_oflw{height : 210px; overflow : auto; overflow-x : hidden;}
-.rf_upd_name{ width : 100%; height : 50px; padding : 2px 10px 2px 10px;}
-.rf_upd_del{ width : 90px; text-align : center; padding-top : 3; padding-bottom : 3;}
-.rf_upd_scrl{ width : 10px; text-align : center;}
-.rf_upd_anc{ color : ##0078D0/*generalLinkColor*/;}
+.rf_upd_name{ padding : 2px 0px 2px 0px; font-family : verdana /*generalFamilyFont*/ ; font-size : 11px/*generalSizeFont*/;word-wrap: break-word;}
+.rf_upd_stb{ padding : 5px 0px 2px 0px;}
+.rf_upd_sts{ padding : 2px 0px 0px 0px; font-family : verdana /*generalFamilyFont*/ ; font-size : 11px/*generalSizeFont*/;}
+.rf_upd_lnk{ text-align : center; float : right; line-height : 150%; width : 20%; margin : 9px 20px 0px 0px; font-family : verdana /*generalFamilyFont*/ ; font-size : 11px/*generalSizeFont*/;}
+.rf_upd_fl {width : 70%; padding : 10px 0px 10px 10px;}
+.rf_upd_anc{ color : #0078D0/*generalLinkColor*/;}
+
.rf_upd_tbr_decor{ background : #EAF0F8 /*additionalBackgroundColor*/;border-bottom:1px solid #c0c0c0 /*tableBorderColor*/;border-top:1px solid #FFFFFF /*tableBackgroundColor*/;border-left:1px solid #FFFFFF /*tableBackgroundColor*/;padding : 2px}
@@ -71,7 +73,7 @@
margin-right : 3px;
}
-.rf_upd_name_pdng{padding : 2px 0px 2px 0px;}
+.rf_upd_pdng { padding : 10px 0px 10px 10px;}
.rf_upd_ico{background-position : 0px 50%; background-repeat : no-repeat; padding-left : 19px}
.rf_upd_ico_add{background-image : url(images/ico_add.gif)}
@@ -91,10 +93,11 @@
<body>
+
<div class="rf_upd_lst_width rf_upd_lst_decor">
<table class="rf_upd_lst_width" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td class="rf_upd_tbr_decor">
+ <td class="rf_upd_tbr_decor rf_upd_lst_width">
<div class="rf_upd_btn_brd" style=" float:left"><div class="rf_upd_btn rf_upd_font" onmouseover="this.className='rf_upd_btn_light rf_upd_font'" onmousedown="this.className='rf_upd_btn_press rf_upd_font'" onmouseup="this.className='rf_upd_btn rf_upd_font'" onmouseout="this.className='rf_upd_btn rf_upd_font'"><a href="#" class="rf_upd_btn_sel"><div class="rf_upd_btn_cnt rf_upd_font rf_upd_ico rf_upd_ico_add">Add...</div></a></div></div>
<div class="rf_upd_btn_brd" style=" float:left"><div class="rf_upd_btn_dis rf_upd_font" onmouseover="this.className='rf_upd_btn_light rf_upd_font'" onmousedown="this.className='rf_upd_btn_press rf_upd_font'" onmouseup="this.className='rf_upd_btn rf_upd_font'" onmouseout="this.className='rf_upd_btn rf_upd_font'"><a href="#" class="rf_upd_btn_sel"><div class="rf_upd_btn_cnt rf_upd_font rf_upd_ico rf_upd_ico_start_dis"><b>Upload</b></div></a></div></div>
<!--div class="rf_upd_btn_brd" style=" float:left"><div class="rf_upd_btn rf_upd_font" onmouseover="this.className='rf_upd_btn_light rf_upd_font'" onmousedown="this.className='rf_upd_btn_press rf_upd_font'" onmouseup="this.className='rf_upd_btn rf_upd_font'" onmouseout="this.className='rf_upd_btn rf_upd_font'"><a href="#" class="rf_upd_btn_sel"><div class="rf_upd_btn_cnt rf_upd_font rf_upd_ico rf_upd_ico_stop"><b>Stop</b></div></a></div></div-->
@@ -104,48 +107,86 @@
</table>
<div class="rf_upd_lst_width rf_upd_lst_oflw">
- <table border="0" cellpadding="0" cellspacing="0" id="rf_upd_tbl">
- <tr>
- <td class="rf_upd_font rf_upd_name">
- <div class="rf_upd_name_pdng" style="word-wrap: break-word">
- wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwfile_upload.html
+ <div class="rf_upd_itm rf_upd_lst_width">
+ <div class="rf_upd_lnk"><a href="#" class="rf_upd_anc">Clear</a><br /></div>
+ <div class="rf_upd_fl">
+ <div class="rf_upd_name">
+ N:\Projects\UIComponents\4.0\fileUpload\fileUpload.html
+ </div>
+ <!--div class="rf_upd_stb">
+
+ <div class="rf_upd_bar_extr">
+ <div class="rf_upd_bar_shell">
+ <div class="rf_upd_bar_uploaded">
+
+ </div>
+ </div>
</div>
+
+ </div -->
+ <div class="rf_upd_sts">
+ <b>Done</b>
+ </div>
+ </div>
+ </div>
-
- <!--div class="rf_upd_bar_extr">
+
+ <div class="rf_upd_itm rf_upd_lst_width">
+ <!-- div class="rf_upd_lnk"><a href="#" class="rf_upd_anc">Stop</a><br /></div -->
+ <div class="rf_upd_fl">
+ <div class="rf_upd_name">
+ file_upload.html
+ </div>
+ <div class="rf_upd_stb">
+
+ <div class="rf_upd_bar_extr">
<div class="rf_upd_bar_shell">
<div class="rf_upd_bar_uploaded">
</div>
</div>
- </div-->
-
- <div class="rf_upd_name_pdng">
- <b>Done</b>
</div>
+
+ </div>
+ <!--div class="rf_upd_sts">
+ <b>Done</b>
+ </div -->
+ </div>
+ </div>
-
- </td>
- <td>
- <div class="rf_upd_font rf_upd_del"><a href="#" class="rf_upd_anc">Clear</a></div>
- <div class="rf_upd_font rf_upd_del"><br /></div>
- </td>
- <td>
- <div class="rf_upd_font rf_upd_scrl"> </div>
- </td>
- </tr>
- </table>
+ <div class="rf_upd_itm rf_upd_lst_width">
+ <div class="rf_upd_lnk"><a href="#" class="rf_upd_anc">Delete</a><br /></div>
+ <div class="rf_upd_fl">
+ <div class="rf_upd_name">
+ file_upload.html
+ </div>
+ <!-- div class="rf_upd_stb">
+
+ <div class="rf_upd_bar_extr">
+ <div class="rf_upd_bar_shell">
+ <div class="rf_upd_bar_uploaded">
+
+ </div>
+ </div>
+ </div>
+
+ </div -->
+ <!-- div class="rf_upd_sts">
+ <b>Done</b>
+ </div -->
+ </div>
+ </div>
- <table border="0" cellpadding="0" cellspacing="0" id="rf_upd_tbl">
- <tr>
- <td class="rf_upd_font rf_upd_name">
- <div class="rf_upd_name_pdng">
- file_upload.html
- </div>
-
-
+ <div class="rf_upd_itm rf_upd_lst_width">
+ <div class="rf_upd_lnk"><a href="#" class="rf_upd_anc">Delete</a><br /></div>
+ <div class="rf_upd_fl">
+ <div class="rf_upd_name">
+ file_upload.html
+ </div>
+ <!-- div class="rf_upd_stb">
+
<div class="rf_upd_bar_extr">
<div class="rf_upd_bar_shell">
<div class="rf_upd_bar_uploaded">
@@ -153,132 +194,94 @@
</div>
</div>
</div>
+
+ </div -->
+ <!-- div class="rf_upd_sts">
+ <b>Done</b>
+ </div -->
+ </div>
+ </div>
- <div class="rf_upd_name_pdng">
- 120kb from 2000kb 04:56
- </div>
-
- </td>
- <td>
- <div class="rf_upd_font rf_upd_del"><a href="#" class="rf_upd_anc">Stop</a></div>
- <div class="rf_upd_font rf_upd_del"><br></div>
- </td>
- <td>
- <div class="rf_upd_font rf_upd_scrl"> </div>
- </td>
- </tr>
- </table>
-
-
-
- <table border="0" cellpadding="0" cellspacing="0" id="rf_upd_tbl">
- <tr>
- <td class="rf_upd_font rf_upd_name">
- <div class="rf_upd_name_pdng">
- file_upload.html
- </div>
-
-
- <!--div class="rf_upd_bar_extr">
+ <div class="rf_upd_itm rf_upd_lst_width">
+ <div class="rf_upd_lnk"><a href="#" class="rf_upd_anc">Delete</a><br /></div>
+ <div class="rf_upd_fl">
+ <div class="rf_upd_name">
+ N:\Projects\UIComponents\4.0\fileUpload\fileUpload.html
+ </div>
+ <!-- div class="rf_upd_stb">
+
+ <div class="rf_upd_bar_extr">
<div class="rf_upd_bar_shell">
<div class="rf_upd_bar_uploaded">
</div>
</div>
- </div-->
-
- <div class="rf_upd_name_pdng">
- <br>
</div>
+
+ </div -->
+ <!-- div class="rf_upd_sts">
+ <b>Done</b>
+ </div -->
+ </div>
+ </div>
-
- </td>
- <td>
- <div class="rf_upd_font rf_upd_del"><a href="#" class="rf_upd_anc">Clear</a></div>
- <div class="rf_upd_font rf_upd_del"><br></div>
- </td>
- <td>
- <div class="rf_upd_font rf_upd_scrl"> </div>
- </td>
- </tr>
- </table>
-
-
-
- <table border="0" cellpadding="0" cellspacing="0" id="rf_upd_tbl">
- <tr>
- <td class="rf_upd_font rf_upd_name">
- <div class="rf_upd_name_pdng">
- file_upload.html
- </div>
-
-
- <!--div class="rf_upd_bar_extr">
+ <div class="rf_upd_itm rf_upd_lst_width">
+ <div class="rf_upd_lnk"><a href="#" class="rf_upd_anc">Delete</a><br /></div>
+ <div class="rf_upd_fl">
+ <div class="rf_upd_name">
+ file_upload.html
+ </div>
+ <!-- div class="rf_upd_stb">
+
+ <div class="rf_upd_bar_extr">
<div class="rf_upd_bar_shell">
<div class="rf_upd_bar_uploaded">
</div>
</div>
- </div-->
-
- <div class="rf_upd_name_pdng">
- <br>
</div>
+
+ </div -->
+ <!-- div class="rf_upd_sts">
+ <b>Done</b>
+ </div -->
+ </div>
+ </div>
-
- </td>
- <td>
- <div class="rf_upd_font rf_upd_del"><a href="#" class="rf_upd_anc">Clear</a></div>
- <div class="rf_upd_font rf_upd_del"><br></div>
- </td>
- <td>
- <div class="rf_upd_font rf_upd_scrl"> </div>
- </td>
- </tr>
- </table>
-
-
-
- <table border="0" cellpadding="0" cellspacing="0" id="rf_upd_tbl">
- <tr>
- <td class="rf_upd_font rf_upd_name">
- <div class="rf_upd_name_pdng">
- file_upload.html
- </div>
-
-
- <!--div class="rf_upd_bar_extr">
+ <div class="rf_upd_itm rf_upd_lst_width">
+ <div class="rf_upd_lnk"><a href="#" class="rf_upd_anc">Delete</a><br /></div>
+ <div class="rf_upd_fl">
+ <div class="rf_upd_name">
+ file_upload.html
+ </div>
+ <!-- div class="rf_upd_stb">
+
+ <div class="rf_upd_bar_extr">
<div class="rf_upd_bar_shell">
<div class="rf_upd_bar_uploaded">
</div>
</div>
- </div-->
-
- <div class="rf_upd_name_pdng">
- <br>
</div>
+
+ </div -->
+ <!-- div class="rf_upd_sts">
+ <b>Done</b>
+ </div -->
+ </div>
+ </div>
-
- </td>
- <td>
- <div class="rf_upd_font rf_upd_del"><a href="#" class="rf_upd_anc">Clear</a></div>
- <div class="rf_upd_font rf_upd_del"><br></div>
- </td>
- <td>
- <div class="rf_upd_font rf_upd_scrl"> </div>
- </td>
- </tr>
- </table>
+
+
</div>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r19730 - trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inplaceSelect/samples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-10-28 10:52:37 -0400 (Thu, 28 Oct 2010)
New Revision: 19730
Modified:
trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inplaceSelect/samples/inplaceSelect-sample.xhtml
Log:
https://jira.jboss.org/browse/RF-9208
Modified: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inplaceSelect/samples/inplaceSelect-sample.xhtml
===================================================================
--- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inplaceSelect/samples/inplaceSelect-sample.xhtml 2010-10-28 14:30:03 UTC (rev 19729)
+++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/inplaceSelect/samples/inplaceSelect-sample.xhtml 2010-10-28 14:52:37 UTC (rev 19730)
@@ -14,7 +14,8 @@
<h:outputText value="Simples select"></h:outputText>
</f:facet>
<rich:inplaceSelect defaultLabel="Click here to edit"
- openOnEdit="true" saveOnBlur="false">
+ openOnEdit="true" saveOnBlur="false" oninputchange="alert('10')"
+ onchange="alert('1')" oninputkeydown="alert('kdown')">
<f:selectItem itemValue="0" itemLabel="Option 1" />
<f:selectItem itemValue="1" itemLabel="Option 2" />
<f:selectItem itemValue="2" itemLabel="Option 3" />
@@ -22,21 +23,32 @@
<f:selectItem itemValue="4" itemLabel="Option 5" />
</rich:inplaceSelect>
</rich:panel>
- <p>In that sample component customized in next way:
- </p>
+ <p>In that sample component customized in next way:</p>
<ul>
- <li><b>f:selectItems</b> tag is used to define a list of items to use.</li>
- <li>Controls "save" and "cancel" are turned on with <b>showControls</b> attribute</li>
- <li><b>editEvent</b> set to dblclick and used to switch to edit state.</li>
+ <li><b>f:selectItems</b> tag is used to define a list of items
+ to use.</li>
+ <li>Controls "save" and "cancel" are turned on with <b>showControls</b>
+ attribute</li>
+ <li><b>editEvent</b> set to dblclick and used to switch to edit
+ state.</li>
+ <li><b>saveOnSelect</b> defined as false causes component not to store
+ value right after choosing but wait till buttons will be used or
+ focus lost.</li>
+ <li><b>saveOnBlur</b> defined as false causes component to cancel new
+ value if it was chosen and focus was lost without save button
+ activation. That could be useful on interfaces where every change
+ causes long processing. And if use true value - it will works like in
+ spreadsheets where leaving the changed field causes new value to be
+ applied.</li>
</ul>
<rich:panel style="width:220px;">
<f:facet name="header">
<h:outputText value="Select customization"></h:outputText>
</f:facet>
<rich:inplaceSelect editEvent="dblclick" id="inplaceSelect"
- showControls="true" saveOnBlur="true"
- value="#{inplaceSelectBean.value}" defaultLabel="Double click to edit value"
- openOnEdit="true">
+ showControls="true" saveOnSelect="false" saveOnBlur="false"
+ value="#{inplaceSelectBean.value}"
+ defaultLabel="Double click to edit value">
<f:selectItems value="#{inplaceSelectBean.capitalsOptions}" />
</rich:inplaceSelect>
</rich:panel>
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r19729 - in trunk: ui/output/ui/src/main/java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-10-28 10:30:03 -0400 (Thu, 28 Oct 2010)
New Revision: 19729
Modified:
trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml
trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java
trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tooltip.js
Log:
RF-9474 Tooltip component
small fixes
Modified: trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml
===================================================================
--- trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml 2010-10-28 14:15:26 UTC (rev 19728)
+++ trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml 2010-10-28 14:30:03 UTC (rev 19729)
@@ -49,7 +49,7 @@
<div id="div" style="border: 2px solid red; background-color: #adff2f; width:300px; height:300px">
Hello
- <pn:tooltip id="tooltip">
+ <pn:tooltip id="tooltip" target="div">
ToolTip Yo!!!
</pn:tooltip>
</div>
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-10-28 14:15:26 UTC (rev 19728)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-10-28 14:30:03 UTC (rev 19729)
@@ -57,7 +57,7 @@
}
public String getTarget() {
- return (String) getStateHelper().eval(PropertyKeys.target);
+ return (String) getStateHelper().eval(PropertyKeys.target, getParent().getClientId());
}
public void setTarget(String target) {
Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2010-10-28 14:15:26 UTC (rev 19728)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java 2010-10-28 14:30:03 UTC (rev 19729)
@@ -163,6 +163,7 @@
options.put("showDelay", tooltip.getShowDelay());
options.put("showEvent", tooltip.getShowEvent());
options.put("followMouse", tooltip.isFollowMouse());
+ options.put("target", tooltip.getTarget());
addEventOption(context, tooltip, options, HIDE);
addEventOption(context, tooltip, options, SHOW);
Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tooltip.js
===================================================================
--- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tooltip.js 2010-10-28 14:15:26 UTC (rev 19728)
+++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tooltip.js 2010-10-28 14:30:03 UTC (rev 19729)
@@ -116,36 +116,44 @@
* @param {Hash} options - params
* */
init : function (componentId, options) {
+ this.id = componentId
this.options = $.extend({}, DEFAULT_OPTIONS, this.options || {}, options || {});
this.attachToDom.call(this, componentId);
- rf.ui.Tooltip.$super.constructor.call(this, componentId);
-
this.mode = TooltipMode.ajax;
- this.options = options;
+ this.target = this.options.target;
this.__addUserEventHandler("hide");
this.__addUserEventHandler("show");
this.__addUserEventHandler("beforehide");
this.__addUserEventHandler("beforeshow");
- this.popup = new RichFaces.ui.Popup(this.id + ":cntr", {attachTo: "div", attachToBody: false, positionType: "TOOLTIP", positionOffset: [200,200]});
+ this.popup = new RichFaces.ui.Popup(this.id + ":cntr", {
+ attachTo: this.target,
+ attachToBody: false,
+ positionType: "TOOLTIP",
+ positionOffset: [200,200]
+ });
var tooltip = this;
function mouseMoveHandler(event) {
tooltip.popup.show(event);
}
- $("#div").bind(this.options.showEvent, function (event) {
+ $(this.options.target).bind(this.options.showEvent, function (event) {
tooltip.show(event);
- $("#div").bind("mousemove", mouseMoveHandler);
+ if (tooltip.options.followMouse) {
+ $(tooltip.target).bind("mousemove", mouseMoveHandler);
+ }
});
- $("#div").bind(this.options.hideEvent, function (event) {
+ $(tooltip.target).bind(this.options.hideEvent, function (event) {
tooltip.hide();
- $("#div").unbind("mousemove", mouseMoveHandler);
+ if (tooltip.options.followMouse) {
+ $(tooltip.target).unbind("mousemove", mouseMoveHandler);
+ }
});
},
13 years, 7 months
- 1
- 0
JBoss Rich Faces SVN: r19728 - in trunk/ui/input/ui/src: main/templates and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-10-28 10:15:26 -0400 (Thu, 28 Oct 2010)
New Revision: 19728
Modified:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java
trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml
trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml
Log:
add name attributes to the inputs
Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java
===================================================================
--- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2010-10-28 13:58:50 UTC (rev 19727)
+++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2010-10-28 14:15:26 UTC (rev 19728)
@@ -26,10 +26,8 @@
import java.util.HashMap;
import java.util.Map;
-import javax.faces.application.Resource;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
-import javax.faces.application.ResourceHandler;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -153,13 +151,7 @@
}
public String getResourcePath(FacesContext context, String resourceName) {
- if (resourceName != null) {
- ResourceHandler resourceHandler = context.getApplication()
- .getResourceHandler();
- Resource resource = resourceHandler.createResource(resourceName);
- return resource.getRequestPath();
- }
- return null;
+ return RenderKitUtils.getResourcePath(context, resourceName);
}
public String getStateStyleClass(UIComponent component, InplaceState inplaceState) {
Modified: trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-10-28 13:58:50 UTC (rev 19727)
+++ trunk/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2010-10-28 14:15:26 UTC (rev 19728)
@@ -44,11 +44,11 @@
</span>
<c:if test="#{!isDisable(inplaceState)}">
- <input id="#{clientId}Focus" type="image" style="position: absolute; top: 0px; left: 0px; outline-style: none;" class="rf-is-none" />
+ <input id="#{clientId}Focus" type="image" name="#{clientId}Focus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" class="rf-is-none" />
<span id="#{clientId}Edit" class="#{getEditStyleClass(component, inplaceState)}">
- <input id="#{clientId}selValue" name="#{clientId}" type="hidden" value="#{getValue(facesContext, component)}"/>
- <input id="#{clientId}Input" autocomplete="off"
+ <input id="#{clientId}selValue" name="#{clientId}" type="hidden" value="#{getInputValue(facesContext, component)}"/>
+ <input id="#{clientId}Input" name="#{clientId}Input" autocomplete="off"
type="text" value="#{getSelectInputLabel(facesContext, component)}"
class="rf-is-fld" style="width: #{component.attributes['inputWidth']};" readonly="readonly"
cdk:passThrough="tabIndex">
@@ -64,11 +64,11 @@
<span class="rf-is-shdw-b"></span>
<span id="#{clientId}Btn" style="position : relative;">
- <input type="image" id="#{clientId}Okbtn"
+ <input type="image" name="#{clientId}Okbtn" id="#{clientId}Okbtn"
src="#{getResourcePath(facesContext, 'org.richfaces/ico_ok.gif')}"
class="rf-is-btn" onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" />
- <input type="image" id="#{clientId}Cancelbtn"
+ <input name="#{clientId}Okbtn" type="image" id="#{clientId}Cancelbtn"
src="#{getResourcePath(facesContext,'org.richfaces/ico_cancel.gif')}"
class="rf-is-btn" onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" />
Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml
===================================================================
--- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2010-10-28 13:58:50 UTC (rev 19727)
+++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestDefault.xmlunit.xml 2010-10-28 14:15:26 UTC (rev 19728)
@@ -1,40 +1,45 @@
<span class="rf-is-d-s" id="form:inplaceSelectDefault">
- <span class="rf-is-lbl" id="form:inplaceSelectDefaultLabel">Edit Text</span>
- <input class="rf-is-none" id="form:inplaceSelectDefaultFocus"
- style="position: absolute; top: 0px; left: 0px; outline-style: none;"
- type="image" />
- <span class="rf-is-edit rf-is-none" id="form:inplaceSelectDefaultEdit">
- <input id="form:inplaceSelectDefaultselValue" name="form:inplaceSelectDefault"
- type="hidden" value="Edit Text" />
- <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectDefaultInput"
- readonly="readonly" style="width: ;" type="text" />
- <span class="rf-is-lst-cord" id="form:inplaceSelectDefaultList"
- style="display: none">
- <span class="rf-is-lst-pos" style="width: 250px">
- <span class="rf-is-shdw">
- <span class="rf-is-shdw-t"></span>
- <span class="rf-is-shdw-l"></span>
- <span class="rf-is-shdw-r"></span>
- <span class="rf-is-shdw-b"></span>
- <span class="rf-is-lst-dec">
- <span class="rf-is-lst-scrl" style="height: 100px">
- <span id="form:inplaceSelectDefaultItems">
- <span id="form:inplaceSelectDefaultItem0" class="rf-is-opt">Label#1
- </span>
- <span id="form:inplaceSelectDefaultItem1" class="rf-is-opt">Label#2
- </span>
- <span id="form:inplaceSelectDefaultItem2" class="rf-is-opt">Label#3
- </span>
- <span id="form:inplaceSelectDefaultItem3" class="rf-is-opt">Label#4
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- <script type="text/javascript">
- //ignored
- </script>
+ <span class="rf-is-lbl" id="form:inplaceSelectDefaultLabel">
+ Edit Text
+ </span>
+ <input class="rf-is-none" id="form:inplaceSelectDefaultFocus" name="form:inplaceSelectDefaultFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image"/>
+ <span class="rf-is-edit rf-is-none" id="form:inplaceSelectDefaultEdit">
+ <input id="form:inplaceSelectDefaultselValue" name="form:inplaceSelectDefault" type="hidden"/>
+ <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectDefaultInput" name="form:inplaceSelectDefaultInput" readonly="readonly" style="width: ;" type="text"/>
+ <span class="rf-is-lst-cord" id="form:inplaceSelectDefaultList" style="display: none">
+ <span class="rf-is-lst-pos" style="width: 250px">
+ <span class="rf-is-shdw">
+ <span class="rf-is-shdw-t">
+ </span>
+ <span class="rf-is-shdw-l">
+ </span>
+ <span class="rf-is-shdw-r">
+ </span>
+ <span class="rf-is-shdw-b">
+ </span>
+ <span class="rf-is-lst-dec">
+ <span class="rf-is-lst-scrl" style="height: 100px">
+ <span id="form:inplaceSelectDefaultItems">
+ <span id="form:inplaceSelectDefaultItem0" class="rf-is-opt">
+ Label#1
+ </span>
+ <span id="form:inplaceSelectDefaultItem1" class="rf-is-opt">
+ Label#2
+ </span>
+ <span id="form:inplaceSelectDefaultItem2" class="rf-is-opt">
+ Label#3
+ </span>
+ <span id="form:inplaceSelectDefaultItem3" class="rf-is-opt">
+ Label#4
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ <script type="text/javascript">
+ //ignored
+ </script>
</span>
Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml
===================================================================
--- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-10-28 13:58:50 UTC (rev 19727)
+++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2010-10-28 14:15:26 UTC (rev 19728)
@@ -1,63 +1,64 @@
<span class="rf-is-d-s rf-is-e-s" id="form:inplaceSelectEdit">
- <span class="rf-is-lbl" id="form:inplaceSelectEditLabel">Edit Text</span>
- <input class="rf-is-none" id="form:inplaceSelectEditFocus"
- style="position: absolute; top: 0px; left: 0px; outline-style: none;"
- type="image" />
- <span class="rf-is-edit" id="form:inplaceSelectEditEdit">
- <input id="form:inplaceSelectEditselValue" name="form:inplaceSelectEdit"
- type="hidden" value="Edit Text" />
- <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectEditInput"
- readonly="readonly" style="width: ;" type="text" />
- <span class="rf-is-btn-prepos">
- <span class="rf-is-btn-pos">
- <span class="rf-is-shdw" id="form:inplaceSelectEditBtnshadow">
- <span class="rf-is-shdw-t"></span>
- <span class="rf-is-shdw-l"></span>
- <span class="rf-is-shdw-r"></span>
- <span class="rf-is-shdw-b"></span>
- <span id="form:inplaceSelectEditBtn" style="position : relative;">
- <input class="rf-is-btn" id="form:inplaceSelectEditOkbtn"
- onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'"
- onmouseup="this.className='rf-is-btn'"
- src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf"
- type="image" />
- <input class="rf-is-btn" id="form:inplaceSelectEditCancelbtn"
- onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'"
- onmouseup="this.className='rf-is-btn'"
- src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf"
- type="image" />
- <br />
- </span>
- </span>
- </span>
- </span>
- <span class="rf-is-lst-cord" id="form:inplaceSelectEditList"
- style="display: none">
- <span class="rf-is-lst-pos" style="width: 250px">
- <span class="rf-is-shdw">
- <span class="rf-is-shdw-t"></span>
- <span class="rf-is-shdw-l"></span>
- <span class="rf-is-shdw-r"></span>
- <span class="rf-is-shdw-b"></span>
- <span class="rf-is-lst-dec">
- <span class="rf-is-lst-scrl" style="height: 100px">
- <span id="form:inplaceSelectEditItems">
- <span id="form:inplaceSelectEditItem0" class="rf-is-opt">Label#1
- </span>
- <span id="form:inplaceSelectEditItem1" class="rf-is-opt">Label#2
- </span>
- <span id="form:inplaceSelectEditItem2" class="rf-is-opt">Label#3
- </span>
- <span id="form:inplaceSelectEditItem3" class="rf-is-opt">Label#4
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- <script type="text/javascript">
- //ignored
- </script>
+ <span class="rf-is-lbl" id="form:inplaceSelectEditLabel">
+ Edit Text
+ </span>
+ <input class="rf-is-none" id="form:inplaceSelectEditFocus" name="form:inplaceSelectEditFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image"/>
+ <span class="rf-is-edit" id="form:inplaceSelectEditEdit">
+ <input id="form:inplaceSelectEditselValue" name="form:inplaceSelectEdit" type="hidden"/>
+ <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectEditInput" name="form:inplaceSelectEditInput" readonly="readonly" style="width: ;" type="text"/>
+ <span class="rf-is-btn-prepos">
+ <span class="rf-is-btn-pos">
+ <span class="rf-is-shdw" id="form:inplaceSelectEditBtnshadow">
+ <span class="rf-is-shdw-t">
+ </span>
+ <span class="rf-is-shdw-l">
+ </span>
+ <span class="rf-is-shdw-r">
+ </span>
+ <span class="rf-is-shdw-b">
+ </span>
+ <span id="form:inplaceSelectEditBtn" style="position : relative;">
+ <input class="rf-is-btn" id="form:inplaceSelectEditOkbtn" name="form:inplaceSelectEditOkbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf" type="image"/>
+ <input class="rf-is-btn" id="form:inplaceSelectEditCancelbtn" name="form:inplaceSelectEditOkbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf" type="image"/>
+ <br/>
+ </span>
+ </span>
+ </span>
+ </span>
+ <span class="rf-is-lst-cord" id="form:inplaceSelectEditList" style="display: none">
+ <span class="rf-is-lst-pos" style="width: 250px">
+ <span class="rf-is-shdw">
+ <span class="rf-is-shdw-t">
+ </span>
+ <span class="rf-is-shdw-l">
+ </span>
+ <span class="rf-is-shdw-r">
+ </span>
+ <span class="rf-is-shdw-b">
+ </span>
+ <span class="rf-is-lst-dec">
+ <span class="rf-is-lst-scrl" style="height: 100px">
+ <span id="form:inplaceSelectEditItems">
+ <span id="form:inplaceSelectEditItem0" class="rf-is-opt">
+ Label#1
+ </span>
+ <span id="form:inplaceSelectEditItem1" class="rf-is-opt">
+ Label#2
+ </span>
+ <span id="form:inplaceSelectEditItem2" class="rf-is-opt">
+ Label#3
+ </span>
+ <span id="form:inplaceSelectEditItem3" class="rf-is-opt">
+ Label#4
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ <script type="text/javascript">
+ //ignored
+ </script>
</span>
Modified: trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml
===================================================================
--- trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-10-28 13:58:50 UTC (rev 19727)
+++ trunk/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2010-10-28 14:15:26 UTC (rev 19728)
@@ -1,64 +1,64 @@
<span class="rf-is-d-s" id="form:inplaceSelectWithControls">
- <span class="rf-is-lbl" id="form:inplaceSelectWithControlsLabel">Edit Text</span>
- <input class="rf-is-none" id="form:inplaceSelectWithControlsFocus"
- style="position: absolute; top: 0px; left: 0px; outline-style: none;"
- type="image" />
- <span class="rf-is-edit rf-is-none" id="form:inplaceSelectWithControlsEdit">
- <input id="form:inplaceSelectWithControlsselValue" name="form:inplaceSelectWithControls"
- type="hidden" value="Edit Text" />
- <input autocomplete="off" class="rf-is-fld"
- id="form:inplaceSelectWithControlsInput" readonly="readonly" style="width: ;"
- type="text" />
- <span class="rf-is-btn-prepos">
- <span class="rf-is-btn-pos">
- <span class="rf-is-shdw" id="form:inplaceSelectWithControlsBtnshadow">
- <span class="rf-is-shdw-t"></span>
- <span class="rf-is-shdw-l"></span>
- <span class="rf-is-shdw-r"></span>
- <span class="rf-is-shdw-b"></span>
- <span id="form:inplaceSelectWithControlsBtn" style="position : relative;">
- <input class="rf-is-btn" id="form:inplaceSelectWithControlsOkbtn"
- onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'"
- onmouseup="this.className='rf-is-btn'"
- src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf"
- type="image" />
- <input class="rf-is-btn" id="form:inplaceSelectWithControlsCancelbtn"
- onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'"
- onmouseup="this.className='rf-is-btn'"
- src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf"
- type="image" />
- <br />
- </span>
- </span>
- </span>
- </span>
- <span class="rf-is-lst-cord" id="form:inplaceSelectWithControlsList"
- style="display: none">
- <span class="rf-is-lst-pos" style="width: 250px">
- <span class="rf-is-shdw">
- <span class="rf-is-shdw-t"></span>
- <span class="rf-is-shdw-l"></span>
- <span class="rf-is-shdw-r"></span>
- <span class="rf-is-shdw-b"></span>
- <span class="rf-is-lst-dec">
- <span class="rf-is-lst-scrl" style="height: 100px">
- <span id="form:inplaceSelectWithControlsItems">
- <span id="form:inplaceSelectWithControlsItem0" class="rf-is-opt">Label#1
- </span>
- <span id="form:inplaceSelectWithControlsItem1" class="rf-is-opt">Label#2
- </span>
- <span id="form:inplaceSelectWithControlsItem2" class="rf-is-opt">Label#3
- </span>
- <span id="form:inplaceSelectWithControlsItem3" class="rf-is-opt">Label#4
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- <script type="text/javascript">
- //ignore
- </script>
+ <span class="rf-is-lbl" id="form:inplaceSelectWithControlsLabel">
+ Edit Text
+ </span>
+ <input class="rf-is-none" id="form:inplaceSelectWithControlsFocus" name="form:inplaceSelectWithControlsFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image"/>
+ <span class="rf-is-edit rf-is-none" id="form:inplaceSelectWithControlsEdit">
+ <input id="form:inplaceSelectWithControlsselValue" name="form:inplaceSelectWithControls" type="hidden"/>
+ <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectWithControlsInput" name="form:inplaceSelectWithControlsInput" readonly="readonly" style="width: ;" type="text"/>
+ <span class="rf-is-btn-prepos">
+ <span class="rf-is-btn-pos">
+ <span class="rf-is-shdw" id="form:inplaceSelectWithControlsBtnshadow">
+ <span class="rf-is-shdw-t">
+ </span>
+ <span class="rf-is-shdw-l">
+ </span>
+ <span class="rf-is-shdw-r">
+ </span>
+ <span class="rf-is-shdw-b">
+ </span>
+ <span id="form:inplaceSelectWithControlsBtn" style="position : relative;">
+ <input class="rf-is-btn" id="form:inplaceSelectWithControlsOkbtn" name="form:inplaceSelectWithControlsOkbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/org.richfaces/ico_ok.gif.jsf" type="image"/>
+ <input class="rf-is-btn" id="form:inplaceSelectWithControlsCancelbtn" name="form:inplaceSelectWithControlsOkbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/org.richfaces/ico_cancel.gif.jsf" type="image"/>
+ <br/>
+ </span>
+ </span>
+ </span>
+ </span>
+ <span class="rf-is-lst-cord" id="form:inplaceSelectWithControlsList" style="display: none">
+ <span class="rf-is-lst-pos" style="width: 250px">
+ <span class="rf-is-shdw">
+ <span class="rf-is-shdw-t">
+ </span>
+ <span class="rf-is-shdw-l">
+ </span>
+ <span class="rf-is-shdw-r">
+ </span>
+ <span class="rf-is-shdw-b">
+ </span>
+ <span class="rf-is-lst-dec">
+ <span class="rf-is-lst-scrl" style="height: 100px">
+ <span id="form:inplaceSelectWithControlsItems">
+ <span id="form:inplaceSelectWithControlsItem0" class="rf-is-opt">
+ Label#1
+ </span>
+ <span id="form:inplaceSelectWithControlsItem1" class="rf-is-opt">
+ Label#2
+ </span>
+ <span id="form:inplaceSelectWithControlsItem2" class="rf-is-opt">
+ Label#3
+ </span>
+ <span id="form:inplaceSelectWithControlsItem3" class="rf-is-opt">
+ Label#4
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ </span>
+ <script type="text/javascript">
+ //ignored
+ </script>
</span>
\ No newline at end of file
13 years, 7 months
- 1
- 0