[jbosstools-commits] JBoss Tools SVN: r25054 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: selection/bar and 1 other directory.
Author: mareshkau
Date: 2010-09-21 10:16:56 -0400 (Tue, 21 Sep 2010)
New Revision: 25054
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
Log:
JBIDE-7059, show selection bar behaviour has been adjusted
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-09-21
14:03:39 UTC (rev 25053)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-09-21
14:16:56 UTC (rev 25054)
@@ -611,6 +611,12 @@
palettePage.dispose();
palettePage = null;
}
+ IContextService contextService = (IContextService) getSite()
+ .getService(IContextService.class);
+ if(selBarContextActivation!=null){
+ contextService.deactivateContext(selBarContextActivation);
+ selBarContextActivation=null;
+ }
super.dispose();
}
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-09-21
14:03:39 UTC (rev 25053)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-09-21
14:16:56 UTC (rev 25054)
@@ -174,7 +174,7 @@
createArrowButton();
cmpToolBar.layout();
splitter.getParent().layout(true, true);
- setVisible((Boolean)toggleSelBarState.getValue());
+ setVisible(toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue());
return splitter;
}
@@ -649,11 +649,11 @@
}
public void handleStateChange(State state, Object oldValue) {
- setVisible((Boolean)state.getValue());
+ setVisible(toggleSelBarCommand.isEnabled()&&(Boolean)state.getValue());
}
public void commandChanged(CommandEvent commandEvent) {
- setVisible(commandEvent.getCommand().isEnabled()&&(Boolean)commandEvent.getCommand().getState("org.eclipse.ui.commands.toggleState").getValue());
//$NON-NLS-1$
+ setVisible(toggleSelBarCommand.isEnabled()&&(Boolean)commandEvent.getCommand().getState("org.eclipse.ui.commands.toggleState").getValue());
//$NON-NLS-1$
}
}