Author: lfryc(a)redhat.com Date: 2010-12-17 04:23:12 -0500 (Fri, 17 Dec 2010) New Revision: 20635 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragBehaviorBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragIndicatorBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropBehaviorBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDropBehavior/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDropBehavior/simple.xhtml Log: d-n-d: fixed compilation errors (caused by project changes) and fixed one dropBehavior sample (RF-9769) Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragBehaviorBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragBehaviorBean.java 2010-12-17 08:51:42 UTC (rev 20634) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragBehaviorBean.java 2010-12-17 09:23:12 UTC (rev 20635) @@ -58,7 +58,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getBehaviorAttributes(DragBehavior.class, getClass()); + attributes = Attributes.getBehaviorAttributesFromClass(DragBehavior.class, getClass()); attributes.setAttribute("event", "mouseover"); attributes.setAttribute("type", "drg1"); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragIndicatorBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragIndicatorBean.java 2010-12-17 08:51:42 UTC (rev 20634) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDragIndicatorBean.java 2010-12-17 09:23:12 UTC (rev 20635) @@ -52,7 +52,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getUIComponentAttributes(UIDragIndicator.class, getClass(), true); + attributes = Attributes.getComponentAttributesFromFacesConfig(UIDragIndicator.class, getClass()); attributes.setAttribute("rendered", true); } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropBehaviorBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropBehaviorBean.java 2010-12-17 08:51:42 UTC (rev 20634) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropBehaviorBean.java 2010-12-17 09:23:12 UTC (rev 20635) @@ -64,7 +64,7 @@ logger = LoggerFactory.getLogger(getClass()); logger.debug("initializing bean " + getClass().getName()); - attributes = Attributes.getBehaviorAttributes(DropBehavior.class, getClass()); + attributes = Attributes.getBehaviorAttributesFromClass(DropBehavior.class, getClass()); attributes.setAttribute("event", "mouseover"); attributes.setAttribute("acceptedTypes", "drg1, drg2"); Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/list.xhtml 2010-12-17 08:51:42 UTC (rev 20634) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDragIndicator/list.xhtml 2010-12-17 09:23:12 UTC (rev 20635) @@ -27,7 +27,7 @@ <ui:composition template="/templates/list.xhtml"> - <ui:define name="pageTitle">Rich Drag Behavior</ui:define> + <ui:define name="pageTitle">Rich Drag Indicator</ui:define> <ui:define name="links"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropBehavior/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropBehavior/list.xhtml 2010-12-17 08:51:42 UTC (rev 20634) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropBehavior/list.xhtml 2010-12-17 09:23:12 UTC (rev 20635) @@ -27,7 +27,7 @@ <ui:composition template="/templates/list.xhtml"> - <ui:define name="pageTitle">Rich Drag Behavior</ui:define> + <ui:define name="pageTitle">Rich Drop Behavior</ui:define> <ui:define name="links"> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropBehavior/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropBehavior/simple.xhtml 2010-12-17 08:51:42 UTC (rev 20634) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropBehavior/simple.xhtml 2010-12-17 09:23:12 UTC (rev 20635) @@ -112,8 +112,14 @@ <h:outputLabel value="Drop Event:" rendered="#{not empty richDropListenerBean.dropEvent}" /> <h:panelGroup rendered="#{not empty richDropListenerBean.dropEvent}"> <h:panelGrid columns="2"> - <h:outputLabel value="Value:" /> - <h:outputText value="#{richDropListenerBean.dropEvent.dragBehavior.dragValue}" /> + <h:outputLabel value="clientId:" /> + <h:outputText value="#{richDropListenerBean.dropEvent.component.clientId}" /> + + <h:outputLabel value="Drag Value:" /> + <h:outputText value="#{richDropListenerBean.dropEvent.dragValue}" /> + + <h:outputLabel value="Drop Value:" /> + <h:outputText value="#{richDropListenerBean.dropEvent.dropValue}" /> </h:panelGrid> </h:panelGroup> </h:panelGrid>