Merge pull request #980 from thiagobustamante/master

IGNORE - Reflecting some changes on core
CruxFramework · Jun 23, 2016 · d8659ef · d8659ef
2 parents ab642f0 + 4c7f71f
commit d8659ef
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 35 deletions.
diff --git a/src/main/java/org/cruxframework/crux/smartfaces/rebind/button/ButtonFactory.java b/src/main/java/org/cruxframework/crux/smartfaces/rebind/button/ButtonFactory.java
@@ -15,11 +15,11 @@
  */
 package org.cruxframework.crux.smartfaces.rebind.button;
 
-import org.cruxframework.crux.core.rebind.event.SelectEvtBind;
 import org.cruxframework.crux.core.rebind.screen.widget.WidgetCreator;
 import org.cruxframework.crux.core.rebind.screen.widget.WidgetCreatorContext;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.FocusableFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAllFocusHandlersFactory;
+import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAllSelectHandlersFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasEnabledFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasHTMLFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.children.WidgetChildProcessor;
@@ -30,8 +30,6 @@
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagChild;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagChildren;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagConstraints;
-import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagEvent;
-import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagEvents;
 import org.cruxframework.crux.smartfaces.client.button.Button;
 import org.cruxframework.crux.smartfaces.rebind.Constants;
 
@@ -46,16 +44,14 @@
 	@TagAttribute(value="preventDefaultTouchEvents", type=Boolean.class, defaultValue="false", 
 			description="If true, the component will call preventDefault on all touch events.")
 })
-@TagEvents({
-	@TagEvent(SelectEvtBind.class)
-})
 @TagChildren({
 	@TagChild(value=ButtonFactory.ContentProcessor.class, autoProcess=false)
 })
 
 public class ButtonFactory extends WidgetCreator<WidgetCreatorContext>
 						implements 	HasAllFocusHandlersFactory<WidgetCreatorContext>, HasEnabledFactory<WidgetCreatorContext>,
-									HasHTMLFactory<WidgetCreatorContext>, FocusableFactory<WidgetCreatorContext>
+									HasHTMLFactory<WidgetCreatorContext>, FocusableFactory<WidgetCreatorContext>, 
+									HasAllSelectHandlersFactory<WidgetCreatorContext>
 {
 	@TagConstraints(minOccurs="0", maxOccurs="unbounded", type=HTMLTag.class)
 	public static class ContentProcessor extends WidgetChildProcessor<WidgetCreatorContext> {}

diff --git a/src/main/java/org/cruxframework/crux/smartfaces/rebind/image/ImageFactory.java b/src/main/java/org/cruxframework/crux/smartfaces/rebind/image/ImageFactory.java
@@ -18,12 +18,12 @@
 import org.apache.commons.lang3.StringUtils;
 import org.cruxframework.crux.core.client.utils.EscapeUtils;
 import org.cruxframework.crux.core.rebind.AbstractProxyCreator.SourcePrinter;
-import org.cruxframework.crux.core.rebind.event.SelectEvtBind;
 import org.cruxframework.crux.core.rebind.screen.widget.AttributeProcessor;
 import org.cruxframework.crux.core.rebind.screen.widget.ViewFactoryCreator;
 import org.cruxframework.crux.core.rebind.screen.widget.WidgetCreator;
 import org.cruxframework.crux.core.rebind.screen.widget.WidgetCreatorContext;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAllFocusHandlersFactory;
+import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAllSelectHandlersFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasEnabledFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.event.LoadErrorEvtBind;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.event.LoadEvtBind;
@@ -59,9 +59,12 @@
     			description = "The alternate text of the image for user agents that can't render the image."),
     @TagAttribute(value = "visibleRect", supportsDataBinding=false, 
     			processor = ImageFactory.VisibleRectAttributeParser.class, description = "Visibility rectangle of an image.") })
-@TagEvents({ @TagEvent(LoadEvtBind.class), @TagEvent(LoadErrorEvtBind.class), @TagEvent(SelectEvtBind.class) })
+@TagEvents({ 
+	@TagEvent(LoadEvtBind.class), 
+	@TagEvent(LoadErrorEvtBind.class)
+})
 public class ImageFactory extends WidgetCreator<WidgetCreatorContext> implements HasAllFocusHandlersFactory<WidgetCreatorContext>,
