Author: scabanovich Date: 2008-03-20 07:47:13 -0400 (Thu, 20 Mar 2008) New Revision: 7035 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteAdapter.java Log: JBIDE-1935 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 2008-03-20 11:46:45 UTC (rev 7034) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteAdapter.java 2008-03-20 11:47:13 UTC (rev 7035) @@ -78,7 +78,9 @@ } public void setEnabled(boolean enabled) { - viewer.setEnabled(enabled); + if(viewer != null) { + viewer.setEnabled(enabled); + } } public void dispose() { @@ -86,6 +88,8 @@ dropManager.dispose(); descriptionManager.dispose(); viewPart.getViewSite().getActionBars().getToolBarManager().removeAll(); + viewer = null; + viewPart = null; } public void setPaletteContents(PaletteContents contents) { @@ -96,6 +100,9 @@ } private void reload(XModelObject lastAddedXCat) { + if(viewer != null) { + viewer.deselectAll(); + } model.load(lastAddedXCat); setEnabled(true); /// setEnabled(viewPart.idEnabled()); @@ -185,7 +192,7 @@ isDirty = true; } else { reload(lastAddedCat); - lastAddedCat = null; + lastAddedCat = null; } } }