You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2008/10/15 14:30:58 UTC
svn commit: r704887 - in /myfaces/tobago/trunk/sandbox/src/main:
java/org/apache/myfaces/tobago/model/
java/org/apache/myfaces/tobago/taglib/sandbox/ resources/META-INF/
Author: lofwyr
Date: Wed Oct 15 05:30:57 2008
New Revision: 704887
URL: http://svn.apache.org/viewvc?rev=704887&view=rev
Log:
TOBAGO-518: cleanup
Added:
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Wizard.java (contents, props changed)
- copied, changed from r704800, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardImpl.java
Removed:
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardImpl.java
Modified:
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardCancelTag.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardFinishTag.java
myfaces/tobago/trunk/sandbox/src/main/resources/META-INF/wizardCancel.xml
myfaces/tobago/trunk/sandbox/src/main/resources/META-INF/wizardFinish.xml
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Wizard.java (from r704800, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardImpl.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Wizard.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Wizard.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardImpl.java&r1=704800&r2=704887&rev=704887&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/WizardImpl.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Wizard.java Wed Oct 15 05:30:57 2008
@@ -24,15 +24,15 @@
import java.util.ArrayList;
import java.util.List;
-public class WizardImpl implements Wizard {
+public class Wizard {
- private static final Log LOG = LogFactory.getLog(WizardImpl.class);
+ private static final Log LOG = LogFactory.getLog(Wizard.class);
private int index;
private List<WizardStep> course;
- public WizardImpl() {
+ public Wizard() {
reset();
}
@@ -69,9 +69,9 @@
return getIndex() > 0;
}
- public final void leave(ActionEvent event) {
+ public final void finish(ActionEvent event) {
if (LOG.isDebugEnabled()) {
- LOG.debug("leave");
+ LOG.debug("finish");
}
reset();
@@ -91,7 +91,7 @@
/**
* Helper method to reset attributes
*/
- protected void reset() {
+ public void reset() {
index = 0;
course = new ArrayList<WizardStep>();
}
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/model/Wizard.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardCancelTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardCancelTag.java?rev=704887&r1=704886&r2=704887&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardCancelTag.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardCancelTag.java Wed Oct 15 05:30:57 2008
@@ -45,7 +45,7 @@
button.setParent(getParent());
button.setLabel(StringUtils.isEmpty(label) ? "Cancel Wizard" : label); // todo: i18n
button.setAction(action);
- button.setActionListener("#{" + wizard + ".leave}");
+ button.setActionListener("#{" + wizard + ".cancel}");
button.setDisabled(Boolean.toString(action == null));
// button.setDisabled(controller.replace("}", ".finishAvailable}").replace("#{", "#{!"));
button.setImmediate(Boolean.TRUE.toString());
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardFinishTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardFinishTag.java?rev=704887&r1=704886&r2=704887&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardFinishTag.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardFinishTag.java Wed Oct 15 05:30:57 2008
@@ -45,7 +45,7 @@
button.setParent(getParent());
button.setLabel(StringUtils.isEmpty(label) ? "Finish Wizard" : label); // todo: i18n
button.setAction(action);
- button.setActionListener("#{" + wizard + ".leave}");
+ button.setActionListener("#{" + wizard + ".finish}");
button.setDisabled(Boolean.toString(action == null));
// button.setDisabled(controller.replace("}", ".finishAvailable}").replace("#{", "#{!"));
button.doStartTag();
Modified: myfaces/tobago/trunk/sandbox/src/main/resources/META-INF/wizardCancel.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/resources/META-INF/wizardCancel.xml?rev=704887&r1=704886&r2=704887&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/resources/META-INF/wizardCancel.xml (original)
+++ myfaces/tobago/trunk/sandbox/src/main/resources/META-INF/wizardCancel.xml Wed Oct 15 05:30:57 2008
@@ -27,7 +27,7 @@
<tc:button label="${label}" immediate="true">
<tc:attribute name="action" value="${action}" mode="action"/>
- <tc:attribute name="actionListener" value="${wizard.leave}" mode="actionListener"/>
+ <tc:attribute name="actionListener" value="${wizard.cancel}" mode="actionListener"/>
<tc:attribute name="disabled" value="${action}" mode="isNotSet"/>
</tc:button>
Modified: myfaces/tobago/trunk/sandbox/src/main/resources/META-INF/wizardFinish.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/resources/META-INF/wizardFinish.xml?rev=704887&r1=704886&r2=704887&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/resources/META-INF/wizardFinish.xml (original)
+++ myfaces/tobago/trunk/sandbox/src/main/resources/META-INF/wizardFinish.xml Wed Oct 15 05:30:57 2008
@@ -27,7 +27,7 @@
<tc:button label="${label}">
<tc:attribute name="action" value="${action}" mode="action"/>
- <tc:attribute name="actionListener" value="${wizard.leave}" mode="actionListener"/>
+ <tc:attribute name="actionListener" value="${wizard.finish}" mode="actionListener"/>
<tc:attribute name="disabled" value="${action}" mode="isNotSet"/>
</tc:button>