X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Ftoolbar%2FToolbarContributor.java;fp=org.simantics.g3d%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Ftoolbar%2FToolbarContributor.java;h=70fb9c6b80455edb34da5564e9971fc46f875378;hb=53d55c24c779745f188bdb18d32f71d20acb61b2;hp=d9cc952904843cf8791017016632b7d8e21b634d;hpb=f36217aeeb09c0c46f99886ee99772156ce9cfe6;p=simantics%2F3d.git diff --git a/org.simantics.g3d/src/org/simantics/g3d/toolbar/ToolbarContributor.java b/org.simantics.g3d/src/org/simantics/g3d/toolbar/ToolbarContributor.java index d9cc9529..70fb9c6b 100644 --- a/org.simantics.g3d/src/org/simantics/g3d/toolbar/ToolbarContributor.java +++ b/org.simantics.g3d/src/org/simantics/g3d/toolbar/ToolbarContributor.java @@ -75,15 +75,15 @@ public abstract class ToolbarContributor extends EditorActionBarContributor impl private IEditorPart activePart; private Set parts = new HashSet(); - IToolBarManager mgr; - - - ICommandService service; - IHandlerService handlerService; - List items = new ArrayList(); - MapList actions = new MapList(); - - CommandStateRegistry stateRegistry; + IToolBarManager mgr; + + + ICommandService service; + IHandlerService handlerService; + List items = new ArrayList(); + MapList actions = new MapList(); + + CommandStateRegistry stateRegistry; private Map menus = new HashMap(); @@ -97,15 +97,15 @@ public abstract class ToolbarContributor extends EditorActionBarContributor impl public void contributeToCoolBar(ICoolBarManager coolBarManager) { IContributionItem toolBar = coolBarManager.find(getToolbarId()); - if (toolBar instanceof ToolBarContributionItem) - mgr = ((ToolBarContributionItem) toolBar).getToolBarManager(); - if (mgr == null) - return; - - createCommands(); - - mgr.markDirty(); - + if (toolBar instanceof ToolBarContributionItem) + mgr = ((ToolBarContributionItem) toolBar).getToolBarManager(); + if (mgr == null) + return; + + createCommands(); + + mgr.markDirty(); + } private void createCommands() { @@ -205,29 +205,29 @@ public abstract class ToolbarContributor extends EditorActionBarContributor impl private void setContext(IEditorPart part) { this.activePart = part; - if (!parts.contains(activePart)) { - activePart.getSite().getPage().addPartListener(this); - } - if (part != null) { - for (String commandId : actions.getKeys()) { + if (!parts.contains(activePart)) { + activePart.getSite().getPage().addPartListener(this); + } + if (part != null) { + for (String commandId : actions.getKeys()) { for (CommandAction a : actions.getValues(commandId)) { a.setEnabled(true); } } - updateActionBars(part); - } else { + updateActionBars(part); + } else { for (String commandId : actions.getKeys()) { for (CommandAction a : actions.getValues(commandId)) { a.setEnabled(false); } } - } - } + } + } - private void updateActionBars(IEditorPart part) { - restoreActionStates(); - part.getEditorSite().getActionBars().updateActionBars(); - } + private void updateActionBars(IEditorPart part) { + restoreActionStates(); + part.getEditorSite().getActionBars().updateActionBars(); + } @Override public void dispose() { @@ -239,7 +239,7 @@ public abstract class ToolbarContributor extends EditorActionBarContributor impl mgr.markDirty(); mgr.update(true); if (activePart != null) { - activePart.getEditorSite().getActionBars().updateActionBars(); + activePart.getEditorSite().getActionBars().updateActionBars(); } for (String commandId : actions.getKeys()) {