You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/08/08 00:44:58 UTC
svn commit: r429530 [2/2] - in /incubator/adffaces/trunk/trinidad:
trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/
trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/
trinidad-demo/src/main/java/org/apache/myfaces/t...
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ListTestBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ListTestBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ListTestBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ListTestBean.java Mon Aug 7 17:44:54 2006
@@ -78,46 +78,45 @@
_stringArray = val;
}
- public List getObjectList()
+ public List<Object> getObjectList()
{
return _objectList;
}
- public void setObjectList(List val)
+ public void setObjectList(List<Object> val)
{
_objectList = val;
}
- public List getStringList()
+ public List<String> getStringList()
{
return _stringList;
}
- public void setSelectedSelectItems(List val)
+ public void setSelectedSelectItems(List<?> val)
{
_selectedSelectItems = val;
}
- public List getSelectedSelectItems()
+ public List<?> getSelectedSelectItems()
{
return _selectedSelectItems;
}
- public void setSelectedCars(List selectedCars)
+ public void setSelectedCars(List<?> selectedCars)
{
_selectedCars = selectedCars;
}
- public List getSelectedCars()
+ public List<?> getSelectedCars()
{
return _selectedCars;
}
- public List getMakes()
+ public List<SelectItem> getMakes()
{
return _MAKE_ITEMS;
}
-
public SelectItem getFirstSelectItemString()
{
@@ -208,7 +207,7 @@
private String _name;
}
- static private final List _MAKE_ITEMS = new ArrayList();
+ static private final List<SelectItem> _MAKE_ITEMS = new ArrayList<SelectItem>();
static private final SelectItem _FIRST_CAR =
new SelectItem("cordera", "Cordera Ltd.");
@@ -236,8 +235,8 @@
_MAKE_ITEMS.add(_THIRD_SELECT_ITEM_CAR);
}
- private List _selectedCars;
- private List _selectedSelectItems;
+ private List<?> _selectedCars;
+ private List<?> _selectedSelectItems;
private Integer _int = 1;
private int[] _intArray;
@@ -245,9 +244,6 @@
private String _string;
private String[] _stringArray;
- private List _stringList;
- private List _objectList;
-
-
-
+ private List<String> _stringList;
+ private List<Object> _objectList;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProgressBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProgressBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProgressBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProgressBean.java Mon Aug 7 17:44:54 2006
@@ -73,12 +73,13 @@
_updateValueFactor = updateValueFactor;
}
+ @Override
public void run()
{
try
{
//pu: Be in indeterminate mode for some time to start with
- this.sleep(3000);
+ sleep(3000);
//pu: Take care to get out if we are the discarded thread upon endProcess()
while ( (__processThread == Thread.currentThread()) &&
(__model != null) &&
@@ -94,7 +95,7 @@
updatedValue = maximum;
}
__model.setValue(updatedValue);
- this.sleep(sleepFactor * _updateIntervalFactor);
+ sleep(sleepFactor * _updateIntervalFactor);
}
}
catch (InterruptedException ie)
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProgressStepsBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProgressStepsBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProgressStepsBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ProgressStepsBean.java Mon Aug 7 17:44:54 2006
@@ -34,7 +34,7 @@
*/
public class ProgressStepsBean extends ProgressBean
{
- public List getProgressSteps()
+ public List<String> getProgressSteps()
{
return _PROGRESS_STEPS;
}
@@ -63,6 +63,7 @@
}
}
+ @Override
protected void prepare()
{
__model = new DefaultBoundedRangeModel(-1, 6);
@@ -71,14 +72,14 @@
__processThread.start();
}
- static private List _PROGRESS_STEPS;
+ static private List<String> _PROGRESS_STEPS;
static private final Logger _LOG = Logger.getLogger(
ProgressStepsBean.class.getName());
static
{
- _PROGRESS_STEPS = new ArrayList();
+ _PROGRESS_STEPS = new ArrayList<String>();
_PROGRESS_STEPS.add("Checking for latest version");
_PROGRESS_STEPS.add("Checking available disk space");
_PROGRESS_STEPS.add("Copying files");
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ReorderTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ReorderTest.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ReorderTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/ReorderTest.java Mon Aug 7 17:44:54 2006
@@ -32,30 +32,34 @@
return _panel;
}
+ @SuppressWarnings("unchecked")
public void add(ActionEvent event)
{
- List children = _panel.getChildren();
+ List<UIComponent> children = _panel.getChildren();
CoreOutputText output = new CoreOutputText();
output.setValue("Item " + (children.size() + 1));
children.add(0, output);
}
+ @SuppressWarnings("unchecked")
public void remove(ActionEvent event)
{
- List children = _panel.getChildren();
+ List<UIComponent> children = _panel.getChildren();
children.remove(children.size() - 1);
}
+ @SuppressWarnings("unchecked")
public void removeFirst(ActionEvent event)
{
- List children = _panel.getChildren();
+ List<UIComponent> children = _panel.getChildren();
children.remove(0);
}
+ @SuppressWarnings("unchecked")
public void rotate(ActionEvent event)
{
- List children = _panel.getChildren();
- Object o = children.get(0);
+ List<UIComponent> children = _panel.getChildren();
+ UIComponent o = children.get(0);
children.remove(0);
children.add(o);
}
@@ -65,6 +69,7 @@
_panel.getFacets().remove("separator");
}
+ @SuppressWarnings("unchecked")
public void setSeparator(ActionEvent event)
{
CoreOutputText output = new CoreOutputText();
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SelectItemTestBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SelectItemTestBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SelectItemTestBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/SelectItemTestBean.java Mon Aug 7 17:44:54 2006
@@ -25,7 +25,7 @@
{
_oneItem = new SelectItem("foo", "Foo", "Description of foo", false);
- _itemList = new ArrayList();
+ _itemList = new ArrayList<SelectItem>();
_itemList.add(new SelectItem("foo", "Foo", "Description of foo", false));
_itemList.add(new SelectItem("bar", "Bar", "Description of bar", false));
_itemList.add(new SelectItem("baz", "Baz", "Description of baz", false));
@@ -35,7 +35,7 @@
_itemArray[1] = new SelectItem("bar", "Bar", "Description of bar", false);
_itemArray[2] = new SelectItem("baz", "Baz", "Description of baz", false);
- _itemMap = new HashMap();
+ _itemMap = new HashMap<String, String>();
_itemMap.put("Foo", "foo");
_itemMap.put("Bar", "bar");
_itemMap.put("Baz", "baz");
@@ -46,12 +46,12 @@
return _oneItem;
}
- public ArrayList getItemList()
+ public ArrayList<SelectItem> getItemList()
{
return _itemList;
}
- public HashMap getItemMap()
+ public HashMap<String, String> getItemMap()
{
return _itemMap;
}
@@ -61,8 +61,8 @@
return _itemArray;
}
- private SelectItem _oneItem;
- private ArrayList _itemList;
- private HashMap _itemMap;
- private SelectItem[] _itemArray;
+ private SelectItem _oneItem;
+ private ArrayList<SelectItem> _itemList;
+ private HashMap<String, String> _itemMap;
+ private SelectItem[] _itemArray;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TableBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TableBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TableBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TableBean.java Mon Aug 7 17:44:54 2006
@@ -31,6 +31,12 @@
public class TableBean
{
+ @SuppressWarnings("unchecked")
+ public TableBean()
+ {
+ _selection = Collections.EMPTY_LIST;
+ }
+
public UIComponent getTable()
{
return _table;
@@ -41,17 +47,18 @@
_table = hgrid;
}
+ @SuppressWarnings("unchecked")
public void performReport(ActionEvent action)
{
UIXCollection table = (UIXCollection) _table;
- final RowKeySet state;
+ final RowKeySet<Object> state;
if (table instanceof UIXTable)
state = ((UIXTable) table).getSelectedRowKeys();
else
state = ((UIXTree) table).getSelectedRowKeys();
- Iterator selection = state.iterator();
+ Iterator<Object> selection = state.iterator();
Object oldKey = table.getRowKey();
- _selection = new ArrayList();
+ _selection = new ArrayList<Object>();
while (selection.hasNext())
{
table.setRowKey(selection.next());
@@ -65,11 +72,11 @@
context.addMessage(null, message);
}
- public List getReportItems()
+ public List<Object> getReportItems()
{
return _selection;
}
private UIComponent _table = null;
- private List _selection = Collections.EMPTY_LIST;
+ private List<Object> _selection;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeModelAdapter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeModelAdapter.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeModelAdapter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeModelAdapter.java Mon Aug 7 17:44:54 2006
@@ -80,7 +80,7 @@
* creation facility, which requires the parameter type is List.
* @param instance the list of root nodes
*/
- public void setListInstance(List instance)
+ public void setListInstance(List<Object> instance)
{
setInstance(instance);
}
@@ -95,9 +95,10 @@
* "getListInstance" with 0 arg(s) of
* matching types in websphere
*/
- public List getListInstance()
+ @SuppressWarnings("unchecked")
+ public List<Object> getListInstance()
{
- return (List)getInstance();
+ return (List<Object>)getInstance();
}
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeNodeImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeNodeImpl.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeNodeImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeNodeImpl.java Mon Aug 7 17:44:54 2006
@@ -61,13 +61,13 @@
_destination = destination;
}
- public void setChildren(List nodes)
+ public void setChildren(List<TreeNodeImpl> nodes)
{
// Clone on the way in.
- _nodes = new ArrayList(nodes);
+ _nodes = new ArrayList<TreeNodeImpl>(nodes);
}
- public List getChildren()
+ public List<TreeNodeImpl> getChildren()
{
if (_nodes == null)
return null;
@@ -79,5 +79,5 @@
private String _text = null;
private String _destination = null;
private String _icon = null;
- private List _nodes;
+ private List<TreeNodeImpl> _nodes;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/UIBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/UIBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/UIBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/UIBean.java Mon Aug 7 17:44:54 2006
@@ -24,10 +24,8 @@
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
import javax.faces.event.ValueChangeEvent;
-import org.apache.myfaces.trinidad.event.DisclosureEvent;
import org.apache.myfaces.trinidad.component.core.layout.CorePanelPage;
import org.apache.myfaces.trinidad.model.UploadedFile;
@@ -71,19 +69,22 @@
}
}
+ @SuppressWarnings("unchecked")
public void testFailover()
{
FacesContext context = FacesContext.getCurrentInstance();
- Map session = context.getExternalContext().getSessionMap();
- Map.Entry writing = null;
+ Map<String, Object> session =
+ context.getExternalContext().getSessionMap();
+
+ Map.Entry<String, Object> writing = null;
try
{
ObjectOutputStream oos =
new ObjectOutputStream(new ByteArrayOutputStream(2 << 16));
- Iterator entries = session.entrySet().iterator();
+ Iterator<Map.Entry<String, Object>> entries = session.entrySet().iterator();
while (entries.hasNext())
{
- writing = (Map.Entry) entries.next();
+ writing = entries.next();
oos.writeObject(writing.getValue());
context.addMessage(null,
new FacesMessage("Successfully serialized " + writing.getValue() + " [at " + writing.getKey() + "]"));
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/change/ChangeBean.java Mon Aug 7 17:44:54 2006
@@ -64,6 +64,7 @@
/**
* Picks up an image randomly from a list and changes it on the image.
*/
+ @SuppressWarnings("unchecked")
public void modifyObjectImage(ActionEvent event)
{
UIComponent uic = event.getComponent().findComponent("oi1");
@@ -76,6 +77,7 @@
* Picks up a string randomly from a list and changes the text attribute value
* of the panelBox.
*/
+ @SuppressWarnings("unchecked")
public void modifyPanelBox(ActionEvent event)
{
UIComponent uic = event.getComponent().findComponent("pb1");
@@ -87,6 +89,7 @@
/**
* Modifies the sortable property of the column.
*/
+ @SuppressWarnings("unchecked")
public void modifyColumn(ActionEvent event)
{
//=-=pu: 'uic1' gets null, while 'uic' gets valid component, maybe a bug ?.
@@ -107,6 +110,7 @@
* Picks up a string randomly from a list and changes the label attribute
* value of the inputText.
*/
+ @SuppressWarnings("unchecked")
public void modifyInputText(ActionEvent event)
{
UIComponent uic = event.getComponent().findComponent("it1");
@@ -144,6 +148,7 @@
/**
* Appends an image child to the panelGroup.
*/
+ @SuppressWarnings("unchecked")
public void appendChild(ActionEvent event)
{
UIComponent eventSource = event.getComponent();
@@ -170,6 +175,7 @@
/**
* Adds a 'brandingAppContextual' facet to the panelGroup.
*/
+ @SuppressWarnings("unchecked")
public void addFacet(ActionEvent event)
{
UIComponent eventSource = event.getComponent();
@@ -192,18 +198,18 @@
/**
* Reverses the order of children of the panelGroup.
*/
+ @SuppressWarnings("unchecked")
public void reorderChildren(ActionEvent event)
{
UIComponent uic = event.getComponent().findComponent("pg1");
int numChildren = uic.getChildCount();
if (numChildren == 0)
return;
- List children = uic.getChildren();
+ List<UIComponent> children = uic.getChildren();
Collections.reverse(children);
- List reorderedChildIdList = new ArrayList();
- for (int i=0; i<children.size(); i++)
+ List<String> reorderedChildIdList = new ArrayList<String>();
+ for(UIComponent child : children)
{
- UIComponent child = (UIComponent) children.get(i);
reorderedChildIdList.add(child.getId());
}
@@ -242,6 +248,7 @@
* Removes one or more facets, based on some characteristic of the
* event source.
*/
+ @SuppressWarnings("unchecked")
public void removeFacets(ActionEvent event)
{
CoreCommandButton eventSource = (CoreCommandButton) event.getComponent();
@@ -253,7 +260,7 @@
//pu: Get the CorePanelPage components that has all the removable facets
UIComponent uic = eventSource.findComponent("pp1");
- Map facets = uic.getFacets();
+ Map<String, UIComponent> facets = uic.getFacets();
if (facets.keySet().size() == 0)
return;
@@ -325,12 +332,13 @@
}
}
+ @SuppressWarnings("unchecked")
private static void _removeChild(UIComponent uic, String removableChildId)
{
UIComponent removableChild = _findChildById(uic, removableChildId);
if (removableChild != null)
{
- List children = uic.getChildren();
+ List<UIComponent> children = uic.getChildren();
children.remove(removableChild);
ComponentChange rca = new RemoveChildComponentChange(removableChildId);
FacesContext fc = FacesContext.getCurrentInstance();
@@ -339,16 +347,17 @@
}
}
+ @SuppressWarnings("unchecked")
private static UIComponent _findChildById(UIComponent uic, String id)
{
int numChildren = uic.getChildCount();
if (numChildren == 0)
return null;
- List children = uic.getChildren();
+ List<UIComponent> children = uic.getChildren();
UIComponent child = null;
for (int i=0; i<numChildren; i++)
{
- child = (UIComponent) children.get(i);
+ child = children.get(i);
if (id.equals(child.getId()))
return child;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/CompositeTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/CompositeTest.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/CompositeTest.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/CompositeTest.java Mon Aug 7 17:44:54 2006
@@ -47,6 +47,7 @@
*/
static public class ForceRendererType extends UIInput
{
+ @Override
public String getRendererType()
{
return "org.apache.myfaces.trinidaddemo.DateField";
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateField.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateField.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateField.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateField.java Mon Aug 7 17:44:54 2006
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
import javax.faces.application.FacesMessage;
@@ -63,13 +62,14 @@
super(null);
}
-
+ @Override
public void processDecodes(FacesContext context)
{
_addChildren(context);
super.processDecodes(context);
}
+ @Override
public void validate(FacesContext context)
{
if (!_month.isValid() ||
@@ -121,18 +121,19 @@
}
}
+ @Override
public void encodeBegin(FacesContext context) throws IOException
{
_addChildren(context);
super.encodeBegin(context);
}
+ @SuppressWarnings("unchecked")
+ @Override
public void encodeChildren(FacesContext context) throws IOException
{
- Iterator children = getChildren().iterator();
- while (children.hasNext())
+ for(UIComponent child : (List<UIComponent>)getChildren())
{
- UIComponent child = (UIComponent) children.next();
assert(child.getChildCount() == 0);
assert(child.getFacets().isEmpty());
child.encodeBegin(context);
@@ -141,6 +142,7 @@
}
}
+ @Override
public boolean getRendersChildren()
{
return true;
@@ -151,7 +153,7 @@
if (_month != null)
return;
- List children = getChildren();
+ List<UIComponent> children = getChildren();
children.clear();
Date value = (Date) getValue();
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldAsRenderer.java Mon Aug 7 17:44:54 2006
@@ -53,11 +53,13 @@
*/
public class DateFieldAsRenderer extends Renderer
{
+ @SuppressWarnings("unchecked")
+ @Override
public void decode(FacesContext context, UIComponent component)
{
_addChildren(context, component);
- Map attrs = component.getAttributes();
+ Map<String, UIComponent> attrs = component.getAttributes();
if (Boolean.TRUE.equals(attrs.get("readOnly")) ||
Boolean.TRUE.equals(attrs.get("disabled")))
return;
@@ -74,6 +76,7 @@
component.getFacet("day").processDecodes(context);
}
+ @Override
public Object getConvertedValue(
FacesContext context,
UIComponent component,
@@ -119,12 +122,14 @@
return newValue;
}
+ @Override
public void encodeBegin(FacesContext context,
UIComponent component) throws IOException
{
_addChildren(context, component);
}
+ @Override
public void encodeChildren(FacesContext context,
UIComponent component) throws IOException
{
@@ -150,11 +155,13 @@
year.encodeEnd(context);
}
+ @Override
public boolean getRendersChildren()
{
return true;
}
+ @SuppressWarnings("unchecked")
private void _addChildren(FacesContext context, UIComponent component)
{
// If the components are already there, bail.
@@ -168,7 +175,7 @@
component.setId(id);
}
- Map facets = component.getFacets();
+ Map<String, UIComponent> facets = component.getFacets();
facets.clear();
Date value = (Date) ((EditableValueHolder) component).getValue();
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldTag.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldTag.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/composite/DateFieldTag.java Mon Aug 7 17:44:54 2006
@@ -25,11 +25,13 @@
*/
public class DateFieldTag extends UIXEditableValueTag
{
+ @Override
public String getComponentType()
{
return "org.apache.myfaces.trinidaddemo.DateField";
}
+ @Override
public String getRendererType()
{
return null;
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ConvertSSNTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ConvertSSNTag.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ConvertSSNTag.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ConvertSSNTag.java Mon Aug 7 17:44:54 2006
@@ -28,6 +28,7 @@
{
}
+ @Override
public int doStartTag() throws JspException
{
super.setConverterId(SSNConverter.CONVERTER_ID);
@@ -37,13 +38,11 @@
/**
*
*/
+ @Override
protected Converter createConverter() throws JspException
{
SSNConverter converter =
(SSNConverter)super.createConverter();
return converter;
}
-
-
-
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/PasswordValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/PasswordValidator.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/PasswordValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/PasswordValidator.java Mon Aug 7 17:44:54 2006
@@ -74,6 +74,7 @@
}
+ @SuppressWarnings("unchecked")
public String getClientScript(
FacesContext context,
UIComponent component)
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/SSNConverter.java Mon Aug 7 17:44:54 2006
@@ -124,6 +124,7 @@
);
}
+ @SuppressWarnings("unchecked")
public String getClientScript(
FacesContext context,
UIComponent component)
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ValidatePasswordTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ValidatePasswordTag.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ValidatePasswordTag.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/convertValidate/ValidatePasswordTag.java Mon Aug 7 17:44:54 2006
@@ -28,6 +28,7 @@
{
}
+ @Override
public int doStartTag() throws JspException
{
super.setValidatorId(PasswordValidator.VALIDATOR_ID);
@@ -37,13 +38,11 @@
/**
*
*/
+ @Override
protected Validator createValidator() throws JspException
{
PasswordValidator validator =
(PasswordValidator)super.createValidator();
return validator;
}
-
-
-
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/ChooseIntegerBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/ChooseIntegerBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/ChooseIntegerBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/ChooseIntegerBean.java Mon Aug 7 17:44:54 2006
@@ -18,7 +18,6 @@
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
-import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidad.event.ReturnEvent;
public class ChooseIntegerBean
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/LaunchDialogBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/LaunchDialogBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/LaunchDialogBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/LaunchDialogBean.java Mon Aug 7 17:44:54 2006
@@ -59,7 +59,7 @@
public String doLaunch()
{
RequestContext afContext = RequestContext.getCurrentInstance();
- Map process = afContext.getPageFlowScope();
+ Map<String, Object> process = afContext.getPageFlowScope();
process.put("lastLaunch", new Date());
return "dialog:chooseInteger";
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/PeriodicDialogBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/PeriodicDialogBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/PeriodicDialogBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/dialog/PeriodicDialogBean.java Mon Aug 7 17:44:54 2006
@@ -41,13 +41,14 @@
return null;
}
+ @SuppressWarnings("unchecked")
public String select()
{
FacesContext context = FacesContext.getCurrentInstance();
// The tableSelectOne is marked as required; so there'd better
// be a selected row - an exception will result here if there
// isn't. Is there some better code?
- Iterator iterator = _table.getSelectedRowKeys().iterator();
+ Iterator<Object> iterator = _table.getSelectedRowKeys().iterator();
String rowKey = (String) iterator.next();
Object oldRowKey = _table.getRowKey();
_table.setRowKey(rowKey);
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/AccountData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/AccountData.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/AccountData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/AccountData.java Mon Aug 7 17:44:54 2006
@@ -198,7 +198,7 @@
{
_rootFolders = rootFolders;
- List rootFolderList = Arrays.asList((Object[]) _rootFolders);
+ List<Object> rootFolderList = Arrays.asList((Object[]) _rootFolders);
TreeModel folderTreeModel = new ChildPropertyTreeModel(rootFolderList, "subFolders");
setFolderModel(folderTreeModel);
@@ -304,6 +304,7 @@
/**
* Clean up resources
*/
+ @Override
protected void finalize() throws Throwable
{
destroy();
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/FolderData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/FolderData.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/FolderData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/FolderData.java Mon Aug 7 17:44:54 2006
@@ -138,7 +138,8 @@
* gets this folder's subfolders
* @todo Why does this code return "null" instead of the empty list???
*/
- public synchronized List getSubFolders() throws MessagingException
+ @SuppressWarnings("unchecked")
+ public synchronized List<Object> getSubFolders() throws MessagingException
{
if (_subFolders == Collections.EMPTY_LIST)
{
@@ -230,7 +231,7 @@
return "messages";
}
- private List _subFolders = null;
+ private List<Object> _subFolders = null;
private DataModel _messageListModel = null;
private final Folder _folder;
private final AccountData _accountData;
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessageData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessageData.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessageData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessageData.java Mon Aug 7 17:44:54 2006
@@ -227,7 +227,7 @@
/**
* Get the list of attachments.
*/
- public List getAttachments()
+ public List<BodyPart> getAttachments()
{
return _attachments;
}
@@ -262,7 +262,7 @@
? Folder.READ_ONLY
: Folder.READ_WRITE);
- List attachments = new ArrayList();
+ List<BodyPart> attachments = new ArrayList<BodyPart>();
try
{
@@ -495,6 +495,6 @@
private int _size;
private boolean _isRead;
private boolean _isDeleted;
- private List _attachments;
+ private List<BodyPart> _attachments;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessageDataModel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessageDataModel.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessageDataModel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessageDataModel.java Mon Aug 7 17:44:54 2006
@@ -46,17 +46,20 @@
_fetchProfile = fetchProfile;
}
+ @Override
public int getRowCount()
{
return _count;
}
+ @Override
public boolean isRowAvailable()
{
int index = getRowIndex();
return (index >= 0) && (index < getRowCount());
}
+ @Override
public Object getRowData()
{
if (!isRowAvailable())
@@ -69,6 +72,7 @@
return _loaded[index];
}
+ @Override
public void setRowIndex(int index)
{
if (index < -1)
@@ -77,16 +81,19 @@
_rowIndex = index;
}
+ @Override
public int getRowIndex()
{
return _rowIndex;
}
+ @Override
public Object getWrappedData()
{
return _folder;
}
+ @Override
public void setWrappedData(Object data)
{
Folder newFolder = (Folder) data;
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessagesBackingBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessagesBackingBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessagesBackingBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/MessagesBackingBean.java Mon Aug 7 17:44:54 2006
@@ -131,7 +131,7 @@
public void performDelete(ActionEvent event)
{
- Iterator selection = _messagesTable.getSelectedRowKeys().iterator();
+ Iterator<?> selection = _messagesTable.getSelectedRowKeys().iterator();
// Nothing was selected
if (selection.hasNext())
{
@@ -142,7 +142,7 @@
Folder folder = _folderData.getFolder();
folder.open(Folder.READ_WRITE);
- List messageList = new ArrayList();
+ List<Message> messageList = new ArrayList<Message>();
try
{
while (selection.hasNext())
@@ -164,7 +164,7 @@
}
}
- Message[] messages = (Message[])
+ Message[] messages =
messageList.toArray(new Message[messageList.size()]);
folder.setFlags(messages, new Flags(Flags.Flag.DELETED), true);
// clear the selection:
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/NewMessageBackingBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/NewMessageBackingBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/NewMessageBackingBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/NewMessageBackingBean.java Mon Aug 7 17:44:54 2006
@@ -275,9 +275,9 @@
{
String username = _account.getUsername();
String from = username + "@" + _account.getDomain();
- List to = _getEmailList(getTo());
+ List<InternetAddress> to = _getEmailList(getTo());
- List cc = null;
+ List<InternetAddress> cc = null;
String ccString = getCc();
if(ccString != null)
{
@@ -287,13 +287,11 @@
msg.setFrom(new InternetAddress(from));
if ((to != null) && !to.isEmpty())
msg.setRecipients(Message.RecipientType.TO,
- (InternetAddress[])
- to.toArray(new InternetAddress[0]));
+ to.toArray(new InternetAddress[0]));
if ((cc != null) && !cc.isEmpty())
msg.setRecipients(Message.RecipientType.CC,
- (InternetAddress[])
- cc.toArray(new InternetAddress[0]));
+ cc.toArray(new InternetAddress[0]));
msg.setSubject(_subject == null ? "" : _subject);
if ((_attachment1 == null) &&
(_attachment2 == null) &&
@@ -365,10 +363,10 @@
multipart.addBodyPart(messageBodyPart);
}
- static private List _getEmailList(String values)
+ static private List<InternetAddress> _getEmailList(String values)
throws AddressException
{
- ArrayList list = new ArrayList();
+ ArrayList<InternetAddress> list = new ArrayList<InternetAddress>();
StringTokenizer tokens = new StringTokenizer(values.toString(), ",");
while (tokens.hasMoreTokens())
{
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/PreferencesData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/PreferencesData.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/PreferencesData.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/PreferencesData.java Mon Aug 7 17:44:54 2006
@@ -68,7 +68,7 @@
/**
* @todo Provide internationalized list.
*/
- public List getSkinFamilyItems()
+ public List<SelectItem> getSkinFamilyItems()
{
return _SKIN_FAMILIES;
}
@@ -77,7 +77,7 @@
/**
* @todo Provide internationalized list.
*/
- public List getAccessibilityModeItems()
+ public List<SelectItem> getAccessibilityModeItems()
{
return _ACCESSIBILITY_MODES;
}
@@ -251,7 +251,7 @@
private static final int _DEFAULT_ROWS_SHOWN = 25;
- private static final List _ACCESSIBILITY_MODES = new ArrayList();
+ private static final List<SelectItem> _ACCESSIBILITY_MODES = new ArrayList<SelectItem>();
static
{
_ACCESSIBILITY_MODES.add(new SelectItem("default", "Default"));
@@ -259,7 +259,7 @@
_ACCESSIBILITY_MODES.add(new SelectItem("screenReader", "Screen Readers"));
}
- private static final List _SKIN_FAMILIES = new ArrayList();
+ private static final List<SelectItem> _SKIN_FAMILIES = new ArrayList<SelectItem>();
static
{
_SKIN_FAMILIES.add(new SelectItem("oracle", "Oracle"));
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/resource/EmailDemoBundle.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/resource/EmailDemoBundle.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/resource/EmailDemoBundle.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/email/resource/EmailDemoBundle.java Mon Aug 7 17:44:54 2006
@@ -20,6 +20,7 @@
public class EmailDemoBundle extends ListResourceBundle
{
+ @Override
public Object[][] getContents()
{
return _CONTENTS;
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/nav/DemoNavigationItem.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/nav/DemoNavigationItem.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/nav/DemoNavigationItem.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/nav/DemoNavigationItem.java Mon Aug 7 17:44:54 2006
@@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.apache.myfaces.trinidaddemo.nav;
+
import java.io.Serializable;
import java.util.List;
-import org.apache.myfaces.trinidad.component.core.nav.CoreCommandNavigationItem;
public class DemoNavigationItem implements Serializable
@@ -78,12 +78,12 @@
return _destination;
}
- public List getChildren()
+ public List<?> getChildren()
{
return _children;
}
- public void setChildren(List children)
+ public void setChildren(List<?> children)
{
_children = children;
}
@@ -91,12 +91,12 @@
- private String _label = null;
- private String _outcome = null;
- private String _viewId = null;
- private String _destination = null;
- private String _icon = null;
- private List _children = null;
+ private String _label = null;
+ private String _outcome = null;
+ private String _viewId = null;
+ private String _destination = null;
+ private String _icon = null;
+ private List<?> _children = null;
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/nav/MenuModelAdapter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/nav/MenuModelAdapter.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/nav/MenuModelAdapter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/nav/MenuModelAdapter.java Mon Aug 7 17:44:54 2006
@@ -31,7 +31,7 @@
}
private ViewIdPropertyMenuModel _model = null;
- private List _aliasList = null;
+ private List<Object> _aliasList = null;
private boolean _aliasListAdded = false;
/**
@@ -66,7 +66,7 @@
return _model;
}
- public List getAliasList()
+ public List<Object> getAliasList()
{
return _aliasList;
}
@@ -76,7 +76,7 @@
* We iterate over the list like so:
* ViewIdPropertyMenuModel.addViewId(aliasList.get(i), aliasList.get(i+1))
*/
- public void setAliasList(List aliasList)
+ public void setAliasList(List<Object> aliasList)
{
_aliasList = aliasList;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/resource/SkinBundle.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/resource/SkinBundle.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/resource/SkinBundle.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/resource/SkinBundle.java Mon Aug 7 17:44:54 2006
@@ -20,6 +20,7 @@
public class SkinBundle extends ListResourceBundle
{
+ @Override
public Object[][] getContents()
{
return _CONTENTS;
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/AnswerValidatorTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/AnswerValidatorTag.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/AnswerValidatorTag.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/AnswerValidatorTag.java Mon Aug 7 17:44:54 2006
@@ -41,6 +41,7 @@
return _questionIndex;
}
+ @Override
protected Validator createValidator() throws JspException {
AnswerValidator validator = (AnswerValidator)super.createValidator();
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/CheckboxQuestionBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/CheckboxQuestionBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/CheckboxQuestionBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/CheckboxQuestionBean.java Mon Aug 7 17:44:54 2006
@@ -15,6 +15,7 @@
*/
package org.apache.myfaces.trinidaddemo.survey;
+import java.io.Serializable;
import java.util.ArrayList;
/***
@@ -30,14 +31,14 @@
*
* ***/
-public class CheckboxQuestionBean implements java.io.Serializable
+public class CheckboxQuestionBean implements QuestionBean, Serializable
{
/** The question prompt as a String object */
private String _prompt;
/** arbitrary number of possible answer choices (Strings) */
- private ArrayList _choices;
+ private ArrayList<String> _choices;
/** An integer that represents the correct checkbox choices */
@@ -64,8 +65,14 @@
/**
* Class constructor.
*/
- public CheckboxQuestionBean(String prompt, ArrayList choices, int correctAnswer,
- boolean checkbox0, boolean checkbox1, boolean checkbox2, boolean checkbox3)
+ public CheckboxQuestionBean(
+ String prompt,
+ ArrayList<String> choices,
+ int correctAnswer,
+ boolean checkbox0,
+ boolean checkbox1,
+ boolean checkbox2,
+ boolean checkbox3)
{
_prompt = prompt;
_choices = choices;
@@ -95,30 +102,22 @@
public String getText1()
{
-
- String result = (String)_choices.get(0);
- return result;
+ return _choices.get(0);
}
public String getText2()
{
-
- String result = (String)_choices.get(1);
- return result;
+ return _choices.get(1);
}
public String getText3()
{
-
- String result = (String)_choices.get(2);
- return result;
+ return _choices.get(2);
}
public String getText4()
{
-
- String result = (String)_choices.get(3);
- return result;
+ return _choices.get(3);
}
/*** util functions ***/
@@ -129,6 +128,7 @@
*
* @return a String representation of a QuestionBean
*/
+ @Override
public String toString()
{
String str = _prompt + "; " + _choices.toString();
@@ -170,7 +170,7 @@
if( bitMap.charAt(i) == '1')
{
// it's a correct solution
- message = message + (String)_choices.get(j) + " & ";
+ message = message + _choices.get(j) + " & ";
atLeastOneSelected = true;
}
} //end for loop
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/MultChoiceQuestionBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/MultChoiceQuestionBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/MultChoiceQuestionBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/MultChoiceQuestionBean.java Mon Aug 7 17:44:54 2006
@@ -15,6 +15,7 @@
*/
package org.apache.myfaces.trinidaddemo.survey;
+import java.io.Serializable;
import java.util.List;
/***
@@ -26,7 +27,7 @@
***/
-public class MultChoiceQuestionBean implements java.io.Serializable
+public class MultChoiceQuestionBean implements QuestionBean, Serializable
{
/** Constructors **/
@@ -42,7 +43,7 @@
* Class constructor.
*/
public MultChoiceQuestionBean(String prompt,
- List choices,
+ List<String> choices,
int correctIndex)
{
_prompt = prompt;
@@ -66,7 +67,7 @@
/**
* returns the list of answer strings.
*/
- public List getAnswerStrings()
+ public List<String> getAnswerStrings()
{
return _choices;
}
@@ -77,6 +78,7 @@
*
* @return a String representation of a MultChoiceQuestionBean
*/
+ @Override
public String toString()
{
String str = "[" + _prompt + "; " + _choices.toString() + "]";
@@ -92,7 +94,7 @@
*/
public String getCorrectAnswerMessage()
{
- return "The correct answer is: " + (String)_choices.get(_correctIndex);
+ return "The correct answer is: " + _choices.get(_correctIndex);
}
/**
@@ -109,7 +111,7 @@
private String _prompt;
/* arbitrary number of possible answer choices (Strings) */
- private List _choices;
+ private List<String> _choices;
/* The index of the correct answer */
private int _correctIndex;
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/SurveyBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/SurveyBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/SurveyBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/SurveyBean.java Mon Aug 7 17:44:54 2006
@@ -15,6 +15,7 @@
*/
package org.apache.myfaces.trinidaddemo.survey;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -29,17 +30,17 @@
*
* ***/
-public class SurveyBean extends Object implements java.io.Serializable
+public class SurveyBean extends Object implements Serializable
{
/** A List of QuestionBean objects */
- private ArrayList _questions = new ArrayList();
+ private ArrayList<QuestionBean> _questions = new ArrayList<QuestionBean>();
/** The index of the (current) question displayed */
private int _currentIndex;
/** A List of QuestionBean objects */
- private ArrayList _userAnswers = new ArrayList();
+ private ArrayList<String> _userAnswers = new ArrayList<String>();
/** number of choices */
static final int NUMBER_OF_ANSWER_CHOICES = 4;
@@ -72,7 +73,7 @@
String _a4; //response for a multiple choice (normal) question
/** A List of SurveyPage objects for use with the processTrain component */
- private List _pages;
+ private List<SurveyPage> _pages;
/**
* Class constructor (no arguments).
*/
@@ -121,7 +122,7 @@
// together in an Array List
// question 0, for surveyPage1
- ArrayList choices = new ArrayList();
+ ArrayList<String> choices = new ArrayList<String>();
choices.add("A. Loading zone for freight or passengers.");
choices.add("B. Loading zone for passengers or mail only.");
choices.add("C. Loading zone for freight only.");
@@ -134,7 +135,7 @@
_questions.add(_q1);
// question 2, for surveyPage3
- ArrayList choices2 = new ArrayList();
+ ArrayList<String> choices2 = new ArrayList<String>();
choices2.add("A. If the shoulder is wide enough to accommodate your vehicle.");
choices2.add("B. If the vehicle ahead of you is turning left.");
choices2.add("C. Under no circumstances.");
@@ -143,7 +144,7 @@
_questions.add(_q2);
// question 3, for surveyPage4
- ArrayList choices3 = new ArrayList();
+ ArrayList<String> choices3 = new ArrayList<String>();
choices3.add("A. In a crosswalk.");
choices3.add("B. Within 10 feet of a fire hydrant.");
choices3.add("C. Next to a red painted curb.");
@@ -152,7 +153,7 @@
_questions.add(_q3);
// question 4, for surveyPage5
- ArrayList choices4 = new ArrayList();
+ ArrayList<String> choices4 = new ArrayList<String>();
choices4.add("A. Stop, then proceed when you think all of the children have exited the bus.");
choices4.add("B. Slow to 25 MPH and pass cautiously.");
choices4.add("C. Stop as long as the red lights are flashing. ");
@@ -561,11 +562,11 @@
return _a33;
}
- public List getPages()
+ public List<SurveyPage> getPages()
{
if (_pages == null)
{
- _pages = new ArrayList();
+ _pages = new ArrayList<SurveyPage>();
_pages.add(new SurveyPage("/surveydemo/surveyPage1.jspx", "Step1"));
_pages.add(new SurveyPage("/surveydemo/surveyPage2.jspx", "Step2"));
_pages.add(new SurveyPage("/surveydemo/surveyPage3.jspx", "Step3"));
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/TextQuestionBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/TextQuestionBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/TextQuestionBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/survey/TextQuestionBean.java Mon Aug 7 17:44:54 2006
@@ -15,6 +15,8 @@
*/
package org.apache.myfaces.trinidaddemo.survey;
+import java.io.Serializable;
+
/***
* class TextQuestionBean
*
@@ -24,7 +26,7 @@
* ***/
-public class TextQuestionBean implements java.io.Serializable
+public class TextQuestionBean implements QuestionBean, Serializable
{
/** The question as a String object. */
private String _prompt;
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/table/DynamicModel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/table/DynamicModel.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/table/DynamicModel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/table/DynamicModel.java Mon Aug 7 17:44:54 2006
@@ -23,6 +23,7 @@
{
}
+ @Override
public int getRowCount()
{
return _rowCount;
@@ -58,31 +59,37 @@
}
}
+ @Override
public boolean isRowAvailable()
{
return (_index >= 0) && (_index < _length);
}
+ @Override
public Object getRowData()
{
return isRowAvailable() ? new Integer(_index) : null;
}
+ @Override
public int getRowIndex()
{
return _index;
}
+ @Override
public void setRowIndex(int index)
{
_index = index;
}
+ @Override
public Object getWrappedData()
{
return this;
}
+ @Override
public void setWrappedData(Object obj)
{
throw new UnsupportedOperationException();
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/table/TableBuilder.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/table/TableBuilder.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/table/TableBuilder.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/table/TableBuilder.java Mon Aug 7 17:44:54 2006
@@ -27,9 +27,13 @@
public class TableBuilder implements java.io.Serializable
{
+ @SuppressWarnings("unchecked")
public TableBuilder()
{
// no arg contructor needed for usage as managed-bean
+ _beanProps = Collections.EMPTY_LIST;
+ _data = Collections.EMPTY_LIST;
+ _result = null;
}
public void setBeanClass(String klass)
@@ -37,21 +41,21 @@
_beanClass = klass;
}
- public void setBeanProperties(List props)
+ public void setBeanProperties(List<Object> props)
{
if (props == null)
throw new NullPointerException("beanProperties");
_beanProps = props;
}
- public void setBeanData(List data)
+ public void setBeanData(List<?> data)
{
if (data == null)
throw new NullPointerException("beanData");
_data = data;
}
- public List getTableData()
+ public List<?> getTableData()
throws ClassNotFoundException, IntrospectionException, InstantiationException,
IllegalAccessException, InvocationTargetException
{
@@ -62,19 +66,19 @@
return _result;
}
- private List _getAsList()
+ private List<Object> _getAsList()
throws ClassNotFoundException, IntrospectionException, InstantiationException,
IllegalAccessException, InvocationTargetException
{
if (_beanClass == null)
throw new NullPointerException("beanClass");
- Class beanClass = Class.forName(_beanClass);
+ Class<?> beanClass = Class.forName(_beanClass);
_setPropertySetters(beanClass, _beanProps);
int sz = _beanProps.size();
- List result = new ArrayList(sz);
+ List<Object> result = new ArrayList<Object>(sz);
- Iterator cells = _data.iterator();
+ Iterator<?> cells = _data.iterator();
while(cells.hasNext())
{
Object beanInstance = beanClass.newInstance();
@@ -82,7 +86,7 @@
{
Object value = cells.next();
Method setter = (Method) _beanProps.get(i);
- Class expectedType = setter.getParameterTypes()[0];
+ Class<?> expectedType = setter.getParameterTypes()[0];
if (!expectedType.isAssignableFrom(value.getClass()))
{
value = _convert(value, expectedType);
@@ -95,7 +99,7 @@
return result;
}
- private Object _convert(Object instance, Class expectedType)
+ private Object _convert(Object instance, Class<?> expectedType)
{
if (Integer.TYPE == expectedType)
{
@@ -105,14 +109,14 @@
" of class:"+instance.getClass()+" into "+expectedType);
}
- private void _setPropertySetters(Class klass, List props)
+ private void _setPropertySetters(Class<?> klass, List<Object> props)
throws IntrospectionException
{
BeanInfo beanInfo = Introspector.getBeanInfo(klass);
PropertyDescriptor[] descs = beanInfo.getPropertyDescriptors();
for(int i=0, sz=props.size(); i<sz; i++)
{
- String name = (String) props.get(i);
+ String name = (String)props.get(i);
PropertyDescriptor desc = _getDescriptor(descs, name);
if (desc == null)
{
@@ -144,7 +148,7 @@
private String _beanClass = null;
// Transient as it contains java.lang.reflect.Method objects
- private transient List _beanProps = Collections.EMPTY_LIST;
- private List _data = Collections.EMPTY_LIST;
- private List _result = null;
+ private transient List<Object> _beanProps;
+ private List<?> _data;
+ private List<?> _result;
}
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/tableDemos/EmployeeTableBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/tableDemos/EmployeeTableBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/tableDemos/EmployeeTableBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/tableDemos/EmployeeTableBean.java Mon Aug 7 17:44:54 2006
@@ -23,7 +23,6 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.faces.event.ActionEvent;
@@ -38,7 +37,7 @@
_populate();
}
- private List _list;
+ private List<EmployeeBean> _list;
private int _total;
@@ -46,7 +45,7 @@
* @param _list
* The _list to set.
*/
- public void setList(List list)
+ public void setList(List<EmployeeBean> list)
{
this._list = list;
}
@@ -54,7 +53,7 @@
/**
* @return Returns the _list.
*/
- public List getList()
+ public List<EmployeeBean> getList()
{
return _list;
}
@@ -78,7 +77,7 @@
public void addRow(ActionEvent event)
{
- EmployeeBean dataHolder = (EmployeeBean) _list.get(_list.size() - 1);
+ EmployeeBean dataHolder = _list.get(_list.size() - 1);
dataHolder.setReadOnly(true);
dataHolder = new EmployeeBean("", "");
dataHolder.setReadOnly(false);
@@ -88,9 +87,8 @@
public void totalRow(ActionEvent event)
{
_total = 0;
- for (Iterator iter = _list.iterator(); iter.hasNext();)
+ for(EmployeeBean dataHolder : _list)
{
- EmployeeBean dataHolder = (EmployeeBean) iter.next();
if (!dataHolder.getData2().equalsIgnoreCase(""))
{
_total = _total + Integer.parseInt(dataHolder.getData2());
@@ -100,7 +98,7 @@
private void _populate()
{
- _list = new ArrayList();
+ _list = new ArrayList<EmployeeBean>();
_list.add(new EmployeeBean("22", "22"));
_list.add(new EmployeeBean("44", "44"));
_list.add(new EmployeeBean("44", "44"));
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/java/org/apache/myfaces/trinidaddemo/CustomerBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/java/org/apache/myfaces/trinidaddemo/CustomerBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/java/org/apache/myfaces/trinidaddemo/CustomerBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/java/org/apache/myfaces/trinidaddemo/CustomerBean.java Mon Aug 7 17:44:54 2006
@@ -73,6 +73,8 @@
private String _lastName = null;
private String _userName = null;
private String _password = null;
+ // Never read
+ @SuppressWarnings("unused")
private int _id;
static private int _sID = 2242;
Modified: incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/java/org/apache/myfaces/trinidaddemo/DynamicBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/java/org/apache/myfaces/trinidaddemo/DynamicBean.java?rev=429530&r1=429529&r2=429530&view=diff
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/java/org/apache/myfaces/trinidaddemo/DynamicBean.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-demo/src/test/java/org/apache/myfaces/trinidaddemo/DynamicBean.java Mon Aug 7 17:44:54 2006
@@ -33,6 +33,7 @@
System.out.println("Received " + event);
}
+ @SuppressWarnings("unchecked")
public CorePanelBox getPanel()
{
if (_panel == null)