You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2009/12/21 10:14:17 UTC
svn commit: r892737 [2/2] - in /myfaces/tobago/branches/tobago-1.0.x:
core/src/main/java/org/apache/myfaces/tobago/context/
core/src/main/java/org/apache/myfaces/tobago/layout/
core/src/main/java/org/apache/myfaces/tobago/portlet/
core/src/main/java/or...
Modified: myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java Mon Dec 21 09:14:14 2009
@@ -1,62 +1,62 @@
-package org.apache.myfaces.tobago.example.test.tc.button;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.myfaces.tobago.example.test.MultiSuffixSeleniumTest;
-import org.apache.myfaces.tobago.example.test.Parameterized;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(Parameterized.class)
-public class LinkAttributeSeleniumTest extends MultiSuffixSeleniumTest {
-
- public LinkAttributeSeleniumTest(String suffix) {
- super(suffix);
- }
-
- @Test
- public void testInternalLinkWithSlash() {
- open("/tc/button/link-attribute.");
- selenium.click("page:button-internal-link-with-slash");
- Assert.assertEquals(
- getHtmlSource(),
- "A simple page for the resource test (static).", selenium.getText("//html/body"));
- }
-
- @Test
- public void testInternalLinkWithoutSlash() {
- open("/tc/button/link-attribute.");
- selenium.click("page:button-internal-link-without-slash");
- Assert.assertEquals(
- getHtmlSource(),
- "A simple page for the resource test (static).", selenium.getText("//html/body"));
- }
-
- @Test
- public void testExternalLink() throws InterruptedException {
- open("/tc/button/link-attribute.");
- selenium.click("page:button-external-link");
- // XXX This sleep call is not nice...
- sleep();
- // go to the apache home page
- Assert.assertTrue(
- getHtmlSource(),
- selenium.getText("//html/head/title").contains("Apache Software Foundation"));
- }
-}
+package org.apache.myfaces.tobago.example.test.tc.button;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.example.test.MultiSuffixSeleniumTest;
+import org.apache.myfaces.tobago.example.test.Parameterized;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Parameterized.class)
+public class LinkAttributeSeleniumTest extends MultiSuffixSeleniumTest {
+
+ public LinkAttributeSeleniumTest(String suffix) {
+ super(suffix);
+ }
+
+ @Test
+ public void testInternalLinkWithSlash() {
+ open("/tc/button/link-attribute.");
+ selenium.click("page:button-internal-link-with-slash");
+ Assert.assertEquals(
+ getHtmlSource(),
+ "A simple page for the resource test (static).", selenium.getText("//html/body"));
+ }
+
+ @Test
+ public void testInternalLinkWithoutSlash() {
+ open("/tc/button/link-attribute.");
+ selenium.click("page:button-internal-link-without-slash");
+ Assert.assertEquals(
+ getHtmlSource(),
+ "A simple page for the resource test (static).", selenium.getText("//html/body"));
+ }
+
+ @Test
+ public void testExternalLink() throws InterruptedException {
+ open("/tc/button/link-attribute.");
+ selenium.click("page:button-external-link");
+ // XXX This sleep call is not nice...
+ sleep();
+ // go to the apache home page
+ Assert.assertTrue(
+ getHtmlSource(),
+ selenium.getText("//html/head/title").contains("Apache Software Foundation"));
+ }
+}
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/LinkAttributeSeleniumTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java Mon Dec 21 09:14:14 2009
@@ -1,52 +1,52 @@
-package org.apache.myfaces.tobago.example.test.tc.button;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.myfaces.tobago.example.test.MultiSuffixSeleniumTest;
-import org.apache.myfaces.tobago.example.test.Parameterized;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(Parameterized.class)
-public class ResourceAttributeSeleniumTest extends MultiSuffixSeleniumTest {
-
- public ResourceAttributeSeleniumTest(String suffix) {
- super(suffix);
- }
-
- @Test
- public void testHtmlResource() throws InterruptedException {
- open("/tc/button/resource-attribute.");
- selenium.click("page:button-html-resource");
- // XXX This sleep call is not nice...
- sleep();
- Assert.assertEquals(getHtmlSource(),
- "Eine einfache Seite für den Resourcen-Test (statisch).", selenium.getText("//html/body"));
- }
-
- @Test
- public void testXhtmlResource() throws InterruptedException {
- open("/tc/button/resource-attribute.");
- selenium.click("page:button-xhtml-resource");
- // XXX This sleep call is not nice...
- sleep();
- Assert.assertTrue(getHtmlSource(),
- selenium.getText("//html/body").contains("Eine einfache Seite für den Resourcen-Test (dynamisch)."));
- }
-}
+package org.apache.myfaces.tobago.example.test.tc.button;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.example.test.MultiSuffixSeleniumTest;
+import org.apache.myfaces.tobago.example.test.Parameterized;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(Parameterized.class)
+public class ResourceAttributeSeleniumTest extends MultiSuffixSeleniumTest {
+
+ public ResourceAttributeSeleniumTest(String suffix) {
+ super(suffix);
+ }
+
+ @Test
+ public void testHtmlResource() throws InterruptedException {
+ open("/tc/button/resource-attribute.");
+ selenium.click("page:button-html-resource");
+ // XXX This sleep call is not nice...
+ sleep();
+ Assert.assertEquals(getHtmlSource(),
+ "Eine einfache Seite für den Resourcen-Test (statisch).", selenium.getText("//html/body"));
+ }
+
+ @Test
+ public void testXhtmlResource() throws InterruptedException {
+ open("/tc/button/resource-attribute.");
+ selenium.click("page:button-xhtml-resource");
+ // XXX This sleep call is not nice...
+ sleep();
+ Assert.assertTrue(getHtmlSource(),
+ selenium.getText("//html/body").contains("Eine einfache Seite für den Resourcen-Test (dynamisch)."));
+ }
+}
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/test/src/test/java/org/apache/myfaces/tobago/example/test/tc/button/ResourceAttributeSeleniumTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/event/FacesEventWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/event/FacesEventWrapper.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/facelets/TobagoSandboxTagLibrary.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/facelets/TobagoSandboxTagLibrary.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/facelets/sandbox/WizardComponentHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/facelets/sandbox/WizardComponentHandler.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java Mon Dec 21 09:14:14 2009
@@ -1,180 +1,180 @@
-package org.apache.myfaces.tobago.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public abstract class AbstractCrudController implements Crud {
-
- private String defaultOutcome;
-
- private boolean showDetail;
-
- private boolean itemEditable;
-
- protected AbstractCrudController() {
- reset();
- }
-
- /**
- * @see Crud#getShowDetail()
- */
- public final boolean getShowDetail() {
- return showDetail;
- }
-
- /**
- * @see Crud#isItemEditable()
- */
- public final boolean isItemEditable() {
- return itemEditable;
- }
-
- /**
- * @see Crud#deleteItem()
- */
- public final String deleteItem() {
- doDeleteItem();
- return getDefaultOutcome();
- }
-
- /**
- * <p>
- * Hook for the implementation of business logic, after invoking the action
- * {@link AbstractCrudController#deleteItem()}. If the execution of the
- * business logic completed successfully, the method has to return <i>true</i>.
- * Otherwise the method has to return <i>false</i>.
- * </p>
- *
- * @return true if the method completed sucessfully, false if not
- */
- protected abstract boolean doDeleteItem();
-
- /**
- * @see Crud#showItem()
- */
- public final String showItem() {
- itemEditable = false;
- showDetail = doShowItem() ? true : false;
- return getDefaultOutcome();
- }
-
- /**
- * @see Crud#editItem()
- */
- public final String editItem() {
- itemEditable = true;
- showDetail = doShowItem() ? true : false;
- return getDefaultOutcome();
- }
-
- /**
- * <p>
- * Hook for the implementation of business logic, after invoking the action
- * {@link AbstractCrudController#showItem()}. If the execution of the
- * business logic completed successfully, the method has to return <i>true</i>.
- * Otherwise the method has to return <i>false</i>.
- * </p>
- *
- * @return true if the method completed sucessfully, false if not
- */
- protected abstract boolean doShowItem();
-
- /**
- * @see Crud#createItem()
- */
- public final String createItem() {
- itemEditable = true;
- showDetail = doCreateItem() ? true : false;
- return getDefaultOutcome();
- }
-
- /**
- * <p>
- * Hook for the implementation of business logic, after invoking the action
- * {@link AbstractCrudController#createItem()}. If the execution of the
- * business logic completed successfully, the method has to return <i>true</i>.
- * Otherwise the method has to return <i>false</i>.
- * </p>
- *
- * @return true if the method completed sucessfully, false if not
- */
- protected abstract boolean doCreateItem();
-
- /**
- * @see Crud#saveItem()
- */
- public final String saveItem() {
- showDetail = doSaveItem() ? false : true;
- return getDefaultOutcome();
- }
-
- /**
- * <p>
- * Hook for the implementation of business logic, after invoking the action
- * {@link AbstractCrudController#saveItem()}. If the execution of the
- * business logic completed successfully, the method has to return <i>true</i>.
- * Otherwise the method has to return <i>false</i>.
- * </p>
- *
- * @return true if the method completed sucessfully, false if not
- */
- protected abstract boolean doSaveItem();
-
- /**
- * @see Crud#cancelItem()
- */
- public final String cancelItem() {
- // doCancelItem();
- showDetail = false;
- return getDefaultOutcome();
- }
-
- //
- // /**
- // * <p>
- // * Hook for the implementation of business logic, after invoking the action
- // {@link AbstractCrudController#cancelItem()}.
- // * </p>
- // */
- // public abstract void doCancelItem();
-
- /**
- * @return The outcome for the actions of the crud component
- */
- protected final String getDefaultOutcome() {
- return this.defaultOutcome;
- }
-
- /**
- * Set the outcome for all actions of the crud component.
- *
- * @param defaultOutcome
- * The outcome for all actions of the crud component
- */
- public final void setDefaultOutcome(String defaultOutcome) {
- this.defaultOutcome = defaultOutcome;
- }
-
- /**
- * Helper mehtod to reset the controllers attributes.
- */
- protected void reset() {
- showDetail = false;
- itemEditable = false;
- }
-
-}
+package org.apache.myfaces.tobago.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public abstract class AbstractCrudController implements Crud {
+
+ private String defaultOutcome;
+
+ private boolean showDetail;
+
+ private boolean itemEditable;
+
+ protected AbstractCrudController() {
+ reset();
+ }
+
+ /**
+ * @see Crud#getShowDetail()
+ */
+ public final boolean getShowDetail() {
+ return showDetail;
+ }
+
+ /**
+ * @see Crud#isItemEditable()
+ */
+ public final boolean isItemEditable() {
+ return itemEditable;
+ }
+
+ /**
+ * @see Crud#deleteItem()
+ */
+ public final String deleteItem() {
+ doDeleteItem();
+ return getDefaultOutcome();
+ }
+
+ /**
+ * <p>
+ * Hook for the implementation of business logic, after invoking the action
+ * {@link AbstractCrudController#deleteItem()}. If the execution of the
+ * business logic completed successfully, the method has to return <i>true</i>.
+ * Otherwise the method has to return <i>false</i>.
+ * </p>
+ *
+ * @return true if the method completed sucessfully, false if not
+ */
+ protected abstract boolean doDeleteItem();
+
+ /**
+ * @see Crud#showItem()
+ */
+ public final String showItem() {
+ itemEditable = false;
+ showDetail = doShowItem() ? true : false;
+ return getDefaultOutcome();
+ }
+
+ /**
+ * @see Crud#editItem()
+ */
+ public final String editItem() {
+ itemEditable = true;
+ showDetail = doShowItem() ? true : false;
+ return getDefaultOutcome();
+ }
+
+ /**
+ * <p>
+ * Hook for the implementation of business logic, after invoking the action
+ * {@link AbstractCrudController#showItem()}. If the execution of the
+ * business logic completed successfully, the method has to return <i>true</i>.
+ * Otherwise the method has to return <i>false</i>.
+ * </p>
+ *
+ * @return true if the method completed sucessfully, false if not
+ */
+ protected abstract boolean doShowItem();
+
+ /**
+ * @see Crud#createItem()
+ */
+ public final String createItem() {
+ itemEditable = true;
+ showDetail = doCreateItem() ? true : false;
+ return getDefaultOutcome();
+ }
+
+ /**
+ * <p>
+ * Hook for the implementation of business logic, after invoking the action
+ * {@link AbstractCrudController#createItem()}. If the execution of the
+ * business logic completed successfully, the method has to return <i>true</i>.
+ * Otherwise the method has to return <i>false</i>.
+ * </p>
+ *
+ * @return true if the method completed sucessfully, false if not
+ */
+ protected abstract boolean doCreateItem();
+
+ /**
+ * @see Crud#saveItem()
+ */
+ public final String saveItem() {
+ showDetail = doSaveItem() ? false : true;
+ return getDefaultOutcome();
+ }
+
+ /**
+ * <p>
+ * Hook for the implementation of business logic, after invoking the action
+ * {@link AbstractCrudController#saveItem()}. If the execution of the
+ * business logic completed successfully, the method has to return <i>true</i>.
+ * Otherwise the method has to return <i>false</i>.
+ * </p>
+ *
+ * @return true if the method completed sucessfully, false if not
+ */
+ protected abstract boolean doSaveItem();
+
+ /**
+ * @see Crud#cancelItem()
+ */
+ public final String cancelItem() {
+ // doCancelItem();
+ showDetail = false;
+ return getDefaultOutcome();
+ }
+
+ //
+ // /**
+ // * <p>
+ // * Hook for the implementation of business logic, after invoking the action
+ // {@link AbstractCrudController#cancelItem()}.
+ // * </p>
+ // */
+ // public abstract void doCancelItem();
+
+ /**
+ * @return The outcome for the actions of the crud component
+ */
+ protected final String getDefaultOutcome() {
+ return this.defaultOutcome;
+ }
+
+ /**
+ * Set the outcome for all actions of the crud component.
+ *
+ * @param defaultOutcome
+ * The outcome for all actions of the crud component
+ */
+ public final void setDefaultOutcome(String defaultOutcome) {
+ this.defaultOutcome = defaultOutcome;
+ }
+
+ /**
+ * Helper mehtod to reset the controllers attributes.
+ */
+ protected void reset() {
+ showDetail = false;
+ itemEditable = false;
+ }
+
+}
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/AbstractCrudController.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java Mon Dec 21 09:14:14 2009
@@ -1,85 +1,85 @@
-package org.apache.myfaces.tobago.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public interface Crud {
-
- /**
- * Indicates if the crud component should show the crud detail view
- * otherwise the crud master view is shown
- *
- * @return True if the detail view should be shown, false if the master view
- * should be shown
- */
- boolean getShowDetail();
-
- /**
- * Managed bean (controller) method to delete an selected item.
- *
- * @return The outcome after the method was executed
- */
- String deleteItem();
-
- /**
- * Managed bean (controller) method to show an selected item on the CRUD
- * detail view.
- *
- * @return The outcome after the method was executed
- */
- String showItem();
-
- /**
- * Managed bean (controller) method to show and edit an selected item on the
- * CRUD detail view.
- *
- * @return The outcome after the method was executed
- */
- String editItem();
-
- /**
- * Managed bean (controller) method to create a new item on the CRUD detail
- * view.
- *
- * @return The outcome after the method was executed
- */
- String createItem();
-
- /**
- * Managed bean (controller) method to save changes to a existing item or
- * save a newly created item on the crud detail view.
- *
- * @return The outcome after the method was executed
- */
- String saveItem();
-
- /**
- * Managed bean (controller) method to exit the crud detail view without
- * saving.
- *
- * @return The outcome after the method was executed
- */
- String cancelItem();
-
- /**
- * Indicates wether an item shown in the CRUD detail view is editable.
- *
- * @return true if the shown item is editable, false if not
- */
- boolean isItemEditable();
-
-}
+package org.apache.myfaces.tobago.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public interface Crud {
+
+ /**
+ * Indicates if the crud component should show the crud detail view
+ * otherwise the crud master view is shown
+ *
+ * @return True if the detail view should be shown, false if the master view
+ * should be shown
+ */
+ boolean getShowDetail();
+
+ /**
+ * Managed bean (controller) method to delete an selected item.
+ *
+ * @return The outcome after the method was executed
+ */
+ String deleteItem();
+
+ /**
+ * Managed bean (controller) method to show an selected item on the CRUD
+ * detail view.
+ *
+ * @return The outcome after the method was executed
+ */
+ String showItem();
+
+ /**
+ * Managed bean (controller) method to show and edit an selected item on the
+ * CRUD detail view.
+ *
+ * @return The outcome after the method was executed
+ */
+ String editItem();
+
+ /**
+ * Managed bean (controller) method to create a new item on the CRUD detail
+ * view.
+ *
+ * @return The outcome after the method was executed
+ */
+ String createItem();
+
+ /**
+ * Managed bean (controller) method to save changes to a existing item or
+ * save a newly created item on the crud detail view.
+ *
+ * @return The outcome after the method was executed
+ */
+ String saveItem();
+
+ /**
+ * Managed bean (controller) method to exit the crud detail view without
+ * saving.
+ *
+ * @return The outcome after the method was executed
+ */
+ String cancelItem();
+
+ /**
+ * Indicates wether an item shown in the CRUD detail view is editable.
+ *
+ * @return true if the shown item is editable, false if not
+ */
+ boolean isItemEditable();
+
+}
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/Crud.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/Wizard.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/Wizard.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java Mon Dec 21 09:14:14 2009
@@ -1,70 +1,70 @@
-package org.apache.myfaces.tobago.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * User: lofwyr
- * Date: 15.05.2008 09:33:43
- */
-
-public class WizardStep {
-
- private String outcome;
- private String title;
- private int index;
-
- public WizardStep(int index) {
- this.index = index;
- }
-
- public String getOutcome() {
- return outcome;
- }
-
- public void setOutcome(String outcome) {
- this.outcome = outcome;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public int getIndex() {
- return index;
- }
-
- public void setIndex(int index) {
- this.index = index;
- }
-
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("#");
- builder.append(index);
- builder.append(" outcome='");
- builder.append(outcome);
- builder.append("' title='");
- builder.append(title);
- builder.append("'");
- return builder.toString();
- }
-}
+package org.apache.myfaces.tobago.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * User: lofwyr
+ * Date: 15.05.2008 09:33:43
+ */
+
+public class WizardStep {
+
+ private String outcome;
+ private String title;
+ private int index;
+
+ public WizardStep(int index) {
+ this.index = index;
+ }
+
+ public String getOutcome() {
+ return outcome;
+ }
+
+ public void setOutcome(String outcome) {
+ this.outcome = outcome;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("#");
+ builder.append(index);
+ builder.append(" outcome='");
+ builder.append(outcome);
+ builder.append("' title='");
+ builder.append(title);
+ builder.append("'");
+ return builder.toString();
+ }
+}
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardStep.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardCancelTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardCancelTag.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardExtensionTag.java?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardExtensionTag.java Mon Dec 21 09:14:14 2009
@@ -1,136 +1,136 @@
-package org.apache.myfaces.tobago.taglib.sandbox;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.FACET_LAYOUT;
-import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
-import org.apache.myfaces.tobago.apt.annotation.Tag;
-import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.taglib.component.GridLayoutTag;
-import org.apache.myfaces.tobago.taglib.component.PanelTag;
-
-import javax.faces.webapp.FacetTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-@Tag(name = "tx_wizard")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.sandbox.WizardExtensionTag")
-public class WizardExtensionTag extends BodyTagSupport {
-
- private static final Log LOG = LogFactory.getLog(WizardExtensionTag.class);
-
- private String controller;
-
- private String outcome;
- private String title;
- private String allowJumpForward;
-
- private WizardTag controllerTag;
- private PanelTag panelTag;
-
- @Override
- public int doStartTag() throws JspException {
-
- controllerTag = new WizardTag();
- controllerTag.setPageContext(pageContext);
- controllerTag.setParent(getParent());
- controllerTag.setController(controller);
-
- controllerTag.setOutcome(outcome);
- controllerTag.setTitle(title);
- controllerTag.setAllowJumpForward(allowJumpForward);
-
- // todo: change "w" to ? or make it configurable or settable over this tag? Whould this be helpful?
- controllerTag.setVar("w");
-
- controllerTag.doStartTag();
-
- panelTag = new PanelTag();
- panelTag.setPageContext(pageContext);
- panelTag.setParent(controllerTag);
-/* todo
- if (rendered != null) {
- panelTag.setRendered(rendered);
- }
-*/
- panelTag.doStartTag();
-
- FacetTag facetTag = new FacetTag();
- facetTag.setPageContext(pageContext);
- facetTag.setName(FACET_LAYOUT);
- facetTag.setParent(panelTag);
- facetTag.doStartTag();
-
- GridLayoutTag gridLayoutTag = new GridLayoutTag();
- gridLayoutTag.setPageContext(pageContext);
- gridLayoutTag.setRows("fixed;*;fixed");
- gridLayoutTag.setParent(facetTag);
- gridLayoutTag.doStartTag();
- gridLayoutTag.doEndTag();
-
- facetTag.doEndTag();
-
- return super.doStartTag();
- }
-
- @Override
- public int doEndTag() throws JspException {
-
- panelTag.doEndTag();
-
- controllerTag.doEndTag();
-
- return super.doEndTag();
- }
-
- @Override
- public void release() {
- super.release();
- controller = null;
- outcome = null;
- title = null;
- panelTag = null;
- }
-
- @TagAttribute(required = true)
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.Wizard")
- public void setController(String controller) {
- this.controller = controller;
- }
-
- @TagAttribute
- @UIComponentTagAttribute
- public void setOutcome(String outcome) {
- this.outcome = outcome;
- }
-
- @TagAttribute
- @UIComponentTagAttribute
- public void setTitle(String title) {
- this.title = title;
- }
-
- @TagAttribute
- @UIComponentTagAttribute(type="java.lang.Boolean")
- public void setAllowJumpForward(String allowJumpForward) {
- this.allowJumpForward = allowJumpForward;
- }
-}
+package org.apache.myfaces.tobago.taglib.sandbox;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import static org.apache.myfaces.tobago.TobagoConstants.FACET_LAYOUT;
+import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
+import org.apache.myfaces.tobago.apt.annotation.Tag;
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.taglib.component.GridLayoutTag;
+import org.apache.myfaces.tobago.taglib.component.PanelTag;
+
+import javax.faces.webapp.FacetTag;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+@Tag(name = "tx_wizard")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.sandbox.WizardExtensionTag")
+public class WizardExtensionTag extends BodyTagSupport {
+
+ private static final Log LOG = LogFactory.getLog(WizardExtensionTag.class);
+
+ private String controller;
+
+ private String outcome;
+ private String title;
+ private String allowJumpForward;
+
+ private WizardTag controllerTag;
+ private PanelTag panelTag;
+
+ @Override
+ public int doStartTag() throws JspException {
+
+ controllerTag = new WizardTag();
+ controllerTag.setPageContext(pageContext);
+ controllerTag.setParent(getParent());
+ controllerTag.setController(controller);
+
+ controllerTag.setOutcome(outcome);
+ controllerTag.setTitle(title);
+ controllerTag.setAllowJumpForward(allowJumpForward);
+
+ // todo: change "w" to ? or make it configurable or settable over this tag? Whould this be helpful?
+ controllerTag.setVar("w");
+
+ controllerTag.doStartTag();
+
+ panelTag = new PanelTag();
+ panelTag.setPageContext(pageContext);
+ panelTag.setParent(controllerTag);
+/* todo
+ if (rendered != null) {
+ panelTag.setRendered(rendered);
+ }
+*/
+ panelTag.doStartTag();
+
+ FacetTag facetTag = new FacetTag();
+ facetTag.setPageContext(pageContext);
+ facetTag.setName(FACET_LAYOUT);
+ facetTag.setParent(panelTag);
+ facetTag.doStartTag();
+
+ GridLayoutTag gridLayoutTag = new GridLayoutTag();
+ gridLayoutTag.setPageContext(pageContext);
+ gridLayoutTag.setRows("fixed;*;fixed");
+ gridLayoutTag.setParent(facetTag);
+ gridLayoutTag.doStartTag();
+ gridLayoutTag.doEndTag();
+
+ facetTag.doEndTag();
+
+ return super.doStartTag();
+ }
+
+ @Override
+ public int doEndTag() throws JspException {
+
+ panelTag.doEndTag();
+
+ controllerTag.doEndTag();
+
+ return super.doEndTag();
+ }
+
+ @Override
+ public void release() {
+ super.release();
+ controller = null;
+ outcome = null;
+ title = null;
+ panelTag = null;
+ }
+
+ @TagAttribute(required = true)
+ @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.Wizard")
+ public void setController(String controller) {
+ this.controller = controller;
+ }
+
+ @TagAttribute
+ @UIComponentTagAttribute
+ public void setOutcome(String outcome) {
+ this.outcome = outcome;
+ }
+
+ @TagAttribute
+ @UIComponentTagAttribute
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ @TagAttribute
+ @UIComponentTagAttribute(type="java.lang.Boolean")
+ public void setAllowJumpForward(String allowJumpForward) {
+ this.allowJumpForward = allowJumpForward;
+ }
+}
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardExtensionTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardExtensionTag.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardFinishTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardFinishTag.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardNextTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardNextTag.java?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardNextTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardNextTag.java Mon Dec 21 09:14:14 2009
@@ -1,82 +1,82 @@
-package org.apache.myfaces.tobago.taglib.sandbox;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
-import org.apache.myfaces.tobago.apt.annotation.Tag;
-import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.taglib.component.ButtonTag;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-@Tag(name = "wizardNext")
-@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.sandbox.WizardNextTag")
-public class WizardNextTag extends BodyTagSupport {
-
- private String wizard;
- private String action;
- private String label;
-
- @Override
- public int doStartTag() throws JspException {
-
- int result = super.doStartTag();
-
- ButtonTag button = new ButtonTag();
- button.setPageContext(pageContext);
- button.setParent(getParent());
- button.setLabel(StringUtils.isEmpty(label) ? "Next" : label); // todo: i18n
- button.setAction(action);
- button.setActionListener("#{" + wizard + ".next}");
- button.setDisabled(Boolean.toString(action == null));
-// button.setDisabled(controller.replace("}", ".nextAvailable}").replace("#{", "#{!"));
- button.doStartTag();
- button.doEndTag();
-
- return result;
- }
-
- @Override
- public void release() {
- super.release();
- wizard = null;
- action = null;
- label = null;
- }
-
- @TagAttribute(required = true)
- @UIComponentTagAttribute
- public void setWizard(String wizard) {
- this.wizard = wizard;
- }
-
- @TagAttribute
- @UIComponentTagAttribute
- public void setAction(String action) {
- this.action = action;
- }
-
- @TagAttribute
- @UIComponentTagAttribute
- public void setLabel(String label) {
- this.label = label;
- }
-}
+package org.apache.myfaces.tobago.taglib.sandbox;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
+import org.apache.myfaces.tobago.apt.annotation.Tag;
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.taglib.component.ButtonTag;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+@Tag(name = "wizardNext")
+@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.sandbox.WizardNextTag")
+public class WizardNextTag extends BodyTagSupport {
+
+ private String wizard;
+ private String action;
+ private String label;
+
+ @Override
+ public int doStartTag() throws JspException {
+
+ int result = super.doStartTag();
+
+ ButtonTag button = new ButtonTag();
+ button.setPageContext(pageContext);
+ button.setParent(getParent());
+ button.setLabel(StringUtils.isEmpty(label) ? "Next" : label); // todo: i18n
+ button.setAction(action);
+ button.setActionListener("#{" + wizard + ".next}");
+ button.setDisabled(Boolean.toString(action == null));
+// button.setDisabled(controller.replace("}", ".nextAvailable}").replace("#{", "#{!"));
+ button.doStartTag();
+ button.doEndTag();
+
+ return result;
+ }
+
+ @Override
+ public void release() {
+ super.release();
+ wizard = null;
+ action = null;
+ label = null;
+ }
+
+ @TagAttribute(required = true)
+ @UIComponentTagAttribute
+ public void setWizard(String wizard) {
+ this.wizard = wizard;
+ }
+
+ @TagAttribute
+ @UIComponentTagAttribute
+ public void setAction(String action) {
+ this.action = action;
+ }
+
+ @TagAttribute
+ @UIComponentTagAttribute
+ public void setLabel(String label) {
+ this.label = label;
+ }
+}
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardNextTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardNextTag.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardPreviousTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardPreviousTag.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java Mon Dec 21 09:14:14 2009
@@ -1,71 +1,71 @@
-package org.apache.myfaces.tobago.taglib.sandbox;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
-import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
-import org.apache.myfaces.tobago.apt.annotation.Tag;
-import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
-
-/**
- * Renders a fexible Wizard.
- */
-@Tag(name = "wizard")
-@BodyContentDescription(anyTagOf = "facestag")
-@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UIWizard",
- rendererType = "Wizard")
-public interface WizardTagDeclaration extends HasIdBindingAndRendered {
-
- @TagAttribute(required = true)
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.Wizard",
- expression = DynamicExpression.VALUE_BINDING)
- void setController(String controller);
-
- /**
- * Name of a request-scope attribute under which the model data will be exposed.
- */
- @TagAttribute(required = true)
- @UIComponentTagAttribute(expression = DynamicExpression.NONE)
- void setVar(String var);
-
- /**
- * Outcome to navigate to this page.
- */
- @TagAttribute(required = true)
- @UIComponentTagAttribute(expression = DynamicExpression.NONE)
- void setOutcome(String outcome);
-
- /**
- * Title of this page
- */
- @TagAttribute
- @UIComponentTagAttribute
- void setTitle(String title);
-
- /**
- * Is a jump forward to folling pages allowed?
- */
- @TagAttribute
- @UIComponentTagAttribute(type = "java.lang.Boolean")
- void setAllowJumpForward(String allowJumpForward);
-}
-
+package org.apache.myfaces.tobago.taglib.sandbox;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
+import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
+import org.apache.myfaces.tobago.apt.annotation.Tag;
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
+
+/**
+ * Renders a fexible Wizard.
+ */
+@Tag(name = "wizard")
+@BodyContentDescription(anyTagOf = "facestag")
+@UIComponentTag(
+ uiComponent = "org.apache.myfaces.tobago.component.UIWizard",
+ rendererType = "Wizard")
+public interface WizardTagDeclaration extends HasIdBindingAndRendered {
+
+ @TagAttribute(required = true)
+ @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.Wizard",
+ expression = DynamicExpression.VALUE_BINDING)
+ void setController(String controller);
+
+ /**
+ * Name of a request-scope attribute under which the model data will be exposed.
+ */
+ @TagAttribute(required = true)
+ @UIComponentTagAttribute(expression = DynamicExpression.NONE)
+ void setVar(String var);
+
+ /**
+ * Outcome to navigate to this page.
+ */
+ @TagAttribute(required = true)
+ @UIComponentTagAttribute(expression = DynamicExpression.NONE)
+ void setOutcome(String outcome);
+
+ /**
+ * Title of this page
+ */
+ @TagAttribute
+ @UIComponentTagAttribute
+ void setTitle(String title);
+
+ /**
+ * Is a jump forward to folling pages allowed?
+ */
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.Boolean")
+ void setAllowJumpForward(String allowJumpForward);
+}
+
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTrainTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTrainTag.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/crud-detail-navigation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/crud-detail-navigation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/crud-master-navigation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/crud-master-navigation.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/crud.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/crud.xml?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/crud.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/crud.xml Mon Dec 21 09:14:14 2009
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<ui:composition xmlns:c="http://java.sun.com/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
-
- <c:if test="${empty showMasterNavigation}">
- <c:set var="showMasterNavigation" value="true" />
- </c:if>
- <c:set var="replaceMasterNavigation" value="true" />
- <c:if test="${empty navigationMasterSource}" >
- <c:set var="replaceMasterNavigation" value="false" />
- </c:if>
-
- <c:if test="${empty showDetailNavigation}">
- <c:set var="showMasterNavigation" value="true" />
- </c:if>
- <c:set var="replaceDetailNavigation" value="true" />
- <c:if test="${empty navigationDetailSource}" >
- <c:set var="replaceDetailNavigation" value="false" />
- </c:if>
-
- <!-- show master or detail content view -->
- <c:choose>
- <c:when test="${!controller.showDetail}">
- <!-- master view -->
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="*;fixed" />
- </f:facet>
-
- <!-- detail content area -->
- <ui:include src="${contentMasterSource}" />
- <!-- detail navigation area -->
- <c:choose>
- <c:when test="${showMasterNavigation}">
- <c:choose>
- <c:when test="${replaceMasterNavigation}">
- <ui:include src="${navigationMasterSource}" />
- </c:when>
- <c:otherwise>
- <tfs:crud-master-navigation controller="${controller}" />
- </c:otherwise>
- </c:choose>
- </c:when>
- <c:otherwise>
- <tc:cell />
- </c:otherwise>
- </c:choose>
- </tc:panel>
- </c:when>
- <c:otherwise>
- <!--detail view -->
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="*;fixed" />
- </f:facet>
-
- <!-- detail content area -->
- <ui:include src="${contentDetailSource}" />
- <!-- detail navigation area -->
- <c:choose>
- <c:when test="${showDetailNavigation}">
- <c:choose>
- <c:when test="${replaceDetailNavigation}">
- <ui:include src="${navigationDetailSource}" />
- </c:when>
- <c:otherwise>
- <tfs:crud-detail-navigation controller="${controller}" />
- </c:otherwise>
- </c:choose>
- </c:when>
- <c:otherwise>
- <tc:cell />
- </c:otherwise>
- </c:choose>
- </tc:panel>
- </c:otherwise>
- </c:choose>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
+
+ <c:if test="${empty showMasterNavigation}">
+ <c:set var="showMasterNavigation" value="true" />
+ </c:if>
+ <c:set var="replaceMasterNavigation" value="true" />
+ <c:if test="${empty navigationMasterSource}" >
+ <c:set var="replaceMasterNavigation" value="false" />
+ </c:if>
+
+ <c:if test="${empty showDetailNavigation}">
+ <c:set var="showMasterNavigation" value="true" />
+ </c:if>
+ <c:set var="replaceDetailNavigation" value="true" />
+ <c:if test="${empty navigationDetailSource}" >
+ <c:set var="replaceDetailNavigation" value="false" />
+ </c:if>
+
+ <!-- show master or detail content view -->
+ <c:choose>
+ <c:when test="${!controller.showDetail}">
+ <!-- master view -->
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="*;fixed" />
+ </f:facet>
+
+ <!-- detail content area -->
+ <ui:include src="${contentMasterSource}" />
+ <!-- detail navigation area -->
+ <c:choose>
+ <c:when test="${showMasterNavigation}">
+ <c:choose>
+ <c:when test="${replaceMasterNavigation}">
+ <ui:include src="${navigationMasterSource}" />
+ </c:when>
+ <c:otherwise>
+ <tfs:crud-master-navigation controller="${controller}" />
+ </c:otherwise>
+ </c:choose>
+ </c:when>
+ <c:otherwise>
+ <tc:cell />
+ </c:otherwise>
+ </c:choose>
+ </tc:panel>
+ </c:when>
+ <c:otherwise>
+ <!--detail view -->
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="*;fixed" />
+ </f:facet>
+
+ <!-- detail content area -->
+ <ui:include src="${contentDetailSource}" />
+ <!-- detail navigation area -->
+ <c:choose>
+ <c:when test="${showDetailNavigation}">
+ <c:choose>
+ <c:when test="${replaceDetailNavigation}">
+ <ui:include src="${navigationDetailSource}" />
+ </c:when>
+ <c:otherwise>
+ <tfs:crud-detail-navigation controller="${controller}" />
+ </c:otherwise>
+ </c:choose>
+ </c:when>
+ <c:otherwise>
+ <tc:cell />
+ </c:otherwise>
+ </c:choose>
+ </tc:panel>
+ </c:otherwise>
+ </c:choose>
+
</ui:composition>
\ No newline at end of file
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/crud.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/crud.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/tobago-facelet-sandbox.taglib.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/tobago-sandbox.taglib.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/tobago-sandbox.taglib.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardCancel.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardCancel.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardExtension.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardExtension.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardFinish.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardFinish.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardNext.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardNext.xml?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardNext.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardNext.xml Mon Dec 21 09:14:14 2009
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<ui:composition xmlns:c="http://java.sun.com/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
-
- <c:if test="${empty label}">
- <!--todo: i18n-->
- <c:set var="label" value="Next"/>
- </c:if>
-
- <tc:button label="${label}">
- <tc:attribute name="action" value="${action}" mode="action"/>
- <tc:attribute name="actionListener" value="${wizard.next}" mode="actionListener"/>
- <tc:attribute name="disabled" value="${action}" mode="isNotSet"/>
- </tc:button>
-
-</ui:composition>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
+
+ <c:if test="${empty label}">
+ <!--todo: i18n-->
+ <c:set var="label" value="Next"/>
+ </c:if>
+
+ <tc:button label="${label}">
+ <tc:attribute name="action" value="${action}" mode="action"/>
+ <tc:attribute name="actionListener" value="${wizard.next}" mode="actionListener"/>
+ <tc:attribute name="disabled" value="${action}" mode="isNotSet"/>
+ </tc:button>
+
+</ui:composition>
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardNext.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardNext.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardPrevious.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardPrevious.xml?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardPrevious.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardPrevious.xml Mon Dec 21 09:14:14 2009
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<ui:composition xmlns:c="http://java.sun.com/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tc="http://myfaces.apache.org/tobago/component">
-
- <c:if test="${empty label}">
- <!--todo: i18n-->
- <c:set var="label" value="Previous"/>
- </c:if>
-
- <tc:button label="${label}"
- disabled="${! wizard.previousAvailable}">
- <tc:attribute name="action" value="${wizard.previous}" mode="action"/>
- </tc:button>
-
-</ui:composition>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:tc="http://myfaces.apache.org/tobago/component">
+
+ <c:if test="${empty label}">
+ <!--todo: i18n-->
+ <c:set var="label" value="Previous"/>
+ </c:if>
+
+ <tc:button label="${label}"
+ disabled="${! wizard.previousAvailable}">
+ <tc:attribute name="action" value="${wizard.previous}" mode="action"/>
+ </tc:button>
+
+</ui:composition>
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardPrevious.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardPrevious.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardTrain.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardTrain.xml?rev=892737&r1=892736&r2=892737&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardTrain.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardTrain.xml Mon Dec 21 09:14:14 2009
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<ui:composition xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
-
- <c:set var="columns" value=""/>
- <c:forEach var="i" begin="0" end="${wizard.size}" step="1">
- <c:set var="columns" value="fixed;${columns}"/>
- </c:forEach>
- <c:set var="columns" value="${columns}*;50px"/>
-
- <tc:panel>
-
- <f:facet name="layout">
- <tc:gridLayout rows="fixed" columns="${columns}"/>
- </f:facet>
-
- <c:forEach items="${wizard.course}" var="step">
- <tc:button label="${step.title}">
- <tc:attribute name="action" value="${step.outcome}" mode="actionFromValue"/>
- <tc:attribute name="actionListener" value="${wizard.gotoStep}" mode="actionListener"/>
- <tc:attribute name="step" value="${step.index}"/>
- </tc:button>
- </c:forEach>
-
- <tc:cell/>
- <tc:out value="${wizard.index}/${wizard.size}"/>
-
- </tc:panel>
-</ui:composition>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tfs="http://myfaces.apache.org/tobago/facelet-sandbox">
+
+ <c:set var="columns" value=""/>
+ <c:forEach var="i" begin="0" end="${wizard.size}" step="1">
+ <c:set var="columns" value="fixed;${columns}"/>
+ </c:forEach>
+ <c:set var="columns" value="${columns}*;50px"/>
+
+ <tc:panel>
+
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed" columns="${columns}"/>
+ </f:facet>
+
+ <c:forEach items="${wizard.course}" var="step">
+ <tc:button label="${step.title}">
+ <tc:attribute name="action" value="${step.outcome}" mode="actionFromValue"/>
+ <tc:attribute name="actionListener" value="${wizard.gotoStep}" mode="actionListener"/>
+ <tc:attribute name="step" value="${step.index}"/>
+ </tc:button>
+ </c:forEach>
+
+ <tc:cell/>
+ <tc:out value="${wizard.index}/${wizard.size}"/>
+
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardTrain.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/main/resources/META-INF/wizardTrain.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/test/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/TreeNodeRendererUnitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/branches/tobago-1.0.x/sandbox/src/test/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/TreeNodeRendererUnitTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL