dbeaver/dbeaver-ee#587 Migrate to GEF3

features/org.jkiss.dbeaver.ui.feature/feature.xml

@@ -27,8 +27,8 @@
       <import plugin="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.search" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.draw2d" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.draw2dl" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.gef3" version="0.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

plugins/org.jkiss.dbeaver.erd.ui/META-INF/MANIFEST.MF

@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
- org.eclipse.gef;visibility:=reexport,
+ org.eclipse.gef3;visibility:=reexport,
  org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.erd.model;visibility:=reexport,
  org.jkiss.dbeaver.ui,

plugins/org.jkiss.dbeaver.erd.ui/plugin.xml

@@ -51,7 +51,7 @@
     </extension>
 
     <extension point="org.eclipse.core.runtime.adapters">
-        <factory adaptableType="org.eclipse.gef.EditPart" class="org.jkiss.dbeaver.erd.ui.model.ERDObjectAdapter">
+        <factory adaptableType="org.eclipse.gef3.EditPart" class="org.jkiss.dbeaver.erd.ui.model.ERDObjectAdapter">
             <adapter type="org.jkiss.dbeaver.model.DBPNamedObject"/>
             <adapter type="org.jkiss.dbeaver.model.DBPQualifiedObject"/>
             <adapter type="org.jkiss.dbeaver.model.struct.DBSObject"/>
@@ -518,7 +518,7 @@
     </extension>
 
     <extension point="org.eclipse.ui.commands">
-        <command id="org.jkiss.dbeaver.erd.toggleHand" name="Toggle hand tool" description="Cycle through hand tool and previously used tool" categoryId="org.eclipse.gef.category.view"/>
+        <command id="org.jkiss.dbeaver.erd.toggleHand" name="Toggle hand tool" description="Cycle through hand tool and previously used tool" categoryId="org.eclipse.gef3.category.view"/>
     </extension>
 
     <extension point="org.eclipse.ui.bindings">

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIConstants.java

@@ -17,7 +17,7 @@
 
 package org.jkiss.dbeaver.erd.ui;
 
-import org.eclipse.draw2d.PrintFigureOperation;
+import org.eclipse.draw2dl.PrintFigureOperation;
 import org.jkiss.dbeaver.erd.ui.internal.ERDUIActivator;
 
 /**

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIUtils.java

@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui;
 
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteEntry;
+import org.eclipse.gef3.palette.PaletteContainer;
+import org.eclipse.gef3.palette.PaletteEntry;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPage;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/DiagramToggleHandAction.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.action;
 
-import org.eclipse.gef.Disposable;
-import org.eclipse.gef.palette.PaletteListener;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.ui.palette.PaletteViewer;
+import org.eclipse.gef3.Disposable;
+import org.eclipse.gef3.palette.PaletteListener;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.ui.palette.PaletteViewer;
 import org.eclipse.jface.action.Action;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.erd.ui.ERDIcon;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDEditorPropertyTester.java

@@ -17,7 +17,7 @@
 package org.jkiss.dbeaver.erd.ui.action;
 
 import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.gef.ui.actions.DeleteAction;
+import org.eclipse.gef3.ui.actions.DeleteAction;
 import org.eclipse.ui.IWorkbenchPart;
 import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerDelete.java

@@ -19,9 +19,9 @@ package org.jkiss.dbeaver.erd.ui.action;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.ui.actions.DeleteAction;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.commands.CompoundCommand;
+import org.eclipse.gef3.ui.actions.DeleteAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IEditorPart;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerPaste.java

@@ -19,8 +19,8 @@ package org.jkiss.dbeaver.erd.ui.action;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.gef3.commands.Command;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.ISources;
 import org.eclipse.ui.handlers.HandlerUtil;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerSelectAll.java

@@ -19,7 +19,7 @@ package org.jkiss.dbeaver.erd.ui.action;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.gef.ui.actions.SelectAllAction;
+import org.eclipse.gef3.ui.actions.SelectAllAction;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.ISources;
 import org.eclipse.ui.handlers.HandlerUtil;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationCreateCommand.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.*;
 import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
 import org.jkiss.dbeaver.model.struct.DBSEntity;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationDeleteCommand.java

@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.commands.Command;
 import org.eclipse.swt.SWT;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDElement;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectSourceCommand.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDElement;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectTargetCommand.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDElement;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AttributeCheckCommand.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.ui.part.AttributePart;
 
 /**

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCommand.java

@@ -17,7 +17,7 @@
 
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
 
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCreateCommand.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2dl.geometry.Point;
 import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
 
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointMoveCommand.java

@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2dl.Bendpoint;
+import org.eclipse.draw2dl.geometry.Point;
 import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
 
 public class BendpointMoveCommand extends BendpointCommand {

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityAddCommand.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.model.ERDUtils;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityRemoveCommand.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
@@ -74,7 +74,7 @@ public class EntityRemoveCommand extends Command {
     }
 
     /**
-     * @see org.eclipse.gef.commands.Command#execute()
+     * @see org.eclipse.gef3.commands.Command#execute()
      */
     @Override
     public void execute() {
@@ -98,7 +98,7 @@ public class EntityRemoveCommand extends Command {
     }
 
     /**
-     * @see org.eclipse.gef.commands.Command#redo()
+     * @see org.eclipse.gef3.commands.Command#redo()
      */
     @Override
     public void redo() {

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NodeMoveCommand.java

@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.ui.part.NodePart;
 
 /**

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteCreateCommand.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDNote;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
 import org.jkiss.dbeaver.erd.ui.part.NotePart;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteDeleteCommand.java

@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDNote;
 import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
 import org.jkiss.dbeaver.erd.ui.part.NotePart;
@@ -42,7 +42,7 @@ public class NoteDeleteCommand extends Command
     }
 
 	/**
-	 * @see org.eclipse.gef.commands.Command#execute()
+	 * @see org.eclipse.gef3.commands.Command#execute()
 	 */
 	@Override
     public void execute()
@@ -51,7 +51,7 @@ public class NoteDeleteCommand extends Command
 	}
 
 	/**
-	 * @see org.eclipse.gef.commands.Command#redo()
+	 * @see org.eclipse.gef3.commands.Command#redo()
 	 */
 	@Override
     public void redo()

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteSetTextCommand.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.ui.figures.NoteFigure;
 import org.jkiss.dbeaver.erd.ui.part.NotePart;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/ExtendedDirectEditManager.java

@@ -19,14 +19,14 @@
  */
 package org.jkiss.dbeaver.erd.ui.directedit;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.Label;
+import org.eclipse.gef3.EditPolicy;
+import org.eclipse.gef3.GraphicalEditPart;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.commands.CommandStack;
+import org.eclipse.gef3.tools.CellEditorLocator;
+import org.eclipse.gef3.tools.DirectEditManager;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/FigureEditorLocator.java

@@ -19,11 +19,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.directedit;
 
-import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.draw2dl.Border;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.tools.CellEditorLocator;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.swt.widgets.Text;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataEditDropTargetListener.java

@@ -19,9 +19,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.dnd;
 
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.dnd.TemplateTransferDropTargetListener;
-import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.gef3.EditPartViewer;
+import org.eclipse.gef3.dnd.TemplateTransferDropTargetListener;
+import org.eclipse.gef3.requests.CreationFactory;
 
 /**
  * Provides a listener for dropping templates onto the editor drawing

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataElementFactory.java

@@ -19,7 +19,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.dnd;
 
-import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.gef3.requests.CreationFactory;
 
 /**
  * Factory for creating instances of new objects from a palette
@@ -42,7 +42,7 @@ public class DataElementFactory implements CreationFactory
 	}
 
 	/**
-	 * @see org.eclipse.gef.requests.CreationFactory#getNewObject()
+	 * @see org.eclipse.gef3.requests.CreationFactory#getNewObject()
 	 */
 	@Override
     public Object getNewObject()
@@ -58,7 +58,7 @@ public class DataElementFactory implements CreationFactory
 	}
 
 	/**
-	 * @see org.eclipse.gef.requests.CreationFactory#getObjectType()
+	 * @see org.eclipse.gef3.requests.CreationFactory#getObjectType()
 	 */
 	@Override
     public Object getObjectType()

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/NodeDropTargetListener.java

