Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 34532 Details for
Bug 125745
Adapt to the Elipse base provided Tabbed Property Pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Migrate properties to use Eclipse based tabbed property pages.
org.eclipse.wst.wsdl.ui-patch125745 (text/plain), 61.74 KB, created by
Richard Mah
on 2006-02-10 23:23:03 EST
(
hide
)
Description:
Migrate properties to use Eclipse based tabbed property pages.
Filename:
MIME Type:
Creator:
Richard Mah
Created:
2006-02-10 23:23:03 EST
Size:
61.74 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.wst.wsdl.ui >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java,v >retrieving revision 1.7 >diff -u -r1.7 PartSection.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java 30 Mar 2005 23:15:38 -0000 1.7 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSection.java 11 Feb 2006 04:23:27 -0000 >@@ -24,8 +24,8 @@ > import org.eclipse.swt.widgets.Composite; > import org.eclipse.swt.widgets.Event; > import org.eclipse.ui.IEditorPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants; >-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory; >+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants; >+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; > import org.eclipse.wst.wsdl.Part; > import org.eclipse.wst.wsdl.ui.internal.WSDLEditor; > import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin; >@@ -77,41 +77,43 @@ > data.top = new FormAttachment(referenceKindCombo, 0, SWT.CENTER); > valueLabel.setLayoutData(data); > >- componentNameCombo = getWidgetFactory().createCCombo(composite); >- componentNameCombo.setBackground(composite.getBackground()); >- componentNameCombo.addListener(SWT.Modify, this); >- componentNameCombo.addSelectionListener(this); >+ componentNameCombo = getWidgetFactory().createCCombo(composite); >+ componentNameCombo.setBackground(composite.getBackground()); >+ componentNameCombo.addListener(SWT.Modify, this); >+ componentNameCombo.addSelectionListener(this); > >- componentNameLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT") + ":"); //$NON-NLS-1$ >+ componentNameLabel = getWidgetFactory().createCLabel(composite, WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT") + ":"); //$NON-NLS-1$ > data = new FormData(); > data.left = new FormAttachment(0, 0); > data.right = new FormAttachment(componentNameCombo, -ITabbedPropertyConstants.HSPACE); > data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER); > componentNameLabel.setLayoutData(data); >- >- button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$ >- button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$ > >- button.addSelectionListener(this); >+ button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$ >+ button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$ >+ >+ button.addSelectionListener(this); > data = new FormData(); > data.left = new FormAttachment(100, -rightMarginSpace + 2); > data.right = new FormAttachment(100, 0); > data.top = new FormAttachment(componentNameCombo, 0, SWT.CENTER); > button.setLayoutData(data); >- >- data = new FormData(); >- data.left = new FormAttachment(0, 100); >- data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE); >- data.top = new FormAttachment(0, 0); >- referenceKindCombo.setLayoutData(data); >- >- data = new FormData(); >- data.left = new FormAttachment(0, 100); >- data.right = new FormAttachment(button, 0); >- data.top = new FormAttachment(referenceKindCombo, +ITabbedPropertyConstants.VSPACE); >- componentNameCombo.setLayoutData(data); > >- referenceKindCombo.addListener(SWT.Modify, this); >+ data = new FormData(); >+ data.left = new FormAttachment(0, 100); >+ data.right = new FormAttachment(100, -rightMarginSpace - ITabbedPropertyConstants.HSPACE); >+ data.top = new FormAttachment(0, 0); >+ referenceKindCombo.setLayoutData(data); >+ >+ data = new FormData(); >+ data.left = new FormAttachment(0, 100); >+ data.right = new FormAttachment(button, 0); >+ data.top = new FormAttachment(referenceKindCombo, +ITabbedPropertyConstants.VSPACE); >+ componentNameCombo.setLayoutData(data); >+ >+ referenceKindCombo.addListener(SWT.Modify, this); >+ >+ this.editorPart = getActiveEditor(); > } > > /* >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java,v >retrieving revision 1.2 >diff -u -r1.2 WSDLTypeMapper.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java 30 Mar 2005 23:15:38 -0000 1.2 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTypeMapper.java 11 Feb 2006 04:23:27 -0000 >@@ -10,7 +10,7 @@ > *******************************************************************************/ > package org.eclipse.wst.wsdl.ui.internal.properties.section; > >-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper; >+import org.eclipse.ui.views.properties.tabbed.ITypeMapper; > import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject; > > public class WSDLTypeMapper implements ITypeMapper >@@ -18,9 +18,9 @@ > /* (non-Javadoc) > * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper#remapType(java.lang.Object, java.lang.Class) > */ >- public Class remapType(Object object, Class effectiveType) >+ public Class mapType(Object object) > { >- Class type = effectiveType; >+ Class type = object.getClass(); > > if (object instanceof WSDLGroupObject) { > type = ((WSDLGroupObject) object).getDefinition().getClass(); >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSectionDescriptor.java 3 Oct 2005 17:55:09 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,108 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2001, 2004 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- *******************************************************************************/ >-package org.eclipse.wst.wsdl.ui.internal.properties.section; >- >-import java.util.ArrayList; >-import java.util.List; >- >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.StructuredSelection; >-import org.eclipse.ui.IWorkbenchPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper; >-import org.eclipse.wst.wsdl.WSDLElement; >-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject; >- >-public class AbstractSectionDescriptor implements ISectionDescriptor >-{ >- /** >- * >- */ >- public AbstractSectionDescriptor() >- { >- super(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId() >- */ >- public String getId() >- { >- return ""; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getFilter() >- */ >- public ITypeMapper getFilter() >- { >- return null; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes() >- */ >- public List getInputTypes() >- { >- List list = new ArrayList(); >- list.add(WSDLElement.class); >- return list; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass() >- */ >- public ISection getSectionClass() >- { >- return null; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab() >- */ >- public String getTargetTab() >- { >- // TODO Auto-generated method stub >- return null; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) >- */ >- public boolean appliesTo(IWorkbenchPart part, ISelection selection) >- { >- Object object = null; >- if (selection instanceof StructuredSelection) >- { >- StructuredSelection structuredSelection = (StructuredSelection)selection; >- object = structuredSelection.getFirstElement(); >- if (object instanceof WSDLElement || object instanceof WSDLGroupObject) >- { >- return true; >- } >- } >- return false; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection() >- */ >- public String getAfterSection() >- { >- return ""; >- } >- >- public int getEnablesFor() >- { >- return ENABLES_FOR_ANY; >- } >-} >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java,v >retrieving revision 1.5 >diff -u -r1.5 WSDLTabbedPropertySheetPage.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java 30 Nov 2005 21:52:26 -0000 1.5 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLTabbedPropertySheetPage.java 11 Feb 2006 04:23:27 -0000 >@@ -17,8 +17,8 @@ > import org.eclipse.jface.viewers.StructuredSelection; > import org.eclipse.swt.widgets.Composite; > import org.eclipse.ui.IWorkbenchPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor; >-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage; >+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor; >+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; > import org.eclipse.wst.sse.ui.internal.view.events.INodeSelectionListener; > import org.eclipse.wst.sse.ui.internal.view.events.NodeSelectionChangedEvent; > import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement; >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java,v >retrieving revision 1.9 >diff -u -r1.9 ReferenceSection.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java 18 Apr 2005 17:37:52 -0000 1.9 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSection.java 11 Feb 2006 04:23:27 -0000 >@@ -23,8 +23,8 @@ > import org.eclipse.swt.widgets.Composite; > import org.eclipse.swt.widgets.Event; > import org.eclipse.ui.IEditorPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants; >-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory; >+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants; >+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; > import org.eclipse.wst.wsdl.Binding; > import org.eclipse.wst.wsdl.MessageReference; > import org.eclipse.wst.wsdl.Port; >@@ -77,6 +77,8 @@ > componentNameCombo.setLayoutData(data); > > componentNameCombo.addListener(SWT.Modify, this); >+ >+ this.editorPart = getActiveEditor(); > } > > /* >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java,v >retrieving revision 1.2 >diff -u -r1.2 AbstractSection.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java 30 Mar 2005 23:15:38 -0000 1.2 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/AbstractSection.java 11 Feb 2006 04:23:26 -0000 >@@ -30,9 +30,9 @@ > import org.eclipse.ui.IWorkbenchPart; > import org.eclipse.ui.IWorkbenchWindow; > import org.eclipse.ui.part.EditorActionBarContributor; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection; >-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage; >-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory; >+import org.eclipse.ui.views.properties.tabbed.ISection; >+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; >+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; > import org.eclipse.wst.wsdl.WSDLElement; > import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin; > import org.eclipse.wst.wsdl.ui.internal.graph.model.WSDLGraphModelAdapterFactory; >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/ReferenceSectionDescriptor.java 11 Jun 2005 04:45:39 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,104 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2001, 2004 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- *******************************************************************************/ >-package org.eclipse.wst.wsdl.ui.internal.properties.section; >- >-import java.util.ArrayList; >-import java.util.List; >- >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.StructuredSelection; >-import org.eclipse.ui.IWorkbenchPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor; >-import org.eclipse.wst.wsdl.Binding; >-import org.eclipse.wst.wsdl.MessageReference; >-import org.eclipse.wst.wsdl.Port; >- >- >-public class ReferenceSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor >-{ >- ReferenceSection referenceSection; >- >- /** >- * >- */ >- public ReferenceSectionDescriptor() >- { >- super(); >- this.referenceSection = new ReferenceSection(); >- } >- >- >- /** >- * >- */ >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId() >- */ >- public String getId() >- { >- return "org.eclipse.wst.wsdl.ui.internal.section.reference"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes() >- */ >- public List getInputTypes() >- { >- List list = new ArrayList(); >- list.add(MessageReference.class); >- list.add(Binding.class); >- list.add(Port.class); >- return list; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass() >- */ >- public ISection getSectionClass() >- { >- return referenceSection; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab() >- */ >- public String getTargetTab() >- { >- return "org.eclipse.wst.xmlwebservices.general"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) >- */ >- public boolean appliesTo(IWorkbenchPart part, ISelection selection) >- { >- referenceSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor()); >- Object object = null; >- if (selection instanceof StructuredSelection) >- { >- StructuredSelection structuredSelection = (StructuredSelection)selection; >- object = structuredSelection.getFirstElement(); >- if (object instanceof MessageReference || object instanceof Binding || object instanceof Port) >- { >- return true; >- } >- } >- return false; >- } >- >- public String getAfterSection() >- { >- return "org.eclipse.wst.wsdl.ui.internal.section.name"; >- } >- >-} >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/PartSectionDescriptor.java 11 Jun 2005 04:45:39 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,94 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2001, 2004 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- *******************************************************************************/ >-package org.eclipse.wst.wsdl.ui.internal.properties.section; >- >-import java.util.ArrayList; >-import java.util.List; >- >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.StructuredSelection; >-import org.eclipse.ui.IWorkbenchPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor; >-import org.eclipse.wst.wsdl.Part; >- >- >-public class PartSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor >-{ >- PartSection partSection; >- /** >- * >- */ >- public PartSectionDescriptor() >- { >- super(); >- partSection = new PartSection(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId() >- */ >- public String getId() >- { >- return "org.eclipse.wst.wsdl.ui.internal.section.part"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes() >- */ >- public List getInputTypes() >- { >- List list = new ArrayList(); >- list.add(Part.class); >- return list; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass() >- */ >- public ISection getSectionClass() >- { >- return partSection; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab() >- */ >- public String getTargetTab() >- { >- return "org.eclipse.wst.xmlwebservices.general"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) >- */ >- public boolean appliesTo(IWorkbenchPart part, ISelection selection) >- { >- partSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor()); >- Object object = null; >- if (selection instanceof StructuredSelection) >- { >- StructuredSelection structuredSelection = (StructuredSelection)selection; >- object = structuredSelection.getFirstElement(); >- if (object instanceof Part) >- { >- return true; >- } >- } >- return false; >- } >- >- public String getAfterSection() >- { >- return "org.eclipse.wst.wsdl.ui.internal.section.name"; >- } >- >-} >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java,v >retrieving revision 1.5 >diff -u -r1.5 NamespaceSection.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java 31 Aug 2005 21:26:11 -0000 1.5 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSection.java 11 Feb 2006 04:23:26 -0000 >@@ -24,8 +24,8 @@ > import org.eclipse.swt.widgets.Composite; > import org.eclipse.swt.widgets.Event; > import org.eclipse.swt.widgets.Text; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants; >-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory; >+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants; >+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; > import org.eclipse.wst.wsdl.Definition; > import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin; > import org.eclipse.wst.wsdl.ui.internal.actions.EditNamespacesAction; >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSectionDescriptor.java 11 Jun 2005 04:45:39 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,108 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2001, 2004 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- *******************************************************************************/ >-package org.eclipse.wst.wsdl.ui.internal.properties.section; >- >-import java.util.ArrayList; >-import java.util.List; >- >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.StructuredSelection; >-import org.eclipse.ui.IWorkbenchPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor; >-import org.eclipse.wst.wsdl.Definition; >-import org.eclipse.wst.wsdl.ExtensibilityElement; >-import org.eclipse.wst.wsdl.Import; >-import org.eclipse.wst.wsdl.WSDLElement; >- >- >-public class NameSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor >-{ >- /** >- * >- */ >- public NameSectionDescriptor() >- { >- super(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId() >- */ >- public String getId() >- { >- return "org.eclipse.wst.wsdl.ui.internal.section.name"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes() >- */ >- public List getInputTypes() >- { >- List list = new ArrayList(); >- list.add(WSDLElement.class); >- return list; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass() >- */ >- public ISection getSectionClass() >- { >- return new NameSection(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab() >- */ >- public String getTargetTab() >- { >- return "org.eclipse.wst.xmlwebservices.general"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) >- */ >- public boolean appliesTo(IWorkbenchPart part, ISelection selection) >- { >- Object object = null; >- if (selection instanceof StructuredSelection) >- { >- StructuredSelection structuredSelection = (StructuredSelection)selection; >- object = structuredSelection.getFirstElement(); >- if (object instanceof WSDLElement && >- !(object instanceof ExtensibilityElement) && >- !(object instanceof Import)) >- { >- if (object instanceof WSDLElement) { >- Definition definition = ((WSDLElement) object).getEnclosingDefinition(); >- if (definition.getElement() != null && !(object instanceof Definition)) { >- return true; >- } >- >- return false; >- } >- /* >- else if (object instanceof WSDLGroupObject) { >- Definition definition = ((WSDLGroupObject) object).getDefinition(); >- if (definition.getElement() != null) { >- return true; >- } >- >- return false; >- } >- */ >- } >- } >- return false; >- } >- >-} >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensibilityElementSectionDescriptor.java 11 Jun 2005 04:45:39 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,82 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2001, 2004 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- *******************************************************************************/ >-package org.eclipse.wst.wsdl.ui.internal.properties.section; >- >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.StructuredSelection; >-import org.eclipse.ui.IWorkbenchPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor; >-import org.eclipse.wst.wsdl.ExtensibilityElement; >- >-public class ExtensibilityElementSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor >-{ >- /** >- * >- */ >- public ExtensibilityElementSectionDescriptor() >- { >- super(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId() >- */ >- public String getId() >- { >- return "org.eclipse.wst.wsdl.ui.internal.section.extensibilityelement"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass() >- */ >- public ISection getSectionClass() >- { >- // TODO Auto-generated method stub >- return new ExtensiblityElementSection(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab() >- */ >- public String getTargetTab() >- { >- // TODO Auto-generated method stub >- return "org.eclipse.wst.xmlwebservices.general"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) >- */ >- public boolean appliesTo(IWorkbenchPart part, ISelection selection) >- { >- Object object = null; >- if (selection instanceof StructuredSelection) >- { >- StructuredSelection structuredSelection = (StructuredSelection)selection; >- object = structuredSelection.getFirstElement(); >- if (object instanceof ExtensibilityElement) >- { >- return true; >- } >- } >- return false; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection() >- */ >- public String getAfterSection() >- { >- return ""; >- } >- >-} >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java,v >retrieving revision 1.3 >diff -u -r1.3 NameSection.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java 31 Aug 2005 21:26:11 -0000 1.3 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/NameSection.java 11 Feb 2006 04:23:26 -0000 >@@ -19,8 +19,8 @@ > import org.eclipse.swt.widgets.Composite; > import org.eclipse.swt.widgets.Event; > import org.eclipse.swt.widgets.Text; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants; >-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory; >+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants; >+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; > import org.eclipse.wst.wsdl.Binding; > import org.eclipse.wst.wsdl.BindingFault; > import org.eclipse.wst.wsdl.BindingInput; >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/WSDLSectionDescriptorProvider.java 30 Mar 2005 23:15:38 -0000 1.2 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,82 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2001, 2004 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- *******************************************************************************/ >-package org.eclipse.wst.wsdl.ui.internal.properties.section; >- >-import java.util.ArrayList; >-import java.util.List; >- >-import org.eclipse.ui.IEditorPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider; >-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor; >-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin; >-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension; >-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry; >- >-public class WSDLSectionDescriptorProvider implements ISectionDescriptorProvider >-{ >- protected WSDLEditorExtension[] propertySectionDescriptorProviderExtensions; >- protected ISectionDescriptorProvider[] propertySectionDescriptorProviders; >- >- protected WSDLEditorExtension[] labelProviderExtensions; >- >- protected final static Object[] EMPTY_ARRAY = {}; >- >- IEditorPart editorPart; >- >- /** >- * >- */ >- public WSDLSectionDescriptorProvider() >- { >- super(); >- // TODO Check this >- this.editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider#getSectionDescriptors() >- */ >- public ISectionDescriptor[] getSectionDescriptors() >- { >- List list = new ArrayList(); >- >- >- WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); >- >- propertySectionDescriptorProviderExtensions = registry.getRegisteredExtensions(WSDLEditorExtension.PROPERTY_SECTION_DESCRIPTOR_PROVIDER); >- propertySectionDescriptorProviders = new ISectionDescriptorProvider[propertySectionDescriptorProviderExtensions.length]; >- for (int i = 0; i < propertySectionDescriptorProviderExtensions.length; i++) >- { >- propertySectionDescriptorProviders[i] = (ISectionDescriptorProvider)propertySectionDescriptorProviderExtensions[i].createExtensionObject(WSDLEditorExtension.PROPERTY_SECTION_DESCRIPTOR_PROVIDER, (WSDLEditor)editorPart); >- >- ISectionDescriptor [] extensionSectionDescriptors = propertySectionDescriptorProviders[i].getSectionDescriptors(); >- for (int j = 0; j < extensionSectionDescriptors.length; j++) >- { >- list.add(extensionSectionDescriptors[j]); >- } >- } >- >- >- list.add(new NameSectionDescriptor()); >- list.add(new PartSectionDescriptor()); >- list.add(new DocumentationSectionDescriptor()); >- list.add(new ReferenceSectionDescriptor()); >- list.add(new NamespaceSectionDescriptor()); >- list.add(new ExtensibilityElementSectionDescriptor()); >- list.add(new ImportSectionDescriptor()); >- >- ISectionDescriptor[] descriptors = new ISectionDescriptor[list.size()]; >- list.toArray(descriptors); >- >- return descriptors; >- } >-} >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java,v >retrieving revision 1.2 >diff -u -r1.2 DocumentationSection.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java 30 Mar 2005 23:15:38 -0000 1.2 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSection.java 11 Feb 2006 04:23:26 -0000 >@@ -16,7 +16,7 @@ > import org.eclipse.swt.widgets.Composite; > import org.eclipse.swt.widgets.Event; > import org.eclipse.swt.widgets.Text; >-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory; >+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; > import org.eclipse.wst.wsdl.ui.internal.actions.AddElementAction; > import org.w3c.dom.Document; > import org.w3c.dom.Element; >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/NamespaceSectionDescriptor.java 11 Jun 2005 04:45:39 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,106 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2001, 2004 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- *******************************************************************************/ >-package org.eclipse.wst.wsdl.ui.internal.properties.section; >- >-import java.util.ArrayList; >-import java.util.List; >- >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.StructuredSelection; >-import org.eclipse.ui.IWorkbenchPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor; >-import org.eclipse.wst.wsdl.Definition; >-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject; >- >-public class NamespaceSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor >-{ >- /** >- * >- */ >- public NamespaceSectionDescriptor() >- { >- super(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId() >- */ >- public String getId() >- { >- return "org.eclipse.wst.wsdl.ui.internal.section.namespace"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes() >- */ >- public List getInputTypes() >- { >- List list = new ArrayList(); >- list.add(WSDLGroupObject.class); >- return list; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass() >- */ >- public ISection getSectionClass() >- { >- return new NamespaceSection(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab() >- */ >- public String getTargetTab() >- { >- return "org.eclipse.wst.xmlwebservices.general"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) >- */ >- public boolean appliesTo(IWorkbenchPart part, ISelection selection) >- { >- Object object = null; >- if (selection instanceof StructuredSelection) >- { >- StructuredSelection structuredSelection = (StructuredSelection)selection; >- object = structuredSelection.getFirstElement(); >- if (object instanceof WSDLGroupObject) >- { >- Definition definition = ((WSDLGroupObject) object).getDefinition(); >- if (definition.getElement() != null) { >- return true; >- } >- >- return false; >- } >- else if (object instanceof org.eclipse.wst.wsdl.Definition) { >- Definition definition = (Definition) object; >- if (definition.getElement() != null) { >- return true; >- } >- >- return false; >- } >- } >- return false; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection() >- */ >- public String getAfterSection() >- { >- return ""; >- } >-} >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java,v >retrieving revision 1.5 >diff -u -r1.5 ImportSection.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java 29 Nov 2005 20:50:19 -0000 1.5 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSection.java 11 Feb 2006 04:23:26 -0000 >@@ -26,9 +26,9 @@ > import org.eclipse.swt.widgets.Text; > import org.eclipse.ui.IEditorPart; > import org.eclipse.ui.IFileEditorInput; >+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants; >+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; > import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants; >-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory; > import org.eclipse.wst.wsdl.Definition; > import org.eclipse.wst.wsdl.Import; > import org.eclipse.wst.wsdl.internal.impl.ImportImpl; >@@ -98,21 +98,23 @@ > data.top = new FormAttachment(locationText, 0, SWT.CENTER); > locationLabel.setLayoutData(data); > >- button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$ >- button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$ >+ button = getWidgetFactory().createButton(composite, "", SWT.PUSH); //$NON-NLS-1$ >+ button.setImage(WSDLEditorPlugin.getInstance().getImage("icons/browsebutton.gif")); //$NON-NLS-1$ > >- button.addSelectionListener(this); >+ button.addSelectionListener(this); > data = new FormData(); > data.left = new FormAttachment(100, -rightMarginSpace + 2); > data.right = new FormAttachment(100,0); > data.top = new FormAttachment(locationText, 0, SWT.CENTER); > button.setLayoutData(data); >+ >+ data = new FormData(); >+ data.left = new FormAttachment(0, 100); >+ data.right = new FormAttachment(button, 0); >+ data.top = new FormAttachment(prefixText, +ITabbedPropertyConstants.VSPACE); >+ locationText.setLayoutData(data); > >- data = new FormData(); >- data.left = new FormAttachment(0, 100); >- data.right = new FormAttachment(button, 0); >- data.top = new FormAttachment(prefixText, +ITabbedPropertyConstants.VSPACE); >- locationText.setLayoutData(data); >+ this.editorPart = getActiveEditor(); > } > > /* >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java,v >retrieving revision 1.2 >diff -u -r1.2 ExtensiblityElementSection.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java 30 Mar 2005 23:15:38 -0000 1.2 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/ExtensiblityElementSection.java 11 Feb 2006 04:23:26 -0000 >@@ -14,7 +14,7 @@ > import org.eclipse.swt.layout.FormData; > import org.eclipse.swt.widgets.Composite; > import org.eclipse.swt.widgets.Display; >-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory; >+import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; > import org.eclipse.wst.wsdl.ui.internal.model.ModelAdapterListener; > import org.eclipse.wst.wsdl.ui.internal.viewers.ExtensibilityElementViewer; > import org.eclipse.wst.wsdl.ui.internal.viewers.widgets.AttributesTable; >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/ImportSectionDescriptor.java 11 Jun 2005 04:45:39 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,93 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2001, 2004 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- *******************************************************************************/ >-package org.eclipse.wst.wsdl.ui.internal.properties.section; >- >-import java.util.ArrayList; >-import java.util.List; >- >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.StructuredSelection; >-import org.eclipse.ui.IWorkbenchPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor; >-import org.eclipse.wst.wsdl.Import; >- >-public class ImportSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor >-{ >- ImportSection importSection; >- /** >- * >- */ >- public ImportSectionDescriptor() >- { >- super(); >- importSection = new ImportSection(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId() >- */ >- public String getId() >- { >- return "org.eclipse.wst.wsdl.ui.internal.section.import"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes() >- */ >- public List getInputTypes() >- { >- List list = new ArrayList(); >- list.add(Import.class); >- return list; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass() >- */ >- public ISection getSectionClass() >- { >- return importSection; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab() >- */ >- public String getTargetTab() >- { >- return "org.eclipse.wst.xmlwebservices.general"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) >- */ >- public boolean appliesTo(IWorkbenchPart part, ISelection selection) >- { >- importSection.setEditorPart(part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor()); >- Object object = null; >- if (selection instanceof StructuredSelection) >- { >- StructuredSelection structuredSelection = (StructuredSelection)selection; >- object = structuredSelection.getFirstElement(); >- if (object instanceof Import) >- { >- return true; >- } >- } >- return false; >- } >- >- public String getAfterSection() >- { >- return "org.eclipse.wst.wsdl.ui.internal.section.name"; >- } >- >-} >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java >--- src/org/eclipse/wst/wsdl/ui/internal/properties/section/DocumentationSectionDescriptor.java 11 Jun 2005 04:45:39 -0000 1.3 >+++ /dev/null 1 Jan 1970 00:00:00 -0000 >@@ -1,82 +0,0 @@ >-/******************************************************************************* >- * Copyright (c) 2001, 2004 IBM Corporation and others. >- * All rights reserved. This program and the accompanying materials >- * are made available under the terms of the Eclipse Public License v1.0 >- * which accompanies this distribution, and is available at >- * http://www.eclipse.org/legal/epl-v10.html >- * >- * Contributors: >- * IBM Corporation - initial API and implementation >- *******************************************************************************/ >-package org.eclipse.wst.wsdl.ui.internal.properties.section; >- >-import org.eclipse.jface.viewers.ISelection; >-import org.eclipse.jface.viewers.StructuredSelection; >-import org.eclipse.ui.IWorkbenchPart; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor; >-import org.eclipse.wst.wsdl.WSDLElement; >- >- >-public class DocumentationSectionDescriptor extends AbstractSectionDescriptor implements ISectionDescriptor >-{ >- /** >- * >- */ >- public DocumentationSectionDescriptor() >- { >- super(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId() >- */ >- public String getId() >- { >- return "org.eclipse.wst.wsdl.ui.internal.section.documentation"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass() >- */ >- public ISection getSectionClass() >- { >- // TODO Auto-generated method stub >- return new DocumentationSection(); >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab() >- */ >- public String getTargetTab() >- { >- // TODO Auto-generated method stub >- return "org.eclipse.wst.xmlwebservices.documentation"; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) >- */ >- public boolean appliesTo(IWorkbenchPart part, ISelection selection) >- { >- Object object = null; >- if (selection instanceof StructuredSelection) >- { >- StructuredSelection structuredSelection = (StructuredSelection)selection; >- object = structuredSelection.getFirstElement(); >- if (object instanceof WSDLElement) >- { >- return true; >- } >- } >- return false; >- } >- >- /* (non-Javadoc) >- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection() >- */ >- public String getAfterSection() >- { >- return "org.eclipse.wst.xmlwebservices.general"; >- } >-} >Index: plugin.xml >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/plugin.xml,v >retrieving revision 1.31 >diff -u -r1.31 plugin.xml >--- plugin.xml 9 Feb 2006 05:33:11 -0000 1.31 >+++ plugin.xml 11 Feb 2006 04:23:25 -0000 >@@ -185,11 +185,10 @@ > </extension> > > <extension >- point="org.eclipse.wst.common.ui.properties.propertyContributor"> >+ point="org.eclipse.ui.views.properties.tabbed.propertyContributor"> > <propertyContributor > typeMapper="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLTypeMapper" > contributorId="org.eclipse.wst.wsdl.ui.internal.WSDLEditor" >- sectionDescriptorProvider="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLSectionDescriptorProvider" > labelProvider="org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLLabelProvider"> > <propertyCategory category="general"></propertyCategory> > <propertyCategory category="namespace"></propertyCategory> >@@ -203,7 +202,7 @@ > </propertyContributor> > </extension> > <extension >- point="org.eclipse.wst.common.ui.properties.propertyTabs"> >+ point="org.eclipse.ui.views.properties.tabbed.propertyTabs"> > <propertyTabs > contributorId="org.eclipse.wst.wsdl.ui.internal.WSDLEditor"> > <propertyTab >@@ -244,6 +243,69 @@ > </propertyTab> > </propertyTabs> > </extension> >+ >+ <extension point="org.eclipse.ui.views.properties.tabbed.propertySections"> >+ <propertySections contributorId="org.eclipse.wst.wsdl.ui.internal.WSDLEditor"> >+ <propertySection tab="org.eclipse.wst.xmlwebservices.general" >+ class="org.eclipse.wst.wsdl.ui.internal.properties.section.NamespaceSection" >+ filter="org.eclipse.wst.wsdl.ui.internal.properties.section.filter.NamespaceSectionFilter" >+ id="org.eclipse.wst.wsdl.ui.internal.section.namespace"> >+ <input type="org.eclipse.wst.wsdl.Definition"> >+ </input> >+ </propertySection> >+ <propertySection tab="org.eclipse.wst.xmlwebservices.general" >+ class="org.eclipse.wst.wsdl.ui.internal.properties.section.NamespaceSection" >+ filter="org.eclipse.wst.wsdl.ui.internal.properties.section.filter.NamespaceSectionFilter" >+ id="org.eclipse.wst.wsdl.ui.internal.section.namespace"> >+ <input type="org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject"> >+ </input> >+ </propertySection> >+ >+ <propertySection tab="org.eclipse.wst.xmlwebservices.general" >+ class="org.eclipse.wst.wsdl.ui.internal.properties.section.PartSection" >+ id="org.eclipse.wst.wsdl.ui.internal.section.part"> >+ <input type="org.eclipse.wst.wsdl.Part"> >+ </input> >+ </propertySection> >+ >+ <propertySection tab="org.eclipse.wst.xmlwebservices.general" >+ class="org.eclipse.wst.wsdl.ui.internal.properties.section.ReferenceSection" >+ filter="org.eclipse.wst.wsdl.ui.internal.properties.section.filter.ReferenceSectionFilter" >+ id="org.eclipse.wst.wsdl.ui.internal.section.reference"> >+ <input type="org.eclipse.wst.wsdl.WSDLElement"> >+ </input> >+ </propertySection> >+ <propertySection tab="org.eclipse.wst.xmlwebservices.general" >+ class="org.eclipse.wst.wsdl.ui.internal.properties.section.NameSection" >+ filter="org.eclipse.wst.wsdl.ui.internal.properties.section.filter.NameSectionFilter" >+ id="org.eclipse.wst.wsdl.ui.internal.section.name"> >+ <input type="org.eclipse.wst.wsdl.WSDLElement"> >+ </input> >+ </propertySection> >+ >+ <propertySection tab="org.eclipse.wst.xmlwebservices.general" >+ class="org.eclipse.wst.wsdl.ui.internal.properties.section.ExtensiblityElementSection" >+ id="org.eclipse.wst.wsdl.ui.internal.section.extensibilityelement"> >+ <input type="org.eclipse.wst.wsdl.ExtensibilityElement"> >+ </input> >+ </propertySection> >+ >+ <propertySection tab="org.eclipse.wst.xmlwebservices.general" >+ class="org.eclipse.wst.wsdl.ui.internal.properties.section.ImportSection" >+ id="org.eclipse.wst.wsdl.ui.internal.section.import"> >+ <input type="org.eclipse.wst.wsdl.Import"> >+ </input> >+ </propertySection> >+ >+ <propertySection tab="org.eclipse.wst.xmlwebservices.documentation" >+ class="org.eclipse.wst.wsdl.ui.internal.properties.section.DocumentationSection" >+ id="org.eclipse.wst.wsdl.ui.internal.section.documentation"> >+ <input type="org.eclipse.wst.wsdl.WSDLElement"> >+ </input> >+ </propertySection> >+ >+ </propertySections> >+</extension> > > <extension > point="org.eclipse.wst.wsdl.ui.internalEditorExtensions"> >Index: src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java,v >retrieving revision 1.27 >diff -u -r1.27 WSDLEditor.java >--- src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java 23 Jan 2006 19:27:15 -0000 1.27 >+++ src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java 11 Feb 2006 04:23:26 -0000 >@@ -48,7 +48,7 @@ > import org.eclipse.ui.texteditor.TextSelectionNavigationLocation; > import org.eclipse.ui.views.contentoutline.IContentOutlinePage; > import org.eclipse.ui.views.properties.IPropertySheetPage; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor; >+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor; > import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; > import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; > import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; >Index: src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java,v >retrieving revision 1.2 >diff -u -r1.2 XSDSectionDescriptorProvider.java >--- src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java 30 Mar 2005 23:15:38 -0000 1.2 >+++ src/org/eclipse/wst/wsdl/ui/internal/xsd/XSDSectionDescriptorProvider.java 11 Feb 2006 04:23:27 -0000 >@@ -10,8 +10,8 @@ > *******************************************************************************/ > package org.eclipse.wst.wsdl.ui.internal.xsd; > >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor; >-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider; >+import org.eclipse.ui.views.properties.tabbed.ISectionDescriptor; >+import org.eclipse.ui.views.properties.tabbed.ISectionDescriptorProvider; > > public class XSDSectionDescriptorProvider implements ISectionDescriptorProvider > { >Index: META-INF/MANIFEST.MF >=================================================================== >RCS file: /home/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/META-INF/MANIFEST.MF,v >retrieving revision 1.13 >diff -u -r1.13 MANIFEST.MF >--- META-INF/MANIFEST.MF 6 Feb 2006 06:22:56 -0000 1.13 >+++ META-INF/MANIFEST.MF 11 Feb 2006 04:23:25 -0000 >@@ -65,12 +65,12 @@ > org.eclipse.wst.xml.ui, > org.eclipse.xsd, > org.eclipse.wst.wsdl, >- org.eclipse.wst.common.ui.properties, > org.eclipse.wst.common.core, > org.eclipse.wst.xsd.ui, > org.eclipse.emf.edit, > org.eclipse.emf.edit.ui, > org.eclipse.wst.validation, >+ org.eclipse.ui.views.properties.tabbed, > org.wsdl4j, > org.eclipse.wst.wsdl.validation, > org.eclipse.ltk.core.refactoring, >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/ReferenceSectionFilter.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/ReferenceSectionFilter.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/ReferenceSectionFilter.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/ReferenceSectionFilter.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,17 @@ >+package org.eclipse.wst.wsdl.ui.internal.properties.section.filter; >+ >+import org.eclipse.jface.viewers.IFilter; >+import org.eclipse.wst.wsdl.Binding; >+import org.eclipse.wst.wsdl.MessageReference; >+import org.eclipse.wst.wsdl.Port; >+ >+public class ReferenceSectionFilter implements IFilter { >+ >+ public boolean select(Object toTest) { >+ if (toTest instanceof MessageReference || toTest instanceof Binding || toTest instanceof Port) { >+ return true; >+ } >+ >+ return false; >+ } >+} >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/NameSectionFilter.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/NameSectionFilter.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/NameSectionFilter.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/NameSectionFilter.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,28 @@ >+package org.eclipse.wst.wsdl.ui.internal.properties.section.filter; >+ >+import org.eclipse.jface.viewers.IFilter; >+import org.eclipse.wst.wsdl.Definition; >+import org.eclipse.wst.wsdl.ExtensibilityElement; >+import org.eclipse.wst.wsdl.Import; >+import org.eclipse.wst.wsdl.WSDLElement; >+ >+public class NameSectionFilter implements IFilter { >+ >+ public boolean select(Object object) { >+ if (object instanceof WSDLElement && >+ !(object instanceof ExtensibilityElement) && >+ !(object instanceof Import)) >+ { >+ if (object instanceof WSDLElement) { >+ Definition definition = ((WSDLElement) object).getEnclosingDefinition(); >+ if (definition.getElement() != null && !(object instanceof Definition)) { >+ return true; >+ } >+ >+ return false; >+ } >+ } >+ >+ return false; >+ } >+} >Index: src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/NamespaceSectionFilter.java >=================================================================== >RCS file: src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/NamespaceSectionFilter.java >diff -N src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/NamespaceSectionFilter.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/wst/wsdl/ui/internal/properties/section/filter/NamespaceSectionFilter.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,29 @@ >+package org.eclipse.wst.wsdl.ui.internal.properties.section.filter; >+ >+import org.eclipse.jface.viewers.IFilter; >+import org.eclipse.wst.wsdl.Definition; >+import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject; >+ >+public class NamespaceSectionFilter implements IFilter { >+ >+ public boolean select(Object object) { >+ if (object instanceof WSDLGroupObject) >+ { >+ Definition definition = ((WSDLGroupObject) object).getDefinition(); >+ if (definition.getElement() != null) { >+ return true; >+ } >+ >+ return false; >+ } >+ else if (object instanceof org.eclipse.wst.wsdl.Definition) { >+ Definition definition = (Definition) object; >+ if (definition.getElement() != null) { >+ return true; >+ } >+ } >+ >+ return false; >+ } >+ >+}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 125745
: 34532