You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2005/09/28 23:16:40 UTC
svn commit: r292307 [2/2] - in /jakarta/tapestry/trunk: examples/Vlib/
examples/Vlib/src/context/ examples/Vlib/src/context/WEB-INF/
examples/Vlib/src/context/css/
examples/Vlib/src/java/org/apache/tapestry/vlib/
examples/Vlib/src/java/org/apache/tapes...
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/ConfirmBookDelete.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/ConfirmBookDelete.java?rev=292307&r1=292306&r2=292307&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/ConfirmBookDelete.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/ConfirmBookDelete.java Wed Sep 28 14:16:23 2005
@@ -20,7 +20,11 @@
import javax.ejb.RemoveException;
import org.apache.hivemind.ApplicationRuntimeException;
+import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
+import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotations.Message;
+import org.apache.tapestry.annotations.Meta;
import org.apache.tapestry.html.BasePage;
import org.apache.tapestry.vlib.VirtualLibraryEngine;
import org.apache.tapestry.vlib.ejb.Book;
@@ -33,19 +37,26 @@
* @author Howard Lewis Ship
*/
+@Meta("page-type=MyLibrary")
public abstract class ConfirmBookDelete extends BasePage
{
public abstract void setBookId(Integer bookId);
public abstract void setBookTitle(String title);
+ @InjectPage("MyLibrary")
+ public abstract MyLibrary getMyLibrary();
+
+ @Message
+ public abstract String bookDeleted(String title);
+
/**
* Invoked (by {@link MyLibrary}) to select a book to be deleted. This method sets the
* temporary page properties (bookPrimaryKey and bookTitle) and invoked
* {@link IRequestCycle#setPage(IPage)}.
*/
- public void selectBook(Integer bookId, IRequestCycle cycle)
+ public void selectBook(Integer bookId)
{
setBookId(bookId);
@@ -73,18 +84,15 @@
}
}
- cycle.activate(this);
+ getRequestCycle().activate(this);
}
/**
* Hooked up to the yes component, this actually deletes the book.
*/
- public void deleteBook(IRequestCycle cycle)
+ public void deleteBook(Integer bookPK)
{
- Object[] parameters = cycle.getServiceParameters();
- Integer bookPK = (Integer) parameters[0];
-
VirtualLibraryEngine vengine = (VirtualLibraryEngine) getEngine();
Book book = null;
@@ -109,10 +117,10 @@
}
}
- MyLibrary myLibrary = (MyLibrary) cycle.getPage("MyLibrary");
+ MyLibrary myLibrary = getMyLibrary();
- myLibrary.setMessage(format("book-deleted", book.getTitle()));
+ myLibrary.setMessage(bookDeleted(book.getTitle()));
- myLibrary.activate(cycle);
+ myLibrary.activate();
}
}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/EditBook.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/EditBook.java?rev=292307&r1=292306&r2=292307&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/EditBook.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/EditBook.java Wed Sep 28 14:16:23 2005
@@ -26,6 +26,7 @@
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.annotations.Message;
+import org.apache.tapestry.annotations.Meta;
import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.event.PageBeginRenderListener;
import org.apache.tapestry.event.PageEvent;
@@ -39,6 +40,7 @@
* @author Howard Lewis Ship
*/
+@Meta("page-type=MyLibrary")
public abstract class EditBook extends Protected implements PageBeginRenderListener
{
public abstract Map getAttributes();
@@ -57,7 +59,7 @@
* {@link org.apache.tapestry.vlib.ejb.IBook} and updates the request cycle to render this page,
*/
- public void beginEdit(IRequestCycle cycle, Integer bookId)
+ public void beginEdit(Integer bookId)
{
setBookId(bookId);
@@ -89,7 +91,7 @@
}
}
- cycle.activate(this);
+ getRequestCycle().activate(this);
}
@Message
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/EditProfile.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/EditProfile.java?rev=292307&r1=292306&r2=292307&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/EditProfile.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/EditProfile.java Wed Sep 28 14:16:23 2005
@@ -59,10 +59,10 @@
* {@link org.apache.tapestry.valid.ValidField} components.
*/
- public void activate(IRequestCycle cycle)
+ public void activate()
{
Visit visit = (Visit) getVisit();
- VirtualLibraryEngine vengine = (VirtualLibraryEngine) cycle.getEngine();
+ VirtualLibraryEngine vengine = (VirtualLibraryEngine) getRequestCycle().getEngine();
Integer userId = visit.getUserId();
Map attributes = null;
@@ -91,7 +91,7 @@
attributes.remove("password");
setAttributes(attributes);
- cycle.activate(this);
+ getRequestCycle().activate(this);
}
public void updateProfile(IRequestCycle cycle)
@@ -165,7 +165,7 @@
vengine.clearCache();
MyLibrary myLibrary = (MyLibrary) cycle.getPage("MyLibrary");
- myLibrary.activate(cycle);
+ myLibrary.activate();
}
public void pageBeginRender(PageEvent event)
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/GiveAwayBooks.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/GiveAwayBooks.java?rev=292307&r1=292306&r2=292307&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/GiveAwayBooks.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/GiveAwayBooks.java Wed Sep 28 14:16:23 2005
@@ -103,7 +103,7 @@
myLibrary.setMessage(format("transfered-books", Integer.toString(count), target
.getNaturalName()));
- myLibrary.activate(cycle);
+ myLibrary.activate();
}
private IPropertySelectionModel buildPersonModel()
@@ -216,7 +216,7 @@
IRequestCycle cycle = getRequestCycle();
IActivate page = (IActivate) cycle.getPage("MyLibrary");
- page.activate(cycle);
+ page.activate();
throw new PageRedirectException(page);
}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/MyLibrary.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/MyLibrary.java?rev=292307&r1=292306&r2=292307&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/MyLibrary.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/MyLibrary.java Wed Sep 28 14:16:23 2005
@@ -17,6 +17,9 @@
import java.rmi.RemoteException;
import org.apache.tapestry.IRequestCycle;
+import org.apache.tapestry.annotations.InjectComponent;
+import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.annotations.Persist;
import org.apache.tapestry.vlib.ActivatePage;
import org.apache.tapestry.vlib.IMessageProperty;
import org.apache.tapestry.vlib.VirtualLibraryEngine;
@@ -38,26 +41,38 @@
public abstract class MyLibrary extends ActivatePage implements IMessageProperty
{
- public abstract void setOwnedQuery(IBookQuery value);
-
+ @Persist
public abstract IBookQuery getOwnedQuery();
+ public abstract void setOwnedQuery(IBookQuery value);
+
+ @Persist
public abstract SortColumn getSortColumn();
+ public abstract void setSortColumn(SortColumn column);
+
+ @Persist
public abstract boolean isDescending();
- private Browser _browser;
+ @InjectComponent("browser")
+ public abstract Browser getBrowser();
+
+ @InjectPage("EditBook")
+ public abstract EditBook getEditBook();
+
+ @InjectPage("ConfirmBookDelete")
+ public abstract ConfirmBookDelete getConfirmBookDelete();
public void finishLoad()
{
- _browser = (Browser) getComponent("browser");
+ setSortColumn(SortColumn.TITLE);
}
- public void activate(IRequestCycle cycle)
+ public void activate()
{
runQuery();
- cycle.activate(this);
+ getRequestCycle().activate(this);
}
public void requery(IRequestCycle cycle)
@@ -89,8 +104,8 @@
int count = query.ownerQuery(userId, ordering);
- if (count != _browser.getResultCount())
- _browser.initializeForResultCount(count);
+ if (count != getBrowser().getResultCount())
+ getBrowser().initializeForResultCount(count);
break;
}
@@ -107,26 +122,18 @@
* Listener invoked to allow a user to edit a book.
*/
- public void editBook(IRequestCycle cycle)
+ public void editBook(Integer bookId)
{
- Object[] parameters = cycle.getServiceParameters();
- Integer bookId = (Integer) parameters[0];
- EditBook page = (EditBook) cycle.getPage("EditBook");
-
- page.beginEdit(cycle, bookId);
+ getEditBook().beginEdit(bookId);
}
/**
* Listener invoked to allow a user to delete a book.
*/
- public void deleteBook(IRequestCycle cycle)
+ public void deleteBook(Integer bookId)
{
- Object[] parameters = cycle.getServiceParameters();
- Integer bookId = (Integer) parameters[0];
-
- ConfirmBookDelete page = (ConfirmBookDelete) cycle.getPage("ConfirmBookDelete");
- page.selectBook(bookId, cycle);
+ getConfirmBookDelete().selectBook(bookId);
}
}
Modified: jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/NewBook.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/NewBook.java?rev=292307&r1=292306&r2=292307&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/NewBook.java (original)
+++ jakarta/tapestry/trunk/examples/Vlib/src/java/org/apache/tapestry/vlib/pages/NewBook.java Wed Sep 28 14:16:23 2005
@@ -111,7 +111,7 @@
myLibrary.setMessage(format("added-book", attributes.get("title")));
- myLibrary.activate(cycle);
+ myLibrary.activate();
}
public void pageBeginRender(PageEvent event)
Modified: jakarta/tapestry/trunk/examples/Vlib/upgrade-notes.txt
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/examples/Vlib/upgrade-notes.txt?rev=292307&r1=292306&r2=292307&view=diff
==============================================================================
--- jakarta/tapestry/trunk/examples/Vlib/upgrade-notes.txt (original)
+++ jakarta/tapestry/trunk/examples/Vlib/upgrade-notes.txt Wed Sep 28 14:16:23 2005
@@ -66,4 +66,35 @@
vlib.properties
Created to hold common strings
+Protected.java
+ Made getValidationDelegate() and abstract property, with @Bean
+ Uses @InjectState and @InjectPage inside pageValidate()
+
+MyLibrary.html
+ Used If not Conditional
+
+MyLibrary.java
+ Use @Persist for sortColumn descending, ownedQuery properties
+ Set default for sortColumn in finishLoad()
+ Use @InjectComponent for browser property
+
+ConfirmBookDelete.java
+ @Meta for page-type
+
+EditBook.html
+ Made use of proper binding prefixes
+
+Border
+ Moved parameters to Border.java using @Parameter
+ Converted @Conditional to @If
+ Converted XML to 4.0 DTD
+ Made use of binding prefixes
+
+BookMatches
+ Standard changes
+
+BorrowedBooks
+ Standard changes
+
+
Modified: jakarta/tapestry/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/src/documentation/content/xdocs/index.xml?rev=292307&r1=292306&r2=292307&view=diff
==============================================================================
--- jakarta/tapestry/trunk/src/documentation/content/xdocs/index.xml (original)
+++ jakarta/tapestry/trunk/src/documentation/content/xdocs/index.xml Wed Sep 28 14:16:23 2005
@@ -213,9 +213,8 @@
<p>
Work on Tapestry 4.0 is in full swing. Documentation is being converted
-from the old DocBook format, to the new Forrest format, leaving many temporary gaps. Only the
-main code base and the Workbench example is being built, all other example code is not (this unfortunately
-includes the Virtual Library). A new <link href="QuickStart/index.html">Quick Start</link> series
+from the old DocBook format, to the new Forrest format, leaving many temporary gaps.
+ A new <link href="QuickStart/index.html">Quick Start</link> series
of tutorials is being written.
</p>
@@ -271,10 +270,6 @@
not all, situations. </li>
</ul>
-<note>
-We apologize for any lack of documentation; the alpha period for Tapestry 4.0 has been marked by furious
-activity, the beta period is about bug fixing and catching up on the documentation.
-</note>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org