Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

体验新版 GitCode，发现更多精彩内容 >>

提交 8d6bd1d3 编写于 作者: S serge-rider
浏览文件
操作

dbeaver/dbeaver-ee#587 Migrate to GEF3

上级 9e995369
展开全部 隐藏空白更改
内联 并排
Showing with 481 addition and 480 deletion
features/org.jkiss.dbeaver.ui.feature/feature.xml
浏览文件 @ 8d6bd1d3
......@@ -27,8 +27,8 @@
<import plugin="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.views" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.search" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.draw2d" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.draw2dl" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.gef3" version="0.0.0" match="greaterOrEqual"/>
</requires>
<plugin
......
plugins/org.jkiss.dbeaver.erd.ui/META-INF/MANIFEST.MF
浏览文件 @ 8d6bd1d3
......@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.ui.views,
org.eclipse.gef;visibility:=reexport,
org.eclipse.gef3;visibility:=reexport,
org.jkiss.dbeaver.model;visibility:=reexport,
org.jkiss.dbeaver.erd.model;visibility:=reexport,
org.jkiss.dbeaver.ui,
......
plugins/org.jkiss.dbeaver.erd.ui/plugin.xml
浏览文件 @ 8d6bd1d3
......@@ -51,7 +51,7 @@
</extension>
<extension point="org.eclipse.core.runtime.adapters">
<factory adaptableType="org.eclipse.gef.EditPart" class="org.jkiss.dbeaver.erd.ui.model.ERDObjectAdapter">
<factory adaptableType="org.eclipse.gef3.EditPart" class="org.jkiss.dbeaver.erd.ui.model.ERDObjectAdapter">
<adapter type="org.jkiss.dbeaver.model.DBPNamedObject"/>
<adapter type="org.jkiss.dbeaver.model.DBPQualifiedObject"/>
<adapter type="org.jkiss.dbeaver.model.struct.DBSObject"/>
......@@ -518,7 +518,7 @@
</extension>
<extension point="org.eclipse.ui.commands">
<command id="org.jkiss.dbeaver.erd.toggleHand" name="Toggle hand tool" description="Cycle through hand tool and previously used tool" categoryId="org.eclipse.gef.category.view"/>
<command id="org.jkiss.dbeaver.erd.toggleHand" name="Toggle hand tool" description="Cycle through hand tool and previously used tool" categoryId="org.eclipse.gef3.category.view"/>
</extension>
<extension point="org.eclipse.ui.bindings">
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIConstants.java
浏览文件 @ 8d6bd1d3
......@@ -17,7 +17,7 @@
package org.jkiss.dbeaver.erd.ui;
import org.eclipse.draw2d.PrintFigureOperation;
import org.eclipse.draw2dl.PrintFigureOperation;
import org.jkiss.dbeaver.erd.ui.internal.ERDUIActivator;
/**
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIUtils.java
浏览文件 @ 8d6bd1d3
......@@ -16,8 +16,8 @@
*/
package org.jkiss.dbeaver.erd.ui;
import org.eclipse.gef.palette.PaletteContainer;
import org.eclipse.gef.palette.PaletteEntry;
import org.eclipse.gef3.palette.PaletteContainer;
import org.eclipse.gef3.palette.PaletteEntry;
import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/DiagramToggleHandAction.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.action;
import org.eclipse.gef.Disposable;
import org.eclipse.gef.palette.PaletteListener;
import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.ui.palette.PaletteViewer;
import org.eclipse.gef3.Disposable;
import org.eclipse.gef3.palette.PaletteListener;
import org.eclipse.gef3.palette.ToolEntry;
import org.eclipse.gef3.ui.palette.PaletteViewer;
import org.eclipse.jface.action.Action;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.erd.ui.ERDIcon;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDEditorPropertyTester.java
浏览文件 @ 8d6bd1d3
......@@ -17,7 +17,7 @@
package org.jkiss.dbeaver.erd.ui.action;
import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.gef.ui.actions.DeleteAction;
import org.eclipse.gef3.ui.actions.DeleteAction;
import org.eclipse.ui.IWorkbenchPart;
import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerDelete.java
浏览文件 @ 8d6bd1d3
......@@ -19,9 +19,9 @@ package org.jkiss.dbeaver.erd.ui.action;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.CompoundCommand;
import org.eclipse.gef.ui.actions.DeleteAction;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.commands.CompoundCommand;
import org.eclipse.gef3.ui.actions.DeleteAction;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.IEditorPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerPaste.java
浏览文件 @ 8d6bd1d3
......@@ -19,8 +19,8 @@ package org.jkiss.dbeaver.erd.ui.action;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.gef3.commands.Command;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.ISources;
import org.eclipse.ui.handlers.HandlerUtil;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerSelectAll.java
浏览文件 @ 8d6bd1d3
......@@ -19,7 +19,7 @@ package org.jkiss.dbeaver.erd.ui.action;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.gef.ui.actions.SelectAllAction;
import org.eclipse.gef3.ui.actions.SelectAllAction;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.ISources;
import org.eclipse.ui.handlers.HandlerUtil;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationCreateCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.model.*;
import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
import org.jkiss.dbeaver.model.struct.DBSEntity;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationDeleteCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,8 +16,8 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef3.EditPart;
import org.eclipse.gef3.commands.Command;
import org.eclipse.swt.SWT;
import org.jkiss.dbeaver.erd.model.ERDAssociation;
import org.jkiss.dbeaver.erd.model.ERDElement;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectSourceCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.model.ERDAssociation;
import org.jkiss.dbeaver.erd.model.ERDElement;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectTargetCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.model.ERDAssociation;
import org.jkiss.dbeaver.erd.model.ERDElement;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AttributeCheckCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.ui.part.AttributePart;
/**
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCommand.java
浏览文件 @ 8d6bd1d3
......@@ -17,7 +17,7 @@
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCreateCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2dl.geometry.Point;
import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointMoveCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,8 +16,8 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.draw2d.Bendpoint;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2dl.Bendpoint;
import org.eclipse.draw2dl.geometry.Point;
import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
public class BendpointMoveCommand extends BendpointCommand {
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityAddCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.commands.Command;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.model.ERDEntity;
import org.jkiss.dbeaver.erd.model.ERDUtils;
import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityRemoveCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.model.ERDAssociation;
import org.jkiss.dbeaver.erd.model.ERDEntity;
import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
......@@ -74,7 +74,7 @@ public class EntityRemoveCommand extends Command {
}
/**
* @see org.eclipse.gef.commands.Command#execute()
* @see org.eclipse.gef3.commands.Command#execute()
*/
@Override
public void execute() {
......@@ -98,7 +98,7 @@ public class EntityRemoveCommand extends Command {
}
/**
* @see org.eclipse.gef.commands.Command#redo()
* @see org.eclipse.gef3.commands.Command#redo()
*/
@Override
public void redo() {
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NodeMoveCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,8 +16,8 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.commands.Command;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.ui.part.NodePart;
/**
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteCreateCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.commands.Command;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.model.ERDNote;
import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
import org.jkiss.dbeaver.erd.ui.part.NotePart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteDeleteCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,8 +16,8 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.commands.Command;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.model.ERDNote;
import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
import org.jkiss.dbeaver.erd.ui.part.NotePart;
......@@ -42,7 +42,7 @@ public class NoteDeleteCommand extends Command
}
/**
* @see org.eclipse.gef.commands.Command#execute()
* @see org.eclipse.gef3.commands.Command#execute()
*/
@Override
public void execute()
......@@ -51,7 +51,7 @@ public class NoteDeleteCommand extends Command
}
/**
* @see org.eclipse.gef.commands.Command#redo()
* @see org.eclipse.gef3.commands.Command#redo()
*/
@Override
public void redo()
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteSetTextCommand.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.command;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef3.commands.Command;
import org.jkiss.dbeaver.erd.ui.figures.NoteFigure;
import org.jkiss.dbeaver.erd.ui.part.NotePart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/ExtendedDirectEditManager.java
浏览文件 @ 8d6bd1d3
......@@ -19,14 +19,14 @@
*/
package org.jkiss.dbeaver.erd.ui.directedit;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.CommandStack;
import org.eclipse.gef.tools.CellEditorLocator;
import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.Label;
import org.eclipse.gef3.EditPolicy;
import org.eclipse.gef3.GraphicalEditPart;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.commands.CommandStack;
import org.eclipse.gef3.tools.CellEditorLocator;
import org.eclipse.gef3.tools.DirectEditManager;
import org.eclipse.jface.viewers.ICellEditorValidator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.VerifyEvent;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/FigureEditorLocator.java
浏览文件 @ 8d6bd1d3
......@@ -19,11 +19,11 @@
*/
package org.jkiss.dbeaver.erd.ui.directedit;
import org.eclipse.draw2d.Border;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.tools.CellEditorLocator;
import org.eclipse.draw2dl.Border;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.tools.CellEditorLocator;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Text;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataEditDropTargetListener.java
浏览文件 @ 8d6bd1d3
......@@ -19,9 +19,9 @@
*/
package org.jkiss.dbeaver.erd.ui.dnd;
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.dnd.TemplateTransferDropTargetListener;
import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.gef3.EditPartViewer;
import org.eclipse.gef3.dnd.TemplateTransferDropTargetListener;
import org.eclipse.gef3.requests.CreationFactory;
/**
* Provides a listener for dropping templates onto the editor drawing
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataElementFactory.java
浏览文件 @ 8d6bd1d3
......@@ -19,7 +19,7 @@
*/
package org.jkiss.dbeaver.erd.ui.dnd;
import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.gef3.requests.CreationFactory;
/**
* Factory for creating instances of new objects from a palette
......@@ -42,7 +42,7 @@ public class DataElementFactory implements CreationFactory
}
/**
* @see org.eclipse.gef.requests.CreationFactory#getNewObject()
* @see org.eclipse.gef3.requests.CreationFactory#getNewObject()
*/
@Override
public Object getNewObject()
......@@ -58,7 +58,7 @@ public class DataElementFactory implements CreationFactory
}
/**
* @see org.eclipse.gef.requests.CreationFactory#getObjectType()
* @see org.eclipse.gef3.requests.CreationFactory#getObjectType()
*/
@Override
public Object getObjectType()
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/NodeDropTargetListener.java
浏览文件 @ 8d6bd1d3
......@@ -22,12 +22,12 @@ package org.jkiss.dbeaver.erd.ui.dnd;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.Request;
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.dnd.AbstractTransferDropTargetListener;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.gef3.EditPartViewer;
import org.eclipse.gef3.Request;
import org.eclipse.gef3.RequestConstants;
import org.eclipse.gef3.dnd.AbstractTransferDropTargetListener;
import org.eclipse.gef3.requests.CreateRequest;
import org.eclipse.gef3.requests.CreationFactory;
import org.jkiss.dbeaver.erd.model.DiagramObjectCollector;
import org.jkiss.dbeaver.erd.model.ERDEntity;
import org.jkiss.dbeaver.erd.ui.internal.ERDUIActivator;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/ObjectCreationFactory.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.dnd;
import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.gef3.requests.CreationFactory;
/**
* Simple object creation factory
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditPartFactory.java
浏览文件 @ 8d6bd1d3
......@@ -19,8 +19,8 @@
*/
package org.jkiss.dbeaver.erd.ui.editor;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartFactory;
import org.eclipse.gef3.EditPart;
import org.eclipse.gef3.EditPartFactory;
import org.jkiss.dbeaver.erd.model.ERDAssociation;
import org.jkiss.dbeaver.erd.model.ERDEntity;
import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorPart.java
浏览文件 @ 8d6bd1d3
......@@ -21,21 +21,21 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PrintFigureOperation;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.gef.*;
import org.eclipse.gef.commands.CommandStack;
import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
import org.eclipse.gef.editparts.ZoomManager;
import org.eclipse.gef.palette.PaletteRoot;
import org.eclipse.gef.ui.actions.*;
import org.eclipse.gef.ui.palette.FlyoutPaletteComposite;
import org.eclipse.gef.ui.palette.PaletteViewerProvider;
import org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette;
import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
import org.eclipse.gef.ui.properties.UndoablePropertySheetEntry;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.PrintFigureOperation;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Insets;
import org.eclipse.gef3.*;
import org.eclipse.gef3.commands.CommandStack;
import org.eclipse.gef3.editparts.ScalableFreeformRootEditPart;
import org.eclipse.gef3.editparts.ZoomManager;
import org.eclipse.gef3.palette.PaletteRoot;
import org.eclipse.gef3.ui.actions.*;
import org.eclipse.gef3.ui.palette.FlyoutPaletteComposite;
import org.eclipse.gef3.ui.palette.PaletteViewerProvider;
import org.eclipse.gef3.ui.parts.GraphicalEditorWithFlyoutPalette;
import org.eclipse.gef3.ui.parts.GraphicalViewerKeyHandler;
import org.eclipse.gef3.ui.properties.UndoablePropertySheetEntry;
import org.eclipse.jface.action.*;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
......@@ -60,11 +60,7 @@ import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.erd.model.*;
import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
import org.jkiss.dbeaver.erd.ui.action.DiagramExportAction;
import org.jkiss.dbeaver.erd.ui.action.DiagramLayoutAction;
import org.jkiss.dbeaver.erd.ui.action.DiagramToggleGridAction;
import org.jkiss.dbeaver.erd.ui.action.DiagramToggleHandAction;
import org.jkiss.dbeaver.erd.ui.action.ERDEditorPropertyTester;
import org.jkiss.dbeaver.erd.ui.action.*;
import org.jkiss.dbeaver.erd.ui.directedit.StatusLineValidationMessageHandler;
import org.jkiss.dbeaver.erd.ui.dnd.DataEditDropTargetListener;
import org.jkiss.dbeaver.erd.ui.dnd.NodeDropTargetListener;
......@@ -107,14 +103,15 @@ import org.jkiss.utils.ArrayUtils;
import org.jkiss.utils.CommonUtils;
import java.io.File;
import java.util.*;
import java.util.ArrayList;
import java.util.EventObject;
import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
/**
* Editor implementation based on the the example editor skeleton that is built in <i>Building
* an editor </i> in chapter <i>Introduction to GEF </i>
* an editor </i> in chapter <i>Introduction to .gef3 </i>
*/
public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
implements DBPDataSourceTask, IDatabaseModellerEditor, ISearchContextProvider, IRefreshablePart, INavigatorModelView {
......@@ -314,7 +311,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
@Override
public Object getAdapter(Class adapter)
{
// we need to handle common GEF elements we created
// we need to handle common .gef3 elements we created
if (adapter == GraphicalViewer.class || adapter == EditPartViewer.class) {
return getGraphicalViewer();
} else if (adapter == CommandStack.class) {
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorViewer.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.editor;
import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef3.GraphicalViewer;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java
浏览文件 @ 8d6bd1d3
......@@ -19,17 +19,17 @@
*/
package org.jkiss.dbeaver.erd.ui.editor;
import org.eclipse.draw2d.FigureCanvas;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.*;
import org.eclipse.gef.palette.PaletteContainer;
import org.eclipse.gef.palette.PaletteDrawer;
import org.eclipse.gef.palette.PaletteRoot;
import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.tools.SelectionTool;
import org.eclipse.gef.ui.parts.AbstractEditPartViewer;
import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
import org.eclipse.draw2dl.FigureCanvas;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.*;
import org.eclipse.gef3.palette.PaletteContainer;
import org.eclipse.gef3.palette.PaletteDrawer;
import org.eclipse.gef3.palette.PaletteRoot;
import org.eclipse.gef3.palette.ToolEntry;
import org.eclipse.gef3.tools.SelectionTool;
import org.eclipse.gef3.ui.parts.AbstractEditPartViewer;
import org.eclipse.gef3.ui.parts.ScrollingGraphicalViewer;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT;
......@@ -565,10 +565,10 @@ public class ERDGraphicalViewer extends ScrollingGraphicalViewer implements IPro
/**
* Handler that provides horizontal scrolling using mouse wheel.
*
* Copied from {@link org.eclipse.graphiti.ui.internal.util.gef.MouseWheelHorizontalScrollHandler}
* Copied from {@link org.eclipse.graphiti.ui.internal.util.gef3.MouseWheelHorizontalScrollHandler}
*
* @implNote this implementation differs from the source, since scrolling direction is inverted.
* @see org.eclipse.graphiti.ui.internal.util.gef.MouseWheelHorizontalScrollHandler
* @see org.eclipse.graphiti.ui.internal.util.gef3.MouseWheelHorizontalScrollHandler
*/
private static class MouseWheelHorizontalScrollHandler implements MouseWheelHandler {
public static final MouseWheelHandler SINGLETON = new MouseWheelHorizontalScrollHandler();
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDOutlinePage.java
浏览文件 @ 8d6bd1d3
......@@ -16,13 +16,13 @@
*/
package org.jkiss.dbeaver.erd.ui.editor;
import org.eclipse.draw2d.LightweightSystem;
import org.eclipse.draw2d.MarginBorder;
import org.eclipse.draw2d.Viewport;
import org.eclipse.draw2d.parts.ScrollableThumbnail;
import org.eclipse.draw2d.parts.Thumbnail;
import org.eclipse.gef.LayerConstants;
import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
import org.eclipse.draw2dl.LightweightSystem;
import org.eclipse.draw2dl.MarginBorder;
import org.eclipse.draw2dl.Viewport;
import org.eclipse.draw2dl.parts.ScrollableThumbnail;
import org.eclipse.draw2dl.parts.Thumbnail;
import org.eclipse.gef3.LayerConstants;
import org.eclipse.gef3.editparts.ScalableFreeformRootEditPart;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.StructuredSelection;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPalettePreferences.java
浏览文件 @ 8d6bd1d3
......@@ -19,8 +19,8 @@
*/
package org.jkiss.dbeaver.erd.ui.editor;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.gef.ui.palette.FlyoutPaletteComposite.FlyoutPreferences;
import org.eclipse.draw2dl.PositionConstants;
import org.eclipse.gef3.ui.palette.FlyoutPaletteComposite.FlyoutPreferences;
import org.jkiss.dbeaver.erd.ui.internal.ERDUIActivator;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPaletteViewerProvider.java
浏览文件 @ 8d6bd1d3
......@@ -19,10 +19,10 @@
*/
package org.jkiss.dbeaver.erd.ui.editor;
import org.eclipse.gef.EditDomain;
import org.eclipse.gef.dnd.TemplateTransferDragSourceListener;
import org.eclipse.gef.ui.palette.PaletteViewer;
import org.eclipse.gef.ui.palette.PaletteViewerProvider;
import org.eclipse.gef3.EditDomain;
import org.eclipse.gef3.dnd.TemplateTransferDragSourceListener;
import org.eclipse.gef3.ui.palette.PaletteViewer;
import org.eclipse.gef3.ui.palette.PaletteViewerProvider;
/**
* PaletteViewerProvider subclass used for initialising drag and drop
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPreferencePage.java
浏览文件 @ 8d6bd1d3
......@@ -18,7 +18,7 @@
package org.jkiss.dbeaver.erd.ui.editor;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.PrintFigureOperation;
import org.eclipse.draw2dl.PrintFigureOperation;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPropertiesDrawer.java
浏览文件 @ 8d6bd1d3
......@@ -19,14 +19,14 @@
*/
package org.jkiss.dbeaver.erd.ui.editor;
import org.eclipse.gef.palette.PaletteDrawer;
import org.eclipse.gef.palette.SelectionToolEntry;
import org.eclipse.gef3.palette.PaletteDrawer;
import org.eclipse.gef3.palette.SelectionToolEntry;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
/**
* Experimental drawer.
* Unfortunately it is not possible to customize drawer look-and-feel. All UI rendering is performed by GEF.
* Unfortunately it is not possible to customize drawer look-and-feel. All UI rendering is performed by .gef3.
*/
public class ERDPropertiesDrawer extends PaletteDrawer
{
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ActionToolEntry.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.editor.tools;
import org.eclipse.gef.Tool;
import org.eclipse.gef.palette.PaletteEntry;
import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.tools.SelectionTool;
import org.eclipse.gef3.Tool;
import org.eclipse.gef3.palette.PaletteEntry;
import org.eclipse.gef3.palette.ToolEntry;
import org.eclipse.gef3.tools.SelectionTool;
import org.eclipse.jface.action.IAction;
public class ActionToolEntry extends ToolEntry {
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/BringToFrontToolEntry.java
浏览文件 @ 8d6bd1d3
......@@ -16,11 +16,11 @@
*/
package org.jkiss.dbeaver.erd.ui.editor.tools;
import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.SharedImages;
import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.tools.SelectionTool;
import org.eclipse.gef3.DefaultEditDomain;
import org.eclipse.gef3.GraphicalViewer;
import org.eclipse.gef3.SharedImages;
import org.eclipse.gef3.palette.ToolEntry;
import org.eclipse.gef3.tools.SelectionTool;
import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
import org.jkiss.dbeaver.erd.ui.part.NodePart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ChangeZOrderAction.java
浏览文件 @ 8d6bd1d3
package org.jkiss.dbeaver.erd.ui.editor.tools;
import org.eclipse.draw2d.IFigure;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.ui.actions.SelectionAction;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.ui.actions.SelectionAction;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
import org.jkiss.dbeaver.erd.ui.internal.ERDUIMessages;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/CommandToolEntry.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.editor.tools;
import org.eclipse.gef.Tool;
import org.eclipse.gef.palette.PaletteEntry;
import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.tools.SelectionTool;
import org.eclipse.gef3.Tool;
import org.eclipse.gef3.palette.PaletteEntry;
import org.eclipse.gef3.palette.ToolEntry;
import org.eclipse.gef3.tools.SelectionTool;
import org.jkiss.dbeaver.model.DBPImage;
import org.jkiss.dbeaver.ui.ActionUtils;
import org.jkiss.dbeaver.ui.DBeaverIcons;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/HandToolEntry.java
浏览文件 @ 8d6bd1d3
......@@ -16,13 +16,13 @@
*/
package org.jkiss.dbeaver.erd.ui.editor.tools;
import org.eclipse.draw2d.Cursors;
import org.eclipse.draw2d.FigureCanvas;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.tools.AbstractTool;
import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
import org.eclipse.draw2dl.Cursors;
import org.eclipse.draw2dl.FigureCanvas;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.gef3.EditPartViewer;
import org.eclipse.gef3.palette.ToolEntry;
import org.eclipse.gef3.tools.AbstractTool;
import org.eclipse.gef3.ui.parts.ScrollingGraphicalViewer;
import org.eclipse.swt.widgets.Control;
import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ResetPartColorAction.java
浏览文件 @ 8d6bd1d3
package org.jkiss.dbeaver.erd.ui.editor.tools;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.ui.actions.SelectionAction;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.ui.actions.SelectionAction;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.graphics.Color;
import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SelectionToolEntry.java
浏览文件 @ 8d6bd1d3
......@@ -16,15 +16,15 @@
*/
package org.jkiss.dbeaver.erd.ui.editor.tools;
import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.tools.SelectionTool;
import org.eclipse.gef3.palette.ToolEntry;
import org.eclipse.gef3.tools.SelectionTool;
import org.jkiss.dbeaver.erd.ui.ERDIcon;
import org.jkiss.dbeaver.ui.DBeaverIcons;
/**
* This class is used to override default GEF icons.
*
* @see org.eclipse.gef.palette.SelectionToolEntry
* @see org.eclipse.gef3.palette.SelectionToolEntry
*/
public class SelectionToolEntry extends ToolEntry {
public SelectionToolEntry() {
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartColorAction.java
浏览文件 @ 8d6bd1d3
package org.jkiss.dbeaver.erd.ui.editor.tools;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.ui.actions.SelectionAction;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.ui.actions.SelectionAction;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartSettingsAction.java
浏览文件 @ 8d6bd1d3
package org.jkiss.dbeaver.erd.ui.editor.tools;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.ui.actions.SelectionAction;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.ui.actions.SelectionAction;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.preference.ColorSelector;
import org.eclipse.jface.viewers.IStructuredSelection;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportFormatHandler.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.export;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2dl.IFigure;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportGraphML.java
浏览文件 @ 8d6bd1d3
......@@ -16,9 +16,9 @@
*/
package org.jkiss.dbeaver.erd.ui.export;
import org.eclipse.draw2d.Bendpoint;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2dl.Bendpoint;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.swt.graphics.Color;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.erd.model.*;
......@@ -37,7 +37,10 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.util.*;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportRasterImage.java
浏览文件 @ 8d6bd1d3
......@@ -16,11 +16,11 @@
*/
package org.jkiss.dbeaver.erd.ui.export;
import org.eclipse.draw2d.FreeformLayeredPane;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.SWTGraphics;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2dl.FreeformLayeredPane;
import org.eclipse.draw2dl.Graphics;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.SWTGraphics;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeItemFigure.java
浏览文件 @ 8d6bd1d3
......@@ -16,12 +16,12 @@
*/
package org.jkiss.dbeaver.erd.ui.figures;
import org.eclipse.draw2d.Figure;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.ToolbarLayout;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2dl.Figure;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.Label;
import org.eclipse.draw2dl.ToolbarLayout;
import org.eclipse.draw2dl.geometry.Insets;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.jkiss.code.NotNull;
......@@ -164,8 +164,8 @@ public class AttributeItemFigure extends Figure
if (parent != null && parent.getBorder() != null) {
// Extend bounds to the parent's width. This is required for navigation to work correctly:
// If there's two attributes whose names have different length (e.g. 'id' and 'description'),
// descending direction between them would be 'east', not 'south', since that's what GEF thinks.
// See org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler.getNavigationPoint
// descending direction between them would be 'east', not 'south', since that's what .gef3 thinks.
// See org.eclipse.gef3.ui.parts.GraphicalViewerKeyHandler.getNavigationPoint
final Insets insets = parent.getBorder().getInsets(this);
final Rectangle bounds = parent.getBounds();
return super.getBounds().getCopy()
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeListFigure.java
浏览文件 @ 8d6bd1d3
......@@ -19,9 +19,9 @@
*/
package org.jkiss.dbeaver.erd.ui.figures;
import org.eclipse.draw2d.*;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2dl.*;
import org.eclipse.draw2dl.geometry.Insets;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.jface.resource.ColorRegistry;
import org.jkiss.dbeaver.erd.model.ERDEntity;
import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/CustomCheckBoxFigure.java
浏览文件 @ 8d6bd1d3
......@@ -5,8 +5,8 @@
package org.jkiss.dbeaver.erd.ui.figures;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.Toggle;
import org.eclipse.draw2dl.Label;
import org.eclipse.draw2dl.Toggle;
import org.eclipse.swt.graphics.Image;
import org.jkiss.dbeaver.ui.DBeaverIcons;
import org.jkiss.dbeaver.ui.UIIcon;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EditableLabel.java
浏览文件 @ 8d6bd1d3
......@@ -19,11 +19,11 @@
*/
package org.jkiss.dbeaver.erd.ui.figures;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2dl.Graphics;
import org.eclipse.draw2dl.Label;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Insets;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
import org.jkiss.dbeaver.ui.UIUtils;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityDiagramFigure.java
浏览文件 @ 8d6bd1d3
......@@ -20,12 +20,12 @@
*/
package org.jkiss.dbeaver.erd.ui.figures;
import org.eclipse.draw2d.*;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2d.text.FlowPage;
import org.eclipse.draw2d.text.TextFlow;
import org.eclipse.draw2dl.*;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.draw2dl.text.FlowPage;
import org.eclipse.draw2dl.text.TextFlow;
import org.eclipse.jface.resource.JFaceResources;
import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
import org.jkiss.dbeaver.erd.ui.editor.ERDGraphicalViewer;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityFigure.java
浏览文件 @ 8d6bd1d3
......@@ -16,7 +16,7 @@
*/
package org.jkiss.dbeaver.erd.ui.figures;
import org.eclipse.draw2d.*;
import org.eclipse.draw2dl.*;
import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/NoteFigure.java
浏览文件 @ 8d6bd1d3
......@@ -20,12 +20,12 @@
*/
package org.jkiss.dbeaver.erd.ui.figures;
import org.eclipse.draw2d.CompoundBorder;
import org.eclipse.draw2d.LineBorder;
import org.eclipse.draw2d.MarginBorder;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.text.FlowPage;
import org.eclipse.draw2d.text.TextFlow;
import org.eclipse.draw2dl.CompoundBorder;
import org.eclipse.draw2dl.LineBorder;
import org.eclipse.draw2dl.MarginBorder;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.text.FlowPage;
import org.eclipse.draw2dl.text.TextFlow;
import org.jkiss.dbeaver.erd.model.ERDNote;
import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
import org.jkiss.dbeaver.ui.UIUtils;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/RoundedLineBorder.java
浏览文件 @ 8d6bd1d3
package org.jkiss.dbeaver.erd.ui.figures;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.LineBorder;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2dl.Graphics;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.LineBorder;
import org.eclipse.draw2dl.geometry.Insets;
import org.eclipse.swt.graphics.Color;
public class RoundedLineBorder extends LineBorder {
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/DelegatingLayoutManager.java
浏览文件 @ 8d6bd1d3
......@@ -19,11 +19,11 @@
*/
package org.jkiss.dbeaver.erd.ui.layout;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.LayoutManager;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.EditPolicy;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.LayoutManager;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.EditPolicy;
import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
import org.jkiss.dbeaver.erd.ui.policy.DiagramXYLayoutPolicy;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphAnimation.java
浏览文件 @ 8d6bd1d3
......@@ -20,12 +20,12 @@
*/
package org.jkiss.dbeaver.erd.ui.layout;
import org.eclipse.draw2d.Connection;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Viewport;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.PointList;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2dl.Connection;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.Viewport;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.draw2dl.geometry.PointList;
import org.eclipse.draw2dl.geometry.Rectangle;
import java.util.HashMap;
import java.util.Iterator;
......@@ -33,7 +33,7 @@ import java.util.List;
import java.util.Map;
/**
* GraphAnimation class lifted directly from the GEF flow example. The only
* GraphAnimation class lifted directly from the .gef3 flow example. The only
* modification is in playBackState(): if either the width of height of a final
* state figure bounds is greater, then the rectangle during animation is shown
* as the final size from the outset
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutAuto.java
浏览文件 @ 8d6bd1d3
......@@ -19,11 +19,11 @@
*/
package org.jkiss.dbeaver.erd.ui.layout;
import org.eclipse.draw2d.AbstractLayout;
import org.eclipse.draw2d.Animation;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2dl.AbstractLayout;
import org.eclipse.draw2dl.Animation;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.jkiss.dbeaver.erd.ui.layout.algorithm.direct.DirectedGraphLayoutVisitor;
import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutXY.java
浏览文件 @ 8d6bd1d3
......@@ -19,9 +19,9 @@
*/
package org.jkiss.dbeaver.erd.ui.layout;
import org.eclipse.draw2d.FreeformLayout;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2dl.FreeformLayout;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/ClusterEdgeCreator.java
浏览文件 @ 8d6bd1d3
......@@ -20,7 +20,7 @@
*/
package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
import org.eclipse.draw2d.graph.*;
import org.eclipse.draw2dl.graph.*;
import java.util.ArrayList;
import java.util.Iterator;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DirectedGraphLayoutVisitor.java
浏览文件 @ 8d6bd1d3
......@@ -20,15 +20,15 @@
*/
package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
import org.eclipse.draw2d.*;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2d.graph.*;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.NodeEditPart;
import org.eclipse.gef.editparts.AbstractConnectionEditPart;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.draw2dl.*;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.draw2dl.graph.*;
import org.eclipse.gef3.EditPart;
import org.eclipse.gef3.GraphicalEditPart;
import org.eclipse.gef3.NodeEditPart;
import org.eclipse.gef3.editparts.AbstractConnectionEditPart;
import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.erd.ui.layout.GraphAnimation;
import org.jkiss.dbeaver.erd.ui.model.ERDDecorator;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DummyEdgePart.java
浏览文件 @ 8d6bd1d3
......@@ -20,9 +20,9 @@
*/
package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
import org.eclipse.draw2d.BendpointConnectionRouter;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.PolylineConnection;
import org.eclipse.draw2dl.BendpointConnectionRouter;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.PolylineConnection;
/**
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/NodeJoiningDirectedGraphLayout.java
浏览文件 @ 8d6bd1d3
......@@ -19,9 +19,9 @@
*/
package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
import org.eclipse.draw2d.graph.DirectedGraph;
import org.eclipse.draw2d.graph.DirectedGraphLayout;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.draw2dl.graph.DirectedGraph;
import org.eclipse.draw2dl.graph.DirectedGraphLayout;
import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
/**
* Extended version of DirectedGraphLayout which allows DirectedGraphLayout
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/StandaloneNodeConnector.java
浏览文件 @ 8d6bd1d3
......@@ -19,9 +19,9 @@
*/
package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
import org.eclipse.draw2d.graph.*;
import org.eclipse.gef.NodeEditPart;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.draw2dl.graph.*;
import org.eclipse.gef3.NodeEditPart;
import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
import org.eclipse.swt.graphics.Point;
import java.util.ArrayList;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/DiagramLoader.java
浏览文件 @ 8d6bd1d3
......@@ -20,10 +20,10 @@
package org.jkiss.dbeaver.erd.ui.model;
import org.eclipse.core.resources.IProject;
import org.eclipse.draw2d.AbsoluteBendpoint;
import org.eclipse.draw2d.Bendpoint;
import org.eclipse.draw2d.RelativeBendpoint;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2dl.AbsoluteBendpoint;
import org.eclipse.draw2dl.Bendpoint;
import org.eclipse.draw2dl.RelativeBendpoint;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.jface.resource.StringConverter;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDContainerDecorated.java
浏览文件 @ 8d6bd1d3
......@@ -16,8 +16,8 @@
*/
package org.jkiss.dbeaver.erd.ui.model;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.jkiss.code.NotNull;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecorator.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.model;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.gef.EditPartFactory;
import org.eclipse.gef.palette.PaletteRoot;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Insets;
import org.eclipse.gef3.EditPartFactory;
import org.eclipse.gef3.palette.PaletteRoot;
import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecoratorDefault.java
浏览文件 @ 8d6bd1d3
......@@ -16,12 +16,12 @@
*/
package org.jkiss.dbeaver.erd.ui.model;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.gef.EditPartFactory;
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.palette.*;
import org.eclipse.gef.requests.CreationFactory;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Insets;
import org.eclipse.gef3.EditPartFactory;
import org.eclipse.gef3.RequestConstants;
import org.eclipse.gef3.palette.*;
import org.eclipse.gef3.requests.CreationFactory;
import org.eclipse.jface.resource.ImageDescriptor;
import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapter.java
浏览文件 @ 8d6bd1d3
......@@ -16,8 +16,8 @@
*/
package org.jkiss.dbeaver.erd.ui.model;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef3.EditPart;
import org.eclipse.gef3.Request;
/**
* ERD model adapter
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapterDefault.java
浏览文件 @ 8d6bd1d3
......@@ -16,8 +16,8 @@
*/
package org.jkiss.dbeaver.erd.ui.model;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef3.EditPart;
import org.eclipse.gef3.Request;
/**
* Empty model adapter
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDObjectAdapter.java
浏览文件 @ 8d6bd1d3
......@@ -17,7 +17,7 @@
package org.jkiss.dbeaver.erd.ui.model;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.gef.EditPart;
import org.eclipse.gef3.EditPart;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.erd.model.ERDObject;
import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AssociationPart.java
浏览文件 @ 8d6bd1d3
......@@ -19,13 +19,13 @@
*/
package org.jkiss.dbeaver.erd.ui.part;
import org.eclipse.draw2d.*;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.PointList;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.*;
import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
import org.eclipse.draw2dl.*;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.draw2dl.geometry.PointList;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.*;
import org.eclipse.gef3.editpolicies.ConnectionEndpointEditPolicy;
import org.eclipse.swt.SWT;
import org.jkiss.dbeaver.erd.model.ERDAssociation;
import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AttributePart.java
浏览文件 @ 8d6bd1d3
......@@ -16,9 +16,9 @@
*/
package org.jkiss.dbeaver.erd.ui.part;
import org.eclipse.draw2d.IFigure;
import org.eclipse.gef.*;
import org.eclipse.gef.tools.DragEditPartsTracker;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.gef3.*;
import org.eclipse.gef3.tools.DragEditPartsTracker;
import org.jkiss.dbeaver.erd.model.ERDEntity;
import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;
import org.jkiss.dbeaver.erd.ui.ERDUIUtils;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/DiagramPart.java
浏览文件 @ 8d6bd1d3
......@@ -16,16 +16,16 @@
*/
package org.jkiss.dbeaver.erd.ui.part;
import org.eclipse.draw2d.ConnectionLayer;
import org.eclipse.draw2d.FanRouter;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.ShortestPathConnectionRouter;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.*;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.CommandStackEvent;
import org.eclipse.gef.commands.CommandStackEventListener;
import org.eclipse.draw2dl.ConnectionLayer;
import org.eclipse.draw2dl.FanRouter;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.ShortestPathConnectionRouter;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.*;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.commands.CommandStackEvent;
import org.eclipse.gef3.commands.CommandStackEventListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Control;
......@@ -206,7 +206,7 @@ public class DiagramPart extends PropertyAwarePart {
}
/**
* @see org.eclipse.gef.editparts.AbstractEditPart#isSelectable()
* @see org.eclipse.gef3.editparts.AbstractEditPart#isSelectable()
*/
@Override
public boolean isSelectable()
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/EntityPart.java
浏览文件 @ 8d6bd1d3
......@@ -19,12 +19,12 @@
*/
package org.jkiss.dbeaver.erd.ui.part;
import org.eclipse.draw2d.ChopboxAnchor;
import org.eclipse.draw2d.ConnectionAnchor;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.*;
import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.draw2dl.ChopboxAnchor;
import org.eclipse.draw2dl.ConnectionAnchor;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.*;
import org.eclipse.gef3.tools.DirectEditManager;
import org.jkiss.dbeaver.erd.model.ERDElement;
import org.jkiss.dbeaver.erd.model.ERDEntity;
import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NodePart.java
浏览文件 @ 8d6bd1d3
......@@ -17,9 +17,9 @@
package org.jkiss.dbeaver.erd.ui.part;
import org.eclipse.draw2d.*;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.NodeEditPart;
import org.eclipse.draw2dl.*;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.NodeEditPart;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.jkiss.dbeaver.erd.model.ERDAssociation;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NotePart.java
浏览文件 @ 8d6bd1d3
......@@ -17,15 +17,15 @@
*/
package org.jkiss.dbeaver.erd.ui.part;
import org.eclipse.draw2d.ChopboxAnchor;
import org.eclipse.draw2d.ConnectionAnchor;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.*;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.requests.DirectEditRequest;
import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.draw2dl.ChopboxAnchor;
import org.eclipse.draw2dl.ConnectionAnchor;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.*;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.requests.DirectEditRequest;
import org.eclipse.gef3.tools.DirectEditManager;
import org.jkiss.dbeaver.erd.model.ERDElement;
import org.jkiss.dbeaver.erd.model.ERDNote;
import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwareConnectionPart.java
浏览文件 @ 8d6bd1d3
......@@ -16,9 +16,9 @@
*/
package org.jkiss.dbeaver.erd.ui.part;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.editparts.AbstractConnectionEditPart;
import org.eclipse.gef3.EditPart;
import org.eclipse.gef3.GraphicalEditPart;
import org.eclipse.gef3.editparts.AbstractConnectionEditPart;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.erd.model.ERDObject;
import org.jkiss.dbeaver.model.DBPNamedObject;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwarePart.java
浏览文件 @ 8d6bd1d3
......@@ -16,13 +16,13 @@
*/
package org.jkiss.dbeaver.erd.ui.part;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.ConnectionEditPart;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.geometry.Dimension;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.ConnectionEditPart;
import org.eclipse.gef3.EditPart;
import org.eclipse.gef3.GraphicalEditPart;
import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
import org.eclipse.ui.views.properties.IPropertySource;
import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationBendEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.BendpointEditPolicy;
import org.eclipse.gef.requests.BendpointRequest;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.BendpointEditPolicy;
import org.eclipse.gef3.requests.BendpointRequest;
import org.jkiss.dbeaver.erd.ui.command.BendpointCreateCommand;
import org.jkiss.dbeaver.erd.ui.command.BendpointDeleteCommand;
import org.jkiss.dbeaver.erd.ui.command.BendpointMoveCommand;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,9 +16,9 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.ComponentEditPolicy;
import org.eclipse.gef.requests.GroupRequest;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.ComponentEditPolicy;
import org.eclipse.gef3.requests.GroupRequest;
import org.jkiss.dbeaver.erd.ui.command.AssociationDeleteCommand;
import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeConnectionEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.GroupRequest;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.requests.ChangeBoundsRequest;
import org.eclipse.gef3.requests.CreateRequest;
import org.eclipse.gef3.requests.GroupRequest;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.erd.ui.command.AssociationCreateCommand;
import org.jkiss.dbeaver.erd.ui.part.AttributePart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeContainerEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,11 +16,11 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.ContainerEditPolicy;
import org.eclipse.gef.requests.ChangeBoundsRequest;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.GroupRequest;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.ContainerEditPolicy;
import org.eclipse.gef3.requests.ChangeBoundsRequest;
import org.eclipse.gef3.requests.CreateRequest;
import org.eclipse.gef3.requests.GroupRequest;
/**
* Edit policy for attribute container
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeDragAndDropEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.gef.Request;
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
import org.eclipse.gef3.Request;
import org.eclipse.gef3.RequestConstants;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.GraphicalEditPolicy;
import org.jkiss.dbeaver.erd.ui.part.AttributePart;
/**
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramContainerEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,14 +16,14 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.AbstractEditPolicy;
import org.eclipse.gef.editpolicies.ContainerEditPolicy;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef.requests.GroupRequest;
import org.eclipse.draw2dl.geometry.Point;
import org.eclipse.gef3.EditPart;
import org.eclipse.gef3.Request;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.AbstractEditPolicy;
import org.eclipse.gef3.editpolicies.ContainerEditPolicy;
import org.eclipse.gef3.requests.CreateRequest;
import org.eclipse.gef3.requests.GroupRequest;
import org.jkiss.dbeaver.erd.model.ERDEntity;
import org.jkiss.dbeaver.erd.model.ERDNote;
import org.jkiss.dbeaver.erd.ui.command.NoteCreateCommand;
......@@ -43,7 +43,7 @@ import java.util.List;
public class DiagramContainerEditPolicy extends ContainerEditPolicy {
/**
* @see org.eclipse.gef.editpolicies.ContainerEditPolicy#getAddCommand(org.eclipse.gef.requests.GroupRequest)
* @see org.eclipse.gef3.editpolicies.ContainerEditPolicy#getAddCommand(org.eclipse.gef3.requests.GroupRequest)
*/
@Override
protected Command getAddCommand(GroupRequest request)
......@@ -53,7 +53,7 @@ public class DiagramContainerEditPolicy extends ContainerEditPolicy {
}
/**
* @see ContainerEditPolicy#getCreateCommand(org.eclipse.gef.requests.CreateRequest)
* @see ContainerEditPolicy#getCreateCommand(org.eclipse.gef3.requests.CreateRequest)
*/
@Override
protected Command getCreateCommand(CreateRequest request)
......@@ -85,7 +85,7 @@ public class DiagramContainerEditPolicy extends ContainerEditPolicy {
}
/**
* @see AbstractEditPolicy#getTargetEditPart(org.eclipse.gef.Request)
* @see AbstractEditPolicy#getTargetEditPart(org.eclipse.gef3.Request)
*/
@Override
public EditPart getTargetEditPart(Request request)
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramXYLayoutPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,15 +16,15 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.draw2d.Figure;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.draw2dl.Figure;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.EditPart;
import org.eclipse.gef3.GraphicalEditPart;
import org.eclipse.gef3.Request;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.XYLayoutEditPolicy;
import org.eclipse.gef3.requests.CreateRequest;
import org.jkiss.dbeaver.erd.ui.command.NodeMoveCommand;
import org.jkiss.dbeaver.erd.ui.part.EntityPart;
import org.jkiss.dbeaver.erd.ui.part.NodePart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityConnectionEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
import org.eclipse.gef.requests.CreateConnectionRequest;
import org.eclipse.gef.requests.ReconnectRequest;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.GraphicalNodeEditPolicy;
import org.eclipse.gef3.requests.CreateConnectionRequest;
import org.eclipse.gef3.requests.ReconnectRequest;
import org.jkiss.dbeaver.erd.model.ERDAssociation;
import org.jkiss.dbeaver.erd.ui.command.AssociationCreateCommand;
import org.jkiss.dbeaver.erd.ui.command.AssociationReconnectSourceCommand;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityContainerEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,9 +16,9 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.ContainerEditPolicy;
import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.ContainerEditPolicy;
import org.eclipse.gef3.requests.CreateRequest;
/**
* Edit policy for Table as a container, handling functionality for dropping new columns into tables
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,9 +16,9 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.ComponentEditPolicy;
import org.eclipse.gef.requests.GroupRequest;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.ComponentEditPolicy;
import org.eclipse.gef3.requests.GroupRequest;
import org.jkiss.dbeaver.erd.ui.part.EntityPart;
/**
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteDirectEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,9 +16,9 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.DirectEditPolicy;
import org.eclipse.gef.requests.DirectEditRequest;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.DirectEditPolicy;
import org.eclipse.gef3.requests.DirectEditRequest;
import org.eclipse.jface.viewers.CellEditor;
import org.jkiss.dbeaver.erd.ui.command.NoteSetTextCommand;
import org.jkiss.dbeaver.erd.ui.part.NotePart;
......
plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,10 +16,10 @@
*/
package org.jkiss.dbeaver.erd.ui.policy;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.ComponentEditPolicy;
import org.eclipse.gef.requests.GroupRequest;
import org.eclipse.draw2dl.geometry.Rectangle;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.ComponentEditPolicy;
import org.eclipse.gef3.requests.GroupRequest;
import org.jkiss.dbeaver.erd.ui.command.NoteDeleteCommand;
import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
import org.jkiss.dbeaver.erd.ui.part.NotePart;
......
plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF
浏览文件 @ 8d6bd1d3
......@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.osgi.services,
org.eclipse.ui.workbench,
org.eclipse.ui.workbench.texteditor,
org.eclipse.ui.editors,
org.eclipse.gef,
org.eclipse.gef3,
org.jkiss.dbeaver.model,
org.jkiss.dbeaver.registry,
org.jkiss.dbeaver.ext.postgresql,
......
plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF
浏览文件 @ 8d6bd1d3
......@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.gef,
org.eclipse.gef3,
org.jkiss.dbeaver.model,
org.jkiss.dbeaver.ui,
org.jkiss.dbeaver.ui.navigator,
......
plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionAnchor.java
浏览文件 @ 8d6bd1d3
......@@ -16,9 +16,9 @@
*/
package org.jkiss.dbeaver.ext.ui.locks.graph;
import org.eclipse.draw2d.AbstractConnectionAnchor;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2dl.AbstractConnectionAnchor;
import org.eclipse.draw2dl.IFigure;
import org.eclipse.draw2dl.geometry.Point;
public class LockGraphConnectionAnchor extends AbstractConnectionAnchor {
......
plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionEditPolicy.java
浏览文件 @ 8d6bd1d3
......@@ -16,9 +16,9 @@
*/
package org.jkiss.dbeaver.ext.ui.locks.graph;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.ConnectionEditPolicy;
import org.eclipse.gef.requests.GroupRequest;
import org.eclipse.gef3.commands.Command;
import org.eclipse.gef3.editpolicies.ConnectionEditPolicy;
import org.eclipse.gef3.requests.GroupRequest;
public class LockGraphConnectionEditPolicy extends ConnectionEditPolicy {
......
plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEdgeEditPart.java
浏览文件 @ 8d6bd1d3
......@@ -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 {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或