diff options
author | Martin Fluegge | 2010-09-04 21:54:59 +0000 |
---|---|---|
committer | Martin Fluegge | 2010-09-04 21:54:59 +0000 |
commit | c260f5d2eb5d262505a0ae115b7b3abf6f37fe66 (patch) | |
tree | 0bf50688c3217213278b26c3f5f8156fca759c74 /plugins/org.eclipse.net4j.util.ui | |
parent | 56da1c541b96defa03ec02384e77fdccf1add351 (diff) | |
download | cdo-c260f5d2eb5d262505a0ae115b7b3abf6f37fe66.tar.gz cdo-c260f5d2eb5d262505a0ae115b7b3abf6f37fe66.tar.xz cdo-c260f5d2eb5d262505a0ae115b7b3abf6f37fe66.zip |
fixed warnings and added connector wizards
Diffstat (limited to 'plugins/org.eclipse.net4j.util.ui')
3 files changed, 43 insertions, 5 deletions
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizard.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizard.java index 902335480a..48c7384e7d 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizard.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizard.java @@ -11,6 +11,7 @@ package org.eclipse.net4j.util.ui.container; import org.eclipse.net4j.util.ui.UIUtil; +import org.eclipse.net4j.util.ui.container.IElementWizard.ValidationContext; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Combo; @@ -22,12 +23,16 @@ import org.eclipse.swt.widgets.Text; * @author Eike Stepper * @since 3.1 */ -public abstract class ElementWizard implements IElementWizard +public abstract class ElementWizard implements IElementWizard, ValidationContext { private String factoryType; private String defaultDescription; + private String resultDescription; + + private ValidationContext validationContext; + public ElementWizard() { } @@ -44,16 +49,32 @@ public abstract class ElementWizard implements IElementWizard public String getResultDescription() { - return null; + return resultDescription; } - public final void create(Composite parent, String factoryType, String defaultDescription) + public void create(Composite parent, String factoryType, String defaultDescription, + ValidationContext validationContext) { this.factoryType = factoryType; this.defaultDescription = defaultDescription; + this.validationContext = validationContext; + create(parent); } + protected void setResultDescription(String resultDescription) + { + this.resultDescription = resultDescription; + } + + public void setErrorMessage(String message) + { + if (validationContext != null) + { + validationContext.setErrorMessage(message); + } + } + protected abstract void create(Composite parent); protected Label addLabel(Composite parent, String label) diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java index 085c10d505..8c05758de7 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/ElementWizardComposite.java @@ -14,6 +14,7 @@ import org.eclipse.net4j.util.container.FactoryNotFoundException; import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.container.IPluginContainer; import org.eclipse.net4j.util.ui.UIUtil; +import org.eclipse.net4j.util.ui.container.IElementWizard.ValidationContext; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -46,6 +47,8 @@ public class ElementWizardComposite extends Composite private List<IElementWizard> wizards; + private ValidationContext validationContext; + public ElementWizardComposite(Composite parent, int style, String productGroup, String label) { super(parent, style); @@ -64,6 +67,11 @@ public class ElementWizardComposite extends Composite return label; } + public void setValidationContext(ValidationContext validationContext) + { + this.validationContext = validationContext; + } + protected void create() { IManagedContainer container = getContainer(); @@ -133,7 +141,7 @@ public class ElementWizardComposite extends Composite IElementWizard wizard = wizards.get(index); String factoryType = factoryTypes.get(index); - wizard.create(this, factoryType, null); + wizard.create(this, factoryType, null, validationContext); getParent().layout(); } diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/IElementWizard.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/IElementWizard.java index e26e7d039a..25f227f53a 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/IElementWizard.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/container/IElementWizard.java @@ -20,5 +20,14 @@ public interface IElementWizard { public String getResultDescription(); - public void create(Composite parent, String factoryType, String defaultDescription); + public void create(Composite parent, String factoryType, String defaultDescription, + ValidationContext validationContext); + + /** + * @author Eike Stepper + */ + public interface ValidationContext + { + public void setErrorMessage(String message); + } } |