You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cr...@apache.org on 2007/05/18 23:18:31 UTC
svn commit: r539606 - in /beehive/trunk:
docs/forrest/release/src/documentation/content/xdocs/
samples/netui-jsf/src/ samples/netui-jsf/src/jsf/
samples/netui-jsf/src/jsf/physiciansFlow/
samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/ sampl...
Author: crogers
Date: Fri May 18 14:18:30 2007
New Revision: 539606
URL: http://svn.apache.org/viewvc?view=rev&rev=539606
Log:
Fixed the MismatchedActionOutputException in the Repeating Select example of netui-samples (BEEHIVE-1191). Also cleaned up warnings about unused import statements, variables, etc. in other sample files.
Tests: build the distribution and run through the samples.
Removed:
beehive/trunk/samples/netui-samples/web/ui/tree/echo.jsp
Modified:
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/installation.xml
beehive/trunk/samples/netui-jsf/src/Controller.java
beehive/trunk/samples/netui-jsf/src/jsf/Controller.java
beehive/trunk/samples/netui-jsf/src/jsf/home.java
beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/Controller.java
beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/search.java
beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/SharedFlow.java
beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianDataAccess.java
beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianSession.java
beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/confirmMailSent.jsp
beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/physicianDetail.jsp
beehive/trunk/samples/netui-samples/src/advanced/dynaforms/Controller.java
beehive/trunk/samples/netui-samples/src/nesting/chooseairport/ChooseAirport.java
beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/controls/pets/PetsImpl.java
beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/customValidator/CustomRules.java
beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/CustomerBean.java
beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/util/FilterPredicate.java
beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/util/SortByProperty.java
beehive/trunk/samples/netui-samples/src/ui/datagrid/sortandfilter/Controller.java
beehive/trunk/samples/netui-samples/src/ui/select/Controller.java
beehive/trunk/samples/netui-samples/src/ui/tree/Controller.java
beehive/trunk/samples/netui-samples/web/fileupload/results.jsp
beehive/trunk/samples/netui-samples/web/ui/select/repeatingSelect.jsp
beehive/trunk/samples/netui-samples/web/ui/select/repeatingSelectWithOptionBody.jsp
Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/installation.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/installation.xml?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/installation.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/installation.xml Fri May 18 14:18:30 2007
@@ -12,7 +12,7 @@
</p>
<p>(1) The following software is required for developing Beehive applications:</p>
<ul>
- <li>Beehive Binary Distribution -- download from <a class="fork" href="site:beehive-release/current">http://beehive.apache.org/releases/release-1.0.2.cgi</a></li>
+ <li>Beehive Binary Distribution -- download from <a href="site:beehive-release/current">http://beehive.apache.org/releases/release-1.0.2.cgi</a></li>
<li>Ant 1.6.2 -- download from <a class="fork" href="site:ant16/download">http://ant.apache.org/bindownload.cgi</a></li>
<li>J2SE 5.0 JDK -- download from <a class="fork" href="site:java5download">http://java.sun.com/j2se/1.5.0/download.jsp</a></li>
</ul>
Modified: beehive/trunk/samples/netui-jsf/src/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/src/Controller.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-jsf/src/Controller.java (original)
+++ beehive/trunk/samples/netui-jsf/src/Controller.java Fri May 18 14:18:30 2007
@@ -16,9 +16,6 @@
*
* $Header:$
*/
-import javax.servlet.http.HttpSession;
-
-import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
@@ -33,6 +30,4 @@
public class Controller
extends PageFlowController
{
- @Jpf.SharedFlowField(name="shared")
- private shared.SharedFlow sharedFlow;
}
Modified: beehive/trunk/samples/netui-jsf/src/jsf/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/src/jsf/Controller.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-jsf/src/jsf/Controller.java (original)
+++ beehive/trunk/samples/netui-jsf/src/jsf/Controller.java Fri May 18 14:18:30 2007
@@ -18,9 +18,6 @@
*/
package jsf;
-import javax.servlet.http.HttpSession;
-
-import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
Modified: beehive/trunk/samples/netui-jsf/src/jsf/home.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/src/jsf/home.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-jsf/src/jsf/home.java (original)
+++ beehive/trunk/samples/netui-jsf/src/jsf/home.java Fri May 18 14:18:30 2007
@@ -20,7 +20,6 @@
import org.apache.beehive.netui.pageflow.FacesBackingBean;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.pageflow.PageFlowController;
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
Modified: beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/Controller.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/Controller.java (original)
+++ beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/Controller.java Fri May 18 14:18:30 2007
@@ -18,11 +18,10 @@
*/
package jsf.physiciansFlow;
+import java.io.Serializable;
import javax.faces.model.DataModel;
import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.beehive.netui.pageflow.FormData;
import org.apache.beehive.netui.pageflow.Forward;
import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
@@ -213,7 +212,27 @@
@Jpf.Action(
forwards = {
- @Jpf.Forward(name = "success", path="confirmMailSent.faces")
+ @Jpf.Forward(
+ name = "success",
+ path="confirmMailSent.faces",
+ actionOutputs={
+ @Jpf.ActionOutput(
+ name="mailMessage",
+ type = String.class,
+ required = true
+ ),
+ @Jpf.ActionOutput(
+ name="firstName",
+ type = String.class,
+ required = true
+ ),
+ @Jpf.ActionOutput(
+ name="lastName",
+ type = String.class,
+ required = true
+ )
+ }
+ )
}
)
protected Forward submitMailMessage(MailMessageForm form)
@@ -228,7 +247,7 @@
//
// Form Beans
//
- public static class MailMessageForm extends FormData
+ public static class MailMessageForm implements Serializable
{
private Physician physician;
private String message;
@@ -254,7 +273,7 @@
}
}
- public static class PhysicianSearchForm extends FormData
+ public static class PhysicianSearchForm implements Serializable
{
private Physician searchCriteria;
Modified: beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/search.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/search.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/search.java (original)
+++ beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/search.java Fri May 18 14:18:30 2007
@@ -18,17 +18,10 @@
*/
package jsf.physiciansFlow;
-import javax.faces.component.UIComponent;
-import javax.faces.component.html.HtmlCommandButton;
-import javax.faces.component.html.HtmlSelectOneMenu;
-import javax.faces.component.html.HtmlSelectOneRadio;
-import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
import javax.faces.model.SelectItem;
import org.apache.beehive.netui.pageflow.FacesBackingBean;
-import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.samples.netui.jsf.physician.Physician;
@@ -56,9 +49,6 @@
// start with the specialist choices disabled
private boolean specialistsDisabled = true;
- // default setting is abbreviated results
- private boolean showDetailedResults = false;
-
// The type of physician - see "types" below
private String resultFormatType = "shortFormat";
Modified: beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/SharedFlow.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/SharedFlow.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/SharedFlow.java (original)
+++ beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/SharedFlow.java Fri May 18 14:18:30 2007
@@ -18,10 +18,6 @@
*/
package org.apache.beehive.samples.netui.jsf;
-import java.io.IOException;
-
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowException;
import org.apache.beehive.netui.pageflow.SharedFlowController;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
Modified: beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianDataAccess.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianDataAccess.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianDataAccess.java (original)
+++ beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianDataAccess.java Fri May 18 14:18:30 2007
@@ -23,8 +23,8 @@
public class PhysicianDataAccess
{
private boolean initialized = false;
- private ArrayList results;
- private ArrayList data;
+ private ArrayList<Physician> results;
+ private ArrayList<Physician> data;
public PhysicianDataAccess()
{
@@ -35,7 +35,7 @@
{
if (initialized == false)
{
- data = new ArrayList();
+ data = new ArrayList<Physician>();
addPhysician(new Physician("Ear", "female", "Doc", "Watson"));
addPhysician(new Physician("Nose", "male", "Doctor", "Watson"));
@@ -78,7 +78,7 @@
}
}
- ArrayList getPhysicians(Physician criteria)
+ ArrayList<Physician> getPhysicians(Physician criteria)
{
initialize();
@@ -87,7 +87,7 @@
for (int i = 0; i < data.size(); i++)
{
- Physician doc = (Physician)data.get(i);
+ Physician doc = data.get(i);
boolean match = false;
if ((criteria.getSpecialty() == null) ||
@@ -110,7 +110,7 @@
if (match == true)
{
if (results == null)
- results = new ArrayList();
+ results = new ArrayList<Physician>();
results.add(doc);
}
}
@@ -125,7 +125,7 @@
for (int i = 0; i < data.size(); i++)
{
- Physician p = (Physician)data.get(i);
+ Physician p = data.get(i);
if (p.getId() == id)
{
physician = p;
Modified: beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianSession.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianSession.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianSession.java (original)
+++ beehive/trunk/samples/netui-jsf/src/org/apache/beehive/samples/netui/jsf/physician/PhysicianSession.java Fri May 18 14:18:30 2007
@@ -65,7 +65,7 @@
return this.dataAccess.getPhysician(id);
}
- public ArrayList getPhysicians(Physician criteria)
+ public ArrayList<Physician> getPhysicians(Physician criteria)
{
return this.dataAccess.getPhysicians(criteria);
}
@@ -73,7 +73,7 @@
public DataModel getSortedPhysiciansModel()
{
assert(this.searchCriteria != null);
- ArrayList physicians = dataAccess.getPhysicians(searchCriteria);
+ ArrayList<Physician> physicians = dataAccess.getPhysicians(searchCriteria);
sortPhysicians(physicians);
if (physiciansModel == null)
@@ -89,47 +89,47 @@
/**
* sort utilities
*/
- private static final Comparator ASC_LASTNAME_COMPARATOR = new Comparator()
+ private static final Comparator<Physician> ASC_LASTNAME_COMPARATOR = new Comparator<Physician>()
{
- public int compare (Object o1, Object o2)
+ public int compare (Physician p1, Physician p2)
{
- String s1 = ((Physician)o1).getLastName();
- String s2 = ((Physician)o2).getLastName();
+ String s1 = p1.getLastName();
+ String s2 = p2.getLastName();
return s1.compareTo(s2);
}
};
- private static final Comparator DESC_LASTNAME_COMPARATOR = new Comparator()
+ private static final Comparator<Physician> DESC_LASTNAME_COMPARATOR = new Comparator<Physician>()
{
- public int compare (Object o1, Object o2)
+ public int compare (Physician p1, Physician p2)
{
- String s1 = ((Physician)o1).getLastName();
- String s2 = ((Physician)o2).getLastName();
+ String s1 = p1.getLastName();
+ String s2 = p2.getLastName();
return s2.compareTo(s1);
}
};
- private static final Comparator ASC_GENDER_COMPARATOR = new Comparator()
+ private static final Comparator<Physician> ASC_GENDER_COMPARATOR = new Comparator<Physician>()
{
- public int compare (Object o1, Object o2)
+ public int compare (Physician p1, Physician p2)
{
- String s1 = ((Physician)o1).getGender();
- String s2 = ((Physician)o2).getGender();
+ String s1 = p1.getGender();
+ String s2 = p2.getGender();
return s1.compareTo(s2);
}
};
- private static final Comparator DESC_GENDER_COMPARATOR = new Comparator()
+ private static final Comparator<Physician> DESC_GENDER_COMPARATOR = new Comparator<Physician>()
{
- public int compare (Object o1, Object o2)
+ public int compare (Physician p1, Physician p2)
{
- String s1 = ((Physician)o1).getGender();
- String s2 = ((Physician)o2).getGender();
+ String s1 = p1.getGender();
+ String s2 = p2.getGender();
return s2.compareTo(s1);
}
};
- private void sortPhysicians(ArrayList physicians)
+ private void sortPhysicians(ArrayList<Physician> physicians)
{
switch (sortBy)
{
Modified: beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/confirmMailSent.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/confirmMailSent.jsp?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/confirmMailSent.jsp (original)
+++ beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/confirmMailSent.jsp Fri May 18 14:18:30 2007
@@ -17,12 +17,13 @@
$Header:$
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"%>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"%>
-<netui-data:declarePageInput name="mailMessage" type="String" />
-<netui-data:declarePageInput name="firstName" type="String" />
-<netui-data:declarePageInput name="lastName" type="String" />
+<netui-data:declarePageInput name="mailMessage" type="java.lang.String" />
+<netui-data:declarePageInput name="firstName" type="java.lang.String" />
+<netui-data:declarePageInput name="lastName" type="java.lang.String" />
<html>
<head>
Modified: beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/physicianDetail.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/physicianDetail.jsp?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/physicianDetail.jsp (original)
+++ beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/physicianDetail.jsp Fri May 18 14:18:30 2007
@@ -17,11 +17,12 @@
$Header:$
--%>
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"%>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<netui-data:declarePageInput name="physicianDetail" type="physician.Physician" />
+<netui-data:declarePageInput name="physician" type="org.apache.beehive.samples.netui.jsf.physician.Physician" />
<html>
<head>
Modified: beehive/trunk/samples/netui-samples/src/advanced/dynaforms/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/advanced/dynaforms/Controller.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/src/advanced/dynaforms/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/src/advanced/dynaforms/Controller.java Fri May 18 14:18:30 2007
@@ -38,7 +38,22 @@
@Jpf.Action(
forwards={
- @Jpf.Forward(name="output", path="output.jsp")
+ @Jpf.Forward(
+ name="output",
+ path="output.jsp",
+ actionOutputs={
+ @Jpf.ActionOutput(
+ name="name",
+ type = String.class,
+ required = true
+ ),
+ @Jpf.ActionOutput(
+ name="age",
+ type = String.class,
+ required = true
+ )
+ }
+ )
},
// Note: the validation annotations are optional!
validatableProperties={
Modified: beehive/trunk/samples/netui-samples/src/nesting/chooseairport/ChooseAirport.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/nesting/chooseairport/ChooseAirport.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/src/nesting/chooseairport/ChooseAirport.java (original)
+++ beehive/trunk/samples/netui-samples/src/nesting/chooseairport/ChooseAirport.java Fri May 18 14:18:30 2007
@@ -166,7 +166,7 @@
}
}
- private static final ArrayList AIRPORTS = new ArrayList();
+ private static final ArrayList<Results> AIRPORTS = new ArrayList<Results>();
static
{
Modified: beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/controls/pets/PetsImpl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/controls/pets/PetsImpl.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/controls/pets/PetsImpl.java (original)
+++ beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/controls/pets/PetsImpl.java Fri May 18 14:18:30 2007
@@ -21,8 +21,6 @@
import org.apache.beehive.samples.netui.beans.PetType;
import org.apache.beehive.controls.api.bean.ControlImplementation;
-import java.util.Date;
-
@ControlImplementation(isTransient=true)
public class PetsImpl
implements Pets
Modified: beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/customValidator/CustomRules.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/customValidator/CustomRules.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/customValidator/CustomRules.java (original)
+++ beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/customValidator/CustomRules.java Fri May 18 14:18:30 2007
@@ -54,7 +54,7 @@
if (! GenericValidator.isBlankOrNull(value)) {
for (int i = 0, len = value.length(); i < len; ++i) {
if (value.charAt(i) != value.charAt(len - i - 1)) {
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
return false;
}
}
@@ -92,7 +92,7 @@
// error will be returned below
}
- errors.add(field.getKey(), Resources.getActionError(request, va, field));
+ errors.add(field.getKey(), Resources.getActionMessage(request, va, field));
return false;
}
Modified: beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/CustomerBean.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/CustomerBean.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/CustomerBean.java (original)
+++ beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/CustomerBean.java Fri May 18 14:18:30 2007
@@ -18,9 +18,6 @@
*/
package org.apache.beehive.samples.netui.ui.datagrid.sortandfilter;
-import java.util.LinkedList;
-import java.util.List;
-
/**
* JavaBean representing a Customer object.
*/
Modified: beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/util/FilterPredicate.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/util/FilterPredicate.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/util/FilterPredicate.java (original)
+++ beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/util/FilterPredicate.java Fri May 18 14:18:30 2007
@@ -18,7 +18,6 @@
*/
package org.apache.beehive.samples.netui.ui.datagrid.sortandfilter.util;
-import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterOperation;
import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterOperationHint;
/**
Modified: beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/util/SortByProperty.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/util/SortByProperty.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/util/SortByProperty.java (original)
+++ beehive/trunk/samples/netui-samples/src/org/apache/beehive/samples/netui/ui/datagrid/sortandfilter/util/SortByProperty.java Fri May 18 14:18:30 2007
@@ -38,20 +38,20 @@
* for production applications -- it's just enables example that show how sorting and filtering work in the
* NetUI data grid.
*/
-public class SortByProperty {
+public class SortByProperty<T> {
- public List sort(Sort sort, List list) {
+ public List sort(Sort sort, List<T> list) {
if (list == null || list.size() == 0)
return list;
- List sorted = new ArrayList(list);
+ List<T> sorted = new ArrayList<T>(list);
SortByPropertyComparator sorter = new SortByPropertyComparator(sort);
Collections.sort(sorted, sorter);
return sorted;
}
private class SortByPropertyComparator
- implements Comparator {
+ implements Comparator<T> {
private Sort _sort = null;
Modified: beehive/trunk/samples/netui-samples/src/ui/datagrid/sortandfilter/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/ui/datagrid/sortandfilter/Controller.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/src/ui/datagrid/sortandfilter/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/src/ui/datagrid/sortandfilter/Controller.java Fri May 18 14:18:30 2007
@@ -117,7 +117,7 @@
List<CustomerBean> dataSet = _customers;
/* implement sorting */
- final List<Sort> sorts = (List<Sort>)dataGridState.getSortModel().getSorts();
+ final List sorts = (List)dataGridState.getSortModel().getSorts();
if(sorts != null && sorts.size() < 2) {
Sort sort = (Sort)sorts.get(0);
Modified: beehive/trunk/samples/netui-samples/src/ui/select/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/ui/select/Controller.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/src/ui/select/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/src/ui/select/Controller.java Fri May 18 14:18:30 2007
@@ -18,6 +18,7 @@
*/
package ui.select;
+import java.util.ArrayList;
import java.util.Map;
import java.util.LinkedHashMap;
@@ -37,26 +38,30 @@
@Control
private Pets _petControl;
- private Map _colorOptions = null;
- private Map _colorOptionsIntKeys = null;
+ private Map<String, String> _colorOptions = null;
+ private Map<Integer, String> _colorOptionsIntKeys = null;
- private PetType[] _pets = null;
+ private ArrayList<PetType> _pets = null;
protected void onCreate()
throws Exception {
- _colorOptions = new LinkedHashMap();
+ _colorOptions = new LinkedHashMap<String, String>();
_colorOptions.put("blue", "Blue");
_colorOptions.put("orange", "Orange");
_colorOptions.put("white", "White");
_colorOptions.put("black", "Black");
- _colorOptionsIntKeys = new LinkedHashMap();
+ _colorOptionsIntKeys = new LinkedHashMap<Integer, String>();
_colorOptionsIntKeys.put(1, "Blue");
_colorOptionsIntKeys.put(2, "Orange");
_colorOptionsIntKeys.put(3, "White");
_colorOptionsIntKeys.put(4, "Black");
- _pets = _petControl.getPetList();
+ PetType[] pets = _petControl.getPetList();
+ _pets = new ArrayList<PetType>();
+ for (int i = 0; i < pets.length; i++) {
+ _pets.add(pets[i]);
+ }
}
@Jpf.Action(forwards=
@@ -120,7 +125,7 @@
name="success",
path="repeatingSelect.jsp",
actionOutputs={
- @Jpf.ActionOutput(name="petList", type=PetType.class)
+ @Jpf.ActionOutput(name="petList", type=ArrayList.class)
}
))
public Forward showRepeating() {
@@ -133,7 +138,7 @@
@Jpf.Forward(
name="success", path="repeatingSelect.jsp",
actionOutputs = {
- @Jpf.ActionOutput(name="petList", type=PetType.class)
+ @Jpf.ActionOutput(name="petList", type=ArrayList.class)
}
)
)
@@ -148,7 +153,7 @@
name="success",
path="repeatingSelectWithOptionBody.jsp",
actionOutputs={
- @Jpf.ActionOutput(name="petList", type=PetType.class)
+ @Jpf.ActionOutput(name="petList", type=ArrayList.class)
}
))
public Forward showRepeatingWithOptionBody() {
@@ -161,7 +166,7 @@
@Jpf.Forward(
name="success", path="repeatingSelectWithOptionBody.jsp",
actionOutputs = {
- @Jpf.ActionOutput(name="petList", type=PetType.class)
+ @Jpf.ActionOutput(name="petList", type=ArrayList.class)
}
)
)
Modified: beehive/trunk/samples/netui-samples/src/ui/tree/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/src/ui/tree/Controller.java?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/src/ui/tree/Controller.java (original)
+++ beehive/trunk/samples/netui-samples/src/ui/tree/Controller.java Fri May 18 14:18:30 2007
@@ -49,7 +49,6 @@
@Jpf.Action(
forwards = {
- @Jpf.Forward(name = "success", path = "echo.jsp"),
@Jpf.Forward(name = "0.0.0.0", path = "content/0.0.0.0.jsp"),
@Jpf.Forward(name = "0.0.0.1", path = "content/0.0.0.1.jsp"),
@Jpf.Forward(name = "0.0.0", path = "content/0.0.0.jsp"),
Modified: beehive/trunk/samples/netui-samples/web/fileupload/results.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/fileupload/results.jsp?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/web/fileupload/results.jsp (original)
+++ beehive/trunk/samples/netui-samples/web/fileupload/results.jsp Fri May 18 14:18:30 2007
@@ -21,7 +21,7 @@
<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
<%@ taglib prefix="netui-template" uri="http://beehive.apache.org/netui/tags-template-1.0"%>
-<netui-data:declarePageInput name="uploadForm" type="org.apache.struts.upload.FormFile" required="true"/>
+<netui-data:declarePageInput name="uploadForm" type="fileupload.Controller.UploadForm" required="true"/>
<netui-template:template templatePage="/resources/template/template.jsp">
Modified: beehive/trunk/samples/netui-samples/web/ui/select/repeatingSelect.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/ui/select/repeatingSelect.jsp?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/web/ui/select/repeatingSelect.jsp (original)
+++ beehive/trunk/samples/netui-samples/web/ui/select/repeatingSelect.jsp Fri May 18 14:18:30 2007
@@ -21,7 +21,7 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui-data:declarePageInput name="petList" type="org.apache.beehive.samples.netui.beans.PetType"/>
+<netui-data:declarePageInput name="petList" type="java.util.ArrayList"/>
<netui-template:template templatePage="/resources/template/template.jsp">
<netui-template:setAttribute name="sampleTitle" value="Repeating Select Tag"/>
Modified: beehive/trunk/samples/netui-samples/web/ui/select/repeatingSelectWithOptionBody.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/netui-samples/web/ui/select/repeatingSelectWithOptionBody.jsp?view=diff&rev=539606&r1=539605&r2=539606
==============================================================================
--- beehive/trunk/samples/netui-samples/web/ui/select/repeatingSelectWithOptionBody.jsp (original)
+++ beehive/trunk/samples/netui-samples/web/ui/select/repeatingSelectWithOptionBody.jsp Fri May 18 14:18:30 2007
@@ -21,7 +21,7 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui-data:declarePageInput name="petList" type="org.apache.beehive.samples.netui.beans.PetType"/>
+<netui-data:declarePageInput name="petList" type="java.util.ArrayList"/>
<netui-template:template templatePage="/resources/template/template.jsp">
<netui-template:setAttribute name="sampleTitle" value="Repeating Select Tag using a Select Option Body"/>