diff options
author | gkonstantinov | 2013-03-05 21:13:20 +0000 |
---|---|---|
committer | gkonstantinov | 2013-03-05 21:13:20 +0000 |
commit | 6cbdf35309470ddd5ba02b9a48d68c8ffc563ee0 (patch) | |
tree | f6b4aabe74d26f6d2bc0a2bb39252352aa02de34 | |
parent | 55057fdb3c6605637d0085c91bc8ace28052f800 (diff) | |
download | org.eclipse.webtools.incubator.sieditor-6cbdf35309470ddd5ba02b9a48d68c8ffc563ee0.tar.gz org.eclipse.webtools.incubator.sieditor-6cbdf35309470ddd5ba02b9a48d68c8ffc563ee0.tar.xz org.eclipse.webtools.incubator.sieditor-6cbdf35309470ddd5ba02b9a48d68c8ffc563ee0.zip |
fixed NPE
-rw-r--r-- | plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/propertyeditor/TypePropertyEditor.java | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/propertyeditor/TypePropertyEditor.java b/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/propertyeditor/TypePropertyEditor.java index 7916541..b948d03 100644 --- a/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/propertyeditor/TypePropertyEditor.java +++ b/plugins/org.eclipse.wst.sse.sieditor.ui/api/org/eclipse/wst/sse/sieditor/ui/v2/propertyeditor/TypePropertyEditor.java @@ -29,7 +29,6 @@ import org.eclipse.ui.forms.events.HyperlinkAdapter; import org.eclipse.ui.forms.events.HyperlinkEvent; import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Hyperlink; - import org.eclipse.wst.sse.sieditor.model.api.IModelObject; import org.eclipse.wst.sse.sieditor.model.api.IModelRoot; import org.eclipse.wst.sse.sieditor.model.utils.EmfXsdUtils; @@ -39,7 +38,6 @@ import org.eclipse.wst.sse.sieditor.model.wsdl.api.IParameter; import org.eclipse.wst.sse.sieditor.model.xsd.api.ISchema; import org.eclipse.wst.sse.sieditor.model.xsd.api.IStructureType; import org.eclipse.wst.sse.sieditor.model.xsd.api.IType; -import org.eclipse.wst.sse.sieditor.model.xsd.impl.Schema; import org.eclipse.wst.sse.sieditor.model.xsd.impl.UnresolvedType; import org.eclipse.wst.sse.sieditor.ui.Activator; import org.eclipse.wst.sse.sieditor.ui.i18n.Messages; @@ -116,8 +114,8 @@ public abstract class TypePropertyEditor extends AbstractProblemDecoratableContr // reach the parent model root in case that the input object is // imported tree node IModelObject modelObject = input.getModelObject(); - IModelRoot modelRoot = modelObject.getModelRoot(); - final IModelObject originalModelObject = modelRoot.getModelObject(); + IModelRoot modelRoot = modelObject.getModelRoot(); + final IModelObject originalModelObject = modelRoot.getModelObject(); final Collection<ISchema> allVisibleSchemas = new HashSet<ISchema>(); if (originalModelObject instanceof IDescription) { allVisibleSchemas.addAll(((IDescription) originalModelObject).getAllVisibleSchemas()); @@ -187,7 +185,8 @@ public abstract class TypePropertyEditor extends AbstractProblemDecoratableContr setSelectedType(getType()); setSelectedTypeName(getInput().getTypeDisplayText()/* - * WSDLLabelProvider.getTypeDisplayText + * WSDLLabelProvider. + * getTypeDisplayText * ( * getSelectedType(), * getInput()) @@ -257,10 +256,24 @@ public abstract class TypePropertyEditor extends AbstractProblemDecoratableContr final Composite parent = typeLink.getParent(); if (parent.getLayout() instanceof GridLayout) { + if (typeLink.getLayoutData() == null) { + typeLink.setLayoutData(new GridData()); + } ((GridData) typeLink.getLayoutData()).exclude = !visible; - // ((GridData) typeErrorLabel.getLayoutData()).exclude = !visible; + + if (typeCombo.getLayoutData() == null) { + typeCombo.setLayoutData(new GridData()); + } ((GridData) typeCombo.getLayoutData()).exclude = !visible; + + if (browseButton.getLayoutData() == null) { + browseButton.setLayoutData(new GridData()); + } ((GridData) browseButton.getLayoutData()).exclude = !visible; + + if (newButton.getLayoutData() == null) { + newButton.setLayoutData(new GridData()); + } ((GridData) newButton.getLayoutData()).exclude = !visible; } |