Author: scabanovich Date: 2009-10-14 11:51:49 -0400 (Wed, 14 Oct 2009) New Revision: 18088 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/TagAttributesWizardPage.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java Log: https://jira.jboss.org/jira/browse/JBIDE-5019 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/TagAttributesWizardPage.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/TagAttributesWizardPage.java 2009-10-14 15:14:42 UTC (rev 18087) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/TagAttributesWizardPage.java 2009-10-14 15:51:49 UTC (rev 18088) @@ -12,6 +12,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.Properties; import org.eclipse.compare.Splitter; import org.eclipse.swt.SWT; @@ -32,6 +33,7 @@ * */ public class TagAttributesWizardPage extends DefaultDropWizardPage implements PropertyChangeListener { + protected Properties context = new Properties(); /** * @@ -75,13 +77,14 @@ tabs.setLayoutData(data); general = new TabItem(tabs,SWT.NONE); general.setText(DropWizardMessages.General_Tab_Title); - final TagAttributesComposite generalTabContent = new TagAttributesComposite(tabs,SWT.NONE,getSpecificWizard().getWizardModel(),true); + final TagAttributesComposite generalTabContent = new TagAttributesComposite(tabs,SWT.NONE,getSpecificWizard().getWizardModel(),true, context); general.setControl(generalTabContent); TabItem advanced = new TabItem(tabs,SWT.NONE); advanced.setText(DropWizardMessages.Advanced_Tab_Title); - final TagAttributesComposite advancedTabContent = new TagAttributesComposite(tabs,SWT.NONE,getSpecificWizard().getWizardModel()); + final TagAttributesComposite advancedTabContent = new TagAttributesComposite(tabs,SWT.NONE,getSpecificWizard().getWizardModel(), context); advanced.setControl(advancedTabContent); - advancedTabContentOnly = new TagAttributesComposite(composite,SWT.NONE,getSpecificWizard().getWizardModel()); + + advancedTabContentOnly = new TagAttributesComposite(composite,SWT.NONE,getSpecificWizard().getWizardModel(), context); composite.setVisible(tabs,showAdvansedTab()); composite.setVisible(advancedTabContentOnly,!showAdvansedTab()); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2009-10-14 15:14:42 UTC (rev 18087) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesComposite.java 2009-10-14 15:51:49 UTC (rev 18088) @@ -143,8 +143,8 @@ * @param style * @param wizardModel */ - public TagAttributesComposite(Composite parent, int style, IDropWizardModel wizardModel) { - this(parent, style, wizardModel, false); + public TagAttributesComposite(Composite parent, int style, IDropWizardModel wizardModel, Properties context) { + this(parent, style, wizardModel, false, context); } /** @@ -153,8 +153,9 @@ * @param style * @param wizardModel */ - public TagAttributesComposite(Composite parent, int style, IDropWizardModel wizardModel,boolean filtered) { - super(parent, style); + public TagAttributesComposite(Composite parent, int style, IDropWizardModel wizardModel,boolean filtered, final Properties context) { + super(parent, style); + this.context = context; fFiltered = filtered; fWizardModel = wizardModel; fWizardModel.addPropertyChangeListener(this); @@ -163,7 +164,6 @@ fWizardModel.removePropertyChangeListener(TagAttributesComposite.this); if (context != null) { context.clear(); - context = null; } removeDisposeListener(this); } @@ -358,8 +358,8 @@ tableViewer.setInput(new Object()); } - private Properties context = new Properties(); - + private Properties context; + private ExtendedCellEditorProvider createCellEditorProvider() { return (ExtendedCellEditorProvider)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jst.jsp.outline.JSPCellEditorProviderImpl"); //$NON-NLS-1$ }