svn changeset:11377/svn branch:6.3_ddtags/6.7.0.beta1
@@ -5,7 +5,7 @@ import java.lang.annotation.Retention; | |||
import java.lang.annotation.RetentionPolicy; | |||
import java.lang.annotation.Target; | |||
import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriteria; | |||
import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion; | |||
/** | |||
* TODO | |||
@@ -18,5 +18,5 @@ public @interface ClientCriterion { | |||
/** | |||
* @return the client side counterpart for the annotated criterion | |||
*/ | |||
Class<? extends VAcceptCriteria> value(); | |||
Class<? extends VAcceptCriterion> value(); | |||
} |
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.UIDL; | |||
public abstract class VAbstractDropHandler implements VDropHandler { | |||
private UIDL criterioUIDL; | |||
private VAcceptCriteria acceptCriteria = new VAcceptAll(); | |||
private VAcceptCriterion acceptCriteria = new VAcceptAll(); | |||
/** | |||
* Implementor/user of {@link VAbstractDropHandler} must pass the UIDL | |||
@@ -33,7 +33,7 @@ public abstract class VAbstractDropHandler implements VDropHandler { | |||
uidl = (UIDL) childIterator.next(); | |||
} | |||
} | |||
acceptCriteria = VAcceptCriterion.get(uidl.getStringAttribute("name")); | |||
acceptCriteria = VAcceptCriteria.get(uidl.getStringAttribute("name")); | |||
if (acceptCriteria == null) { | |||
throw new IllegalArgumentException( | |||
"No accept criteria found with given name " |
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VAcceptAll implements VAcceptCriteria { | |||
final public class VAcceptAll implements VAcceptCriterion { | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
callback.accepted(drag); |
@@ -1,20 +1,19 @@ | |||
package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
import com.google.gwt.core.client.GWT; | |||
public interface VAcceptCriteria { | |||
/** | |||
* A class via all AcceptCriteria instances are fetched by an identifier. | |||
*/ | |||
public class VAcceptCriteria { | |||
private static VAcceptCriterionFactory impl; | |||
/** | |||
* Checks if current drag event has valid drop target and target accepts the | |||
* transferable. If drop target is valid, callback is used. | |||
* | |||
* @param drag | |||
* @param configuration | |||
* @param callback | |||
*/ | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback); | |||
static { | |||
impl = GWT.create(VAcceptCriterionFactory.class); | |||
} | |||
public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL); | |||
public static VAcceptCriterion get(String name) { | |||
return impl.get(name); | |||
} | |||
} |
@@ -1,19 +1,20 @@ | |||
package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.google.gwt.core.client.GWT; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
/** | |||
* A class via all AcceptCriteria instances are fetched by an identifier. | |||
*/ | |||
public class VAcceptCriterion { | |||
private static VAcceptCriterionFactory impl; | |||
public interface VAcceptCriterion { | |||
static { | |||
impl = GWT.create(VAcceptCriterionFactory.class); | |||
} | |||
/** | |||
* Checks if current drag event has valid drop target and target accepts the | |||
* transferable. If drop target is valid, callback is used. | |||
* | |||
* @param drag | |||
* @param configuration | |||
* @param callback | |||
*/ | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback); | |||
public static VAcceptCriteria get(String name) { | |||
return impl.get(name); | |||
} | |||
public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL); | |||
} |
@@ -2,7 +2,7 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
public abstract class VAcceptCriterionFactory { | |||
public abstract VAcceptCriteria get(String name); | |||
public abstract VAcceptCriterion get(String name); | |||
// name = name.intern(); | |||
// // FIXME make all lazy inited and possibility to use instances per | |||
// // handler |
@@ -6,11 +6,11 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.ApplicationConnection; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VAnd implements VAcceptCriteria { | |||
final public class VAnd implements VAcceptCriterion { | |||
private boolean b1; | |||
private boolean b2; | |||
private VAcceptCriteria crit1; | |||
private VAcceptCriteria crit2; | |||
private VAcceptCriterion crit1; | |||
private VAcceptCriterion crit2; | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
@@ -45,10 +45,10 @@ final public class VAnd implements VAcceptCriteria { | |||
} | |||
} | |||
private VAcceptCriteria getCriteria(VDragEvent drag, UIDL configuration, | |||
private VAcceptCriterion getCriteria(VDragEvent drag, UIDL configuration, | |||
int i) { | |||
UIDL childUIDL = configuration.getChildUIDL(i); | |||
return VAcceptCriterion.get(childUIDL.getStringAttribute("name")); | |||
return VAcceptCriteria.get(childUIDL.getStringAttribute("name")); | |||
} | |||
public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL) { |
@@ -6,7 +6,7 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.Paintable; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VComponentFilter implements VAcceptCriteria { | |||
final public class VComponentFilter implements VAcceptCriterion { | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
try { |
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VContainsDataFlawor implements VAcceptCriteria { | |||
final public class VContainsDataFlawor implements VAcceptCriterion { | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
String name = configuration.getStringAttribute("p"); |
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VDataBound implements VAcceptCriteria { | |||
final public class VDataBound implements VAcceptCriterion { | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
if (drag.getTransferable().getData("itemId") != null) { |
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VDropDetailEquals implements VAcceptCriteria { | |||
final public class VDropDetailEquals implements VAcceptCriterion { | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
String name = configuration.getStringAttribute("p"); |
@@ -7,7 +7,7 @@ import java.util.Set; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VIdentifierIs implements VAcceptCriteria { | |||
final public class VIdentifierIs implements VAcceptCriterion { | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
try { |
@@ -7,7 +7,7 @@ import java.util.Set; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VIsOverId implements VAcceptCriteria { | |||
final public class VIsOverId implements VAcceptCriterion { | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
try { |
@@ -12,7 +12,7 @@ import com.vaadin.terminal.gwt.client.UIDL; | |||
* @deprecated example class testing custom behavior | |||
*/ | |||
@Deprecated | |||
final public class VLazyInitItemIdentifiers implements VAcceptCriteria { | |||
final public class VLazyInitItemIdentifiers implements VAcceptCriterion { | |||
private boolean loaded = false; | |||
private HashSet<String> hashSet; | |||
private VDragEvent lastDragEvent; |
@@ -6,9 +6,9 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.ApplicationConnection; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VNot implements VAcceptCriteria { | |||
final public class VNot implements VAcceptCriterion { | |||
private boolean b1; | |||
private VAcceptCriteria crit1; | |||
private VAcceptCriterion crit1; | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
@@ -35,10 +35,10 @@ final public class VNot implements VAcceptCriteria { | |||
} | |||
} | |||
private VAcceptCriteria getCriteria(VDragEvent drag, UIDL configuration, | |||
private VAcceptCriterion getCriteria(VDragEvent drag, UIDL configuration, | |||
int i) { | |||
UIDL childUIDL = configuration.getChildUIDL(i); | |||
return VAcceptCriterion.get(childUIDL.getStringAttribute("name")); | |||
return VAcceptCriteria.get(childUIDL.getStringAttribute("name")); | |||
} | |||
public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL) { |
@@ -6,11 +6,11 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.ApplicationConnection; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VOr implements VAcceptCriteria { | |||
final public class VOr implements VAcceptCriterion { | |||
private boolean b1; | |||
private boolean b2; | |||
private VAcceptCriteria crit1; | |||
private VAcceptCriteria crit2; | |||
private VAcceptCriterion crit1; | |||
private VAcceptCriterion crit2; | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
@@ -45,10 +45,10 @@ final public class VOr implements VAcceptCriteria { | |||
} | |||
} | |||
private VAcceptCriteria getCriteria(VDragEvent drag, UIDL configuration, | |||
private VAcceptCriterion getCriteria(VDragEvent drag, UIDL configuration, | |||
int i) { | |||
UIDL childUIDL = configuration.getChildUIDL(i); | |||
return VAcceptCriterion.get(childUIDL.getStringAttribute("name")); | |||
return VAcceptCriteria.get(childUIDL.getStringAttribute("name")); | |||
} | |||
public boolean needsServerSideCheck(VDragEvent drag, UIDL criterioUIDL) { |
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VOverTreeNode implements VAcceptCriteria { | |||
final public class VOverTreeNode implements VAcceptCriterion { | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
Boolean containsKey = (Boolean) drag.getDropDetails().get( |
@@ -5,7 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VServerAccept implements VAcceptCriteria { | |||
final public class VServerAccept implements VAcceptCriterion { | |||
public void accept(final VDragEvent drag, UIDL configuration, | |||
final VAcceptCallback callback) { | |||
@@ -6,7 +6,7 @@ package com.vaadin.terminal.gwt.client.ui.dd; | |||
import com.vaadin.terminal.gwt.client.Paintable; | |||
import com.vaadin.terminal.gwt.client.UIDL; | |||
final public class VSourceIsSameAsTarget implements VAcceptCriteria { | |||
final public class VSourceIsSameAsTarget implements VAcceptCriterion { | |||
public void accept(VDragEvent drag, UIDL configuration, | |||
VAcceptCallback callback) { | |||
Paintable dragSource = drag.getTransferable().getDragSource(); |
@@ -15,7 +15,7 @@ import com.google.gwt.user.rebind.ClassSourceFileComposerFactory; | |||
import com.google.gwt.user.rebind.SourceWriter; | |||
import com.vaadin.event.dd.acceptCriteria.AcceptCriterion; | |||
import com.vaadin.event.dd.acceptCriteria.ClientCriterion; | |||
import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriteria; | |||
import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion; | |||
import com.vaadin.ui.ClientWidget; | |||
/** | |||
@@ -93,7 +93,7 @@ public class AcceptCriterionGenerator extends Generator { | |||
private void generateInstantiatorMethod(SourceWriter sourceWriter, | |||
GeneratorContext context, TreeLogger logger) { | |||
sourceWriter.println("public VAcceptCriteria get(String name) {"); | |||
sourceWriter.println("public VAcceptCriterion get(String name) {"); | |||
sourceWriter.indent(); | |||
sourceWriter.println("name = name.intern();"); | |||
@@ -103,7 +103,7 @@ public class AcceptCriterionGenerator extends Generator { | |||
for (Class<? extends AcceptCriterion> class1 : clientSideVerifiableCriterion) { | |||
String canonicalName = class1.getCanonicalName(); | |||
Class<? extends VAcceptCriteria> clientClass = class1 | |||
Class<? extends VAcceptCriterion> clientClass = class1 | |||
.getAnnotation(ClientCriterion.class).value(); | |||
sourceWriter.print("if (\""); | |||
sourceWriter.print(canonicalName); |