EA-55889 - NPE: NavBarRootPaneExtension$.updateUI

This commit is contained in:
Gregory.Shrago
2014-04-15 13:26:13 +04:00
parent fee67119a9
commit fb0efdddb4
@@ -174,7 +174,7 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
AnAction firstAction = null;
for (final AnAction action : ((DefaultActionGroup)group).getChildActionsOrStubs()) {
if (action instanceof DefaultActionGroup) {
firstAction = getFirstAction((DefaultActionGroup)action);
firstAction = getFirstAction(action);
}
else if (action instanceof Separator || action instanceof ActionGroup) {
continue;
@@ -241,13 +241,15 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
@Override
public void updateUI() {
super.updateUI();
setOpaque(true);
if (myScrollPane == null || myNavigationBar == null) return;
myScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
myScrollPane.setHorizontalScrollBar(null);
myScrollPane.setBorder(new NavBarBorder(true, 0));
myScrollPane.setOpaque(false);
myScrollPane.getViewport().setOpaque(false);
myScrollPane.setViewportBorder(null);
setOpaque(true);
myNavigationBar.setBorder(null);
}
};
@@ -286,6 +288,7 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
myWrapperPanel = null;
myRunPanel = null;
myNavigationBar = null;
myScrollPane = null;
myProject = null;
}
}