-    HasEnabledFactory<WidgetCreatorContext>
+    HasEnabledFactory<WidgetCreatorContext>, HasAllSelectHandlersFactory<WidgetCreatorContext>
 {
 	public static class URLAttributeParser extends AttributeProcessor<WidgetCreatorContext>
 	{

diff --git a/src/main/java/org/cruxframework/crux/smartfaces/rebind/label/HTMLFactory.java b/src/main/java/org/cruxframework/crux/smartfaces/rebind/label/HTMLFactory.java
@@ -15,9 +15,9 @@
  */
 package org.cruxframework.crux.smartfaces.rebind.label;
 
-import org.cruxframework.crux.core.rebind.event.SelectEvtBind;
 import org.cruxframework.crux.core.rebind.screen.widget.WidgetCreator;
 import org.cruxframework.crux.core.rebind.screen.widget.WidgetCreatorContext;
+import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAllSelectHandlersFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAutoHorizontalAlignmentFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasHTMLFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasTextFactory;
@@ -30,8 +30,6 @@
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagChild;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagChildren;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagConstraints;
-import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagEvent;
-import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagEvents;
 import org.cruxframework.crux.smartfaces.client.label.HTML;
 import org.cruxframework.crux.smartfaces.rebind.Constants;
 
@@ -48,16 +46,14 @@
 	@TagAttribute(value="preventDefaultTouchEvents", type=Boolean.class, defaultValue="false", 
 				  description="If true, the html will call preventDefault on all touch events.")
 })
-@TagEvents({
-	@TagEvent(SelectEvtBind.class)
-})
 @TagChildren({
 	@TagChild(value=HTMLFactory.ContentProcessor.class, autoProcess=false)
 })
 public class HTMLFactory extends WidgetCreator<WidgetCreatorContext> implements HasTextFactory<WidgetCreatorContext>, 
 													HasWordWrapFactory<WidgetCreatorContext>, 
 													HasAutoHorizontalAlignmentFactory<WidgetCreatorContext>,
-													HasHTMLFactory<WidgetCreatorContext>
+													HasHTMLFactory<WidgetCreatorContext>, 
+													HasAllSelectHandlersFactory<WidgetCreatorContext>
 {	
 	@TagConstraints(minOccurs="0", maxOccurs="unbounded", type=HTMLTag.class)
 	public static class ContentProcessor extends WidgetChildProcessor<WidgetCreatorContext> {}

diff --git a/src/main/java/org/cruxframework/crux/smartfaces/rebind/label/LabelFactory.java b/src/main/java/org/cruxframework/crux/smartfaces/rebind/label/LabelFactory.java
@@ -15,17 +15,15 @@
  */
 package org.cruxframework.crux.smartfaces.rebind.label;
 
-import org.cruxframework.crux.core.rebind.event.SelectEvtBind;
 import org.cruxframework.crux.core.rebind.screen.widget.WidgetCreator;
 import org.cruxframework.crux.core.rebind.screen.widget.WidgetCreatorContext;
+import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAllSelectHandlersFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAutoHorizontalAlignmentFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasTextFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasWordWrapFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.DeclarativeFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagAttribute;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagAttributes;
-import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagEvent;
-import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagEvents;
 import org.cruxframework.crux.smartfaces.client.label.Label;
 import org.cruxframework.crux.smartfaces.rebind.Constants;
 
@@ -41,11 +39,9 @@
 	@TagAttribute(value="preventDefaultTouchEvents", type=Boolean.class, defaultValue="false", 
 				  description="If true, the label will call preventDefault on all touch events.")
 })
-@TagEvents({
-	@TagEvent(SelectEvtBind.class)
-})
 public class LabelFactory extends WidgetCreator<WidgetCreatorContext> implements HasTextFactory<WidgetCreatorContext>, 
