Author: scabanovich Date: 2009-10-06 09:42:23 -0400 (Tue, 06 Oct 2009) New Revision: 17930 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteAdapter.java trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteViewer.java Log: https://jira.jboss.org/jira/browse/JBIDE-4976 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteAdapter.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteAdapter.java 2009-10-06 13:41:44 UTC (rev 17929) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteAdapter.java 2009-10-06 13:42:23 UTC (rev 17930) @@ -25,6 +25,7 @@ import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.views.palette.IPaletteAdapter; +import org.jboss.tools.common.model.ui.views.palette.IPalettePageAdapter; import org.jboss.tools.common.model.ui.views.palette.PaletteContents; import org.jboss.tools.common.model.ui.views.palette.PaletteViewPart; import org.jboss.tools.vpe.ui.palette.model.PaletteModel; @@ -35,7 +36,7 @@ private static final URL BASE_URL = EclipseResourceUtil.getInstallURL(Platform.getBundle(ModelUIPlugin.PLUGIN_ID)); private static final String IMAGE_PATH = "images/xstudio/palette/"; //$NON-NLS-1$ - private PaletteViewPart viewPart = null; + private IPalettePageAdapter viewPart = null; private PaletteModel model = null; private PaletteViewer viewer = null; private Control palette = null; @@ -44,10 +45,19 @@ private PaletteModelListener modelListener = null; private PaletteContents paletteContents; - public void setPaletteViewPart(PaletteViewPart viewPart) { + public void setPaletteViewPart(IPalettePageAdapter viewPart) { this.viewPart = viewPart; } - + + public void initActionBars() { + IActionBars bars = viewPart.getActionBars(); + if(bars != null) { + bars.getToolBarManager().add(new PaletteEditAction()); + bars.getToolBarManager().add(new ShowHideTabsAction()); + bars.getToolBarManager().add(new ImportTLDAction()); + } + } + public Control createControl(Composite root) { model = PaletteModel.getInstance(paletteContents); viewer = new PaletteViewer(viewPart); @@ -57,11 +67,8 @@ PaletteRoot paletteRoot = model.getPaletteRoot(); viewer.setPaletteRoot(paletteRoot); - IActionBars bars = viewPart.getViewSite().getActionBars(); - bars.getToolBarManager().add(new PaletteEditAction()); - bars.getToolBarManager().add(new ShowHideTabsAction()); - bars.getToolBarManager().add(new ImportTLDAction()); - +// initActionBars(); + descriptionManager = new DescriptionManager(viewer); descriptionManager.install(palette); @@ -86,7 +93,7 @@ model.removeModelTreeListener(modelListener); dropManager.dispose(); descriptionManager.dispose(); - viewPart.getViewSite().getActionBars().getToolBarManager().removeAll(); + viewPart.getActionBars().getToolBarManager().removeAll(); viewer = null; viewPart = null; } @@ -206,4 +213,6 @@ return (modelObject.getPath() + "/").startsWith(root.getPath() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ } } + + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteViewer.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteViewer.java 2009-10-06 13:41:44 UTC (rev 17929) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteViewer.java 2009-10-06 13:42:23 UTC (rev 17930) @@ -23,18 +23,19 @@ import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; +import org.jboss.tools.common.model.ui.views.palette.IPalettePageAdapter; import org.jboss.tools.common.model.ui.views.palette.PaletteViewPart; import org.jboss.tools.vpe.ui.palette.model.PaletteItem; public class PaletteViewer extends org.eclipse.gef.ui.palette.PaletteViewer { - private PaletteViewPart viewPart; + private IPalettePageAdapter viewPart; PaletteDragSourceListener listener; static Transfer[] transferTypes = new Transfer[] { TextTransfer.getInstance(),ModelTransfer.getInstance() }; - public PaletteViewer(PaletteViewPart viewPart) { + public PaletteViewer(IPalettePageAdapter viewPart) { this.viewPart = viewPart; setEditPartFactory(new CustomPaletteEditPartFactory()); }