Commit ca4f28ca authored by Simon Barner's avatar Simon Barner
Browse files

Merge branch '3672' into 'master'

DiagramEditors: Overwrite eclipse zoom class for fixed height

See merge request !69
parents 4a3039eb b3cefa3d 9d9eded6848ee78991d1416592d1136efd71d2b7 GREEN fa544546f73eea1150d90b7257b0e6bce82c288c GREEN 69994faea09eec342b8dfaa484ffc03b60978496 GREEN 3a3a0137561c13403c8d731434e4fd5f00d9c86f GREEN 155a5a7ac41c668ae7ef978e8be13b83f5abd67d GREEN 11d48e8a2aecd48eea259a42ef1192c4b292a334 GREEN 09663ce095074d1a8eef086284eea0a7776e0431 GREEN
......@@ -71,7 +71,6 @@ import org.eclipse.gef.ui.actions.PrintAction;
import org.eclipse.gef.ui.actions.SelectAllAction;
import org.eclipse.gef.ui.actions.SelectionAction;
import org.eclipse.gef.ui.actions.UpdateAction;
import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
import org.eclipse.gef.ui.actions.ZoomInAction;
import org.eclipse.gef.ui.actions.ZoomOutAction;
import org.eclipse.jface.action.IAction;
......@@ -86,7 +85,6 @@ import;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.ISelectionListener;
......@@ -137,9 +135,6 @@ abstract class CommonDiagramEditorBase<T extends EObject> extends GEFEditorBase<
/** Stores the zoom manager. */
private ZoomManager zoomManager;
/** Stores the zoom contribution item. */
private ZoomComboContributionItem zoomContribution;
/** A container for editor actions. */
private final ActionRegistry actionRegistry = new ActionRegistry();
......@@ -410,7 +405,6 @@ abstract class CommonDiagramEditorBase<T extends EObject> extends GEFEditorBase<
zoomContribution = new ZoomComboContributionItem(getSite().getPage());
/** Registers and returns the id of the given action. */
......@@ -471,18 +465,6 @@ abstract class CommonDiagramEditorBase<T extends EObject> extends GEFEditorBase<
private static final List<String> defaultZoomLevelContribution =
Arrays.asList(new String[] {FIT_ALL, FIT_WIDTH, FIT_HEIGHT});
/** Registers global actions (including zoom action). */
public void registerGlobalActions(IActionBars bars) {
/** Unregisters global actions (including zoom action). */
public void unregisterGlobalActions(IActionBars bars) {
* Registers the select all action. Sub-classes may override to prevent the
* action registering.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment