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 2010/09/02 16:36:53 UTC
svn commit: r991953 - in
/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main:
java/org/apache/myfaces/tobago/example/addressbook/web/
resources/META-INF/resources/addressbook/admin/
resources/META-INF/resources/addressbook/layout/
Author: lofwyr
Date: Thu Sep 2 14:36:53 2010
New Revision: 991953
URL: http://svn.apache.org/viewvc?rev=991953&view=rev
Log:
- using tc:attribute for binding (is compatible for JSP and Facelets)
- minor changes
Modified:
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/logging.xhtml
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java?rev=991953&r1=991952&r2=991953&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/java/org/apache/myfaces/tobago/example/addressbook/web/Controller.java Thu Sep 2 14:36:53 2010
@@ -147,8 +147,8 @@ public class Controller {
return OUTCOME_EDITOR;
}
- public String addDummyAddresses() throws IOException, AddressDaoException {
- for (int i=0; i<100; ++i) {
+ public String addDummyAddresses() throws AddressDaoException, IOException {
+ for (int i = 0; i < 100; ++i) {
currentAddress = RandomAddressGenerator.generateAddress();
store();
}
@@ -297,6 +297,10 @@ public class Controller {
return "logout";
}
+ public String getVersion() {
+ return getClass().getPackage().getImplementationVersion();
+ }
+
public Locale getLanguage() {
return language;
}
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/logging.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/logging.xhtml?rev=991953&r1=991952&r2=991953&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/logging.xhtml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/admin/logging.xhtml Thu Sep 2 14:36:53 2010
@@ -86,8 +86,9 @@
<f:facet name="layout">
<tc:gridLayout columns="*;*;fixed"/>
</f:facet>
- <tx:in label="Category" value="#{logging.category}"
- binding="#{logging.categoryControl}"/>
+ <tx:in label="Category" value="#{logging.category}">
+ <tc:attribute name="binding" value="#{logging.categoryControl}"/>
+ </tx:in>
<tx:selectOneChoice label="Level" value="#{logging.level}">
<tc:selectItems value="#{logging.levels}"/>
</tx:selectOneChoice>
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml?rev=991953&r1=991952&r2=991953&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/src/main/resources/META-INF/resources/addressbook/layout/basic.xhtml Thu Sep 2 14:36:53 2010
@@ -71,7 +71,7 @@
<ui:insert/>
</tc:cell>
- <tc:popup id="about" width="300px" height="220px" left="200px" top="200px">
+ <tc:popup id="about" width="400px" height="220px" left="200px" top="200px">
<tc:box label="About">
<f:facet name="layout">
<tc:gridLayout rows="150px;*;fixed" columns="150px;*"/>
@@ -86,7 +86,7 @@
<tc:out markup="strong" value="Addressbook Demo"/>
<tc:cell/>
- <tc:out value="Version 1.0"/>
+ <tc:out value="Version #{controller.version}"/>
<tc:cell/>
</tc:panel>