diff options
| author | yyang | 2015-05-28 15:28:29 +0000 |
|---|---|---|
| committer | yyang | 2015-05-28 15:28:29 +0000 |
| commit | ad194dfa7c364b45f1b33c0f9f604d7338f28922 (patch) | |
| tree | bf142a8be59d33c26ea7b7e38f2471ab0a6af9f1 | |
| parent | 266cb0200617c185a830088f824f490ff513142f (diff) | |
| download | org.eclipse.xwt-ad194dfa7c364b45f1b33c0f9f604d7338f28922.tar.gz org.eclipse.xwt-ad194dfa7c364b45f1b33c0f9f604d7338f28922.tar.xz org.eclipse.xwt-ad194dfa7c364b45f1b33c0f9f604d7338f28922.zip | |
[Bug 468271] add the ValidationStatus tag
4 files changed, 16 insertions, 15 deletions
diff --git a/org.eclipse.xwt/src/org/eclipse/xwt/core/IDynamicBinding.java b/org.eclipse.xwt/src/org/eclipse/xwt/core/IDynamicBinding.java index 799102e..b69f7f8 100644 --- a/org.eclipse.xwt/src/org/eclipse/xwt/core/IDynamicBinding.java +++ b/org.eclipse.xwt/src/org/eclipse/xwt/core/IDynamicBinding.java @@ -23,6 +23,7 @@ public interface IDynamicBinding extends IBinding { Object getControl();
+ String getName();
void setHost(Object control);
Object getHost();
diff --git a/org.eclipse.xwt/src/org/eclipse/xwt/internal/core/Binding.java b/org.eclipse.xwt/src/org/eclipse/xwt/internal/core/Binding.java index aa12026..7bd01a9 100644 --- a/org.eclipse.xwt/src/org/eclipse/xwt/internal/core/Binding.java +++ b/org.eclipse.xwt/src/org/eclipse/xwt/internal/core/Binding.java @@ -34,16 +34,6 @@ import org.eclipse.xwt.internal.utils.UserData; public class Binding extends DynamicBinding {
public static Binding[] EMPTY_ARRAY = new Binding[0];
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
private String path;
private Object source;
diff --git a/org.eclipse.xwt/src/org/eclipse/xwt/internal/core/DynamicBinding.java b/org.eclipse.xwt/src/org/eclipse/xwt/internal/core/DynamicBinding.java index 61aa3ff..6466fee 100644 --- a/org.eclipse.xwt/src/org/eclipse/xwt/internal/core/DynamicBinding.java +++ b/org.eclipse.xwt/src/org/eclipse/xwt/internal/core/DynamicBinding.java @@ -42,6 +42,16 @@ public abstract class DynamicBinding implements IDynamicBinding { private IXWTLoader xwtLoader;
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
/**
* The name of the {@link DataBindingContext} that we will look up in static
* resources
diff --git a/org.eclipse.xwt/src/org/eclipse/xwt/javabean/ResourceLoader.java b/org.eclipse.xwt/src/org/eclipse/xwt/javabean/ResourceLoader.java index 5208a40..b460ad1 100644 --- a/org.eclipse.xwt/src/org/eclipse/xwt/javabean/ResourceLoader.java +++ b/org.eclipse.xwt/src/org/eclipse/xwt/javabean/ResourceLoader.java @@ -111,11 +111,11 @@ public class ResourceLoader implements IVisualElementLoader { private Map<String, Object> options;
- private Collection<Binding> bindings;
+ private Collection<IDynamicBinding> bindings;
private Collection<ValidationStatus> status;
- public Collection<Binding> getBindings() {
+ public Collection<IDynamicBinding> getBindings() {
return bindings;
}
@@ -767,8 +767,8 @@ public class ResourceLoader implements IVisualElementLoader { if (targetObject instanceof IDynamicBinding) {
if (bindings == null)
- bindings = new ArrayList<Binding>();
- bindings.add((Binding) targetObject);
+ bindings = new ArrayList<IDynamicBinding>();
+ bindings.add((IDynamicBinding) targetObject);
}
}
@@ -797,7 +797,7 @@ public class ResourceLoader implements IVisualElementLoader { if (status != null && !status.isEmpty()) {
for (ValidationStatus validationStatus : status) {
if (bindings != null && !bindings.isEmpty()) {
- for (Binding binding : bindings) {
+ for (IDynamicBinding binding : bindings) {
if (binding.getName() != null
&& validationStatus.getSourceName() != null
&& validationStatus.getSourceName().equals(
|