Author: nbelaevski
Date: 2009-03-31 15:11:59 -0400 (Tue, 31 Mar 2009)
New Revision: 13325
Modified:
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
Log:
NodeRendererBase generified
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-03-31
18:23:23 UTC (rev 13324)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-03-31
19:11:59 UTC (rev 13325)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -79,7 +80,6 @@
"mainRow".equals(to) && !tree.isToggleOnClick())
return "";
- boolean showLines = tree.isShowConnectingLines();
String id = treeNode.getClientId(context);
StringBuilder script = new StringBuilder();
@@ -95,9 +95,9 @@
UITreeNode nodeFacet = tree.getNodeFacet();
JSFunction function = AjaxRendererUtils.buildAjaxFunction(nodeFacet,
context);
- Map eventOptions = AjaxRendererUtils.buildEventOptions(context,
+ Map<String, Object> eventOptions = AjaxRendererUtils.buildEventOptions(context,
nodeFacet);
- Map parameters = (Map) eventOptions.get("parameters");
+ Map<Object, Object> parameters = (Map<Object, Object>)
eventOptions.get("parameters");
parameters.remove(id);
parameters.put(id + NODE_EXPANDED_INPUT_SUFFIX, String.valueOf(!expanded));
@@ -255,8 +255,8 @@
protected void doDecode(FacesContext context, UIComponent component) {
UITreeNode node = (UITreeNode) component;
UITree tree = node.getUITree();
- TreeRowKey key = (TreeRowKey) tree.getRowKey();
- Map requestMap = context.getExternalContext().getRequestParameterMap();
+ TreeRowKey<?> key = (TreeRowKey<?>) tree.getRowKey();
+ Map<String, String> requestMap =
context.getExternalContext().getRequestParameterMap();
String id = node.getClientId(context);
TreeState componentState = (TreeState) tree.getComponentState();
@@ -311,11 +311,11 @@
return null;
}
- private void convertOptions(Map opts) {
+ private void convertOptions(Map<String, Object> opts) {
//converts JSFunctionDefinition to string
- Iterator iterator = opts.entrySet().iterator();
+ Iterator<Entry<String, Object>> iterator = opts.entrySet().iterator();
while (iterator.hasNext()) {
- Map.Entry entry = (Map.Entry) iterator.next();
+ Entry<String, Object> entry = iterator.next();
Object value = entry.getValue();
if (value instanceof JSFunctionDefinition) {
JSFunctionDefinition definition = (JSFunctionDefinition) value;
@@ -324,7 +324,7 @@
}
}
- private ScriptOptions createOptions(FacesContext context, UITreeNode component, Class
clazz) {
+ private ScriptOptions createOptions(FacesContext context, UITreeNode component,
Class<?> clazz) {
ScriptOptions options = new TreeNodeOptions(component);
mergeScriptOptions(options, context, component, clazz);
convertOptions(options.getMap());
Show replies by date