-													HasWordWrapFactory<WidgetCreatorContext>, HasAutoHorizontalAlignmentFactory<WidgetCreatorContext>
+													HasWordWrapFactory<WidgetCreatorContext>, HasAutoHorizontalAlignmentFactory<WidgetCreatorContext>,
+													HasAllSelectHandlersFactory<WidgetCreatorContext>
 {	
 	@Override
     public WidgetCreatorContext instantiateContext()

diff --git a/src/main/java/org/cruxframework/crux/smartfaces/rebind/panel/SelectableFlowPanelFactory.java b/src/main/java/org/cruxframework/crux/smartfaces/rebind/panel/SelectableFlowPanelFactory.java
@@ -19,6 +19,7 @@
 import org.cruxframework.crux.core.rebind.screen.widget.WidgetCreatorContext;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.FocusableFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAllFocusHandlersFactory;
+import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAllSelectHandlersFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasEnabledFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.children.AnyWidgetChildProcessor;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.DeclarativeFactory;
@@ -44,15 +45,13 @@
 	@TagAttribute(value="preventDefaultTouchEvents", type=Boolean.class, defaultValue="false", 
 						description="If true, the html will call preventDefault on all touch events.")
 })
-@TagEvents({
-	@TagEvent(SelectEvtBind.class)
-})
 @TagChildren({
 	@TagChild(SelectableFlowPanelFactory.WidgetContentProcessor.class)
 })
 public class SelectableFlowPanelFactory extends PanelFactory<WidgetCreatorContext>
 implements 	HasAllFocusHandlersFactory<WidgetCreatorContext>, HasEnabledFactory<WidgetCreatorContext>,
-			FocusableFactory<WidgetCreatorContext>
+			FocusableFactory<WidgetCreatorContext>,
+			HasAllSelectHandlersFactory<WidgetCreatorContext>
 {
 	@TagConstraints(minOccurs="0", maxOccurs="unbounded")
 	public static class WidgetContentProcessor extends AnyWidgetChildProcessor<WidgetCreatorContext> {}		

diff --git a/src/main/java/org/cruxframework/crux/smartfaces/rebind/panel/SelectablePanelFactory.java b/src/main/java/org/cruxframework/crux/smartfaces/rebind/panel/SelectablePanelFactory.java
@@ -15,10 +15,10 @@
  */
 package org.cruxframework.crux.smartfaces.rebind.panel;
 
-import org.cruxframework.crux.core.rebind.event.SelectEvtBind;
 import org.cruxframework.crux.core.rebind.screen.widget.WidgetCreatorContext;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.FocusableFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAllFocusHandlersFactory;
+import org.cruxframework.crux.core.rebind.screen.widget.creator.HasAllSelectHandlersFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.HasEnabledFactory;
 import org.cruxframework.crux.core.rebind.screen.widget.creator.children.AnyWidgetChildProcessor;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.DeclarativeFactory;
@@ -27,8 +27,6 @@
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagChild;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagChildren;
 import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagConstraints;
-import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagEvent;
-import org.cruxframework.crux.core.rebind.screen.widget.declarative.TagEvents;
 import org.cruxframework.crux.gwt.rebind.PanelFactory;
 import org.cruxframework.crux.smartfaces.client.panel.SelectablePanel;
 import org.cruxframework.crux.smartfaces.rebind.Constants;
@@ -44,15 +42,13 @@
 	@TagAttribute(value="preventDefaultTouchEvents", type=Boolean.class, defaultValue="false", 
 						description="If true, the html will call preventDefault on all touch events.")
 })
-@TagEvents({
-	@TagEvent(SelectEvtBind.class)
-})
 @TagChildren({
 	@TagChild(SelectablePanelFactory.WidgetContentProcessor.class)
 })
 public class SelectablePanelFactory extends PanelFactory<WidgetCreatorContext>
 implements 	HasAllFocusHandlersFactory<WidgetCreatorContext>, HasEnabledFactory<WidgetCreatorContext>,
-			FocusableFactory<WidgetCreatorContext>
+			FocusableFactory<WidgetCreatorContext>,
+			HasAllSelectHandlersFactory<WidgetCreatorContext>
 {
 	@TagConstraints(minOccurs="0", maxOccurs="1")
 	public static class WidgetContentProcessor extends AnyWidgetChildProcessor<WidgetCreatorContext> {}