Author: DartPeng Date: 2008-08-16 04:32:29 -0400 (Sat, 16 Aug 2008) New Revision: 9750 Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BaseViewerInitor.java workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ViewerInitorStore.java Log: Fix a bug -- the wizard and wizard page instance IS NOT STATELESS Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BaseViewerInitor.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BaseViewerInitor.java 2008-08-16 00:01:00 UTC (rev 9749) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/BaseViewerInitor.java 2008-08-16 08:32:29 UTC (rev 9750) @@ -10,20 +10,21 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.utils.UIUtils; /** * @author Dart Peng * @Date Aug 6, 2008 */ public class BaseViewerInitor implements IViewerInitor { - protected ILabelProvider labelProvider = null; - protected ITreeContentProvider treeContentProvider = null; - protected IStrucutredDataCreationWizard structuredDataLoadWizard = null; protected String typeID = null; protected String name = "nonamed"; protected String wizardIconPath = null; + IConfigurationElement configurationElement = null; /** * @return the name @@ -44,32 +45,33 @@ * @return the treeContentProvider */ public ITreeContentProvider getTreeContentProvider() { - return treeContentProvider; + try { + return (ITreeContentProvider) configurationElement + .createExecutableExtension(UIUtils.EXTENTION_POINT_ATTRIBUTE_CONTENT_PROVIDER); + } catch (CoreException e) { + e.printStackTrace(); + return null; + } } /** * @param treeContentProvider * the treeContentProvider to set */ - public void setTreeContentProvider(ITreeContentProvider treeContentProvider) { - this.treeContentProvider = treeContentProvider; - } /** * @return the structuredDataLoadWizard */ public IStrucutredDataCreationWizard getStructuredDataLoadWizard() { - return structuredDataLoadWizard; + try { + return ((IStrucutredDataCreationWizard) configurationElement + .createExecutableExtension(UIUtils.EXTENTION_POINT_ATTRIBUTE_CREATION_WIZARD)); + } catch (CoreException e) { + e.printStackTrace(); + } + return null; } - /** - * @param structuredDataLoadWizard - * the structuredDataLoadWizard to set - */ - public void setStructuredDataLoadWizard( - IStrucutredDataCreationWizard structuredDataLoadWizard) { - this.structuredDataLoadWizard = structuredDataLoadWizard; - } /** * @return the typeID @@ -90,16 +92,17 @@ * @return the labelProvider */ public ILabelProvider getLabelProvider() { - return labelProvider; + try { + return (ILabelProvider) configurationElement + .createExecutableExtension(UIUtils.EXTENTION_POINT_ATTRIBUTE_LABEL_PROVIDER); + } catch (CoreException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return null; } - /** - * @param labelProvider - * the labelProvider to set - */ - public void setLabelProvider(ILabelProvider labelProvider) { - this.labelProvider = labelProvider; - } /** * @return the wizardIconPath @@ -115,4 +118,13 @@ public void setWizardIconPath(String wizardIconPath) { this.wizardIconPath = wizardIconPath; } + + public IConfigurationElement getConfigurationElement() { + return configurationElement; + } + + public void setConfigurationElement( + IConfigurationElement configurationElement) { + this.configurationElement = configurationElement; + } } Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ViewerInitorStore.java =================================================================== --- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ViewerInitorStore.java 2008-08-16 00:01:00 UTC (rev 9749) +++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/ViewerInitorStore.java 2008-08-16 08:32:29 UTC (rev 9750) @@ -89,40 +89,37 @@ return initorMap; } - protected ILabelProvider createLabelProvider(BaseViewerInitor initor, - IConfigurationElement element) { - try { - initor - .setLabelProvider((ILabelProvider) element - .createExecutableExtension(UIUtils.EXTENTION_POINT_ATTRIBUTE_LABEL_PROVIDER)); - } catch (CoreException e) { - // ignore - } - return initor.getLabelProvider(); - } +// protected ILabelProvider createLabelProvider(BaseViewerInitor initor, +// IConfigurationElement element) { +// try { +// initor +// .setLabelProvider(); +// } catch (CoreException e) { +// // ignore +// } +// return initor.getLabelProvider(); +// } +// +// protected ILabelProvider createTreeContentProvider(BaseViewerInitor initor, +// IConfigurationElement element) { +// try { +// initor +// .setTreeContentProvider(); +// } catch (CoreException e) {// ignore +// } +// return initor.getLabelProvider(); +// } +// +// protected ILabelProvider createCreationWizard(BaseViewerInitor initor, +// IConfigurationElement element) { +// try { +// initor +// .setStructuredDataLoadWizard); +// } catch (CoreException e) {// ignore +// } +// return initor.getLabelProvider(); +// } - protected ILabelProvider createTreeContentProvider(BaseViewerInitor initor, - IConfigurationElement element) { - try { - initor - .setTreeContentProvider((ITreeContentProvider) element - .createExecutableExtension(UIUtils.EXTENTION_POINT_ATTRIBUTE_CONTENT_PROVIDER)); - } catch (CoreException e) {// ignore - } - return initor.getLabelProvider(); - } - - protected ILabelProvider createCreationWizard(BaseViewerInitor initor, - IConfigurationElement element) { - try { - initor - .setStructuredDataLoadWizard((IStrucutredDataCreationWizard) element - .createExecutableExtension(UIUtils.EXTENTION_POINT_ATTRIBUTE_CREATION_WIZARD)); - } catch (CoreException e) {// ignore - } - return initor.getLabelProvider(); - } - protected HashMap<String, IViewerInitor> createNewInitorMap() { IExtensionRegistry registry = Platform.getExtensionRegistry(); IExtensionPoint ep = registry @@ -151,12 +148,7 @@ initor.setTypeID(typeID); - createLabelProvider(initor, element); - - createTreeContentProvider(initor, element); - - createCreationWizard(initor, element); - + initor.setConfigurationElement(element); map.put(typeID, initor); } if (!map.isEmpty()) {