Skip to content

Commit

Permalink
[Modernize Code] use generic version of getAdapter
Browse files Browse the repository at this point in the history
  • Loading branch information
@azoitl
azoitl committed Aug 24, 2022
1 parent 5cf500d commit 7dda92a
Show file tree
Hide file tree
Showing 42 changed files with 467 additions and 438 deletions.
146 changes: 70 additions & 76 deletions org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/LogicEditor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,9 @@ protected void configureOutlineViewer() {
"org.eclipse.gef.examples.logic.outline.contextmenu", //$NON-NLS-1$
provider, getSite().getSelectionProvider());
getViewer().setKeyHandler(getCommonKeyHandler());
getViewer()
.addDropTargetListener(
(TransferDropTargetListener) new TemplateTransferDropTargetListener(
getViewer()));
getViewer().addDropTargetListener(
(TransferDropTargetListener) new TemplateTransferDropTargetListener(
getViewer()));
IToolBarManager tbm = getSite().getActionBars().getToolBarManager();
showOutlineAction = new Action() {
public void run() {
Expand All @@ -186,8 +185,8 @@ public void run() {
};
showOutlineAction.setImageDescriptor(ImageDescriptor
.createFromFile(LogicPlugin.class, "icons/outline.gif")); //$NON-NLS-1$
showOutlineAction
.setToolTipText(LogicMessages.LogicEditor_outline_show_outline);
showOutlineAction.setToolTipText(
LogicMessages.LogicEditor_outline_show_outline);
tbm.add(showOutlineAction);
showOverviewAction = new Action() {
public void run() {
Expand All @@ -196,8 +195,8 @@ public void run() {
};
showOverviewAction.setImageDescriptor(ImageDescriptor
.createFromFile(LogicPlugin.class, "icons/overview.gif")); //$NON-NLS-1$
showOverviewAction
.setToolTipText(LogicMessages.LogicEditor_outline_show_overview);
showOverviewAction.setToolTipText(
LogicMessages.LogicEditor_outline_show_overview);
tbm.add(showOverviewAction);
showPage(ID_OUTLINE);
}
Expand All @@ -223,10 +222,11 @@ public void dispose() {
outlinePage = null;
}

public Object getAdapter(Class type) {
@Override
public <T> T getAdapter(final Class<T> type) {
if (type == ZoomManager.class)
return getGraphicalViewer().getProperty(
ZoomManager.class.toString());
return type.cast(getGraphicalViewer()
.getProperty(ZoomManager.class.toString()));
return null;
}

Expand All @@ -247,10 +247,11 @@ protected void initializeOverview() {
RootEditPart rep = getGraphicalViewer().getRootEditPart();
if (rep instanceof ScalableFreeformRootEditPart) {
ScalableFreeformRootEditPart root = (ScalableFreeformRootEditPart) rep;
thumbnail = new ScrollableThumbnail((Viewport) root.getFigure());
thumbnail = new ScrollableThumbnail(
(Viewport) root.getFigure());
thumbnail.setBorder(new MarginBorder(3));
thumbnail.setSource(root
.getLayer(LayerConstants.PRINTABLE_LAYERS));
thumbnail.setSource(
root.getLayer(LayerConstants.PRINTABLE_LAYERS));
lws.setContents(thumbnail);
disposeListener = new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
Expand Down Expand Up @@ -303,8 +304,8 @@ protected void unhookOutlineViewer() {
// 1) An open, saved file gets deleted -> close the editor
// 2) An open file gets renamed or moved -> change the editor's input
// accordingly
class ResourceTracker implements IResourceChangeListener,
IResourceDeltaVisitor {
class ResourceTracker
implements IResourceChangeListener, IResourceDeltaVisitor {
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
try {
Expand All @@ -316,9 +317,8 @@ public void resourceChanged(IResourceChangeEvent event) {
}

public boolean visit(IResourceDelta delta) {
if (delta == null
|| !delta.getResource().equals(
((IFileEditorInput) getEditorInput()).getFile()))
if (delta == null || !delta.getResource()
.equals(((IFileEditorInput) getEditorInput()).getFile()))
return true;

if (delta.getKind() == IResourceDelta.REMOVED) {
Expand Down Expand Up @@ -415,8 +415,8 @@ public void partOpened(IWorkbenchPart part) {
protected static final int DEFAULT_PALETTE_SIZE = 130;

static {
LogicPlugin.getDefault().getPreferenceStore()
.setDefault(PALETTE_SIZE, DEFAULT_PALETTE_SIZE);
LogicPlugin.getDefault().getPreferenceStore().setDefault(PALETTE_SIZE,
DEFAULT_PALETTE_SIZE);
}

public LogicEditor() {
Expand All @@ -441,8 +441,8 @@ protected void configureGraphicalViewer() {
// set clipping strategy for connection layer
ConnectionLayer connectionLayer = (ConnectionLayer) root
.getLayer(LayerConstants.CONNECTION_LAYER);
connectionLayer
.setClippingStrategy(new ViewportAwareConnectionLayerClippingStrategy(
connectionLayer.setClippingStrategy(
new ViewportAwareConnectionLayerClippingStrategy(
connectionLayer));

List zoomLevels = new ArrayList(3);
Expand Down Expand Up @@ -503,8 +503,8 @@ protected CustomPalettePage createPalettePage() {
return new CustomPalettePage(getPaletteViewerProvider()) {
public void init(IPageSite pageSite) {
super.init(pageSite);
IAction copy = getActionRegistry().getAction(
ActionFactory.COPY.getId());
IAction copy = getActionRegistry()
.getAction(ActionFactory.COPY.getId());
pageSite.getActionBars().setGlobalActionHandler(
ActionFactory.COPY.getId(), copy);
}
Expand All @@ -518,8 +518,8 @@ protected PaletteViewerProvider createPaletteViewerProvider() {
protected void configurePaletteViewer(PaletteViewer viewer) {
super.configurePaletteViewer(viewer);
viewer.setCustomizer(new LogicPaletteCustomizer());
viewer.addDragSourceListener(new TemplateTransferDragSourceListener(
viewer));
viewer.addDragSourceListener(
new TemplateTransferDragSourceListener(viewer));
}

protected void hookPaletteViewer(PaletteViewer viewer) {
Expand All @@ -530,8 +530,8 @@ protected void hookPaletteViewer(PaletteViewer viewer) {
if (menuListener == null)
menuListener = new IMenuListener() {
public void menuAboutToShow(IMenuManager manager) {
manager.appendToGroup(
GEFActionConstants.GROUP_COPY, copy);
manager.appendToGroup(GEFActionConstants.GROUP_COPY,
copy);
}
};
viewer.getContextMenu().addMenuListener(menuListener);
Expand Down Expand Up @@ -568,14 +568,15 @@ public void doSaveAs() {
performSaveAs();
}

public Object getAdapter(Class type) {
@Override
public <T> T getAdapter(final Class<T> type) {
if (type == IContentOutlinePage.class) {
outlinePage = new OutlinePage(new TreeViewer());
return outlinePage;
return type.cast(outlinePage);
}
if (type == ZoomManager.class)
return getGraphicalViewer().getProperty(
ZoomManager.class.toString());
return type.cast(getGraphicalViewer()
.getProperty(ZoomManager.class.toString()));

return super.getAdapter(type);
}
Expand All @@ -591,10 +592,9 @@ protected Control getGraphicalControl() {
protected KeyHandler getCommonKeyHandler() {
if (sharedKeyHandler == null) {
sharedKeyHandler = new KeyHandler();
sharedKeyHandler.put(
KeyStroke.getPressed(SWT.F2, 0),
getActionRegistry().getAction(
GEFActionConstants.DIRECT_EDIT));
sharedKeyHandler.put(KeyStroke.getPressed(SWT.F2, 0),
getActionRegistry()
.getAction(GEFActionConstants.DIRECT_EDIT));
}
return sharedKeyHandler;
}
Expand All @@ -617,10 +617,10 @@ protected void handleActivationChanged(Event event) {
IAction copy = null;
if (event.type == SWT.Deactivate)
copy = getActionRegistry().getAction(ActionFactory.COPY.getId());
if (getEditorSite().getActionBars().getGlobalActionHandler(
ActionFactory.COPY.getId()) != copy) {
getEditorSite().getActionBars().setGlobalActionHandler(
ActionFactory.COPY.getId(), copy);
if (getEditorSite().getActionBars()
.getGlobalActionHandler(ActionFactory.COPY.getId()) != copy) {
getEditorSite().getActionBars()
.setGlobalActionHandler(ActionFactory.COPY.getId(), copy);
getEditorSite().getActionBars().updateActionBars();
}
}
Expand All @@ -629,15 +629,12 @@ protected void initializeGraphicalViewer() {
super.initializeGraphicalViewer();
getGraphicalViewer().setContents(getLogicDiagram());

getGraphicalViewer()
.addDropTargetListener(
(TransferDropTargetListener) new TemplateTransferDropTargetListener(
getGraphicalViewer()));
getGraphicalViewer()
.addDropTargetListener(
(TransferDropTargetListener) new TextTransferDropTargetListener(
getGraphicalViewer(), TextTransfer
.getInstance()));
getGraphicalViewer().addDropTargetListener(
(TransferDropTargetListener) new TemplateTransferDropTargetListener(
getGraphicalViewer()));
getGraphicalViewer().addDropTargetListener(
(TransferDropTargetListener) new TextTransferDropTargetListener(
getGraphicalViewer(), TextTransfer.getInstance()));
}

protected void createActions() {
Expand Down Expand Up @@ -710,15 +707,14 @@ protected void createActions() {
/*
* (non-Javadoc)
*
* @see
* org.eclipse.gef.ui.parts.GraphicalEditor#createGraphicalViewer(org.eclipse
* .swt.widgets.Composite)
* @see org.eclipse.gef.ui.parts.GraphicalEditor#createGraphicalViewer(org.
* eclipse .swt.widgets.Composite)
*/
protected void createGraphicalViewer(Composite parent) {
rulerComp = new RulerComposite(parent, SWT.NONE);
super.createGraphicalViewer(rulerComp);
rulerComp
.setGraphicalViewer((ScrollingGraphicalViewer) getGraphicalViewer());
rulerComp.setGraphicalViewer(
(ScrollingGraphicalViewer) getGraphicalViewer());
}

protected FigureCanvas getEditor() {
Expand All @@ -743,8 +739,8 @@ protected void loadProperties() {
if (ruler != null) {
provider = new LogicRulerProvider(ruler);
}
getGraphicalViewer().setProperty(
RulerProvider.PROPERTY_HORIZONTAL_RULER, provider);
getGraphicalViewer()
.setProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER, provider);
getGraphicalViewer().setProperty(
RulerProvider.PROPERTY_RULER_VISIBILITY,
Boolean.valueOf(getLogicDiagram().getRulerVisibility()));
Expand All @@ -761,8 +757,8 @@ protected void loadProperties() {
Boolean.valueOf(getLogicDiagram().isGridEnabled()));

// Zoom
ZoomManager manager = (ZoomManager) getGraphicalViewer().getProperty(
ZoomManager.class.toString());
ZoomManager manager = (ZoomManager) getGraphicalViewer()
.getProperty(ZoomManager.class.toString());
if (manager != null)
manager.setZoom(getLogicDiagram().getZoom());
// Scroll-wheel Zoom
Expand All @@ -773,8 +769,8 @@ protected void loadProperties() {
}

protected boolean performSaveAs() {
SaveAsDialog dialog = new SaveAsDialog(getSite().getWorkbenchWindow()
.getShell());
SaveAsDialog dialog = new SaveAsDialog(
getSite().getWorkbenchWindow().getShell());
dialog.setOriginalFile(((IFileEditorInput) getEditorInput()).getFile());
dialog.open();
IPath path = dialog.getResult();
Expand All @@ -792,8 +788,7 @@ public void execute(final IProgressMonitor monitor) {
try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
writeToOutputStream(out);
file.create(
new ByteArrayInputStream(out.toByteArray()),
file.create(new ByteArrayInputStream(out.toByteArray()),
true, monitor);
out.close();
} catch (Exception e) {
Expand All @@ -802,8 +797,9 @@ public void execute(final IProgressMonitor monitor) {
}
};
try {
new ProgressMonitorDialog(getSite().getWorkbenchWindow()
.getShell()).run(false, true, op);
new ProgressMonitorDialog(
getSite().getWorkbenchWindow().getShell()).run(false,
true, op);
} catch (Exception e) {
e.printStackTrace();
}
Expand All @@ -819,18 +815,16 @@ public void execute(final IProgressMonitor monitor) {
}

protected void saveProperties() {
getLogicDiagram().setRulerVisibility(
((Boolean) getGraphicalViewer().getProperty(
RulerProvider.PROPERTY_RULER_VISIBILITY))
getLogicDiagram().setRulerVisibility(((Boolean) getGraphicalViewer()
.getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY))
.booleanValue());
getLogicDiagram().setGridEnabled(((Boolean) getGraphicalViewer()
.getProperty(SnapToGrid.PROPERTY_GRID_ENABLED)).booleanValue());
getLogicDiagram().setSnapToGeometry(((Boolean) getGraphicalViewer()
.getProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED))
.booleanValue());
getLogicDiagram().setGridEnabled(
((Boolean) getGraphicalViewer().getProperty(
SnapToGrid.PROPERTY_GRID_ENABLED)).booleanValue());
getLogicDiagram().setSnapToGeometry(
((Boolean) getGraphicalViewer().getProperty(
SnapToGeometry.PROPERTY_SNAP_ENABLED)).booleanValue());
ZoomManager manager = (ZoomManager) getGraphicalViewer().getProperty(
ZoomManager.class.toString());
ZoomManager manager = (ZoomManager) getGraphicalViewer()
.getProperty(ZoomManager.class.toString());
if (manager != null)
getLogicDiagram().setZoom(manager.getZoom());
}
Expand Down
28 changes: 15 additions & 13 deletions ...e.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/CircuitEditPart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.IScrollableFigure;
import org.eclipse.draw2d.XYLayout;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;

import org.eclipse.gef.AccessibleAnchorProvider;
Expand All @@ -38,8 +39,8 @@
* Holds a circuit, which is a container capable of holding other
* LogicEditParts.
*/
public class CircuitEditPart extends LogicContainerEditPart implements
IScrollableEditPart {
public class CircuitEditPart extends LogicContainerEditPart
implements IScrollableEditPart {

private static final String SCROLLABLE_SELECTION_FEEDBACK = "SCROLLABLE_SELECTION_FEEDBACK"; //$NON-NLS-1$

Expand All @@ -62,15 +63,17 @@ protected IFigure createFigure() {
return FigureFactory.createNewCircuit();
}

public Object getAdapter(Class key) {
@Override
public <T> T getAdapter(final Class<T> key) {
if (key == AutoexposeHelper.class)
return new ViewportAutoexposeHelper(this);
return key.cast(new ViewportAutoexposeHelper(this));
if (key == ExposeHelper.class)
return new ViewportExposeHelper(this);
return key.cast(new ViewportExposeHelper(this));
if (key == AccessibleAnchorProvider.class)
return new DefaultAccessibleAnchorProvider() {
public List getSourceAnchorLocations() {
List list = new ArrayList();
return key.cast(new DefaultAccessibleAnchorProvider() {
@Override
public List<Point> getSourceAnchorLocations() {
List<Point> list = new ArrayList<>();
Vector sourceAnchors = getNodeFigure()
.getSourceConnectionAnchors();
Vector targetAnchors = getNodeFigure()
Expand All @@ -80,19 +83,18 @@ public List getSourceAnchorLocations() {
.get(i);
ConnectionAnchor targetAnchor = (ConnectionAnchor) targetAnchors
.get(i);
list.add(new Rectangle(
sourceAnchor.getReferencePoint(), targetAnchor
.getReferencePoint()).getCenter());
list.add(new Rectangle(sourceAnchor.getReferencePoint(),
targetAnchor.getReferencePoint()).getCenter());
}
return list;
}

public List getTargetAnchorLocations() {
return getSourceAnchorLocations();
}
};
});
if (key == MouseWheelHelper.class)
return new ViewportMouseWheelHelper(this);
return key.cast(new ViewportMouseWheelHelper(this));
return super.getAdapter(key);
}

Expand Down
Loading

0 comments on commit 7dda92a

Please sign in to comment.