From 8d6bd1d34ff9e18a50a51ca6a01b259321715327 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Wed, 11 Aug 2021 20:48:43 +0300 Subject: [PATCH] dbeaver/dbeaver-ee#587 Migrate to GEF3 --- .../org.jkiss.dbeaver.ui.feature/feature.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.jkiss.dbeaver.erd.ui/plugin.xml | 4 +- .../jkiss/dbeaver/erd/ui/ERDUIConstants.java | 2 +- .../org/jkiss/dbeaver/erd/ui/ERDUIUtils.java | 4 +- .../ui/action/DiagramToggleHandAction.java | 8 +- .../ui/action/ERDEditorPropertyTester.java | 2 +- .../erd/ui/action/ERDHandlerDelete.java | 6 +- .../erd/ui/action/ERDHandlerPaste.java | 4 +- .../erd/ui/action/ERDHandlerSelectAll.java | 2 +- .../ui/command/AssociationCreateCommand.java | 2 +- .../ui/command/AssociationDeleteCommand.java | 4 +- .../AssociationReconnectSourceCommand.java | 2 +- .../AssociationReconnectTargetCommand.java | 2 +- .../erd/ui/command/AttributeCheckCommand.java | 2 +- .../erd/ui/command/BendpointCommand.java | 2 +- .../ui/command/BendpointCreateCommand.java | 2 +- .../erd/ui/command/BendpointMoveCommand.java | 4 +- .../erd/ui/command/EntityAddCommand.java | 8 +- .../erd/ui/command/EntityRemoveCommand.java | 6 +- .../erd/ui/command/NodeMoveCommand.java | 4 +- .../erd/ui/command/NoteCreateCommand.java | 8 +- .../erd/ui/command/NoteDeleteCommand.java | 8 +- .../erd/ui/command/NoteSetTextCommand.java | 2 +- .../directedit/ExtendedDirectEditManager.java | 16 +-- .../ui/directedit/FigureEditorLocator.java | 10 +- .../ui/dnd/DataEditDropTargetListener.java | 6 +- .../erd/ui/dnd/DataElementFactory.java | 6 +- .../erd/ui/dnd/NodeDropTargetListener.java | 12 +- .../erd/ui/dnd/ObjectCreationFactory.java | 2 +- .../erd/ui/editor/ERDEditPartFactory.java | 4 +- .../dbeaver/erd/ui/editor/ERDEditorPart.java | 43 +++---- .../erd/ui/editor/ERDEditorViewer.java | 2 +- .../erd/ui/editor/ERDGraphicalViewer.java | 26 ++-- .../dbeaver/erd/ui/editor/ERDOutlinePage.java | 14 +- .../erd/ui/editor/ERDPalettePreferences.java | 4 +- .../ui/editor/ERDPaletteViewerProvider.java | 8 +- .../erd/ui/editor/ERDPreferencePage.java | 2 +- .../erd/ui/editor/ERDPropertiesDrawer.java | 6 +- .../erd/ui/editor/tools/ActionToolEntry.java | 8 +- .../editor/tools/BringToFrontToolEntry.java | 10 +- .../ui/editor/tools/ChangeZOrderAction.java | 6 +- .../erd/ui/editor/tools/CommandToolEntry.java | 8 +- .../erd/ui/editor/tools/HandToolEntry.java | 14 +- .../ui/editor/tools/ResetPartColorAction.java | 4 +- .../ui/editor/tools/SelectionToolEntry.java | 6 +- .../ui/editor/tools/SetPartColorAction.java | 4 +- .../editor/tools/SetPartSettingsAction.java | 4 +- .../erd/ui/export/ERDExportFormatHandler.java | 2 +- .../erd/ui/export/ERDExportGraphML.java | 11 +- .../erd/ui/export/ERDExportRasterImage.java | 10 +- .../erd/ui/figures/AttributeItemFigure.java | 16 +-- .../erd/ui/figures/AttributeListFigure.java | 6 +- .../erd/ui/figures/CustomCheckBoxFigure.java | 4 +- .../dbeaver/erd/ui/figures/EditableLabel.java | 10 +- .../erd/ui/figures/EntityDiagramFigure.java | 12 +- .../dbeaver/erd/ui/figures/EntityFigure.java | 2 +- .../dbeaver/erd/ui/figures/NoteFigure.java | 12 +- .../erd/ui/figures/RoundedLineBorder.java | 8 +- .../ui/layout/DelegatingLayoutManager.java | 10 +- .../dbeaver/erd/ui/layout/GraphAnimation.java | 14 +- .../erd/ui/layout/GraphLayoutAuto.java | 10 +- .../dbeaver/erd/ui/layout/GraphLayoutXY.java | 6 +- .../algorithm/direct/ClusterEdgeCreator.java | 2 +- .../direct/DirectedGraphLayoutVisitor.java | 18 +-- .../algorithm/direct/DummyEdgePart.java | 6 +- .../NodeJoiningDirectedGraphLayout.java | 6 +- .../direct/StandaloneNodeConnector.java | 6 +- .../dbeaver/erd/ui/model/DiagramLoader.java | 8 +- .../erd/ui/model/ERDContainerDecorated.java | 4 +- .../dbeaver/erd/ui/model/ERDDecorator.java | 8 +- .../erd/ui/model/ERDDecoratorDefault.java | 12 +- .../dbeaver/erd/ui/model/ERDModelAdapter.java | 4 +- .../erd/ui/model/ERDModelAdapterDefault.java | 4 +- .../erd/ui/model/ERDObjectAdapter.java | 2 +- .../dbeaver/erd/ui/part/AssociationPart.java | 14 +- .../dbeaver/erd/ui/part/AttributePart.java | 6 +- .../dbeaver/erd/ui/part/DiagramPart.java | 22 ++-- .../jkiss/dbeaver/erd/ui/part/EntityPart.java | 12 +- .../jkiss/dbeaver/erd/ui/part/NodePart.java | 6 +- .../jkiss/dbeaver/erd/ui/part/NotePart.java | 18 +-- .../ui/part/PropertyAwareConnectionPart.java | 6 +- .../erd/ui/part/PropertyAwarePart.java | 14 +- .../ui/policy/AssociationBendEditPolicy.java | 8 +- .../erd/ui/policy/AssociationEditPolicy.java | 6 +- .../policy/AttributeConnectionEditPolicy.java | 8 +- .../policy/AttributeContainerEditPolicy.java | 10 +- .../AttributeDragAndDropEditPolicy.java | 8 +- .../ui/policy/DiagramContainerEditPolicy.java | 22 ++-- .../erd/ui/policy/DiagramXYLayoutPolicy.java | 18 +-- .../ui/policy/EntityConnectionEditPolicy.java | 8 +- .../ui/policy/EntityContainerEditPolicy.java | 6 +- .../erd/ui/policy/EntityEditPolicy.java | 6 +- .../erd/ui/policy/NoteDirectEditPolicy.java | 6 +- .../dbeaver/erd/ui/policy/NoteEditPolicy.java | 8 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../graph/LockGraphConnectionAnchor.java | 6 +- .../graph/LockGraphConnectionEditPolicy.java | 6 +- .../ui/locks/graph/LockGraphEdgeEditPart.java | 12 +- .../ext/ui/locks/graph/LockGraphEditPart.java | 8 +- .../locks/graph/LockGraphEditPartFactory.java | 4 +- .../ui/locks/graph/LockGraphNodeEditPart.java | 16 +-- .../ui/locks/graph/LockGraphNodeFigure.java | 4 +- .../graph/LockGraphXYLayoutEditPolicy.java | 8 +- .../ext/ui/locks/graph/LockGraphicalView.java | 12 +- .../META-INF/MANIFEST.MF | 2 +- .../dbeaver/ext/ui/svg/ERDExportSVG.java | 11 +- .../ui/svg/GraphicsToGraphics2DAdaptor.java | 120 +++++++++--------- product/debug/DBeaver.product.launch | 4 +- 110 files changed, 481 insertions(+), 480 deletions(-) diff --git a/features/org.jkiss.dbeaver.ui.feature/feature.xml b/features/org.jkiss.dbeaver.ui.feature/feature.xml index e96d4e680f..bfa76e67d8 100644 --- a/features/org.jkiss.dbeaver.ui.feature/feature.xml +++ b/features/org.jkiss.dbeaver.ui.feature/feature.xml @@ -27,8 +27,8 @@ - - + + - + @@ -518,7 +518,7 @@ - + diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIConstants.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIConstants.java index 39fabb2027..151ed8ebe2 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIConstants.java +++ b/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; /** diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIUtils.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIUtils.java index f152fd17f3..23f9439450 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIUtils.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/DiagramToggleHandAction.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/DiagramToggleHandAction.java index c3bc5406d0..6cbe61ffaf 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/DiagramToggleHandAction.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDEditorPropertyTester.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDEditorPropertyTester.java index 083d397f45..38993c6a18 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDEditorPropertyTester.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerDelete.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerDelete.java index 07bcf2e750..7365a83f55 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerDelete.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerPaste.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerPaste.java index 4218cf6add..aba36e50b1 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerPaste.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerSelectAll.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerSelectAll.java index e36ad877d5..23e05ed2ae 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerSelectAll.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationCreateCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationCreateCommand.java index f0b25403b0..0e7efc3567 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationCreateCommand.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationDeleteCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationDeleteCommand.java index 8966b62ce2..eba81a909d 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationDeleteCommand.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectSourceCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectSourceCommand.java index eb151bf446..c9c66f826b 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectSourceCommand.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectTargetCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectTargetCommand.java index 9a1dfa4188..6ddde20c91 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectTargetCommand.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AttributeCheckCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AttributeCheckCommand.java index 577fac8112..39fe3aef8e 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AttributeCheckCommand.java +++ b/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; /** diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCommand.java index ca20e26f4c..b87ab10d34 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCommand.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCreateCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCreateCommand.java index 534189db75..f31ca05057 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCreateCommand.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointMoveCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointMoveCommand.java index db40caf1e2..beada7e880 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointMoveCommand.java +++ b/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 { diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityAddCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityAddCommand.java index 2b5a0da5f5..64211a9abb 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityAddCommand.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityRemoveCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityRemoveCommand.java index b95d0c66f7..74c9f9af9d 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityRemoveCommand.java +++ b/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() { diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NodeMoveCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NodeMoveCommand.java index 6608a11238..262ef709cc 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NodeMoveCommand.java +++ b/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; /** diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteCreateCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteCreateCommand.java index 4e0544aa36..34477f2f1e 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteCreateCommand.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteDeleteCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteDeleteCommand.java index 2f5f0e43a6..05d6298a1d 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteDeleteCommand.java +++ b/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() diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteSetTextCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteSetTextCommand.java index b566fcfdb8..905ae9b04a 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteSetTextCommand.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/ExtendedDirectEditManager.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/ExtendedDirectEditManager.java index 06abcbd66b..21b6bd164a 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/ExtendedDirectEditManager.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/FigureEditorLocator.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/FigureEditorLocator.java index c4cadc7ed6..5b33ce832e 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/FigureEditorLocator.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataEditDropTargetListener.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataEditDropTargetListener.java index c4abe1dca0..b26d657577 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataEditDropTargetListener.java +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataElementFactory.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataElementFactory.java index eeea387f09..16f40dd8c4 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataElementFactory.java +++ b/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() diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/NodeDropTargetListener.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/NodeDropTargetListener.java index 467fd63ef2..cbcbdfcfc4 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/NodeDropTargetListener.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/ObjectCreationFactory.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/ObjectCreationFactory.java index c44a859240..9cab6e7819 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/ObjectCreationFactory.java +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditPartFactory.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditPartFactory.java index d57cb9bb9e..d5d46e9514 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditPartFactory.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorPart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorPart.java index 6ae98ce597..3121de1ded 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorPart.java +++ b/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 Building - * an editor in chapter Introduction to GEF + * an editor in chapter Introduction to .gef3 */ 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) { diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorViewer.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorViewer.java index 40d212f9df..d0350294e1 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorViewer.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java index 0acf4631a2..e194d300c5 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java +++ b/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(); diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDOutlinePage.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDOutlinePage.java index 1bea87d394..0105d0f836 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDOutlinePage.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPalettePreferences.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPalettePreferences.java index 7fc06d237b..3baba279f5 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPalettePreferences.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPaletteViewerProvider.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPaletteViewerProvider.java index 0f25a2494c..39fc4dd89f 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPaletteViewerProvider.java +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPreferencePage.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPreferencePage.java index 33a5b4b7ce..1d4b2acd8c 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPreferencePage.java +++ b/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.*; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPropertiesDrawer.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPropertiesDrawer.java index 6e3bd147c3..e318fc22f4 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPropertiesDrawer.java +++ b/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 { diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ActionToolEntry.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ActionToolEntry.java index e76a958438..0847189733 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ActionToolEntry.java +++ b/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 { diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/BringToFrontToolEntry.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/BringToFrontToolEntry.java index 8974452440..6b0acc4661 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/BringToFrontToolEntry.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ChangeZOrderAction.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ChangeZOrderAction.java index 21164bb966..e0219e5cb2 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ChangeZOrderAction.java +++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ChangeZOrderAction.java @@ -1,8 +1,8 @@ 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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/CommandToolEntry.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/CommandToolEntry.java index a39865ef03..744192ef70 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/CommandToolEntry.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/HandToolEntry.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/HandToolEntry.java index 84f7d11208..cdf2d10175 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/HandToolEntry.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ResetPartColorAction.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ResetPartColorAction.java index 14b19dc381..e89e53ee09 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ResetPartColorAction.java +++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ResetPartColorAction.java @@ -1,7 +1,7 @@ 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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SelectionToolEntry.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SelectionToolEntry.java index 0e137b0e2f..88ecce6c42 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SelectionToolEntry.java +++ b/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() { diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartColorAction.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartColorAction.java index 9779659af7..3bc0457825 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartColorAction.java +++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartColorAction.java @@ -1,7 +1,7 @@ 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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartSettingsAction.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartSettingsAction.java index a77c8a7d02..335b66c86f 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartSettingsAction.java +++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartSettingsAction.java @@ -1,7 +1,7 @@ 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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportFormatHandler.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportFormatHandler.java index d5366bc585..6a34c4762a 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportFormatHandler.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportGraphML.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportGraphML.java index 8db4ccfcf0..051a42538a 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportGraphML.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportRasterImage.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportRasterImage.java index 6698b078ae..d12223c5ed 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportRasterImage.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeItemFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeItemFigure.java index d2a3b38c8a..4f3ceae5c5 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeItemFigure.java +++ b/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() diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeListFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeListFigure.java index 3084620d9f..443c2ea73f 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeListFigure.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/CustomCheckBoxFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/CustomCheckBoxFigure.java index e44ba905ef..3f0aaa552d 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/CustomCheckBoxFigure.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EditableLabel.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EditableLabel.java index 1cefd17cad..2323fa595a 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EditableLabel.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityDiagramFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityDiagramFigure.java index e1f3bf5bbe..b9ead54236 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityDiagramFigure.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityFigure.java index 4176c06d1c..595c34f40c 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityFigure.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/NoteFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/NoteFigure.java index f64aa2a3c4..49c13df044 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/NoteFigure.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/RoundedLineBorder.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/RoundedLineBorder.java index 91cc90c354..1ec1e9c78a 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/RoundedLineBorder.java +++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/RoundedLineBorder.java @@ -1,9 +1,9 @@ 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 { diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/DelegatingLayoutManager.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/DelegatingLayoutManager.java index 64bc93fb1b..2e4ed20619 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/DelegatingLayoutManager.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphAnimation.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphAnimation.java index 5dfef8035d..550efcd68e 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphAnimation.java +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutAuto.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutAuto.java index 500e887a37..3925053561 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutAuto.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutXY.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutXY.java index 74e211e835..e9900d6b2f 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutXY.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/ClusterEdgeCreator.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/ClusterEdgeCreator.java index 5c5c72212d..a40f07f5f8 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/ClusterEdgeCreator.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DirectedGraphLayoutVisitor.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DirectedGraphLayoutVisitor.java index 288adcbdbd..f97f68e2e0 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DirectedGraphLayoutVisitor.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DummyEdgePart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DummyEdgePart.java index 2a5033c394..1394b4bdf7 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DummyEdgePart.java +++ b/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; /** diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/NodeJoiningDirectedGraphLayout.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/NodeJoiningDirectedGraphLayout.java index 6122f0ee2e..2399e8289f 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/NodeJoiningDirectedGraphLayout.java +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/StandaloneNodeConnector.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/StandaloneNodeConnector.java index be9e9fefe3..cad1b16dab 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/StandaloneNodeConnector.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/DiagramLoader.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/DiagramLoader.java index 062b56f703..e26773d31e 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/DiagramLoader.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDContainerDecorated.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDContainerDecorated.java index f9b104f264..c1c7f12322 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDContainerDecorated.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecorator.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecorator.java index d8c5958c91..eb9a039490 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecorator.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecoratorDefault.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecoratorDefault.java index 56bb82892a..68fd98ffbe 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecoratorDefault.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapter.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapter.java index d7832a1373..27e6df390b 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapter.java +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapterDefault.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapterDefault.java index 57d86beb9c..c3a670364c 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapterDefault.java +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDObjectAdapter.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDObjectAdapter.java index 2f31a721bf..be3a2673fe 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDObjectAdapter.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AssociationPart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AssociationPart.java index ad10369233..35d63cf663 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AssociationPart.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AttributePart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AttributePart.java index ba9f2ed7c4..e925abbc8b 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AttributePart.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/DiagramPart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/DiagramPart.java index e5aec53066..999008e291 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/DiagramPart.java +++ b/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() diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/EntityPart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/EntityPart.java index 76eba73146..bc314160ad 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/EntityPart.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NodePart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NodePart.java index c90c495b97..7dd6bc2040 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NodePart.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NotePart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NotePart.java index f20421c573..7e4a97d907 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NotePart.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwareConnectionPart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwareConnectionPart.java index c01d066d2e..2f4744e824 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwareConnectionPart.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwarePart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwarePart.java index 396c23afcc..c3d5d84f4f 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwarePart.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationBendEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationBendEditPolicy.java index 37e8e2b150..e67314b87a 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationBendEditPolicy.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationEditPolicy.java index e84ba62545..a89d71a8bc 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationEditPolicy.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeConnectionEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeConnectionEditPolicy.java index ac7eadce4f..a4ce327d81 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeConnectionEditPolicy.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeContainerEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeContainerEditPolicy.java index 1ef890febf..d4dea28226 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeContainerEditPolicy.java +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeDragAndDropEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeDragAndDropEditPolicy.java index 324f9c7d37..0501bbe2ed 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeDragAndDropEditPolicy.java +++ b/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; /** diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramContainerEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramContainerEditPolicy.java index 2ec97e632d..ed0c3c7573 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramContainerEditPolicy.java +++ b/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) diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramXYLayoutPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramXYLayoutPolicy.java index 7a061d7be2..1eb93302f6 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramXYLayoutPolicy.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityConnectionEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityConnectionEditPolicy.java index 56ecce746f..8997dbbfe7 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityConnectionEditPolicy.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityContainerEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityContainerEditPolicy.java index cc09299bd9..db19bbc9ac 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityContainerEditPolicy.java +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityEditPolicy.java index db21ff32de..35ef39006a 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityEditPolicy.java +++ b/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; /** diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteDirectEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteDirectEditPolicy.java index 76c9a55b9d..657f2e5b89 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteDirectEditPolicy.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteEditPolicy.java index 7816b64319..39db230042 100644 --- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteEditPolicy.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF index 78e5c5c8aa..f5025be21a 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF +++ b/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, diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF index 12372cf2f8..aa436ab993 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF +++ b/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, diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionAnchor.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionAnchor.java index 133b25bec6..1ee61e13c6 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionAnchor.java +++ b/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 { diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionEditPolicy.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionEditPolicy.java index 4247be12cf..9bdd8c0904 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionEditPolicy.java +++ b/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 { diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEdgeEditPart.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEdgeEditPart.java index 6649ed5f56..acf4577032 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEdgeEditPart.java +++ b/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 { diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPart.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPart.java index 1207e9dfb0..275a320e5a 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPart.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPartFactory.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPartFactory.java index 2b2c488968..0b7fcd89c1 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPartFactory.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeEditPart.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeEditPart.java index 9b035033e3..ebad647e2a 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeEditPart.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeFigure.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeFigure.java index 354fce0ee7..78bee11c00 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeFigure.java +++ b/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 { diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphXYLayoutEditPolicy.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphXYLayoutEditPolicy.java index efbf65c77e..6b0f32a3d8 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphXYLayoutEditPolicy.java +++ b/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 { diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphicalView.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphicalView.java index cb52fdfc13..7322c1e347 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphicalView.java +++ b/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; diff --git a/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF index c0af7998c3..519dd14c04 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF +++ b/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, diff --git a/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/ERDExportSVG.java b/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/ERDExportSVG.java index 197a6a1cad..1762bd4481 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/ERDExportSVG.java +++ b/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 diff --git a/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/GraphicsToGraphics2DAdaptor.java b/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/GraphicsToGraphics2DAdaptor.java index b693f9e0f9..65862d36a9 100644 --- a/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/GraphicsToGraphics2DAdaptor.java +++ b/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) diff --git a/product/debug/DBeaver.product.launch b/product/debug/DBeaver.product.launch index fc4b361fad..86b96e1822 100644 --- a/product/debug/DBeaver.product.launch +++ b/product/debug/DBeaver.product.launch @@ -80,7 +80,7 @@ - + @@ -158,7 +158,7 @@ - + -- GitLab