Author: alexsmirnov Date: 2007-07-03 20:04:48 -0400 (Tue, 03 Jul 2007) New Revision: 1456 Added: trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java trunk/framework/api/src/main/java/org/richfaces/event/DragListener.java trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java trunk/framework/api/src/main/java/org/richfaces/event/DropListener.java trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java trunk/framework/api/src/main/java/org/richfaces/event/DropSource.java Removed: trunk/framework/api/src/main/java/org/ajax4jsf/event/DragEvent.java trunk/framework/api/src/main/java/org/ajax4jsf/event/DragListener.java trunk/framework/api/src/main/java/org/ajax4jsf/event/DropEvent.java trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListener.java trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListenerBinding.java trunk/framework/api/src/main/java/org/ajax4jsf/event/DropSource.java Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent trunk/framework/api/src/main/java/org/richfaces/component/Draggable.java trunk/framework/api/src/main/java/org/richfaces/component/Dropzone.java trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/taglib/DropSourceMetaRule.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockComponentState.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataAdaptor.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockRange.java trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java trunk/framework/test/src/test/java/DnDScriptTest.java trunk/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java trunk/framework/test/src/test/java/org/richfaces/component/util/FormUtilTest.java trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java trunk/framework/test/src/test/java/org/richfaces/renderkit/InputRendererBaseTest.java trunk/ui/drag-drop/src/main/config/component/dragSupport.xml trunk/ui/drag-drop/src/main/config/component/dropSupport.xml trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropListenerTag.java trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java trunk/ui/tree/src/main/config/component/commonTreeListeners.ent trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java Log: packages and classes refactor Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/ajax_region_attributes.ent 2007-07-04 00:04:48 UTC (rev 1456) @@ -3,7 +3,7 @@ <name>ajaxListener</name> <defaultvalue>null</defaultvalue> <classname>javax.faces.el.MethodBinding</classname> - <methodargs>org.ajax4jsf.framework.ajax.AjaxEvent.class</methodargs> + <methodargs>org.ajax4jsf.event.AjaxEvent.class</methodargs> <description> MethodBinding representing an action listener method that will be notified when this component is activated by the ajax Request and handle it. The expression must evaluate to a public method that takes an AjaxEvent parameter, with a return type of void</description> </property> <property hidden="true"> Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent 2007-07-04 00:04:48 UTC (rev 1456) @@ -30,7 +30,7 @@ <description> MethodBinding representing an listener method that will be notified afrer drag operation. </description> - <methodargs>org.ajax4jsf.dnd.event.DragEvent.class</methodargs> + <methodargs>org.ajax4jsf.event.DragEvent.class</methodargs> </property> </properties> Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2007-07-04 00:04:48 UTC (rev 1456) @@ -43,6 +43,6 @@ MethodBinding representing an action listener method that will be notified afrer drop operation ]]> </description> - <methodargs>org.ajax4jsf.dnd.event.DropEvent.class</methodargs> + <methodargs>org.ajax4jsf.event.DropEvent.class</methodargs> </property> </properties> Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DragEvent.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DragEvent.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DragEvent.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,103 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.component.UIComponent; -import javax.faces.event.FacesEvent; -import javax.faces.event.FacesListener; - -import org.richfaces.component.Draggable; -import org.richfaces.component.Dropzone; - -/** - * @author Nick Belaevski - nbelaevski(a)exadel.com - * created 27.12.2006 - * - */ -public class DragEvent extends FacesEvent { - - private Dropzone dropTarget; - private Object acceptedTypes; - private Object dropValue; - /** - * - */ - private static final long serialVersionUID = 6179268394391836905L; - - public DragEvent(UIComponent uiComponent) { - super(uiComponent); - } - - /* (non-Javadoc) - * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener) - */ - public boolean isAppropriateListener(FacesListener faceslistener) { - return faceslistener instanceof DragListener; - } - - /* (non-Javadoc) - * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener) - */ - public void processListener(FacesListener faceslistener) { - ((DragListener) faceslistener).processDrag(this); - } - - public Object getDragValue() { - return ((Draggable) this.getSource()).getDragValue(); - } - - public Dropzone getDropTarget() { - return dropTarget; - } - - /** - * @see java.util.EventObject#toString() - */ -/* public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE). - append("component", getComponent()).append("source", getSource()).append("phaseId", getPhaseId()). - append("dragValue", getDragValue()). - append("dropTarget", getDropTarget()). - append("dropValue", getDropValue()). - toString(); - } -*/ - public void setDropTarget(Dropzone dropTarget) { - this.dropTarget = dropTarget; - } - - public Object getAcceptedTypes() { - return acceptedTypes; - } - - public void setAcceptedTypes(Object acceptedTypes) { - this.acceptedTypes = acceptedTypes; - } - - public Object getDropValue() { - return dropValue; - } - - public void setDropValue(Object dropValue) { - this.dropValue = dropValue; - } -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DragListener.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DragListener.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DragListener.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,34 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.event.FacesListener; - -/** - * @author Nick Belaevski - nbelaevski(a)exadel.com - * created 27.12.2006 - * - */ -public interface DragListener extends FacesListener { - public void processDrag(DragEvent event); - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DropEvent.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DropEvent.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DropEvent.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,113 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.component.UIComponent; -import javax.faces.event.FacesEvent; -import javax.faces.event.FacesListener; - -import org.richfaces.component.Draggable; -import org.richfaces.component.Dropzone; - -/** - * @author shura - * - */ -public class DropEvent extends FacesEvent { - - /** - * - */ - private static final long serialVersionUID = 1660545054556302746L; - - private Draggable draggableSource; - private String dragType; - private Object dragValue; - - public DropEvent(UIComponent component) { - super(component); - } - - /* (non-Javadoc) - * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener) - */ - public boolean isAppropriateListener(FacesListener listener) { - - return listener instanceof DropListener; - } - - /* (non-Javadoc) - * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener) - */ - public void processListener(FacesListener listener) { - if (listener instanceof DropListener) { - DropListener dropListener = (DropListener) listener; - dropListener.processDrop(this); - } - - } - - /** - * @return the dropValue - */ - public Object getDropValue() { - return ((Dropzone) this.getSource()).getDropValue(); - } - - public Draggable getDraggableSource() { - return draggableSource; - } - - /** - * @see java.util.EventObject#toString() - */ -/* public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE). - append("component", getComponent()). - append("source", getSource()). - append("phaseId", getPhaseId()). - append("dropValue", getDropValue()). - append("draggableSource", getDraggableSource()). - append("dragValue", getDragValue()). - toString(); - } -*/ - public void setDraggableSource(Draggable draggableSource) { - this.draggableSource = draggableSource; - } - - public String getDragType() { - return dragType; - } - - public void setDragType(String dragType) { - this.dragType = dragType; - } - - public Object getDragValue() { - return dragValue; - } - - public void setDragValue(Object dragValue) { - this.dragValue = dragValue; - } -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListener.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListener.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListener.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,39 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.event.FacesListener; - -/** - * Listener for process Drop events - * @author shura - * - */ -public interface DropListener extends FacesListener { - - /** - * Process event on Drop for this component. - * @param event - */ - public void processDrop(DropEvent event); - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListenerBinding.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListenerBinding.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListenerBinding.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,104 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.component.StateHolder; -import javax.faces.component.UIComponentBase; -import javax.faces.context.FacesContext; -import javax.faces.el.ValueBinding; - -/** - * Wrapper for bind DrolListener to EL expression. - * @author shura - * - */ -public class DropListenerBinding implements DropListener, StateHolder { - - private ValueBinding _binding; - - private String _dragType; - - private ValueBinding _dragTypeBinding; - - private boolean _transient = false; - - public DropListenerBinding() { - } - - /** - * @param binding - */ - public DropListenerBinding(ValueBinding binding) { - super(); - _binding = binding; - } - - private DropListener getHandler(FacesContext context) { - return (DropListener) _binding.getValue(context); - } - - public void processDrop(DropEvent event) { - DropListener handler = getHandler(FacesContext.getCurrentInstance()); - handler.processDrop(event); - } - - public boolean isTransient() { - // TODO Auto-generated method stub - return _transient; - } - - public void restoreState(FacesContext context, Object state) { - _binding = (ValueBinding) UIComponentBase.restoreAttachedState(context, state); - - } - - public Object saveState(FacesContext context) { - return UIComponentBase.saveAttachedState(context, _binding); - } - - public void setTransient(boolean newTransientValue) { - _transient = newTransientValue; - - } - - /** - * @return the dragType - */ - public String getDragType() { - return _dragType; - } - - /** - * @param dragType the dragType to set - */ - public void setDragType(String dragType) { - _dragType = dragType; - } - - /** - * @param dragTypeBinding the dragTypeBinding to set - */ - public void setDragTypeBinding(ValueBinding dragTypeBinding) { - _dragTypeBinding = dragTypeBinding; - } - -} Deleted: trunk/framework/api/src/main/java/org/ajax4jsf/event/DropSource.java =================================================================== --- trunk/framework/api/src/main/java/org/ajax4jsf/event/DropSource.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/ajax4jsf/event/DropSource.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,54 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.ajax4jsf.event; - -import javax.faces.el.MethodBinding; - -/** - * Interface for component applicable to process drag/drop events. - * @author shura - * - */ -public interface DropSource { - - /** - * Append drop listener to component listeners collection - * @param listener - */ - public void addDropListener(DropListener listener); - - /** - * Get array of all Drop Listeners - * @return - */ - public DropListener[] getDropListeners(); - - /** - * Remove drop listener from component listeners array. - * @param listener - */ - public void removeDropListener(DropListener listener); - - public void setDropListener(MethodBinding binding); - public MethodBinding getDropListener(); - -} Modified: trunk/framework/api/src/main/java/org/richfaces/component/Draggable.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/component/Draggable.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/richfaces/component/Draggable.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -23,7 +23,7 @@ import javax.faces.el.MethodBinding; -import org.ajax4jsf.event.DragListener; +import org.richfaces.event.DragListener; /** Modified: trunk/framework/api/src/main/java/org/richfaces/component/Dropzone.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/component/Dropzone.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/richfaces/component/Dropzone.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,7 +21,7 @@ package org.richfaces.component; -import org.ajax4jsf.event.DropSource; +import org.richfaces.event.DropSource; /** * Base interface for all components, accesible as drop zone. Copied: trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DragEvent.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DragEvent.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,103 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.component.UIComponent; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; + +import org.richfaces.component.Draggable; +import org.richfaces.component.Dropzone; + +/** + * @author Nick Belaevski - nbelaevski(a)exadel.com + * created 27.12.2006 + * + */ +public class DragEvent extends FacesEvent { + + private Dropzone dropTarget; + private Object acceptedTypes; + private Object dropValue; + /** + * + */ + private static final long serialVersionUID = 6179268394391836905L; + + public DragEvent(UIComponent uiComponent) { + super(uiComponent); + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener) + */ + public boolean isAppropriateListener(FacesListener faceslistener) { + return faceslistener instanceof DragListener; + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener) + */ + public void processListener(FacesListener faceslistener) { + ((DragListener) faceslistener).processDrag(this); + } + + public Object getDragValue() { + return ((Draggable) this.getSource()).getDragValue(); + } + + public Dropzone getDropTarget() { + return dropTarget; + } + + /** + * @see java.util.EventObject#toString() + */ +/* public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE). + append("component", getComponent()).append("source", getSource()).append("phaseId", getPhaseId()). + append("dragValue", getDragValue()). + append("dropTarget", getDropTarget()). + append("dropValue", getDropValue()). + toString(); + } +*/ + public void setDropTarget(Dropzone dropTarget) { + this.dropTarget = dropTarget; + } + + public Object getAcceptedTypes() { + return acceptedTypes; + } + + public void setAcceptedTypes(Object acceptedTypes) { + this.acceptedTypes = acceptedTypes; + } + + public Object getDropValue() { + return dropValue; + } + + public void setDropValue(Object dropValue) { + this.dropValue = dropValue; + } +} Copied: trunk/framework/api/src/main/java/org/richfaces/event/DragListener.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DragListener.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DragListener.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DragListener.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,34 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.event.FacesListener; + +/** + * @author Nick Belaevski - nbelaevski(a)exadel.com + * created 27.12.2006 + * + */ +public interface DragListener extends FacesListener { + public void processDrag(DragEvent event); + +} Copied: trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DropEvent.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DropEvent.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,113 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.component.UIComponent; +import javax.faces.event.FacesEvent; +import javax.faces.event.FacesListener; + +import org.richfaces.component.Draggable; +import org.richfaces.component.Dropzone; + +/** + * @author shura + * + */ +public class DropEvent extends FacesEvent { + + /** + * + */ + private static final long serialVersionUID = 1660545054556302746L; + + private Draggable draggableSource; + private String dragType; + private Object dragValue; + + public DropEvent(UIComponent component) { + super(component); + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener) + */ + public boolean isAppropriateListener(FacesListener listener) { + + return listener instanceof DropListener; + } + + /* (non-Javadoc) + * @see javax.faces.event.FacesEvent#processListener(javax.faces.event.FacesListener) + */ + public void processListener(FacesListener listener) { + if (listener instanceof DropListener) { + DropListener dropListener = (DropListener) listener; + dropListener.processDrop(this); + } + + } + + /** + * @return the dropValue + */ + public Object getDropValue() { + return ((Dropzone) this.getSource()).getDropValue(); + } + + public Draggable getDraggableSource() { + return draggableSource; + } + + /** + * @see java.util.EventObject#toString() + */ +/* public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE). + append("component", getComponent()). + append("source", getSource()). + append("phaseId", getPhaseId()). + append("dropValue", getDropValue()). + append("draggableSource", getDraggableSource()). + append("dragValue", getDragValue()). + toString(); + } +*/ + public void setDraggableSource(Draggable draggableSource) { + this.draggableSource = draggableSource; + } + + public String getDragType() { + return dragType; + } + + public void setDragType(String dragType) { + this.dragType = dragType; + } + + public Object getDragValue() { + return dragValue; + } + + public void setDragValue(Object dragValue) { + this.dragValue = dragValue; + } +} Copied: trunk/framework/api/src/main/java/org/richfaces/event/DropListener.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListener.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DropListener.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DropListener.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,39 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.event.FacesListener; + +/** + * Listener for process Drop events + * @author shura + * + */ +public interface DropListener extends FacesListener { + + /** + * Process event on Drop for this component. + * @param event + */ + public void processDrop(DropEvent event); + +} Copied: trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DropListenerBinding.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DropListenerBinding.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,104 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.component.StateHolder; +import javax.faces.component.UIComponentBase; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; + +/** + * Wrapper for bind DrolListener to EL expression. + * @author shura + * + */ +public class DropListenerBinding implements DropListener, StateHolder { + + private ValueBinding _binding; + + private String _dragType; + + private ValueBinding _dragTypeBinding; + + private boolean _transient = false; + + public DropListenerBinding() { + } + + /** + * @param binding + */ + public DropListenerBinding(ValueBinding binding) { + super(); + _binding = binding; + } + + private DropListener getHandler(FacesContext context) { + return (DropListener) _binding.getValue(context); + } + + public void processDrop(DropEvent event) { + DropListener handler = getHandler(FacesContext.getCurrentInstance()); + handler.processDrop(event); + } + + public boolean isTransient() { + // TODO Auto-generated method stub + return _transient; + } + + public void restoreState(FacesContext context, Object state) { + _binding = (ValueBinding) UIComponentBase.restoreAttachedState(context, state); + + } + + public Object saveState(FacesContext context) { + return UIComponentBase.saveAttachedState(context, _binding); + } + + public void setTransient(boolean newTransientValue) { + _transient = newTransientValue; + + } + + /** + * @return the dragType + */ + public String getDragType() { + return _dragType; + } + + /** + * @param dragType the dragType to set + */ + public void setDragType(String dragType) { + _dragType = dragType; + } + + /** + * @param dragTypeBinding the dragTypeBinding to set + */ + public void setDragTypeBinding(ValueBinding dragTypeBinding) { + _dragTypeBinding = dragTypeBinding; + } + +} Copied: trunk/framework/api/src/main/java/org/richfaces/event/DropSource.java (from rev 1454, trunk/framework/api/src/main/java/org/ajax4jsf/event/DropSource.java) =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/event/DropSource.java (rev 0) +++ trunk/framework/api/src/main/java/org/richfaces/event/DropSource.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -0,0 +1,54 @@ +/** + * License Agreement. + * + * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.richfaces.event; + +import javax.faces.el.MethodBinding; + +/** + * Interface for component applicable to process drag/drop events. + * @author shura + * + */ +public interface DropSource { + + /** + * Append drop listener to component listeners collection + * @param listener + */ + public void addDropListener(DropListener listener); + + /** + * Get array of all Drop Listeners + * @return + */ + public DropListener[] getDropListeners(); + + /** + * Remove drop listener from component listeners array. + * @param listener + */ + public void removeDropListener(DropListener listener); + + public void setDropListener(MethodBinding binding); + public MethodBinding getDropListener(); + +} Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -125,11 +125,11 @@ } } - protected TreeNode locateTreeNode(TreeRowKey rowKey) { + public TreeNode locateTreeNode(TreeRowKey rowKey) { return locateTreeNode(rowKey, false); } - protected TreeNode locateTreeNode(TreeRowKey rowKey, boolean allowCreate) { + public TreeNode locateTreeNode(TreeRowKey rowKey, boolean allowCreate) { boolean useCached = (rowTreeData != null && rowKey != null && rowKey.equals(this.oldRowKey)); if (!useCached) { TreeNode rootNode = (TreeNode) getWrappedData(); Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/taglib/DropSourceMetaRule.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/taglib/DropSourceMetaRule.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/dnd/taglib/DropSourceMetaRule.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -33,8 +33,8 @@ import javax.faces.el.MethodBinding; -import org.ajax4jsf.event.DropEvent; -import org.ajax4jsf.event.DropSource; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropSource; import com.sun.facelets.FaceletContext; import com.sun.facelets.tag.MetaRule; Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -26,9 +26,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; -import java.io.PrintWriter; import java.net.URL; import java.util.Collections; import java.util.Enumeration; @@ -44,11 +42,9 @@ import javax.faces.context.FacesContext; import javax.faces.render.RenderKitFactory; import javax.faces.render.Renderer; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxContextImpl; import org.ajax4jsf.framework.renderer.AjaxViewRootRenderer; import org.ajax4jsf.framework.renderer.ChameleonRenderKitImpl; Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractThreadedAjax4JsfTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -26,7 +26,7 @@ import junit.framework.AssertionFailedError; import junit.framework.TestResult; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.AjaxContextImpl; import org.apache.shale.test.mock.MockFacesContext; import org.apache.shale.test.mock.MockHttpServletRequest; Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockComponentState.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockComponentState.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockComponentState.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -25,8 +25,8 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataComponentState; -import org.ajax4jsf.ajax.repeat.Range; +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.Range; /** * @author shura Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataAdaptor.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataAdaptor.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataAdaptor.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -23,9 +23,9 @@ import java.util.Iterator; -import org.ajax4jsf.ajax.repeat.DataComponentState; -import org.ajax4jsf.ajax.repeat.ExtendedDataModel; import org.ajax4jsf.ajax.repeat.UIDataAdaptor; +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.ExtendedDataModel; /** * @author shura Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockDataModel.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -22,14 +22,13 @@ package org.ajax4jsf.tests; import java.io.IOException; -import java.util.Iterator; import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataVisitor; -import org.ajax4jsf.ajax.repeat.ExtendedDataModel; -import org.ajax4jsf.ajax.repeat.Range; -import org.ajax4jsf.ajax.repeat.SequenceRange; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.ExtendedDataModel; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SequenceRange; /** * @author shura Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockRange.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockRange.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockRange.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,7 +21,7 @@ package org.ajax4jsf.tests; -import org.ajax4jsf.ajax.repeat.Range; +import org.ajax4jsf.model.Range; /** * @author shura Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/MockSerializableDataModel.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -25,9 +25,9 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.ajax.repeat.DataVisitor; -import org.ajax4jsf.ajax.repeat.Range; -import org.ajax4jsf.ajax.repeat.SerializableDataModel; +import org.ajax4jsf.model.DataVisitor; +import org.ajax4jsf.model.Range; +import org.ajax4jsf.model.SerializableDataModel; /** * @author shura Modified: trunk/framework/test/src/test/java/DnDScriptTest.java =================================================================== --- trunk/framework/test/src/test/java/DnDScriptTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/DnDScriptTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -24,7 +24,6 @@ import org.ajax4jsf.dnd.DnDScript; import org.ajax4jsf.framework.resource.FacesResourceContext; import org.ajax4jsf.framework.resource.ResourceContext; -import org.ajax4jsf.framework.resource.TemplateCSSResource; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; /** Modified: trunk/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/ajax/repeat/DataAdaptorTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,16 +21,16 @@ package org.ajax4jsf.ajax.repeat; -import java.io.IOException; import java.util.ArrayList; import javax.faces.component.UIColumn; -import javax.faces.component.UIComponent; import javax.faces.component.UIData; import javax.faces.component.UIInput; import javax.faces.component.UIViewRoot; import javax.faces.context.FacesContext; +import org.ajax4jsf.model.DataComponentState; +import org.ajax4jsf.model.ExtendedDataModel; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.ajax4jsf.tests.MockComponentState; import org.ajax4jsf.tests.MockDataAdaptor; Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/renderer/BeforeRendererListenerTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,15 +21,13 @@ package org.ajax4jsf.framework.renderer; -import javax.faces.component.UIComponent; import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; -import org.ajax4jsf.framework.ajax.AjaxContext; +import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.framework.ajax.xmlfilter.BaseFilter; import org.ajax4jsf.framework.ajax.xmlfilter.FilterServletResponseWrapper; - import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; /** Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/CSSTemplateTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -23,10 +23,8 @@ import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import org.ajax4jsf.framework.renderer.compiler.TemplateContext; -import org.ajax4jsf.framework.skin.SkinFactory; import org.ajax4jsf.framework.util.config.WebXml; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.shale.test.mock.MockPrintWriter; Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/InternetResourceServiceTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -23,13 +23,9 @@ import java.io.IOException; -import javax.servlet.ServletException; - import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.shale.test.mock.MockServletOutputStream; -import com.gargoylesoftware.htmlunit.Page; - /** * @author shura * Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/MockResourceRequest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,23 +21,9 @@ package org.ajax4jsf.framework.resource; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.Principal; -import java.util.Enumeration; -import java.util.Locale; -import java.util.Map; - -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpSession; -import org.apache.shale.test.mock.MockHttpServletRequest; - /** * @author shura * Modified: trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java =================================================================== --- trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/ajax4jsf/framework/resource/ResourceServiceThreadsTestCase.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -23,9 +23,7 @@ import javax.faces.context.FacesContext; -import org.ajax4jsf.framework.skin.SkinThreadsTestCase.SkinTestRunnable; import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase; -import org.ajax4jsf.tests.AbstractThreadedAjax4JsfTestCase.TestCaseRunnable; import org.apache.shale.test.mock.MockHttpServletRequest; import org.apache.shale.test.mock.MockHttpServletResponse; import org.apache.shale.test.mock.MockServletOutputStream; Modified: trunk/framework/test/src/test/java/org/richfaces/component/util/FormUtilTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/component/util/FormUtilTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/richfaces/component/util/FormUtilTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -21,8 +21,6 @@ package org.richfaces.component.util; -import java.util.List; - import javax.faces.component.UIComponent; import javax.faces.component.UIForm; import javax.faces.component.UIOutput; Modified: trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/richfaces/renderkit/CompositeRendererTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -3,24 +3,18 @@ import java.io.IOException; import java.io.StringWriter; import java.util.Arrays; -import java.util.List; import java.util.Map; import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; import javax.faces.component.UIForm; import javax.faces.component.UIInput; -import javax.faces.component.UIOutput; import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import org.apache.shale.test.mock.MockFacesContext; import org.apache.shale.test.mock.MockResponseWriter; -import junit.framework.TestCase; - public class CompositeRendererTest extends AbstractAjax4JsfTestCase { public CompositeRendererTest(String name) { Modified: trunk/framework/test/src/test/java/org/richfaces/renderkit/InputRendererBaseTest.java =================================================================== --- trunk/framework/test/src/test/java/org/richfaces/renderkit/InputRendererBaseTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/framework/test/src/test/java/org/richfaces/renderkit/InputRendererBaseTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -28,12 +28,9 @@ import javax.faces.component.UIInput; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; -import javax.faces.convert.IntegerConverter; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; -import junit.framework.TestCase; - /** * @author Nick - mailto:nbelaevski@exadel.com * created 12.04.2007 Modified: trunk/ui/drag-drop/src/main/config/component/dragSupport.xml =================================================================== --- trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/config/component/dragSupport.xml 2007-07-04 00:04:48 UTC (rev 1456) @@ -46,7 +46,7 @@ <description> MethodBinding representing an action listener method that will be notified after drag operation </description> - <methodargs>org.ajax4jsf.event.DragEvent.class</methodargs> + <methodargs>org.richfaces.event.DragEvent.class</methodargs> </property> <property> <name>disableDefault</name> @@ -69,13 +69,13 @@ <listener> <name>dragListener</name> <listenerclass> - org.ajax4jsf.event.DragListener + org.richfaces.event.DragListener </listenerclass> <componentclass> org.richfaces.component.Draggable </componentclass> <eventclass> - org.ajax4jsf.event.DragEvent + org.richfaces.event.DragEvent </eventclass> <taghandler generate="true"> <classname> Modified: trunk/ui/drag-drop/src/main/config/component/dropSupport.xml =================================================================== --- trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/config/component/dropSupport.xml 2007-07-04 00:04:48 UTC (rev 1456) @@ -39,7 +39,7 @@ MethodBinding representing an action listener method that will be notified after drop operation. ]]> </description> - <methodargs>org.ajax4jsf.event.DropEvent.class</methodargs> + <methodargs>org.richfaces.event.DropEvent.class</methodargs> </property> <property> <name>disableDefault</name> @@ -68,13 +68,13 @@ <listener> <name>dropListener</name> <listenerclass> - org.ajax4jsf.event.DropListener + org.richfaces.event.DropListener </listenerclass> <componentclass> - org.ajax4jsf.event.DropSource + org.richfaces.event.DropSource </componentclass> <eventclass> - org.ajax4jsf.event.DropEvent + org.richfaces.event.DropEvent </eventclass> <methodname>addDropListener</methodname> <taghandler generate="true"> Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -29,8 +29,8 @@ import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DragListener; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DragListener; /** * JSF component class Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -29,8 +29,8 @@ import org.ajax4jsf.component.AjaxActionComponent; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.DropEvent; -import org.ajax4jsf.event.DropListener; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropListener; /** * JSF component class Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -30,11 +30,11 @@ import javax.faces.event.FacesEvent; import org.ajax4jsf.dnd.DnDScript; -import org.ajax4jsf.event.DragEvent; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.resource.PrototypeScript; import org.richfaces.component.Draggable; import org.richfaces.component.Dropzone; +import org.richfaces.event.DragEvent; import org.richfaces.renderkit.DnDEventsExchangeMailer.EventCallback; /** Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -29,7 +29,6 @@ import javax.faces.event.FacesEvent; import org.ajax4jsf.dnd.DnDScript; -import org.ajax4jsf.event.DropEvent; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.resource.PrototypeScript; import org.ajax4jsf.framework.util.javascript.JSFunction; @@ -38,6 +37,7 @@ import org.ajax4jsf.framework.util.javascript.ScriptUtils; import org.richfaces.component.Draggable; import org.richfaces.component.Dropzone; +import org.richfaces.event.DropEvent; import org.richfaces.json.JSONCollection; import org.richfaces.json.JSONException; import org.richfaces.json.JSONMap; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -82,7 +82,7 @@ static class dragListenerMapper extends Metadata { - private static final Class[] SIGNATURE = new Class[] { org.ajax4jsf.event.DragEvent.class }; + private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.DragEvent.class }; private final TagAttribute _action; Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropListenerTag.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropListenerTag.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropListenerTag.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -30,9 +30,9 @@ import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.TagSupport; -import org.ajax4jsf.event.DropListener; -import org.ajax4jsf.event.DropListenerBinding; -import org.ajax4jsf.event.DropSource; +import org.richfaces.event.DropListener; +import org.richfaces.event.DropListenerBinding; +import org.richfaces.event.DropSource; /** Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -81,7 +81,7 @@ static class dropListenerMapper extends Metadata { - private static final Class[] SIGNATURE = new Class[] { org.ajax4jsf.event.DropEvent.class }; + private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.DropEvent.class }; private final TagAttribute _action; Modified: trunk/ui/tree/src/main/config/component/commonTreeListeners.ent =================================================================== --- trunk/ui/tree/src/main/config/component/commonTreeListeners.ent 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/main/config/component/commonTreeListeners.ent 2007-07-04 00:04:48 UTC (rev 1456) @@ -1,13 +1,13 @@ <listener> <name>dropListener</name> <listenerclass> - org.ajax4jsf.dnd.event.DropListener + org.richfaces.event.DropListener </listenerclass> <componentclass> - org.ajax4jsf.dnd.event.DropSource + org.richfaces.event.DropSource </componentclass> <eventclass> - org.ajax4jsf.dnd.event.DropEvent + org.richfaces.event.DropEvent </eventclass> <taghandler generate="false"> <classname> @@ -19,13 +19,13 @@ <listener> <name>dragListener</name> <listenerclass> - org.ajax4jsf.dnd.event.DragListener + org.richfaces.event.DragListener </listenerclass> <componentclass> - org.ajax4jsf.dnd.Draggable + org.richfaces.component.Draggable </componentclass> <eventclass> - org.ajax4jsf.dnd.event.DragEvent + org.richfaces.event.DragEvent </eventclass> <taghandler generate="false"> <classname> @@ -38,13 +38,13 @@ <listener> <name>changeExpandListener</name> <listenerclass> - org.richfaces.component.events.NodeExpandedListener + org.richfaces.event.NodeExpandedListener </listenerclass> <componentclass> - org.richfaces.component.TreeListenerEventsProducer + org.richfaces.event.TreeListenerEventsProducer </componentclass> <eventclass> - org.richfaces.component.events.NodeExpandedEvent + org.richfaces.event.NodeExpandedEvent </eventclass> <taghandler generate="true"> <classname> @@ -55,13 +55,13 @@ <listener> <name>nodeSelectListener</name> <listenerclass> - org.richfaces.component.events.NodeSelectedListener + org.richfaces.event.NodeSelectedListener </listenerclass> <componentclass> - org.richfaces.component.TreeListenerEventsProducer + org.richfaces.event.TreeListenerEventsProducer </componentclass> <eventclass> - org.richfaces.component.events.NodeSelectedEvent + org.richfaces.event.NodeSelectedEvent </eventclass> <taghandler generate="true"> <classname> Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -37,10 +37,6 @@ import org.ajax4jsf.ajax.repeat.UIDataAdaptor; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DragListener; -import org.ajax4jsf.event.DropEvent; -import org.ajax4jsf.event.DropListener; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.model.DataComponentState; import org.ajax4jsf.model.DataVisitor; @@ -54,6 +50,10 @@ import org.richfaces.component.state.events.ExpandAllCommandEvent; import org.richfaces.component.state.events.ExpandNodeCommandEvent; import org.richfaces.component.state.events.TreeStateCommandEvent; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DragListener; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropListener; import org.richfaces.event.NodeExpandedEvent; import org.richfaces.event.NodeExpandedListener; import org.richfaces.event.NodeSelectedEvent; Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -13,12 +13,12 @@ import javax.faces.event.FacesEvent; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DragListener; -import org.ajax4jsf.event.DropEvent; -import org.ajax4jsf.event.DropListener; import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.richfaces.component.events.TreeEvents; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DragListener; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropListener; import org.richfaces.event.NodeExpandedListener; import org.richfaces.event.NodeSelectedListener; import org.richfaces.event.TreeListenerEventsProducer; Modified: trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -27,9 +27,9 @@ import javax.faces.event.FacesEvent; import org.ajax4jsf.event.AjaxEvent; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DropEvent; import org.richfaces.event.AjaxSelectedEvent; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DropEvent; import org.richfaces.event.NodeExpandedEvent; import org.richfaces.event.NodeSelectedEvent; import org.richfaces.event.TreeListenerEventsProducer; Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -38,10 +38,6 @@ import javax.faces.event.PhaseId; import javax.servlet.http.HttpServletResponse; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DragListener; -import org.ajax4jsf.event.DropEvent; -import org.ajax4jsf.event.DropListener; import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.InternetResourceBuilder; import org.ajax4jsf.framework.resource.ResourceBuilderImpl; @@ -50,6 +46,10 @@ import org.apache.commons.lang.StringUtils; import org.richfaces.component.state.events.ExpandAllCommandEvent; import org.richfaces.component.xml.XmlTreeDataBuilder; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DragListener; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropListener; import org.richfaces.event.NodeExpandedEvent; import org.richfaces.event.NodeExpandedListener; import org.richfaces.event.NodeSelectedEvent; @@ -410,7 +410,7 @@ } /** - * Test method for {@link org.richfaces.component.UITreeNode#addDropListener(org.ajax4jsf.event.DropListener)}. + * Test method for {@link org.richfaces.component.UITreeNode#addDropListener(org.richfaces.event.DropListener)}. */ public final void testAddDropListener() { DropListener listener = new DropListener() { @@ -439,7 +439,7 @@ } /** - * Test method for {@link org.richfaces.component.UITreeNode#addDragListener(org.ajax4jsf.event.DragListener)}. + * Test method for {@link org.richfaces.component.UITreeNode#addDragListener(org.richfaces.event.DragListener)}. */ public final void testAddDragListener() { DragListener listener = new DragListener() { Modified: trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java =================================================================== --- trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java 2007-07-03 22:07:58 UTC (rev 1455) +++ trunk/ui/tree/src/test/java/org/richfaces/component/events/TreeEventsTest.java 2007-07-04 00:04:48 UTC (rev 1456) @@ -26,8 +26,6 @@ import javax.faces.event.FacesEvent; import javax.faces.event.FacesListener; -import org.ajax4jsf.event.DragEvent; -import org.ajax4jsf.event.DropEvent; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.ajax4jsf.tests.MockMethodBinding; import org.ajax4jsf.tests.MockViewRoot; @@ -35,6 +33,8 @@ import org.richfaces.component.UITree; import org.richfaces.component.UITreeNode; import org.richfaces.event.AjaxSelectedEvent; +import org.richfaces.event.DragEvent; +import org.richfaces.event.DropEvent; import org.richfaces.event.NodeExpandedEvent; import org.richfaces.event.NodeSelectedEvent;