From fa397b38e7de75b61dff5b9db0387c23be8c5f74 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Wed, 24 Mar 2010 15:13:24 +0000 Subject: renaming criteria svn changeset:12072/svn branch:6.3 --- .../dd/acceptcriteria/DropTargetDetailEquals.java | 73 ---------------------- .../event/dd/acceptcriteria/TargetDetailIs.java | 73 ++++++++++++++++++++++ .../gwt/client/ui/dd/VDropDetailEquals.java | 32 ---------- .../terminal/gwt/client/ui/dd/VTargetDetailIs.java | 32 ++++++++++ src/com/vaadin/ui/Tree.java | 19 ++++-- 5 files changed, 119 insertions(+), 110 deletions(-) delete mode 100644 src/com/vaadin/event/dd/acceptcriteria/DropTargetDetailEquals.java create mode 100644 src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java delete mode 100644 src/com/vaadin/terminal/gwt/client/ui/dd/VDropDetailEquals.java create mode 100644 src/com/vaadin/terminal/gwt/client/ui/dd/VTargetDetailIs.java (limited to 'src') diff --git a/src/com/vaadin/event/dd/acceptcriteria/DropTargetDetailEquals.java b/src/com/vaadin/event/dd/acceptcriteria/DropTargetDetailEquals.java deleted file mode 100644 index ceb98bbcee..0000000000 --- a/src/com/vaadin/event/dd/acceptcriteria/DropTargetDetailEquals.java +++ /dev/null @@ -1,73 +0,0 @@ -/* -@ITMillApache2LicenseForJavaFiles@ - */ -/** - * - */ -package com.vaadin.event.dd.acceptcriteria; - -import com.vaadin.event.dd.DragAndDropEvent; -import com.vaadin.event.dd.DropTargetDetails; -import com.vaadin.terminal.PaintException; -import com.vaadin.terminal.PaintTarget; -import com.vaadin.terminal.gwt.client.ui.dd.VDropDetailEquals; - -/** - * Criterion for checking if drop target details contains the specific property - * with the specific value. Currently only String values are supported. - * - * @since 6.3 - * - * TODO add support for other basic data types that we support in UIDL. - * - */ -@ClientCriterion(VDropDetailEquals.class) -public class DropTargetDetailEquals extends ClientSideCriterion { - - private static final long serialVersionUID = 763165450054331246L; - private String propertyName; - private Object value; - - /** - * Constructs a criterion which ensures that the value there is a value in - * {@link DropTargetDetails} that equals the reference value. - * - * @param dataFlavor - * the type of data to be checked - * @param value - * the reference value to which the drop target detail will be - * compared - */ - public DropTargetDetailEquals(String dataFlavor, String value) { - propertyName = dataFlavor; - this.value = value; - } - - public DropTargetDetailEquals(String dataFlavor, Boolean true1) { - propertyName = dataFlavor; - value = true1; - } - - @Override - public void paintContent(PaintTarget target) throws PaintException { - super.paintContent(target); - target.addAttribute("p", propertyName); - if (value instanceof Boolean) { - target.addAttribute("v", ((Boolean) value).booleanValue()); - target.addAttribute("t", "b"); - } else if (value instanceof String) { - target.addAttribute("v", (String) value); - } - } - - public boolean accept(DragAndDropEvent dragEvent) { - Object data = dragEvent.getDropTargetDetails().getData(propertyName); - return value.equals(data); - } - - @Override - protected String getIdentifier() { - // sub classes by default use VDropDetailEquals a client implementation - return DropTargetDetailEquals.class.getCanonicalName(); - } -} \ No newline at end of file diff --git a/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java b/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java new file mode 100644 index 0000000000..c20f10667d --- /dev/null +++ b/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java @@ -0,0 +1,73 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ +/** + * + */ +package com.vaadin.event.dd.acceptcriteria; + +import com.vaadin.event.dd.DragAndDropEvent; +import com.vaadin.event.dd.DropTargetDetails; +import com.vaadin.terminal.PaintException; +import com.vaadin.terminal.PaintTarget; +import com.vaadin.terminal.gwt.client.ui.dd.VTargetDetailIs; + +/** + * Criterion for checking if drop target details contains the specific property + * with the specific value. Currently only String values are supported. + * + * @since 6.3 + * + * TODO add support for other basic data types that we support in UIDL. + * + */ +@ClientCriterion(VTargetDetailIs.class) +public class TargetDetailIs extends ClientSideCriterion { + + private static final long serialVersionUID = 763165450054331246L; + private String propertyName; + private Object value; + + /** + * Constructs a criterion which ensures that the value there is a value in + * {@link DropTargetDetails} that equals the reference value. + * + * @param dataFlavor + * the type of data to be checked + * @param value + * the reference value to which the drop target detail will be + * compared + */ + public TargetDetailIs(String dataFlavor, String value) { + propertyName = dataFlavor; + this.value = value; + } + + public TargetDetailIs(String dataFlavor, Boolean true1) { + propertyName = dataFlavor; + value = true1; + } + + @Override + public void paintContent(PaintTarget target) throws PaintException { + super.paintContent(target); + target.addAttribute("p", propertyName); + if (value instanceof Boolean) { + target.addAttribute("v", ((Boolean) value).booleanValue()); + target.addAttribute("t", "b"); + } else if (value instanceof String) { + target.addAttribute("v", (String) value); + } + } + + public boolean accept(DragAndDropEvent dragEvent) { + Object data = dragEvent.getDropTargetDetails().getData(propertyName); + return value.equals(data); + } + + @Override + protected String getIdentifier() { + // sub classes by default use VDropDetailEquals a client implementation + return TargetDetailIs.class.getCanonicalName(); + } +} \ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDropDetailEquals.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDropDetailEquals.java deleted file mode 100644 index 6d04e4c35e..0000000000 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDropDetailEquals.java +++ /dev/null @@ -1,32 +0,0 @@ -/* -@ITMillApache2LicenseForJavaFiles@ - */ -/** - * - */ -package com.vaadin.terminal.gwt.client.ui.dd; - -import com.vaadin.terminal.gwt.client.UIDL; - -final public class VDropDetailEquals extends VAcceptCriterion { - - @Override - protected boolean accept(VDragEvent drag, UIDL configuration) { - String name = configuration.getStringAttribute("p"); - String t = configuration.hasAttribute("t") ? configuration - .getStringAttribute("t").intern() : "s"; - Object value = null; - if (t == "s") { - value = configuration.getStringAttribute("v"); - } else if (t == "b") { - value = configuration.getBooleanAttribute("v"); - } - if (value != null) { - Object object = drag.getDropDetails().get(name); - return value.equals(object); - } else { - return false; - } - - } -} \ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetDetailIs.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetDetailIs.java new file mode 100644 index 0000000000..4e838fb031 --- /dev/null +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetDetailIs.java @@ -0,0 +1,32 @@ +/* +@ITMillApache2LicenseForJavaFiles@ + */ +/** + * + */ +package com.vaadin.terminal.gwt.client.ui.dd; + +import com.vaadin.terminal.gwt.client.UIDL; + +final public class VTargetDetailIs extends VAcceptCriterion { + + @Override + protected boolean accept(VDragEvent drag, UIDL configuration) { + String name = configuration.getStringAttribute("p"); + String t = configuration.hasAttribute("t") ? configuration + .getStringAttribute("t").intern() : "s"; + Object value = null; + if (t == "s") { + value = configuration.getStringAttribute("v"); + } else if (t == "b") { + value = configuration.getBooleanAttribute("v"); + } + if (value != null) { + Object object = drag.getDropDetails().get(name); + return value.equals(object); + } else { + return false; + } + + } +} \ No newline at end of file diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java index 2ce6fe2341..ac4222f8ec 100644 --- a/src/com/vaadin/ui/Tree.java +++ b/src/com/vaadin/ui/Tree.java @@ -35,8 +35,8 @@ import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.DropTargetDetails; import com.vaadin.event.dd.acceptcriteria.ClientCriterion; import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion; -import com.vaadin.event.dd.acceptcriteria.DropTargetDetailEquals; import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; +import com.vaadin.event.dd.acceptcriteria.TargetDetailIs; import com.vaadin.terminal.KeyMapper; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; @@ -1361,16 +1361,25 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, } /** - * A criterion that accepts transferable only directly on a tree node that - * can have children. + * A criterion that accepts {@link Transferable} only directly on a tree + * node that can have children. + *

+ * Class is singleton, use {@link TargetItemAllowsChildren#get()} to get the + * instance. * * @see Tree#setChildrenAllowed(Object, boolean) * * @since 6.3 */ - public static class OverFolderNode extends DropTargetDetailEquals { + public static class TargetItemAllowsChildren extends TargetDetailIs { + + private static TargetItemAllowsChildren instance = new TargetItemAllowsChildren(); + + public static TargetItemAllowsChildren get() { + return instance; + } - public OverFolderNode() { + private TargetItemAllowsChildren() { super("itemIdOverIsNode", Boolean.TRUE); } -- cgit v1.2.3