@@ -22,12 +22,12 @@ package org.jkiss.dbeaver.erd.ui.dnd;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.dnd.AbstractTransferDropTargetListener;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.gef3.EditPartViewer;
+import org.eclipse.gef3.Request;
+import org.eclipse.gef3.RequestConstants;
+import org.eclipse.gef3.dnd.AbstractTransferDropTargetListener;
+import org.eclipse.gef3.requests.CreateRequest;
+import org.eclipse.gef3.requests.CreationFactory;
 import org.jkiss.dbeaver.erd.model.DiagramObjectCollector;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.ui.internal.ERDUIActivator;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/ObjectCreationFactory.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.dnd;
 
-import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.gef3.requests.CreationFactory;
 
 /**
  * Simple object creation factory

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditPartFactory.java

@@ -19,8 +19,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.EditPartFactory;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorPart.java

@@ -21,21 +21,21 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PrintFigureOperation;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.gef.*;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.ui.actions.*;
-import org.eclipse.gef.ui.palette.FlyoutPaletteComposite;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
-import org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette;
-import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
-import org.eclipse.gef.ui.properties.UndoablePropertySheetEntry;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.PrintFigureOperation;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.commands.CommandStack;
+import org.eclipse.gef3.editparts.ScalableFreeformRootEditPart;
+import org.eclipse.gef3.editparts.ZoomManager;
+import org.eclipse.gef3.palette.PaletteRoot;
+import org.eclipse.gef3.ui.actions.*;
+import org.eclipse.gef3.ui.palette.FlyoutPaletteComposite;
+import org.eclipse.gef3.ui.palette.PaletteViewerProvider;
+import org.eclipse.gef3.ui.parts.GraphicalEditorWithFlyoutPalette;
+import org.eclipse.gef3.ui.parts.GraphicalViewerKeyHandler;
+import org.eclipse.gef3.ui.properties.UndoablePropertySheetEntry;
 import org.eclipse.jface.action.*;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
@@ -60,11 +60,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.erd.model.*;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
-import org.jkiss.dbeaver.erd.ui.action.DiagramExportAction;
-import org.jkiss.dbeaver.erd.ui.action.DiagramLayoutAction;
-import org.jkiss.dbeaver.erd.ui.action.DiagramToggleGridAction;
-import org.jkiss.dbeaver.erd.ui.action.DiagramToggleHandAction;
-import org.jkiss.dbeaver.erd.ui.action.ERDEditorPropertyTester;
+import org.jkiss.dbeaver.erd.ui.action.*;
 import org.jkiss.dbeaver.erd.ui.directedit.StatusLineValidationMessageHandler;
 import org.jkiss.dbeaver.erd.ui.dnd.DataEditDropTargetListener;
 import org.jkiss.dbeaver.erd.ui.dnd.NodeDropTargetListener;
@@ -107,14 +103,15 @@ import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.EventObject;
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 /**
  * Editor implementation based on the the example editor skeleton that is built in <i>Building
- * an editor </i> in chapter <i>Introduction to GEF </i>
+ * an editor </i> in chapter <i>Introduction to .gef3 </i>
  */
 public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
         implements DBPDataSourceTask, IDatabaseModellerEditor, ISearchContextProvider, IRefreshablePart, INavigatorModelView {
@@ -314,7 +311,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
     @Override
     public Object getAdapter(Class adapter)
     {
-        // we need to handle common GEF elements we created
+        // we need to handle common .gef3 elements we created
         if (adapter == GraphicalViewer.class || adapter == EditPartViewer.class) {
             return getGraphicalViewer();
         } else if (adapter == CommandStack.class) {

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorViewer.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef3.GraphicalViewer;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java

@@ -19,17 +19,17 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.*;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.SelectionTool;
-import org.eclipse.gef.ui.parts.AbstractEditPartViewer;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
+import org.eclipse.draw2dl.FigureCanvas;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.palette.PaletteContainer;
+import org.eclipse.gef3.palette.PaletteDrawer;
+import org.eclipse.gef3.palette.PaletteRoot;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.SelectionTool;
+import org.eclipse.gef3.ui.parts.AbstractEditPartViewer;
+import org.eclipse.gef3.ui.parts.ScrollingGraphicalViewer;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
@@ -565,10 +565,10 @@ public class ERDGraphicalViewer extends ScrollingGraphicalViewer implements IPro
     /**
      * Handler that provides horizontal scrolling using mouse wheel.
      *
-     * Copied from {@link org.eclipse.graphiti.ui.internal.util.gef.MouseWheelHorizontalScrollHandler}
+     * Copied from {@link org.eclipse.graphiti.ui.internal.util.gef3.MouseWheelHorizontalScrollHandler}
      *
      * @implNote this implementation differs from the source, since scrolling direction is inverted.
-     * @see org.eclipse.graphiti.ui.internal.util.gef.MouseWheelHorizontalScrollHandler
+     * @see org.eclipse.graphiti.ui.internal.util.gef3.MouseWheelHorizontalScrollHandler
      */
     private static class MouseWheelHorizontalScrollHandler implements MouseWheelHandler {
         public static final MouseWheelHandler SINGLETON = new MouseWheelHorizontalScrollHandler();

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDOutlinePage.java

@@ -16,13 +16,13 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.draw2d.LightweightSystem;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.parts.ScrollableThumbnail;
-import org.eclipse.draw2d.parts.Thumbnail;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
+import org.eclipse.draw2dl.LightweightSystem;
+import org.eclipse.draw2dl.MarginBorder;
+import org.eclipse.draw2dl.Viewport;
+import org.eclipse.draw2dl.parts.ScrollableThumbnail;
+import org.eclipse.draw2dl.parts.Thumbnail;
+import org.eclipse.gef3.LayerConstants;
+import org.eclipse.gef3.editparts.ScalableFreeformRootEditPart;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.StructuredSelection;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPalettePreferences.java

@@ -19,8 +19,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.ui.palette.FlyoutPaletteComposite.FlyoutPreferences;
+import org.eclipse.draw2dl.PositionConstants;
+import org.eclipse.gef3.ui.palette.FlyoutPaletteComposite.FlyoutPreferences;
 import org.jkiss.dbeaver.erd.ui.internal.ERDUIActivator;
 
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPaletteViewerProvider.java

@@ -19,10 +19,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.dnd.TemplateTransferDragSourceListener;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
+import org.eclipse.gef3.EditDomain;
+import org.eclipse.gef3.dnd.TemplateTransferDragSourceListener;
+import org.eclipse.gef3.ui.palette.PaletteViewer;
+import org.eclipse.gef3.ui.palette.PaletteViewerProvider;
 
 /**
  * PaletteViewerProvider subclass used for initialising drag and drop

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPreferencePage.java

@@ -18,7 +18,7 @@
 package org.jkiss.dbeaver.erd.ui.editor;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.PrintFigureOperation;
+import org.eclipse.draw2dl.PrintFigureOperation;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.*;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPropertiesDrawer.java

@@ -19,14 +19,14 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.gef.palette.SelectionToolEntry;
+import org.eclipse.gef3.palette.PaletteDrawer;
+import org.eclipse.gef3.palette.SelectionToolEntry;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.UIIcon;
 
 /**
  * Experimental drawer.
- * Unfortunately it is not possible to customize drawer look-and-feel. All UI rendering is performed by GEF.
+ * Unfortunately it is not possible to customize drawer look-and-feel. All UI rendering is performed by .gef3.
  */
 public class ERDPropertiesDrawer extends PaletteDrawer
 {

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ActionToolEntry.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.SelectionTool;
+import org.eclipse.gef3.Tool;
+import org.eclipse.gef3.palette.PaletteEntry;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.SelectionTool;
 import org.eclipse.jface.action.IAction;
 
 public class ActionToolEntry extends ToolEntry {

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/BringToFrontToolEntry.java

@@ -16,11 +16,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.SharedImages;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.SelectionTool;
+import org.eclipse.gef3.DefaultEditDomain;
+import org.eclipse.gef3.GraphicalViewer;
+import org.eclipse.gef3.SharedImages;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.SelectionTool;
 import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
 import org.jkiss.dbeaver.erd.ui.part.NodePart;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ChangeZOrderAction.java

 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.ui.actions.SelectionAction;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.ui.actions.SelectionAction;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
 import org.jkiss.dbeaver.erd.ui.internal.ERDUIMessages;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/CommandToolEntry.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.SelectionTool;
+import org.eclipse.gef3.Tool;
+import org.eclipse.gef3.palette.PaletteEntry;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.SelectionTool;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.ui.ActionUtils;
 import org.jkiss.dbeaver.ui.DBeaverIcons;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/HandToolEntry.java

@@ -16,13 +16,13 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.AbstractTool;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
+import org.eclipse.draw2dl.Cursors;
+import org.eclipse.draw2dl.FigureCanvas;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.gef3.EditPartViewer;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.AbstractTool;
+import org.eclipse.gef3.ui.parts.ScrollingGraphicalViewer;
 import org.eclipse.swt.widgets.Control;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ResetPartColorAction.java

 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.ui.actions.SelectionAction;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.ui.actions.SelectionAction;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.graphics.Color;
 import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SelectionToolEntry.java

@@ -16,15 +16,15 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.SelectionTool;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.SelectionTool;
 import org.jkiss.dbeaver.erd.ui.ERDIcon;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 
 /**
  * This class is used to override default GEF icons.
  *
- * @see org.eclipse.gef.palette.SelectionToolEntry
+ * @see org.eclipse.gef3.palette.SelectionToolEntry
  */
 public class SelectionToolEntry extends ToolEntry {
     public SelectionToolEntry() {

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartColorAction.java

 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.ui.actions.SelectionAction;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.ui.actions.SelectionAction;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartSettingsAction.java

 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.ui.actions.SelectionAction;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.ui.actions.SelectionAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.preference.ColorSelector;
 import org.eclipse.jface.viewers.IStructuredSelection;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportFormatHandler.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.export;
 
-import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2dl.IFigure;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportGraphML.java

@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.export;
 
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.Bendpoint;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.swt.graphics.Color;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.erd.model.*;
@@ -37,7 +37,10 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-import java.util.*;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportRasterImage.java

@@ -16,11 +16,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.export;
 
-import org.eclipse.draw2d.FreeformLayeredPane;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.FreeformLayeredPane;
+import org.eclipse.draw2dl.Graphics;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.SWTGraphics;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeItemFigure.java

@@ -16,12 +16,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.Figure;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.Label;
+import org.eclipse.draw2dl.ToolbarLayout;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.jkiss.code.NotNull;
@@ -164,8 +164,8 @@ public class AttributeItemFigure extends Figure
         if (parent != null && parent.getBorder() != null) {
             // Extend bounds to the parent's width. This is required for navigation to work correctly:
             // If there's two attributes whose names have different length (e.g. 'id' and 'description'),
-            // descending direction between them would be 'east', not 'south', since that's what GEF thinks.
-            // See org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler.getNavigationPoint
+            // descending direction between them would be 'east', not 'south', since that's what .gef3 thinks.
+            // See org.eclipse.gef3.ui.parts.GraphicalViewerKeyHandler.getNavigationPoint
             final Insets insets = parent.getBorder().getInsets(this);
             final Rectangle bounds = parent.getBounds();
             return super.getBounds().getCopy()

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeListFigure.java

@@ -19,9 +19,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.jface.resource.ColorRegistry;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/CustomCheckBoxFigure.java

@@ -5,8 +5,8 @@
 
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.Toggle;
+import org.eclipse.draw2dl.Label;
+import org.eclipse.draw2dl.Toggle;
 import org.eclipse.swt.graphics.Image;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.UIIcon;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EditableLabel.java

@@ -19,11 +19,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.Graphics;
+import org.eclipse.draw2dl.Label;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
 import org.jkiss.dbeaver.ui.UIUtils;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityDiagramFigure.java

@@ -20,12 +20,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.text.FlowPage;
-import org.eclipse.draw2d.text.TextFlow;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.draw2dl.text.FlowPage;
+import org.eclipse.draw2dl.text.TextFlow;
 import org.eclipse.jface.resource.JFaceResources;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
 import org.jkiss.dbeaver.erd.ui.editor.ERDGraphicalViewer;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityFigure.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.*;
+import org.eclipse.draw2dl.*;
 import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/NoteFigure.java

@@ -20,12 +20,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.CompoundBorder;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.text.FlowPage;
-import org.eclipse.draw2d.text.TextFlow;
+import org.eclipse.draw2dl.CompoundBorder;
+import org.eclipse.draw2dl.LineBorder;
+import org.eclipse.draw2dl.MarginBorder;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.text.FlowPage;
+import org.eclipse.draw2dl.text.TextFlow;
 import org.jkiss.dbeaver.erd.model.ERDNote;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
 import org.jkiss.dbeaver.ui.UIUtils;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/RoundedLineBorder.java

 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.geometry.Insets;
+import org.eclipse.draw2dl.Graphics;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.LineBorder;
+import org.eclipse.draw2dl.geometry.Insets;
 import org.eclipse.swt.graphics.Color;
 
 public class RoundedLineBorder extends LineBorder {

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/DelegatingLayoutManager.java

@@ -19,11 +19,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPolicy;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.LayoutManager;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.EditPolicy;
 import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
 import org.jkiss.dbeaver.erd.ui.policy.DiagramXYLayoutPolicy;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphAnimation.java

@@ -20,12 +20,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout;
 
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.Connection;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.Viewport;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.PointList;
+import org.eclipse.draw2dl.geometry.Rectangle;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * GraphAnimation class lifted directly from the GEF flow example. The only
+ * GraphAnimation class lifted directly from the .gef3 flow example. The only
  * modification is in playBackState(): if either the width of height of a final
  * state figure bounds is greater, then the rectangle during animation is shown
  * as the final size from the outset

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutAuto.java

@@ -19,11 +19,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout;
 
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.Animation;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.AbstractLayout;
+import org.eclipse.draw2dl.Animation;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.jkiss.dbeaver.erd.ui.layout.algorithm.direct.DirectedGraphLayoutVisitor;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutXY.java

@@ -19,9 +19,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout;
 
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.FreeformLayout;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
 
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/ClusterEdgeCreator.java

@@ -20,7 +20,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
 
-import org.eclipse.draw2d.graph.*;
+import org.eclipse.draw2dl.graph.*;
 
 import java.util.ArrayList;
 import java.util.Iterator;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DirectedGraphLayoutVisitor.java

@@ -20,15 +20,15 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.*;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.NodeEditPart;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.draw2dl.graph.*;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.GraphicalEditPart;
+import org.eclipse.gef3.NodeEditPart;
+import org.eclipse.gef3.editparts.AbstractConnectionEditPart;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.erd.ui.layout.GraphAnimation;
 import org.jkiss.dbeaver.erd.ui.model.ERDDecorator;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DummyEdgePart.java

@@ -20,9 +20,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
 
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PolylineConnection;
+import org.eclipse.draw2dl.BendpointConnectionRouter;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.PolylineConnection;
 
 
 /**

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/NodeJoiningDirectedGraphLayout.java

@@ -19,9 +19,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
 
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.DirectedGraphLayout;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.draw2dl.graph.DirectedGraph;
+import org.eclipse.draw2dl.graph.DirectedGraphLayout;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
 
 /**
  * Extended version of DirectedGraphLayout which allows DirectedGraphLayout

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/StandaloneNodeConnector.java

@@ -19,9 +19,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
 
-import org.eclipse.draw2d.graph.*;
-import org.eclipse.gef.NodeEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.draw2dl.graph.*;
+import org.eclipse.gef3.NodeEditPart;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
 import org.eclipse.swt.graphics.Point;
 
 import java.util.ArrayList;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/DiagramLoader.java

@@ -20,10 +20,10 @@
 package org.jkiss.dbeaver.erd.ui.model;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.RelativeBendpoint;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.AbsoluteBendpoint;
+import org.eclipse.draw2dl.Bendpoint;
+import org.eclipse.draw2dl.RelativeBendpoint;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Display;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDContainerDecorated.java

@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.model;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.jkiss.code.NotNull;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecorator.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.model;
 
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.palette.PaletteRoot;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.gef3.EditPartFactory;
+import org.eclipse.gef3.palette.PaletteRoot;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecoratorDefault.java

@@ -16,12 +16,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.model;
 
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.palette.*;
-import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.gef3.EditPartFactory;
+import org.eclipse.gef3.RequestConstants;
+import org.eclipse.gef3.palette.*;
+import org.eclipse.gef3.requests.CreationFactory;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapter.java

@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.model;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.Request;
 
 /**
  * ERD model adapter

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapterDefault.java

@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.model;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.Request;
 
 /**
  * Empty model adapter

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDObjectAdapter.java

@@ -17,7 +17,7 @@
 package org.jkiss.dbeaver.erd.ui.model;
 
 import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.gef.EditPart;
+import org.eclipse.gef3.EditPart;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.erd.model.ERDObject;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AssociationPart.java

@@ -19,13 +19,13 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.*;
-import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.PointList;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.editpolicies.ConnectionEndpointEditPolicy;
 import org.eclipse.swt.SWT;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AttributePart.java

@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.*;
-import org.eclipse.gef.tools.DragEditPartsTracker;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.tools.DragEditPartsTracker;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;
 import org.jkiss.dbeaver.erd.ui.ERDUIUtils;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/DiagramPart.java

@@ -16,16 +16,16 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.FanRouter;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ShortestPathConnectionRouter;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.*;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStackEvent;
-import org.eclipse.gef.commands.CommandStackEventListener;
+import org.eclipse.draw2dl.ConnectionLayer;
+import org.eclipse.draw2dl.FanRouter;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.ShortestPathConnectionRouter;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.commands.CommandStackEvent;
+import org.eclipse.gef3.commands.CommandStackEventListener;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Control;
@@ -206,7 +206,7 @@ public class DiagramPart extends PropertyAwarePart {
     }
 
     /**
-     * @see org.eclipse.gef.editparts.AbstractEditPart#isSelectable()
+     * @see org.eclipse.gef3.editparts.AbstractEditPart#isSelectable()
      */
     @Override
     public boolean isSelectable()

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/EntityPart.java

@@ -19,12 +19,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.*;
-import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.draw2dl.ChopboxAnchor;
+import org.eclipse.draw2dl.ConnectionAnchor;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.tools.DirectEditManager;
 import org.jkiss.dbeaver.erd.model.ERDElement;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NodePart.java

@@ -17,9 +17,9 @@
 
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.NodeEditPart;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.NodeEditPart;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NotePart.java

@@ -17,15 +17,15 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.*;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.draw2dl.ChopboxAnchor;
+import org.eclipse.draw2dl.ConnectionAnchor;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.requests.DirectEditRequest;
+import org.eclipse.gef3.tools.DirectEditManager;
 import org.jkiss.dbeaver.erd.model.ERDElement;
 import org.jkiss.dbeaver.erd.model.ERDNote;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwareConnectionPart.java

@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.GraphicalEditPart;
+import org.eclipse.gef3.editparts.AbstractConnectionEditPart;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.erd.model.ERDObject;
 import org.jkiss.dbeaver.model.DBPNamedObject;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwarePart.java

@@ -16,13 +16,13 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.ConnectionEditPart;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.GraphicalEditPart;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
 import org.eclipse.ui.views.properties.IPropertySource;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationBendEditPolicy.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.BendpointEditPolicy;
-import org.eclipse.gef.requests.BendpointRequest;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.BendpointEditPolicy;
+import org.eclipse.gef3.requests.BendpointRequest;
 import org.jkiss.dbeaver.erd.ui.command.BendpointCreateCommand;
 import org.jkiss.dbeaver.erd.ui.command.BendpointDeleteCommand;
 import org.jkiss.dbeaver.erd.ui.command.BendpointMoveCommand;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationEditPolicy.java

@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ComponentEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ComponentEditPolicy;
+import org.eclipse.gef3.requests.GroupRequest;
 import org.jkiss.dbeaver.erd.ui.command.AssociationDeleteCommand;
 import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
 

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeConnectionEditPolicy.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.requests.ChangeBoundsRequest;
+import org.eclipse.gef3.requests.CreateRequest;
+import org.eclipse.gef3.requests.GroupRequest;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.erd.ui.command.AssociationCreateCommand;
 import org.jkiss.dbeaver.erd.ui.part.AttributePart;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeContainerEditPolicy.java

@@ -16,11 +16,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ContainerEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ContainerEditPolicy;
+import org.eclipse.gef3.requests.ChangeBoundsRequest;
+import org.eclipse.gef3.requests.CreateRequest;
+import org.eclipse.gef3.requests.GroupRequest;
 
 /**
  * Edit policy for attribute container

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeDragAndDropEditPolicy.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
+import org.eclipse.gef3.Request;
+import org.eclipse.gef3.RequestConstants;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.GraphicalEditPolicy;
 import org.jkiss.dbeaver.erd.ui.part.AttributePart;
 
 /**

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramContainerEditPolicy.java

@@ -16,14 +16,14 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gef.editpolicies.ContainerEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.Request;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.AbstractEditPolicy;
+import org.eclipse.gef3.editpolicies.ContainerEditPolicy;
+import org.eclipse.gef3.requests.CreateRequest;
+import org.eclipse.gef3.requests.GroupRequest;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.model.ERDNote;
 import org.jkiss.dbeaver.erd.ui.command.NoteCreateCommand;
@@ -43,7 +43,7 @@ import java.util.List;
 public class DiagramContainerEditPolicy extends ContainerEditPolicy {
 
     /**
-     * @see org.eclipse.gef.editpolicies.ContainerEditPolicy#getAddCommand(org.eclipse.gef.requests.GroupRequest)
+     * @see org.eclipse.gef3.editpolicies.ContainerEditPolicy#getAddCommand(org.eclipse.gef3.requests.GroupRequest)
      */
     @Override
     protected Command getAddCommand(GroupRequest request)
@@ -53,7 +53,7 @@ public class DiagramContainerEditPolicy extends ContainerEditPolicy {
     }
 
     /**
-     * @see ContainerEditPolicy#getCreateCommand(org.eclipse.gef.requests.CreateRequest)
+     * @see ContainerEditPolicy#getCreateCommand(org.eclipse.gef3.requests.CreateRequest)
      */
     @Override
     protected Command getCreateCommand(CreateRequest request)
@@ -85,7 +85,7 @@ public class DiagramContainerEditPolicy extends ContainerEditPolicy {
     }
 
     /**
-     * @see AbstractEditPolicy#getTargetEditPart(org.eclipse.gef.Request)
+     * @see AbstractEditPolicy#getTargetEditPart(org.eclipse.gef3.Request)
      */
     @Override
     public EditPart getTargetEditPart(Request request)

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramXYLayoutPolicy.java

@@ -16,15 +16,15 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.draw2dl.Figure;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.GraphicalEditPart;
+import org.eclipse.gef3.Request;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.XYLayoutEditPolicy;
+import org.eclipse.gef3.requests.CreateRequest;
 import org.jkiss.dbeaver.erd.ui.command.NodeMoveCommand;
 import org.jkiss.dbeaver.erd.ui.part.EntityPart;
 import org.jkiss.dbeaver.erd.ui.part.NodePart;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityConnectionEditPolicy.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.GraphicalNodeEditPolicy;
+import org.eclipse.gef3.requests.CreateConnectionRequest;
+import org.eclipse.gef3.requests.ReconnectRequest;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.ui.command.AssociationCreateCommand;
 import org.jkiss.dbeaver.erd.ui.command.AssociationReconnectSourceCommand;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityContainerEditPolicy.java

@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ContainerEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ContainerEditPolicy;
+import org.eclipse.gef3.requests.CreateRequest;
 
 /**
  * Edit policy for Table as a container, handling functionality for dropping new columns into tables

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityEditPolicy.java

@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ComponentEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ComponentEditPolicy;
+import org.eclipse.gef3.requests.GroupRequest;
 import org.jkiss.dbeaver.erd.ui.part.EntityPart;
 
 /**

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteDirectEditPolicy.java

@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.DirectEditPolicy;
+import org.eclipse.gef3.requests.DirectEditRequest;
 import org.eclipse.jface.viewers.CellEditor;
 import org.jkiss.dbeaver.erd.ui.command.NoteSetTextCommand;
 import org.jkiss.dbeaver.erd.ui.part.NotePart;

plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteEditPolicy.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ComponentEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ComponentEditPolicy;
+import org.eclipse.gef3.requests.GroupRequest;
 import org.jkiss.dbeaver.erd.ui.command.NoteDeleteCommand;
 import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
 import org.jkiss.dbeaver.erd.ui.part.NotePart;

plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF

@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.osgi.services,
  org.eclipse.ui.workbench,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.editors,
- org.eclipse.gef,
+ org.eclipse.gef3,
  org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.registry,
  org.jkiss.dbeaver.ext.postgresql,

plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF

@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
  org.eclipse.ui.ide,
- org.eclipse.gef,
+ org.eclipse.gef3,
  org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.ui.navigator,

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionAnchor.java

@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.AbstractConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2dl.AbstractConnectionAnchor;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Point;
 
 public class LockGraphConnectionAnchor extends AbstractConnectionAnchor {
 

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionEditPolicy.java

@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ConnectionEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ConnectionEditPolicy;
+import org.eclipse.gef3.requests.GroupRequest;
 
 public class LockGraphConnectionEditPolicy extends ConnectionEditPolicy {
 

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEdgeEditPart.java

@@ -16,12 +16,12 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.PolygonDecoration;
+import org.eclipse.draw2dl.PolylineConnection;
+import org.eclipse.gef3.EditPolicy;
+import org.eclipse.gef3.editparts.AbstractConnectionEditPart;
+import org.eclipse.gef3.editpolicies.ConnectionEndpointEditPolicy;
 
 public class LockGraphEdgeEditPart extends AbstractConnectionEditPart {
 

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPart.java

@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.draw2dl.*;
+import org.eclipse.gef3.EditPolicy;
+import org.eclipse.gef3.LayerConstants;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraph;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraphNode;
 

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPartFactory.java

@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.EditPartFactory;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraph;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraphEdge;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraphNode;

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeEditPart.java

@@ -16,14 +16,14 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.GridData;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
+import org.eclipse.draw2dl.ConnectionAnchor;
+import org.eclipse.draw2dl.GridData;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.gef3.ConnectionEditPart;
+import org.eclipse.gef3.EditPolicy;
+import org.eclipse.gef3.Request;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
+import org.eclipse.gef3.editpolicies.NonResizableEditPolicy;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraph;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraphEdge;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraphNode;

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeFigure.java

@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Rectangle;
 
 
 public class LockGraphNodeFigure extends Figure {

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphXYLayoutEditPolicy.java

@@ -17,10 +17,10 @@
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.XYLayoutEditPolicy;
+import org.eclipse.gef3.requests.CreateRequest;
 
 public class LockGraphXYLayoutEditPolicy extends XYLayoutEditPolicy {
 

plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphicalView.java

@@ -17,12 +17,12 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.editparts.FreeformGraphicalRootEditPart;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
+import org.eclipse.draw2dl.ColorConstants;
+import org.eclipse.gef3.ContextMenuProvider;
+import org.eclipse.gef3.DefaultEditDomain;
+import org.eclipse.gef3.GraphicalViewer;
+import org.eclipse.gef3.editparts.FreeformGraphicalRootEditPart;
+import org.eclipse.gef3.ui.parts.ScrollingGraphicalViewer;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;

plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
- org.eclipse.gef,
+ org.eclipse.gef3,
  org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.erd.ui,

plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/ERDExportSVG.java

@@ -19,9 +19,10 @@ package org.jkiss.dbeaver.ext.ui.svg;
 import org.apache.batik.ext.awt.image.codec.png.PNGImageWriter;
 import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
 import org.apache.batik.svggen.SVGGraphics2D;
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.editparts.LayerManager;
+import org.eclipse.draw2dl.Graphics;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.editparts.LayerManager;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.erd.ui.export.ERDExportFormatHandler;
@@ -32,7 +33,7 @@ import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.xml.XMLUtils;
 import org.w3c.dom.Document;
 
-import java.awt.Dimension;
+import java.awt.*;
 import java.io.File;
 
 /**
@@ -66,7 +67,7 @@ public class ERDExportSVG implements ERDExportFormatHandler {
             SVGGraphics2D svgGenerator = new SVGGraphics2D(document);
             svgGenerator.setSVGCanvasSize(new Dimension(contentBounds.width, contentBounds.height));
 
-            // We need a converter from Draw2D.Graphics (GEF) to awt.Graphics2D (Batik)
+            // We need a converter from draw2dl.Graphics (.gef3) to awt.Graphics2D (Batik)
             Graphics graphics = new GraphicsToGraphics2DAdaptor(svgGenerator);
 
             // Reset origin to make it the top/left most part of the diagram

plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/GraphicsToGraphics2DAdaptor.java

@@ -11,19 +11,19 @@
  *    		   uses GraphitiUiInternal.getWorkbenchService() instead of 
  *    		   GMF's DisplayUtils, does not implement the interface
  *    		   DrawableRenderedImage, since it is not needed.
- *    RaM - Remove/hide initial viewport/clipping area, so all GEF diagrams fit
+ *    RaM - Remove/hide initial viewport/clipping area, so all .gef3 diagrams fit
  *    			
  ****************************************************************************/
 
 package org.jkiss.dbeaver.ext.ui.svg;
 
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.TextUtilities;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.Graphics;
+import org.eclipse.draw2dl.SWTGraphics;
+import org.eclipse.draw2dl.TextUtilities;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.PointList;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
@@ -38,7 +38,7 @@ import java.awt.image.BufferedImage;
 import java.util.Stack;
 
 /**
- * Objects of this class can be used with draw2d to render to a Graphics2D object.
+ * Objects of this class can be used with draw2dl to render to a Graphics2D object.
  * 
  * @author jschofie / sshaw
  * 
@@ -312,7 +312,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#clipRect(org.eclipse.draw2d.geometry.Rectangle )
+     * @see org.eclipse.draw2dl.Graphics#clipRect(org.eclipse.draw2dl.geometry.Rectangle )
      */
     @Override
     public void clipRect(Rectangle rect)
@@ -331,7 +331,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#dispose()
+     * @see org.eclipse.draw2dl.Graphics#dispose()
      */
     @Override
     public void dispose()
@@ -359,7 +359,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawArc(int, int, int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawArc(int, int, int, int, int, int)
      */
     @Override
     public void drawArc(int x, int y, int width, int height, int startAngle, int endAngle)
@@ -374,7 +374,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillArc(int, int, int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillArc(int, int, int, int, int, int)
      */
     @Override
     public void fillArc(int x, int y, int w, int h, int offset, int length)
@@ -388,7 +388,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawFocus(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawFocus(int, int, int, int)
      */
     @Override
     public void drawFocus(int x, int y, int w, int h)
@@ -454,7 +454,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawImage(org.eclipse.swt.graphics.Image, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawImage(org.eclipse.swt.graphics.Image, int, int)
      */
     @Override
     public void drawImage(Image srcImage, int xpos, int ypos)
@@ -472,7 +472,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawImage(org.eclipse.swt.graphics.Image, int, int, int, int, int, int, int,
+     * @see org.eclipse.draw2dl.Graphics#drawImage(org.eclipse.swt.graphics.Image, int, int, int, int, int, int, int,
      * int)
      */
     @Override
@@ -488,7 +488,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawLine(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawLine(int, int, int, int)
      */
     @Override
     public void drawLine(int x1, int y1, int x2, int y2)
@@ -503,7 +503,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawOval(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawOval(int, int, int, int)
      */
     @Override
     public void drawOval(int x, int y, int w, int h)
@@ -518,7 +518,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillOval(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillOval(int, int, int, int)
      */
     @Override
     public void fillOval(int x, int y, int w, int h)
@@ -546,7 +546,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawPolygon(org.eclipse.draw2d.geometry.PointList )
+     * @see org.eclipse.draw2dl.Graphics#drawPolygon(org.eclipse.draw2dl.geometry.PointList )
      */
     @Override
     public void drawPolygon(PointList pointList)
@@ -559,7 +559,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillPolygon(org.eclipse.draw2d.geometry.PointList )
+     * @see org.eclipse.draw2dl.Graphics#fillPolygon(org.eclipse.draw2dl.geometry.PointList )
      */
     @Override
     public void fillPolygon(PointList pointList)
@@ -571,7 +571,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawPolyline(org.eclipse.draw2d.geometry. PointList)
+     * @see org.eclipse.draw2dl.Graphics#drawPolyline(org.eclipse.draw2dl.geometry. PointList)
      */
     @Override
     public void drawPolyline(PointList pointList)
@@ -589,7 +589,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawRectangle(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawRectangle(int, int, int, int)
      */
     @Override
     public void drawRectangle(int x, int y, int w, int h)
@@ -604,7 +604,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillRectangle(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillRectangle(int, int, int, int)
      */
     @Override
     public void fillRectangle(int x, int y, int width, int height)
@@ -618,7 +618,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawRoundRectangle(org.eclipse.draw2d.geometry .Rectangle, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawRoundRectangle(org.eclipse.draw2dl.geometry .Rectangle, int, int)
      */
     @Override
     public void drawRoundRectangle(Rectangle rect, int arcWidth, int arcHeight)
@@ -634,7 +634,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillRoundRectangle(org.eclipse.draw2d.geometry .Rectangle, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillRoundRectangle(org.eclipse.draw2dl.geometry .Rectangle, int, int)
      */
     @Override
     public void fillRoundRectangle(Rectangle rect, int arcWidth, int arcHeight)
@@ -649,7 +649,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawText(java.lang.String, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawText(java.lang.String, int, int)
      */
     @Override
     public void drawText(String s, int x, int y)
@@ -659,7 +659,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawString(java.lang.String, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawString(java.lang.String, int, int)
      */
     @Override
     public void drawString(String s, int x, int y)
@@ -741,7 +741,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillString(java.lang.String, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillString(java.lang.String, int, int)
      */
     @Override
     public void fillString(String s, int x, int y)
@@ -751,7 +751,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillText(java.lang.String, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillText(java.lang.String, int, int)
      */
     @Override
     public void fillText(String s, int x, int y)
@@ -761,7 +761,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getBackgroundColor()
+     * @see org.eclipse.draw2dl.Graphics#getBackgroundColor()
      */
     @Override
     public Color getBackgroundColor()
@@ -771,7 +771,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getClip(org.eclipse.draw2d.geometry.Rectangle )
+     * @see org.eclipse.draw2dl.Graphics#getClip(org.eclipse.draw2dl.geometry.Rectangle )
      */
     @Override
     public Rectangle getClip(Rectangle rect)
@@ -789,7 +789,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getFont()
+     * @see org.eclipse.draw2dl.Graphics#getFont()
      */
     @Override
     public Font getFont()
@@ -799,7 +799,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getFontMetrics()
+     * @see org.eclipse.draw2dl.Graphics#getFontMetrics()
      */
     @Override
     public FontMetrics getFontMetrics()
@@ -809,7 +809,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getForegroundColor()
+     * @see org.eclipse.draw2dl.Graphics#getForegroundColor()
      */
     @Override
     public Color getForegroundColor()
@@ -819,7 +819,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getLineStyle()
+     * @see org.eclipse.draw2dl.Graphics#getLineStyle()
      */
     @Override
     public int getLineStyle()
@@ -829,7 +829,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getLineWidth()
+     * @see org.eclipse.draw2dl.Graphics#getLineWidth()
      */
     @Override
     public int getLineWidth()
@@ -845,7 +845,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getXORMode()
+     * @see org.eclipse.draw2dl.Graphics#getXORMode()
      */
     @Override
     public boolean getXORMode()
@@ -855,7 +855,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#popState()
+     * @see org.eclipse.draw2dl.Graphics#popState()
      */
     @Override
     public void popState()
@@ -867,7 +867,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#pushState()
+     * @see org.eclipse.draw2dl.Graphics#pushState()
      */
     @Override
     public void pushState()
@@ -882,7 +882,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#restoreState()
+     * @see org.eclipse.draw2dl.Graphics#restoreState()
      */
     @Override
     public void restoreState()
@@ -928,7 +928,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#scale(double)
+     * @see org.eclipse.draw2dl.Graphics#scale(double)
      */
     @Override
     public void scale(double amount)
@@ -938,7 +938,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setBackgroundColor(org.eclipse.swt.graphics .Color)
+     * @see org.eclipse.draw2dl.Graphics#setBackgroundColor(org.eclipse.swt.graphics .Color)
      */
     @Override
     public void setBackgroundColor(Color rgb)
@@ -949,7 +949,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setClip(org.eclipse.draw2d.geometry.Rectangle )
+     * @see org.eclipse.draw2dl.Graphics#setClip(org.eclipse.draw2dl.geometry.Rectangle )
      */
     @Override
     public void setClip(Rectangle rect)
@@ -999,7 +999,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setFont(org.eclipse.swt.graphics.Font)
+     * @see org.eclipse.draw2dl.Graphics#setFont(org.eclipse.swt.graphics.Font)
      */
     @Override
     public void setFont(Font f)
@@ -1035,7 +1035,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setForegroundColor(org.eclipse.swt.graphics .Color)
+     * @see org.eclipse.draw2dl.Graphics#setForegroundColor(org.eclipse.swt.graphics .Color)
      */
     @Override
     public void setForegroundColor(Color rgb)
@@ -1072,7 +1072,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setLineStyle(int)
+     * @see org.eclipse.draw2dl.Graphics#setLineStyle(int)
      */
     @Override
     public void setLineStyle(int style)
@@ -1110,7 +1110,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setLineWidth(int)
+     * @see org.eclipse.draw2dl.Graphics#setLineWidth(int)
      */
     @Override
     public void setLineWidth(int width)
@@ -1134,7 +1134,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setXORMode(boolean)
+     * @see org.eclipse.draw2dl.Graphics#setXORMode(boolean)
      */
     @Override
     public void setXORMode(boolean xorMode)
@@ -1157,7 +1157,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#translate(int, int)
+     * @see org.eclipse.draw2dl.Graphics#translate(int, int)
      */
     @Override
     public void translate(int dx, int dy)
@@ -1190,7 +1190,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillGradient(int, int, int, int, boolean)
+     * @see org.eclipse.draw2dl.Graphics#fillGradient(int, int, int, int, boolean)
      */
     @Override
     public void fillGradient(int x, int y, int w, int h, boolean vertical)
@@ -1221,7 +1221,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawPath(org.eclipse.swt.graphics.Path)
+     * @see org.eclipse.draw2dl.Graphics#drawPath(org.eclipse.swt.graphics.Path)
      */
     @Override
     public void drawPath(Path path)
@@ -1234,7 +1234,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillPath(org.eclipse.swt.graphics.Path)
+     * @see org.eclipse.draw2dl.Graphics#fillPath(org.eclipse.swt.graphics.Path)
      */
     @Override
     public void fillPath(Path path)
@@ -1246,7 +1246,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setClip(org.eclipse.swt.graphics.Path)
+     * @see org.eclipse.draw2dl.Graphics#setClip(org.eclipse.swt.graphics.Path)
      */
     @Override
     public void setClip(Path path)
@@ -1269,7 +1269,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getFillRule()
+     * @see org.eclipse.draw2dl.Graphics#getFillRule()
      */
     @Override
     public int getFillRule()
@@ -1279,7 +1279,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setFillRule(int)
+     * @see org.eclipse.draw2dl.Graphics#setFillRule(int)
      */
     @Override
     public void setFillRule(int rule)
@@ -1338,7 +1338,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.DrawableRenderedImage #allowDelayRender()
+     * @see org.eclipse.gmf.runtime.draw2dl.ui.render.awt.internal.DrawableRenderedImage #allowDelayRender()
      */
     public boolean shouldAllowDelayRender()
     {
@@ -1347,7 +1347,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.DrawableRenderedImage #getMaximumRenderSize()
+     * @see org.eclipse.gmf.runtime.draw2dl.ui.render.awt.internal.DrawableRenderedImage #getMaximumRenderSize()
      */
     public Dimension getMaximumRenderSize()
     {
@@ -1366,7 +1366,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getAntialias()
+     * @see org.eclipse.draw2dl.Graphics#getAntialias()
      */
     @Override
     public int getAntialias()
@@ -1387,7 +1387,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setAntialias(int)
+     * @see org.eclipse.draw2dl.Graphics#setAntialias(int)
      */
     @Override
     public void setAntialias(int value)

product/debug/DBeaver.product.launch

@@ -80,7 +80,7 @@
         <setEntry value="org.eclipse.core.variables@default:default"/>
         <setEntry value="org.eclipse.debug.core@default:default"/>
         <setEntry value="org.eclipse.debug.ui@default:default"/>
-        <setEntry value="org.eclipse.draw2d@default:default"/>
+        <setEntry value="org.eclipse.draw2dl@default:default"/>
         <setEntry value="org.eclipse.e4.core.commands@default:default"/>
         <setEntry value="org.eclipse.e4.core.contexts@default:default"/>
         <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>
@@ -158,7 +158,7 @@
         <setEntry value="org.eclipse.equinox.security@default:default"/>
         <setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
         <setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
-        <setEntry value="org.eclipse.gef@default:default"/>
+        <setEntry value="org.eclipse.gef3@default:default"/>
         <setEntry value="org.eclipse.help@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface.notifications@default:default"/>