|
From: Bavo De R. <ba...@us...> - 2010-08-06 21:05:01
|
Update of /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7925/src/java/portal/ui/comp/tree Modified Files: TreeNodeSelectAction.java TreeNodeToggleAction.java TreeNodeModel.java Tree.java TableTreeRenderHelper.java TreeNodeEventAdapter.java TreeModel.java Log Message: Refactored to support generics. Added a default serialization id for all serializable classes. Index: TreeNodeToggleAction.java =================================================================== RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TreeNodeToggleAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TreeNodeToggleAction.java 13 Sep 2005 11:23:27 -0000 1.1 --- TreeNodeToggleAction.java 6 Aug 2010 21:04:52 -0000 1.2 *************** *** 27,30 **** --- 27,32 ---- public class TreeNodeToggleAction implements IAction { + private static final long serialVersionUID = 1L; + public TreeNodeToggleAction(TreeNodeModel treeNode) { Index: TreeNodeModel.java =================================================================== RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TreeNodeModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TreeNodeModel.java 13 Sep 2005 11:23:27 -0000 1.1 --- TreeNodeModel.java 6 Aug 2010 21:04:52 -0000 1.2 *************** *** 26,29 **** --- 26,30 ---- import java.util.Iterator; import java.util.LinkedList; + import java.util.List; import portal.model.IModel; *************** *** 31,38 **** public class TreeNodeModel implements IModel { public TreeNodeModel() { ! _children = new LinkedList(); ! _listeners = new LinkedList(); _opened = false; --- 32,41 ---- public class TreeNodeModel implements IModel { + private static final long serialVersionUID = 1L; + public TreeNodeModel() { ! _children = new LinkedList<TreeNodeModel>(); ! _listeners = new LinkedList<TreeNodeEventListener>(); _opened = false; *************** *** 68,72 **** } ! public Collection getChildren() { return _children; --- 71,75 ---- } ! public Collection<TreeNodeModel> getChildren() { return _children; *************** *** 96,107 **** void notifySelected() { ! LinkedList tempListeners = null; synchronized (_listeners) { ! tempListeners = (LinkedList) _listeners.clone(); } ! Iterator it = tempListeners.iterator(); while (it.hasNext()) --- 99,110 ---- void notifySelected() { ! List<TreeNodeEventListener> tempListeners = null; synchronized (_listeners) { ! tempListeners = new LinkedList<TreeNodeEventListener>(_listeners); } ! Iterator<TreeNodeEventListener> it = tempListeners.iterator(); while (it.hasNext()) *************** *** 115,130 **** private void notifyOpened() { ! LinkedList tempListeners = null; synchronized (_listeners) { ! tempListeners = (LinkedList) _listeners.clone(); } ! Iterator it = tempListeners.iterator(); while (it.hasNext()) { ! TreeNodeEventListener listener = (TreeNodeEventListener) it.next(); listener.opened(); --- 118,133 ---- private void notifyOpened() { ! List<TreeNodeEventListener> tempListeners = null; synchronized (_listeners) { ! tempListeners = new LinkedList<TreeNodeEventListener>(_listeners); } ! Iterator<TreeNodeEventListener> it = tempListeners.iterator(); while (it.hasNext()) { ! TreeNodeEventListener listener = it.next(); listener.opened(); *************** *** 136,151 **** private void notifyClosed() { ! LinkedList tempListeners = null; synchronized (_listeners) { ! tempListeners = (LinkedList) _listeners.clone(); } ! Iterator it = tempListeners.iterator(); while (it.hasNext()) { ! TreeNodeEventListener listener = (TreeNodeEventListener) it.next(); listener.closed(); --- 139,154 ---- private void notifyClosed() { ! LinkedList<TreeNodeEventListener> tempListeners = null; synchronized (_listeners) { ! tempListeners = new LinkedList<TreeNodeEventListener>(_listeners); } ! Iterator<TreeNodeEventListener> it = tempListeners.iterator(); while (it.hasNext()) { ! TreeNodeEventListener listener = it.next(); listener.closed(); *************** *** 156,162 **** private String _name; ! private LinkedList _children; ! private LinkedList _listeners; private boolean _opened; } \ No newline at end of file --- 159,165 ---- private String _name; ! private List<TreeNodeModel> _children; ! private List<TreeNodeEventListener> _listeners; private boolean _opened; } \ No newline at end of file Index: TableTreeRenderHelper.java =================================================================== RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TableTreeRenderHelper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TableTreeRenderHelper.java 1 Sep 2006 19:34:53 -0000 1.2 --- TableTreeRenderHelper.java 6 Aug 2010 21:04:52 -0000 1.3 *************** *** 118,130 **** + "cellspacing='0' " + "cellpadding='3'>"); ! Collection children = parentNodeModel.getChildren(); if (children != null) { ! Iterator it = children.iterator(); while (it.hasNext()) { ! TreeNodeModel treeNodeChild = (TreeNodeModel) it.next(); writer.println("<tr>"); --- 118,130 ---- + "cellspacing='0' " + "cellpadding='3'>"); ! Collection<TreeNodeModel> children = parentNodeModel.getChildren(); if (children != null) { ! Iterator<TreeNodeModel> it = children.iterator(); while (it.hasNext()) { ! TreeNodeModel treeNodeChild = it.next(); writer.println("<tr>"); Index: TreeNodeEventAdapter.java =================================================================== RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TreeNodeEventAdapter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TreeNodeEventAdapter.java 13 Sep 2005 11:23:27 -0000 1.1 --- TreeNodeEventAdapter.java 6 Aug 2010 21:04:52 -0000 1.2 *************** *** 25,28 **** --- 25,30 ---- public class TreeNodeEventAdapter implements TreeNodeEventListener { + private static final long serialVersionUID = 1L; + public void selected() { Index: TreeNodeSelectAction.java =================================================================== RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TreeNodeSelectAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TreeNodeSelectAction.java 13 Sep 2005 11:23:27 -0000 1.1 --- TreeNodeSelectAction.java 6 Aug 2010 21:04:52 -0000 1.2 *************** *** 27,30 **** --- 27,32 ---- public class TreeNodeSelectAction implements IAction { + private static final long serialVersionUID = 1L; + public TreeNodeSelectAction(TreeNodeModel treeNode) { Index: TreeModel.java =================================================================== RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/TreeModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TreeModel.java 13 Sep 2005 11:23:27 -0000 1.1 --- TreeModel.java 6 Aug 2010 21:04:52 -0000 1.2 *************** *** 25,27 **** --- 25,28 ---- public class TreeModel extends TreeNodeModel { + private static final long serialVersionUID = 1L; } \ No newline at end of file Index: Tree.java =================================================================== RCS file: /cvsroot/pfc/pfc-api/src/java/portal/ui/comp/tree/Tree.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Tree.java 1 Sep 2006 19:34:53 -0000 1.2 --- Tree.java 6 Aug 2010 21:04:52 -0000 1.3 *************** *** 25,41 **** import java.io.IOException; - import portal.model.IModel; import portal.ui.Component; import portal.ui.render.IRenderContext; import portal.ui.render.RenderException; ! public class Tree extends Component { public TreeModel getTreeModel() { ! return (TreeModel) getModel(); } ! public IModel createDefaultModel() { return new TreeModel(); --- 25,42 ---- import java.io.IOException; import portal.ui.Component; import portal.ui.render.IRenderContext; import portal.ui.render.RenderException; ! public class Tree extends Component<TreeModel> { + private static final long serialVersionUID = 1L; + public TreeModel getTreeModel() { ! return getModel(); } ! public TreeModel createDefaultModel() { return new TreeModel(); |