From 7dda92a4ed1abf8ef6694a79c090754c6e973097 Mon Sep 17 00:00:00 2001 From: Alois Zoitl Date: Sun, 10 Jul 2022 15:59:59 +0200 Subject: [PATCH] [Modernize Code] use generic version of getAdapter --- .../examples/logicdesigner/LogicEditor.java | 146 +++++++++--------- .../logicdesigner/edit/CircuitEditPart.java | 28 ++-- .../logicdesigner/edit/GateEditPart.java | 20 +-- .../logicdesigner/edit/LEDEditPart.java | 23 +-- .../edit/LogicDiagramEditPart.java | 35 +++-- .../logicdesigner/edit/OutputEditPart.java | 16 +- .../gef/examples/shapes/ShapesEditor.java | 28 ++-- .../eclipse/gef/examples/text/TextEditor.java | 38 ++--- .../actions/StyleComboContributionItem.java | 7 +- .../gef/examples/text/edit/DocumentPart.java | 9 +- .../gef/examples/text/tools/TextTool.java | 31 ++-- .../gef/test/DragEditPartsTrackerTest.java | 11 +- .../src/org/eclipse/gef/AutoexposeHelper.java | 9 +- .../editparts/AbstractConnectionEditPart.java | 14 +- .../gef/editparts/AbstractEditPart.java | 5 +- .../editparts/AbstractGraphicalEditPart.java | 41 +++-- .../FreeformGraphicalRootEditPart.java | 21 +-- .../gef/editparts/ScalableRootEditPart.java | 5 +- .../SelectionHandlesEditPolicy.java | 11 +- .../PropertySourceAdapterFactory.java | 9 +- .../ui/palette/editparts/DrawerEditPart.java | 41 ++--- .../palette/editparts/ToolEntryEditPart.java | 45 +++--- .../gef/internal/ui/rulers/GuideEditPart.java | 11 +- .../internal/ui/rulers/RulerRootEditPart.java | 16 +- .../gef/tools/ConnectionCreationTool.java | 7 +- .../gef/tools/ConnectionEndpointTracker.java | 26 ++-- .../org/eclipse/gef/tools/CreationTool.java | 13 +- .../gef/tools/DragEditPartsTracker.java | 45 +++--- .../org/eclipse/gef/tools/ResizeTracker.java | 41 ++--- .../org/eclipse/gef/tools/SelectionTool.java | 10 +- .../gef/ui/actions/ActionBarContributor.java | 3 +- .../eclipse/gef/ui/actions/PrintAction.java | 5 +- .../gef/ui/actions/SelectAllAction.java | 7 +- .../gef/ui/actions/WorkbenchPartAction.java | 4 +- .../ui/actions/ZoomComboContributionItem.java | 11 +- .../palette/PaletteContextMenuProvider.java | 8 +- .../gef/ui/parts/DomainEventDispatcher.java | 17 +- .../eclipse/gef/ui/parts/GraphicalEditor.java | 31 ++-- .../GraphicalEditorWithFlyoutPalette.java | 16 +- .../gef/ui/parts/GraphicalViewerImpl.java | 21 ++- .../gef/ui/views/palette/PaletteView.java | 8 +- .../ui/views/palette/PaletteViewerPage.java | 12 +- 42 files changed, 467 insertions(+), 438 deletions(-) diff --git a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/LogicEditor.java b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/LogicEditor.java index 8441268a1..ee1889730 100644 --- a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/LogicEditor.java +++ b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/LogicEditor.java @@ -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() { @@ -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() { @@ -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); } @@ -223,10 +222,11 @@ public void dispose() { outlinePage = null; } - public Object getAdapter(Class type) { + @Override + public T getAdapter(final Class type) { if (type == ZoomManager.class) - return getGraphicalViewer().getProperty( - ZoomManager.class.toString()); + return type.cast(getGraphicalViewer() + .getProperty(ZoomManager.class.toString())); return null; } @@ -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) { @@ -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 { @@ -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) { @@ -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() { @@ -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); @@ -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); } @@ -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) { @@ -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); @@ -568,14 +568,15 @@ public void doSaveAs() { performSaveAs(); } - public Object getAdapter(Class type) { + @Override + public T getAdapter(final Class 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); } @@ -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; } @@ -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(); } } @@ -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() { @@ -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() { @@ -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())); @@ -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 @@ -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(); @@ -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) { @@ -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(); } @@ -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()); } diff --git a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/CircuitEditPart.java b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/CircuitEditPart.java index 71985a23f..8b5bfa342 100644 --- a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/CircuitEditPart.java +++ b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/CircuitEditPart.java @@ -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; @@ -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$ @@ -62,15 +63,17 @@ protected IFigure createFigure() { return FigureFactory.createNewCircuit(); } - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class 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 getSourceAnchorLocations() { + List list = new ArrayList<>(); Vector sourceAnchors = getNodeFigure() .getSourceConnectionAnchors(); Vector targetAnchors = getNodeFigure() @@ -80,9 +83,8 @@ 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; } @@ -90,9 +92,9 @@ public List getSourceAnchorLocations() { public List getTargetAnchorLocations() { return getSourceAnchorLocations(); } - }; + }); if (key == MouseWheelHelper.class) - return new ViewportMouseWheelHelper(this); + return key.cast(new ViewportMouseWheelHelper(this)); return super.getAdapter(key); } diff --git a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/GateEditPart.java b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/GateEditPart.java index bc010d613..0f175eea6 100644 --- a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/GateEditPart.java +++ b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/GateEditPart.java @@ -16,6 +16,7 @@ import org.eclipse.draw2d.ConnectionAnchor; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.AccessibleAnchorProvider; @@ -53,24 +54,25 @@ else if (getModel() instanceof XORGate) return figure; } - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (key == AccessibleAnchorProvider.class) - return new DefaultAccessibleAnchorProvider() { - public List getSourceAnchorLocations() { - List list = new ArrayList(); + return key.cast(new DefaultAccessibleAnchorProvider() { + public List getSourceAnchorLocations() { + List list = new ArrayList<>(); Vector sourceAnchors = getNodeFigure() .getSourceConnectionAnchors(); for (int i = 0; i < sourceAnchors.size(); i++) { ConnectionAnchor anchor = (ConnectionAnchor) sourceAnchors .get(i); - list.add(anchor.getReferencePoint() - .getTranslated(0, -3)); + list.add(anchor.getReferencePoint().getTranslated(0, + -3)); } return list; } - public List getTargetAnchorLocations() { - List list = new ArrayList(); + public List getTargetAnchorLocations() { + List list = new ArrayList<>(); Vector targetAnchors = getNodeFigure() .getTargetConnectionAnchors(); for (int i = 0; i < targetAnchors.size(); i++) { @@ -80,7 +82,7 @@ public List getTargetAnchorLocations() { } return list; } - }; + }); return super.getAdapter(key); } diff --git a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/LEDEditPart.java b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/LEDEditPart.java index b7a974490..dd5eec4f9 100644 --- a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/LEDEditPart.java +++ b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/LEDEditPart.java @@ -22,6 +22,7 @@ import org.eclipse.draw2d.ConnectionAnchor; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.AccessibleAnchorProvider; import org.eclipse.gef.AccessibleEditPart; @@ -78,34 +79,36 @@ protected IFigure createFigure() { return FigureFactory.createNewLED(); } - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (key == AccessibleAnchorProvider.class) - return new DefaultAccessibleAnchorProvider() { - public List getSourceAnchorLocations() { - List list = new ArrayList(); + return key.cast(new DefaultAccessibleAnchorProvider() { + public List getSourceAnchorLocations() { + List list = new ArrayList<>(); Vector sourceAnchors = getNodeFigure() .getSourceConnectionAnchors(); for (int i = 0; i < sourceAnchors.size(); i++) { ConnectionAnchor anchor = (ConnectionAnchor) sourceAnchors .get(i); - list.add(anchor.getReferencePoint() - .getTranslated(0, -3)); + list.add(anchor.getReferencePoint().getTranslated(0, + -3)); } return list; } - public List getTargetAnchorLocations() { - List list = new ArrayList(); + public List getTargetAnchorLocations() { + List list = new ArrayList<>(); Vector targetAnchors = getNodeFigure() .getTargetConnectionAnchors(); for (int i = 0; i < targetAnchors.size(); i++) { ConnectionAnchor anchor = (ConnectionAnchor) targetAnchors .get(i); - list.add(anchor.getReferencePoint().getTranslated(0, 3)); + list.add( + anchor.getReferencePoint().getTranslated(0, 3)); } return list; } - }; + }); return super.getAdapter(key); } diff --git a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/LogicDiagramEditPart.java b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/LogicDiagramEditPart.java index d74fbf373..b99b22e53 100644 --- a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/LogicDiagramEditPart.java +++ b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/LogicDiagramEditPart.java @@ -58,8 +58,8 @@ * LogicEditorPart, to hold the entire model. It is sort of a blank board where * all other EditParts get added. */ -public class LogicDiagramEditPart extends LogicContainerEditPart implements - LayerConstants { +public class LogicDiagramEditPart extends LogicContainerEditPart + implements LayerConstants { protected AccessibleEditPart createAccessible() { return new AccessibleGraphicalEditPart() { @@ -102,31 +102,32 @@ protected IFigure createFigure() { /** * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + @Override + public T getAdapter(final Class adapter) { if (adapter == SnapToHelper.class) { List snapStrategies = new ArrayList(); - Boolean val = (Boolean) getViewer().getProperty( - RulerProvider.PROPERTY_RULER_VISIBILITY); + Boolean val = (Boolean) getViewer() + .getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY); if (val != null && val.booleanValue()) snapStrategies.add(new SnapToGuides(this)); - val = (Boolean) getViewer().getProperty( - SnapToGeometry.PROPERTY_SNAP_ENABLED); + val = (Boolean) getViewer() + .getProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED); if (val != null && val.booleanValue()) snapStrategies.add(new SnapToGeometry(this)); - val = (Boolean) getViewer().getProperty( - SnapToGrid.PROPERTY_GRID_ENABLED); + val = (Boolean) getViewer() + .getProperty(SnapToGrid.PROPERTY_GRID_ENABLED); if (val != null && val.booleanValue()) snapStrategies.add(new SnapToGrid(this)); if (snapStrategies.size() == 0) return null; if (snapStrategies.size() == 1) - return snapStrategies.get(0); + return adapter.cast(snapStrategies.get(0)); SnapToHelper ss[] = new SnapToHelper[snapStrategies.size()]; for (int i = 0; i < snapStrategies.size(); i++) ss[i] = (SnapToHelper) snapStrategies.get(i); - return new CompoundSnapToHelper(ss); + return adapter.cast(new CompoundSnapToHelper(ss)); } return super.getAdapter(adapter); } @@ -189,17 +190,17 @@ protected void refreshVisuals() { if ((getViewer().getControl().getStyle() & SWT.MIRRORED) == 0) cLayer.setAntialias(SWT.ON); - if (getLogicDiagram().getConnectionRouter().equals( - LogicDiagram.ROUTER_MANUAL)) { + if (getLogicDiagram().getConnectionRouter() + .equals(LogicDiagram.ROUTER_MANUAL)) { AutomaticRouter router = new FanRouter(); router.setNextRouter(new BendpointConnectionRouter()); cLayer.setConnectionRouter(router); - } else if (getLogicDiagram().getConnectionRouter().equals( - LogicDiagram.ROUTER_MANHATTAN)) + } else if (getLogicDiagram().getConnectionRouter() + .equals(LogicDiagram.ROUTER_MANHATTAN)) cLayer.setConnectionRouter(new ManhattanConnectionRouter()); else - cLayer.setConnectionRouter(new ShortestPathConnectionRouter( - getFigure())); + cLayer.setConnectionRouter( + new ShortestPathConnectionRouter(getFigure())); Animation.run(400); } diff --git a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/OutputEditPart.java b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/OutputEditPart.java index a50ae2b2f..f20e6d99c 100644 --- a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/OutputEditPart.java +++ b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/edit/OutputEditPart.java @@ -18,6 +18,7 @@ import org.eclipse.draw2d.ConnectionAnchor; import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.AccessibleAnchorProvider; import org.eclipse.gef.AccessibleEditPart; @@ -58,23 +59,24 @@ else if (getModel() instanceof GroundOutput) return figure; } - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (key == AccessibleAnchorProvider.class) - return new DefaultAccessibleAnchorProvider() { - public List getSourceAnchorLocations() { - List list = new ArrayList(); + return key.cast(new DefaultAccessibleAnchorProvider() { + public List getSourceAnchorLocations() { + List list = new ArrayList<>(); Vector sourceAnchors = getNodeFigure() .getSourceConnectionAnchors(); for (int i = 0; i < sourceAnchors.size(); i++) { ConnectionAnchor anchor = (ConnectionAnchor) sourceAnchors .get(i); - list.add(anchor.getReferencePoint() - .getTranslated(0, -3)); + list.add(anchor.getReferencePoint().getTranslated(0, + -3)); } return list; } - }; + }); return super.getAdapter(key); } diff --git a/org.eclipse.gef.examples.shapes/src/org/eclipse/gef/examples/shapes/ShapesEditor.java b/org.eclipse.gef.examples.shapes/src/org/eclipse/gef/examples/shapes/ShapesEditor.java index c6e7fcd42..c1c186e62 100644 --- a/org.eclipse.gef.examples.shapes/src/org/eclipse/gef/examples/shapes/ShapesEditor.java +++ b/org.eclipse.gef.examples.shapes/src/org/eclipse/gef/examples/shapes/ShapesEditor.java @@ -7,7 +7,7 @@ * * Contributors: * Elias Volanakis - initial API and implementation - *******************************************************************************/ +�*******************************************************************************/ package org.eclipse.gef.examples.shapes; import java.io.ByteArrayInputStream; @@ -144,8 +144,8 @@ protected void configurePaletteViewer(PaletteViewer viewer) { // CombinatedTemplateCreationEntries // from the palette into the editor // @see ShapesEditor#createTransferDropTargetListener() - viewer.addDragSourceListener(new TemplateTransferDragSourceListener( - viewer)); + viewer.addDragSourceListener( + new TemplateTransferDragSourceListener(viewer)); } }; } @@ -168,9 +168,8 @@ protected CreationFactory getFactory(Object template) { /* * (non-Javadoc) * - * @see - * org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor - * ) + * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime. + * IProgressMonitor ) */ public void doSave(IProgressMonitor monitor) { ByteArrayOutputStream out = new ByteArrayOutputStream(); @@ -220,13 +219,14 @@ public void doSaveAs() { new ProgressMonitorDialog(shell).run(false, // don't fork false, // not cancelable new WorkspaceModifyOperation() { // run this operation - public void execute(final IProgressMonitor monitor) { + public void execute( + final IProgressMonitor monitor) { try { ByteArrayOutputStream out = new ByteArrayOutputStream(); createOutputStream(out); file.create( - new ByteArrayInputStream(out - .toByteArray()), // contents + new ByteArrayInputStream( + out.toByteArray()), // contents true, // keep saving, even if IFile // is out of sync with the // Workspace @@ -250,9 +250,10 @@ public void execute(final IProgressMonitor monitor) { } } - public Object getAdapter(Class type) { + @Override + public T getAdapter(final Class type) { if (type == IContentOutlinePage.class) - return new ShapesOutlinePage(new TreeViewer()); + return type.cast(new ShapesOutlinePage(new TreeViewer())); return super.getAdapter(type); } @@ -343,9 +344,8 @@ public ShapesOutlinePage(EditPartViewer viewer) { /* * (non-Javadoc) * - * @see - * org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite - * ) + * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets. + * Composite ) */ public void createControl(Composite parent) { // create outline viewer page diff --git a/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/TextEditor.java b/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/TextEditor.java index 7cb0d9db8..3b760360e 100644 --- a/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/TextEditor.java +++ b/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/TextEditor.java @@ -160,13 +160,13 @@ protected void createActions() { action = new MultiStyleAction(styleService, TextActionConstants.BLOCK_ALIGN_CENTER, - Style.PROPERTY_ALIGNMENT, Integer.valueOf(PositionConstants.CENTER)); + Style.PROPERTY_ALIGNMENT, + Integer.valueOf(PositionConstants.CENTER)); registry.registerAction(action); action = new MultiStyleAction(styleService, - TextActionConstants.BLOCK_ALIGN_RIGHT, - Style.PROPERTY_ALIGNMENT, Integer.valueOf( - PositionConstants.ALWAYS_RIGHT)); + TextActionConstants.BLOCK_ALIGN_RIGHT, Style.PROPERTY_ALIGNMENT, + Integer.valueOf(PositionConstants.ALWAYS_RIGHT)); registry.registerAction(action); action = new MultiStyleAction(styleService, @@ -192,11 +192,12 @@ protected void createGraphicalViewer(Composite parent) { initializeGraphicalViewer(); } - public Object getAdapter(Class type) { + @Override + public T getAdapter(final Class type) { if (type == IContentOutlinePage.class) - return createOutlinePage(); + return type.cast(createOutlinePage()); if (type == StyleService.class) - return styleService; + return type.cast(styleService); return super.getAdapter(type); } @@ -272,8 +273,8 @@ public void doSaveAs() { public void init(IEditorSite site, IEditorInput input) throws PartInitException { setEditDomain(new DefaultEditDomain(this)); - getCommandStack().addCommandStackEventListener( - new CommandStackEventListener() { + getCommandStack() + .addCommandStackEventListener(new CommandStackEventListener() { public void stackChanged(CommandStackEvent event) { TextCommand command = (TextCommand) event.getCommand(); if (command != null) { @@ -281,10 +282,12 @@ public void stackChanged(CommandStackEvent event) { if (event.getDetail() == CommandStack.POST_EXECUTE) textViewer.setSelectionRange(command .getExecuteSelectionRange(textViewer)); - else if (event.getDetail() == CommandStack.POST_REDO) + else if (event + .getDetail() == CommandStack.POST_REDO) textViewer.setSelectionRange(command .getRedoSelectionRange(textViewer)); - else if (event.getDetail() == CommandStack.POST_UNDO) + else if (event + .getDetail() == CommandStack.POST_UNDO) textViewer.setSelectionRange(command .getUndoSelectionRange(textViewer)); } @@ -293,8 +296,8 @@ else if (event.getDetail() == CommandStack.POST_UNDO) super.init(site, input); - site.getKeyBindingService().setScopes( - new String[] { GEFActionConstants.CONTEXT_TEXT }); + site.getKeyBindingService() + .setScopes(new String[] { GEFActionConstants.CONTEXT_TEXT }); site.getActionBars().setGlobalActionHandler(ActionFactory.UNDO.getId(), getActionRegistry().getAction(ActionFactory.UNDO.getId())); site.getActionBars().setGlobalActionHandler(ActionFactory.REDO.getId(), @@ -347,11 +350,10 @@ protected void setInput(IEditorInput input) { Container code = new Block(Container.TYPE_PARAGRAPH); code.getStyle().setFontFamily("Courier New"); doc.add(code); - code.add(new TextRun( - "public void countToANumber(int limit) {\n" - + " for (int i = 0; i < limit; i++)\n" - + " System.out.println(\"Counting: \" + i); //$NON-NLS-1$\n\n" - + "}", TextRun.TYPE_CODE)); + code.add(new TextRun("public void countToANumber(int limit) {\n" + + " for (int i = 0; i < limit; i++)\n" + + " System.out.println(\"Counting: \" + i); //$NON-NLS-1$\n\n" + + "}", TextRun.TYPE_CODE)); // } } diff --git a/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/actions/StyleComboContributionItem.java b/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/actions/StyleComboContributionItem.java index 4756a4786..a8d7df5fc 100644 --- a/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/actions/StyleComboContributionItem.java +++ b/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/actions/StyleComboContributionItem.java @@ -47,8 +47,7 @@ public void styleChanged(String styleID) { public void partActivated(IWorkbenchPartReference partRef) { IWorkbenchPart part = partRef.getPart(false); if (part instanceof TextEditor) - setStyleService((StyleService) part - .getAdapter(StyleService.class)); + setStyleService(part.getAdapter(StyleService.class)); } public void partBroughtToTop(IWorkbenchPartReference partRef) { @@ -165,8 +164,8 @@ protected void refresh() { if (styleService == null) enablement = false; else { - if (!styleService.getStyleState(getProperty()).equals( - StyleService.STATE_EDITABLE)) + if (!styleService.getStyleState(getProperty()) + .equals(StyleService.STATE_EDITABLE)) // we want the combo disabled, but still want to update the // value enablement = false; diff --git a/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/edit/DocumentPart.java b/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/edit/DocumentPart.java index c0ad8985c..3b2c4e596 100644 --- a/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/edit/DocumentPart.java +++ b/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/edit/DocumentPart.java @@ -35,9 +35,10 @@ protected void createEditPolicies() { installEditPolicy("Text Editing", new BlockEditPolicy()); } - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (key == TextStyleManager.class) - return this; + return key.cast(this); return super.getAdapter(key); } @@ -87,8 +88,8 @@ else if (fontHeight != run.getContainer().getStyle() TextRun run = (TextRun) ((TextEditPart) iter.next()).getModel(); if (fontName == null) fontName = run.getContainer().getStyle().getFontFamily(); - else if (!fontName.equals(run.getContainer().getStyle() - .getFontFamily())) + else if (!fontName + .equals(run.getContainer().getStyle().getFontFamily())) return StyleService.UNDEFINED; } return fontName; diff --git a/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/tools/TextTool.java b/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/tools/TextTool.java index cf49b703a..a18647346 100644 --- a/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/tools/TextTool.java +++ b/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/tools/TextTool.java @@ -280,14 +280,14 @@ private boolean doBackspace() { setTextInputMode(MODE_BS); SelectionRange range = getSelectionRange(); if (range.isEmpty()) { - if (handleTextEdit(new TextRequest(TextRequest.REQ_BACKSPACE, - range, pendingCommand))) + if (handleTextEdit(new TextRequest(TextRequest.REQ_BACKSPACE, range, + pendingCommand))) return true; doSelect(CaretRequest.COLUMN, false, false, null); return false; } else - return handleTextEdit(new TextRequest(TextRequest.REQ_REMOVE_RANGE, - range)); + return handleTextEdit( + new TextRequest(TextRequest.REQ_REMOVE_RANGE, range)); } private boolean doDelete() { @@ -301,8 +301,8 @@ private boolean doDelete() { doSelect(CaretRequest.COLUMN, true, false, null); return false; } else - return handleTextEdit(new TextRequest(TextRequest.REQ_REMOVE_RANGE, - range)); + return handleTextEdit( + new TextRequest(TextRequest.REQ_REMOVE_RANGE, range)); } /** @@ -395,8 +395,9 @@ private void doSelect(Object type, boolean isForward, boolean append, } else { TextLocation caretLocation = getCaretLocation(); if (loc == null) - search.setLocation(new Point(xCaptured ? caretXLoc - : getCaretBounds().x, getCaretInfo().getBaseline())); + search.setLocation( + new Point(xCaptured ? caretXLoc : getCaretBounds().x, + getCaretInfo().getBaseline())); search.where = caretLocation; caretLocation.part.getTextLocation(search, result); // isForward = range.isForward; @@ -545,8 +546,7 @@ private Object getSelectionStyle(String styleID, boolean isState) { EditPart target = getTextTarget(req); if (target == null) return StyleService.UNDEFINED; - TextStyleManager manager = (TextStyleManager) target - .getAdapter(TextStyleManager.class); + TextStyleManager manager = target.getAdapter(TextStyleManager.class); if (isState) return manager.getStyleState(styleID, getSelectionRange()); return manager.getStyleValue(styleID, getSelectionRange()); @@ -567,8 +567,8 @@ private TextEditPart getTextTarget(Request request) { SelectionRange range = getSelectionRange(); if (range == null) return null; - EditPart target, candidate = ToolUtilities.findCommonAncestor( - range.begin.part, range.end.part); + EditPart target, candidate = ToolUtilities + .findCommonAncestor(range.begin.part, range.end.part); do { target = candidate.getTargetEditPart(request); @@ -608,7 +608,8 @@ protected boolean handleKeyDown(KeyEvent e) { } protected void handleKeyTraversed(TraverseEvent event) { - if ((event.detail == SWT.TRAVERSE_TAB_PREVIOUS || event.detail == SWT.TRAVERSE_TAB_NEXT) + if ((event.detail == SWT.TRAVERSE_TAB_PREVIOUS + || event.detail == SWT.TRAVERSE_TAB_NEXT) && (event.stateMask & SWT.CTRL) == 0) event.doit = false; } @@ -781,8 +782,8 @@ public void setViewer(EditPartViewer viewer) { UpdateManager manager = getUpdateManager(); if (manager != null) manager.removeUpdateListener(updateListener); - currentViewer.setProperty(KEY_OVERWRITE, overwrite ? Boolean.TRUE - : Boolean.FALSE); + currentViewer.setProperty(KEY_OVERWRITE, + overwrite ? Boolean.TRUE : Boolean.FALSE); if (styleService != null) styleService.setStyleProvider(null); setTextInputMode(0); diff --git a/org.eclipse.gef.tests/src/org/eclipse/gef/test/DragEditPartsTrackerTest.java b/org.eclipse.gef.tests/src/org/eclipse/gef/test/DragEditPartsTrackerTest.java index 0df78a914..170dfdce6 100644 --- a/org.eclipse.gef.tests/src/org/eclipse/gef/test/DragEditPartsTrackerTest.java +++ b/org.eclipse.gef.tests/src/org/eclipse/gef/test/DragEditPartsTrackerTest.java @@ -13,8 +13,6 @@ import java.util.List; -import junit.framework.TestCase; - import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.IFigure; @@ -30,6 +28,8 @@ import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.PartInitException; +import junit.framework.TestCase; + public class DragEditPartsTrackerTest extends TestCase { /** * @see TestCase#setUp() @@ -45,8 +45,8 @@ protected void tearDown() throws Exception { super.tearDown(); } - private static class TestGraphicalEditPart extends - AbstractGraphicalEditPart { + private static class TestGraphicalEditPart + extends AbstractGraphicalEditPart { /* * (non-Javadoc) @@ -148,7 +148,8 @@ public boolean isSaveOnCloseNeeded() { return false; } - public Object getAdapter(Class adapter) { + @Override + public T getAdapter(final Class adapter) { return null; } diff --git a/org.eclipse.gef/src/org/eclipse/gef/AutoexposeHelper.java b/org.eclipse.gef/src/org/eclipse/gef/AutoexposeHelper.java index da8b73990..53e288a3e 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/AutoexposeHelper.java +++ b/org.eclipse.gef/src/org/eclipse/gef/AutoexposeHelper.java @@ -19,9 +19,9 @@ * DragTrackers tools and native drop listeners will make use of * autoexpose helpers to reveal any potential drop areas that are currently not * visible to the user. An example of this is scrolling a container to reveal - * unexposed area. Another example is a bunch of stacked containers in a - * "tab folder" arrangement, whever hovering over a tab should switch which - * container is on top. + * unexposed area. Another example is a bunch of stacked containers in a "tab + * folder" arrangement, whever hovering over a tab should switch which container + * is on top. *

* Autoexpose helpers are obtained from editparts that are target of whatever * operation is being performed. If the target provides no helper, its parent @@ -95,8 +95,7 @@ public Search(Point pt) { public AutoexposeHelper result; public boolean evaluate(EditPart editpart) { - result = editpart - .getAdapter(AutoexposeHelper.class); + result = editpart.getAdapter(AutoexposeHelper.class); if (result != null && result.detect(where)) return true; result = null; diff --git a/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractConnectionEditPart.java b/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractConnectionEditPart.java index d51c53b6f..51c551225 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractConnectionEditPart.java +++ b/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractConnectionEditPart.java @@ -34,8 +34,9 @@ /** * The base implementation for {@link org.eclipse.gef.ConnectionEditPart}. */ -public abstract class AbstractConnectionEditPart extends - AbstractGraphicalEditPart implements ConnectionEditPart, LayerConstants { +public abstract class AbstractConnectionEditPart + extends AbstractGraphicalEditPart + implements ConnectionEditPart, LayerConstants { private static final ConnectionAnchor DEFAULT_SOURCE_ANCHOR = new XYAnchor( new Point(10, 10)); @@ -50,8 +51,8 @@ public abstract class AbstractConnectionEditPart extends * @author hudsonr * @since 2.0 */ - protected final class DefaultAccessibleAnchorProvider implements - AccessibleAnchorProvider { + protected final class DefaultAccessibleAnchorProvider + implements AccessibleAnchorProvider { /** * This class is internal, but is made protected so that JavaDoc will * see it. @@ -132,9 +133,10 @@ protected void deactivateFigure() { * the adapter Class * @return the adapter */ - public Object getAdapter(Class adapter) { + @Override + public T getAdapter(final Class adapter) { if (adapter == AccessibleAnchorProvider.class) - return new DefaultAccessibleAnchorProvider(); + return adapter.cast(new DefaultAccessibleAnchorProvider()); return super.getAdapter(adapter); } diff --git a/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractEditPart.java b/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractEditPart.java index 30d252fe7..10a984463 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractEditPart.java +++ b/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractEditPart.java @@ -458,9 +458,10 @@ protected AccessibleEditPart getAccessibleEditPart() { * * @see IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (AccessibleEditPart.class == key) - return getAccessibleEditPart(); + return key.cast(getAccessibleEditPart()); return Platform.getAdapterManager().getAdapter(this, key); } diff --git a/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractGraphicalEditPart.java b/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractGraphicalEditPart.java index 670e74e83..91b5206f6 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractGraphicalEditPart.java +++ b/org.eclipse.gef/src/org/eclipse/gef/editparts/AbstractGraphicalEditPart.java @@ -71,8 +71,8 @@ public abstract class AbstractGraphicalEditPart extends AbstractEditPart * * @since 2.0 */ - protected abstract class AccessibleGraphicalEditPart extends - AccessibleEditPart { + protected abstract class AccessibleGraphicalEditPart + extends AccessibleEditPart { /** * @see AccessibleEditPart#getChildCount(AccessibleControlEvent) */ @@ -119,7 +119,8 @@ public void getState(AccessibleControlEvent e) { e.detail = ACC.STATE_SELECTABLE | ACC.STATE_FOCUSABLE; if (getSelected() != EditPart.SELECTED_NONE) e.detail |= ACC.STATE_SELECTED; - if (getViewer().getFocusEditPart() == AbstractGraphicalEditPart.this) + if (getViewer() + .getFocusEditPart() == AbstractGraphicalEditPart.this) e.detail |= ACC.STATE_FOCUSED; } @@ -138,8 +139,8 @@ public void getRole(AccessibleControlEvent e) { * * @since 2.0 */ - protected class DefaultAccessibleAnchorProvider implements - AccessibleAnchorProvider { + protected class DefaultAccessibleAnchorProvider + implements AccessibleAnchorProvider { private List getDefaultLocations() { List list = new ArrayList(); Rectangle r = getFigure().getBounds(); @@ -250,7 +251,8 @@ public void addNotify() { * @param index * Index where it is being added */ - protected void addSourceConnection(ConnectionEditPart connection, int index) { + protected void addSourceConnection(ConnectionEditPart connection, + int index) { primAddSourceConnection(connection, index); GraphicalEditPart source = (GraphicalEditPart) connection.getSource(); @@ -281,7 +283,8 @@ protected void addSourceConnection(ConnectionEditPart connection, int index) { * @param index * Index where it is being added */ - protected void addTargetConnection(ConnectionEditPart connection, int index) { + protected void addTargetConnection(ConnectionEditPart connection, + int index) { primAddTargetConnection(connection, index); GraphicalEditPart target = (GraphicalEditPart) connection.getTarget(); @@ -447,16 +450,18 @@ protected void fireTargetConnectionAdded(ConnectionEditPart connection, * adapter types. Currently, these types include * {@link AccessibleHandleProvider} and {@link AccessibleAnchorProvider}. * Subclasses should extend this method to support additional - * adapter types, or to replace the default provided adapaters. + * adapter types, or to replace the default provided adapters. * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) */ - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (key == AccessibleHandleProvider.class) - return new MergedAccessibleHandles(getEditPolicyIterator()); + return key + .cast(new MergedAccessibleHandles(getEditPolicyIterator())); if (key == AccessibleAnchorProvider.class) - return new DefaultAccessibleAnchorProvider(); + return key.cast(new DefaultAccessibleAnchorProvider()); return super.getAdapter(key); } @@ -686,7 +691,8 @@ protected void refreshSourceConnections() { model = modelObjects.get(i); if (i < sourceConnections.size() - && ((EditPart) sourceConnections.get(i)).getModel() == model) + && ((EditPart) sourceConnections.get(i)) + .getModel() == model) continue; editPart = (ConnectionEditPart) modelToEditPart.get(model); @@ -749,7 +755,8 @@ protected void refreshTargetConnections() { model = modelObjects.get(i); if (i < targetConnections.size() - && ((EditPart) targetConnections.get(i)).getModel() == model) + && ((EditPart) targetConnections.get(i)) + .getModel() == model) continue; editPart = (ConnectionEditPart) modelToEditPart.get(model); @@ -833,8 +840,8 @@ public void removeNotify() { * Connection being removed */ protected void removeSourceConnection(ConnectionEditPart connection) { - fireRemovingSourceConnection(connection, getSourceConnections() - .indexOf(connection)); + fireRemovingSourceConnection(connection, + getSourceConnections().indexOf(connection)); if (connection.getSource() == this) { connection.deactivate(); connection.setSource(null); @@ -852,8 +859,8 @@ protected void removeSourceConnection(ConnectionEditPart connection) { * Connection being removed */ protected void removeTargetConnection(ConnectionEditPart connection) { - fireRemovingTargetConnection(connection, getTargetConnections() - .indexOf(connection)); + fireRemovingTargetConnection(connection, + getTargetConnections().indexOf(connection)); if (connection.getTarget() == this) connection.setTarget(null); primRemoveTargetConnection(connection); diff --git a/org.eclipse.gef/src/org/eclipse/gef/editparts/FreeformGraphicalRootEditPart.java b/org.eclipse.gef/src/org/eclipse/gef/editparts/FreeformGraphicalRootEditPart.java index c86bdf447..20022e2eb 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/editparts/FreeformGraphicalRootEditPart.java +++ b/org.eclipse.gef/src/org/eclipse/gef/editparts/FreeformGraphicalRootEditPart.java @@ -82,8 +82,8 @@ * * */ -public class FreeformGraphicalRootEditPart extends SimpleRootEditPart implements - LayerConstants, LayerManager { +public class FreeformGraphicalRootEditPart extends SimpleRootEditPart + implements LayerConstants, LayerManager { private LayeredPane innerLayers; private LayeredPane printableLayers; @@ -151,9 +151,10 @@ protected LayeredPane createPrintableLayers() { /** * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + @Override + public T getAdapter(final Class adapter) { if (adapter == AutoexposeHelper.class) - return new ViewportAutoexposeHelper(this); + return adapter.cast(new ViewportAutoexposeHelper(this)); return super.getAdapter(adapter); } @@ -230,14 +231,14 @@ protected LayeredPane getPrintableLayers() { protected void refreshGridLayer() { boolean visible = false; GridLayer grid = (GridLayer) getLayer(GRID_LAYER); - Boolean val = (Boolean) getViewer().getProperty( - SnapToGrid.PROPERTY_GRID_VISIBLE); + Boolean val = (Boolean) getViewer() + .getProperty(SnapToGrid.PROPERTY_GRID_VISIBLE); if (val != null) visible = val.booleanValue(); - grid.setOrigin((Point) getViewer().getProperty( - SnapToGrid.PROPERTY_GRID_ORIGIN)); - grid.setSpacing((Dimension) getViewer().getProperty( - SnapToGrid.PROPERTY_GRID_SPACING)); + grid.setOrigin((Point) getViewer() + .getProperty(SnapToGrid.PROPERTY_GRID_ORIGIN)); + grid.setSpacing((Dimension) getViewer() + .getProperty(SnapToGrid.PROPERTY_GRID_SPACING)); grid.setVisible(visible); } diff --git a/org.eclipse.gef/src/org/eclipse/gef/editparts/ScalableRootEditPart.java b/org.eclipse.gef/src/org/eclipse/gef/editparts/ScalableRootEditPart.java index b573bff45..e15e9977c 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/editparts/ScalableRootEditPart.java +++ b/org.eclipse.gef/src/org/eclipse/gef/editparts/ScalableRootEditPart.java @@ -245,9 +245,10 @@ protected Viewport createViewport() { /** * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (key == AutoexposeHelper.class) - return new ViewportAutoexposeHelper(this); + return key.cast(new ViewportAutoexposeHelper(this)); return super.getAdapter(key); } diff --git a/org.eclipse.gef/src/org/eclipse/gef/editpolicies/SelectionHandlesEditPolicy.java b/org.eclipse.gef/src/org/eclipse/gef/editpolicies/SelectionHandlesEditPolicy.java index 088dc87a0..26416bb1d 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/editpolicies/SelectionHandlesEditPolicy.java +++ b/org.eclipse.gef/src/org/eclipse/gef/editpolicies/SelectionHandlesEditPolicy.java @@ -64,11 +64,12 @@ protected void addSelectionHandles() { /** * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) */ - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (key == AccessibleHandleProvider.class) - return new AccessibleHandleProvider() { - public List getAccessibleHandleLocations() { - List result = new ArrayList(); + return key.cast(new AccessibleHandleProvider() { + public List getAccessibleHandleLocations() { + List result = new ArrayList<>(); if (handles != null) { for (int i = 0; i < handles.size(); i++) { Point p = ((Handle) handles.get(i)) @@ -79,7 +80,7 @@ public List getAccessibleHandleLocations() { } return result; } - }; + }); return null; } diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/PropertySourceAdapterFactory.java b/org.eclipse.gef/src/org/eclipse/gef/internal/PropertySourceAdapterFactory.java index 0b921fc23..839106795 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/internal/PropertySourceAdapterFactory.java +++ b/org.eclipse.gef/src/org/eclipse/gef/internal/PropertySourceAdapterFactory.java @@ -21,7 +21,8 @@ public class PropertySourceAdapterFactory implements IAdapterFactory { - public Object getAdapter(Object adaptableObject, Class adapterType) { + @Override + public T getAdapter(Object adaptableObject, Class adapterType) { AbstractEditPart part = (AbstractEditPart) adaptableObject; Object model = part.getModel(); // model can be null @@ -30,12 +31,12 @@ public Object getAdapter(Object adaptableObject, Class adapterType) { } // check if model is already of the desired adapter type if (adapterType.isInstance(model)) { - return model; + return adapterType.cast(model); } // check if model is adaptable and does provide an adapter of the // desired type if (model instanceof IAdaptable) { - Object adapter = ((IAdaptable) model).getAdapter(adapterType); + T adapter = ((IAdaptable) model).getAdapter(adapterType); if (adapter != null) { return adapter; } @@ -44,7 +45,7 @@ public Object getAdapter(Object adaptableObject, Class adapterType) { return Platform.getAdapterManager().getAdapter(model, adapterType); } - public Class[] getAdapterList() { + public Class[] getAdapterList() { return new Class[] { IPropertySource.class }; } diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DrawerEditPart.java b/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DrawerEditPart.java index 094e775f7..8dc34da35 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DrawerEditPart.java +++ b/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DrawerEditPart.java @@ -44,8 +44,8 @@ * * @author Pratik Shah */ -public class DrawerEditPart extends PaletteEditPart implements - IPinnableEditPart { +public class DrawerEditPart extends PaletteEditPart + implements IPinnableEditPart { private static final String PROPERTY_EXPANSION_STATE = "expansion"; //$NON-NLS-1$ private static final String PROPERTY_PINNED_STATE = "pinned"; //$NON-NLS-1$ @@ -87,22 +87,23 @@ public void focusGained(FocusEvent fe) { /** * @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class) */ - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (key == ExposeHelper.class) { ViewportExposeHelper helper = new ViewportExposeHelper(this); helper.setMinimumFrameCount(6); helper.setMargin(new Insets(PaletteScrollBar.BUTTON_HEIGHT, 0, PaletteScrollBar.BUTTON_HEIGHT, 0)); - return helper; + return key.cast(helper); } if (key == MouseWheelHelper.class) - return new ViewportMouseWheelHelper(this); + return key.cast(new ViewportMouseWheelHelper(this)); return super.getAdapter(key); } private PaletteAnimator getPaletteAnimator() { - return (PaletteAnimator) getViewer().getEditPartRegistry().get( - PaletteAnimator.class); + return (PaletteAnimator) getViewer().getEditPartRegistry() + .get(PaletteAnimator.class); } /** @@ -196,12 +197,14 @@ protected void refreshVisuals() { getDrawerFigure().setTitle(getPaletteEntry().getLabel()); getDrawerFigure().setLayoutMode(getLayoutSetting()); - boolean showPin = getPreferenceSource().getAutoCollapseSetting() == PaletteViewerPreferences.COLLAPSE_AS_NEEDED; + boolean showPin = getPreferenceSource() + .getAutoCollapseSetting() == PaletteViewerPreferences.COLLAPSE_AS_NEEDED; getDrawerFigure().showPin(showPin); - Color background = getDrawer().getDrawerType().equals( - PaletteTemplateEntry.PALETTE_TYPE_TEMPLATE) ? PaletteColorUtil.WIDGET_LIST_BACKGROUND - : null; + Color background = getDrawer().getDrawerType() + .equals(PaletteTemplateEntry.PALETTE_TYPE_TEMPLATE) + ? PaletteColorUtil.WIDGET_LIST_BACKGROUND + : null; getDrawerFigure().getScrollpane().setBackgroundColor(background); } @@ -224,14 +227,14 @@ public void restoreState(IMemento memento) { .booleanValue()); RangeModel rModel = getDrawerFigure().getScrollpane().getViewport() .getVerticalRangeModel(); - rModel.setMinimum(memento.getInteger(RangeModel.PROPERTY_MINIMUM) - .intValue()); - rModel.setMaximum(memento.getInteger(RangeModel.PROPERTY_MAXIMUM) - .intValue()); - rModel.setExtent(memento.getInteger(RangeModel.PROPERTY_EXTENT) - .intValue()); - rModel.setValue(memento.getInteger(RangeModel.PROPERTY_VALUE) - .intValue()); + rModel.setMinimum( + memento.getInteger(RangeModel.PROPERTY_MINIMUM).intValue()); + rModel.setMaximum( + memento.getInteger(RangeModel.PROPERTY_MAXIMUM).intValue()); + rModel.setExtent( + memento.getInteger(RangeModel.PROPERTY_EXTENT).intValue()); + rModel.setValue( + memento.getInteger(RangeModel.PROPERTY_VALUE).intValue()); super.restoreState(memento); } diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java b/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java index dfca13a28..c5a8a5d5d 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java +++ b/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java @@ -91,8 +91,8 @@ protected boolean handleButtonDown(int button) { performConditionalSelection(); super.handleButtonDown(button); if (button == 1) { - getFigure().internalGetEventDispatcher().requestRemoveFocus( - getFigure()); + getFigure().internalGetEventDispatcher() + .requestRemoveFocus(getFigure()); getButtonModel().setArmed(true); getButtonModel().setPressed(true); } @@ -185,11 +185,10 @@ protected boolean handleNativeDragStarted(DragSourceEvent event) { // win hack because button down is delayed if (getParent() instanceof IPaletteStackEditPart && SWT.getPlatform().equals("win32")) { //$NON-NLS-1$ - Point nds = getPaletteViewer().getControl().toControl( - event.display.getCursorLocation()); - if (mouseDownLoc != null - && (Math.abs(nds.x - mouseDownLoc.x) + Math.abs(nds.y - - mouseDownLoc.y)) < WIN_THRESHOLD) { + Point nds = getPaletteViewer().getControl() + .toControl(event.display.getCursorLocation()); + if (mouseDownLoc != null && (Math.abs(nds.x - mouseDownLoc.x) + + Math.abs(nds.y - mouseDownLoc.y)) < WIN_THRESHOLD) { getButtonModel().setArmed(false); getButtonModel().setPressed(false); ((IPaletteStackEditPart) getParent()).openMenu(); @@ -265,17 +264,15 @@ protected void paintFigure(Graphics graphics) { ButtonModel model = getModel(); if (model.isSelected()) { - graphics.setBackgroundColor(PaletteColorUtil - .getSelectedColor()); - graphics.fillRoundRectangle( - getSelectionRectangle(getLayoutSetting(), - customLabel), 3, 3); + graphics.setBackgroundColor( + PaletteColorUtil.getSelectedColor()); + graphics.fillRoundRectangle(getSelectionRectangle( + getLayoutSetting(), customLabel), 3, 3); } else if (model.isMouseOver() || showHoverFeedback) { - graphics.setBackgroundColor(PaletteColorUtil - .getHoverColor()); - graphics.fillRoundRectangle( - getSelectionRectangle(getLayoutSetting(), - customLabel), 3, 3); + graphics.setBackgroundColor( + PaletteColorUtil.getHoverColor()); + graphics.fillRoundRectangle(getSelectionRectangle( + getLayoutSetting(), customLabel), 3, 3); } } } @@ -325,14 +322,15 @@ public ToolEntryEditPart(PaletteEntry paletteEntry) { super(paletteEntry); } - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (key == IPinnableEditPart.class) { if ((getParent() instanceof PinnablePaletteStackEditPart) && ((PinnablePaletteStackEditPart) getParent()) .canBePinned() && ((PaletteStack) getParent().getModel()).getActiveEntry() .equals(getModel())) { - return getParent(); + return key.cast(getParent()); } } return super.getAdapter(key); @@ -504,8 +502,10 @@ public void restoreState(IMemento memento) { } public void saveState(IMemento memento) { - memento.putString(ACTIVE_STATE, Boolean.valueOf(getPaletteViewer() - .getActiveTool() == getToolEntry()).toString()); + memento.putString(ACTIVE_STATE, + Boolean.valueOf( + getPaletteViewer().getActiveTool() == getToolEntry()) + .toString()); super.saveState(memento); } @@ -523,8 +523,7 @@ protected void setImageInFigure(Image image) { */ public void setSelected(int value) { super.setSelected(value); - if (value == SELECTED_PRIMARY - && getPaletteViewer().getControl() != null + if (value == SELECTED_PRIMARY && getPaletteViewer().getControl() != null && !getPaletteViewer().getControl().isDisposed() && getPaletteViewer().getControl().isFocusControl()) getFigure().requestFocus(); diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/GuideEditPart.java b/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/GuideEditPart.java index 0202b7cf2..02d44a290 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/GuideEditPart.java +++ b/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/GuideEditPart.java @@ -149,17 +149,18 @@ public void getValue(AccessibleControlEvent e) { return accPart; } - public Object getAdapter(Class key) { + @Override + public T getAdapter(final Class key) { if (key == AccessibleHandleProvider.class) { - return new AccessibleHandleProvider() { - public List getAccessibleHandleLocations() { - List result = new ArrayList(); + return key.cast(new AccessibleHandleProvider() { + public List getAccessibleHandleLocations() { + List result = new ArrayList<>(); Point pt = getFigure().getBounds().getCenter(); getFigure().translateToAbsolute(pt); result.add(pt); return result; } - }; + }); } return super.getAdapter(key); } diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/RulerRootEditPart.java b/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/RulerRootEditPart.java index 93edf7526..584960e1a 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/RulerRootEditPart.java +++ b/org.eclipse.gef/src/org/eclipse/gef/internal/ui/rulers/RulerRootEditPart.java @@ -70,11 +70,14 @@ protected IFigure createFigure() { /** * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + @Override + public T getAdapter(final Class adapter) { if (adapter == AutoexposeHelper.class) { if (((RulerEditPart) getContents()).isHorizontal()) - return new ViewportAutoexposeHelper(this, HORIZONTAL_THRESHOLD); - return new ViewportAutoexposeHelper(this, VERTICAL_THRESHOLD); + return adapter.cast(new ViewportAutoexposeHelper(this, + HORIZONTAL_THRESHOLD)); + return adapter.cast( + new ViewportAutoexposeHelper(this, VERTICAL_THRESHOLD)); } return super.getAdapter(adapter); } @@ -159,7 +162,8 @@ protected void doLayout(boolean force) { contentBounds.x = 0; contentBounds.height = rModel.getMaximum() - rModel.getMinimum(); - contentBounds.width = this.getContents().getPreferredSize().width; + contentBounds.width = this.getContents() + .getPreferredSize().width; } if (!this.getContents().getBounds().equals(contentBounds)) { this.getContents().setBounds(contentBounds); @@ -182,8 +186,8 @@ public Dimension getPreferredSize(int wHint, int hHint) { RangeModel rModel = getVerticalRangeModel(); pSize.height = rModel.getMaximum() - rModel.getMinimum(); } - return pSize - .expand(getInsets().getWidth(), getInsets().getHeight()); + return pSize.expand(getInsets().getWidth(), + getInsets().getHeight()); } /** diff --git a/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionCreationTool.java b/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionCreationTool.java index fbaed562e..4bf2ce27b 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionCreationTool.java +++ b/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionCreationTool.java @@ -90,8 +90,8 @@ && stateTransition(STATE_CONNECTION_STARTED, STATE_TERMINAL)) * @return true if this focus lost event was processed */ protected boolean handleFocusLost() { - if (isInState(STATE_CONNECTION_STARTED - | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) { + if (isInState( + STATE_CONNECTION_STARTED | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) { eraseSourceFeedback(); eraseTargetFeedback(); setState(STATE_INVALID); @@ -200,8 +200,7 @@ public void mouseWheelScrolled(Event event, EditPartViewer viewer) { boolean navigateNextAnchor(int direction) { EditPart focus = getCurrentViewer().getFocusEditPart(); AccessibleAnchorProvider provider; - provider = focus - .getAdapter(AccessibleAnchorProvider.class); + provider = focus.getAdapter(AccessibleAnchorProvider.class); if (provider == null) return false; diff --git a/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionEndpointTracker.java b/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionEndpointTracker.java index a0679ac1d..70670e4f6 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionEndpointTracker.java +++ b/org.eclipse.gef/src/org/eclipse/gef/tools/ConnectionEndpointTracker.java @@ -35,8 +35,8 @@ /** * A DragTracker that moves the endpoint of a connection to another location. */ -public class ConnectionEndpointTracker extends TargetingTool implements - DragTracker { +public class ConnectionEndpointTracker extends TargetingTool + implements DragTracker { private static final int FLAG_SOURCE_FEEBBACK = TargetingTool.MAX_FLAG << 1; /** The max flag */ @@ -220,15 +220,15 @@ protected boolean handleKeyDown(KeyEvent e) { // When the drag first starts, set the focus Part to be one end // of the connection if (isTarget()) { - getCurrentViewer().setFocus( - getConnectionEditPart().getTarget()); - getCurrentViewer().reveal( - getConnectionEditPart().getTarget()); + getCurrentViewer() + .setFocus(getConnectionEditPart().getTarget()); + getCurrentViewer() + .reveal(getConnectionEditPart().getTarget()); } else { - getCurrentViewer().setFocus( - getConnectionEditPart().getSource()); - getCurrentViewer().reveal( - getConnectionEditPart().getSource()); + getCurrentViewer() + .setFocus(getConnectionEditPart().getSource()); + getCurrentViewer() + .reveal(getConnectionEditPart().getSource()); } } int direction = 0; @@ -265,7 +265,8 @@ protected boolean handleKeyDown(KeyEvent e) { e.stateMask |= SWT.CONTROL; if (getCurrentViewer().getKeyHandler().keyPressed(e)) { // Do not try to connect to the same connection being dragged. - if (getCurrentViewer().getFocusEditPart() != getConnectionEditPart()) + if (getCurrentViewer() + .getFocusEditPart() != getConnectionEditPart()) navigateNextAnchor(0); return true; } @@ -281,8 +282,7 @@ private boolean isTarget() { boolean navigateNextAnchor(int direction) { EditPart focus = getCurrentViewer().getFocusEditPart(); AccessibleAnchorProvider provider; - provider = focus - .getAdapter(AccessibleAnchorProvider.class); + provider = focus.getAdapter(AccessibleAnchorProvider.class); if (provider == null) return false; diff --git a/org.eclipse.gef/src/org/eclipse/gef/tools/CreationTool.java b/org.eclipse.gef/src/org/eclipse/gef/tools/CreationTool.java index 1ea22ec51..32fb8724f 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/tools/CreationTool.java +++ b/org.eclipse.gef/src/org/eclipse/gef/tools/CreationTool.java @@ -168,8 +168,7 @@ protected boolean handleButtonDown(int button) { lockTargetEditPart(getTargetEditPart()); // Snap only when size on drop is employed if (getTargetEditPart() != null) - helper = getTargetEditPart().getAdapter( - SnapToHelper.class); + helper = getTargetEditPart().getAdapter(SnapToHelper.class); } return true; } @@ -183,7 +182,8 @@ protected boolean handleButtonDown(int button) { * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int) */ protected boolean handleButtonUp(int button) { - if (stateTransition(STATE_DRAG | STATE_DRAG_IN_PROGRESS, STATE_TERMINAL)) { + if (stateTransition(STATE_DRAG | STATE_DRAG_IN_PROGRESS, + STATE_TERMINAL)) { eraseTargetFeedback(); unlockTargetEditPart(); performCreation(button); @@ -311,8 +311,8 @@ protected void updateTargetRequest() { createRequest.setSize(bounds.getSize()); createRequest.setLocation(bounds.getLocation()); createRequest.getExtendedData().clear(); - createRequest.setSnapToEnabled(!getCurrentInput().isModKeyDown( - MODIFIER_NO_SNAPPING)); + createRequest.setSnapToEnabled( + !getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING)); if (helper != null && createRequest.isSnapToEnabled()) { PrecisionRectangle baseRect = new PrecisionRectangle(bounds); PrecisionRectangle result = baseRect.getPreciseCopy(); @@ -336,7 +336,8 @@ protected void updateTargetRequest() { * * @since 3.7 */ - protected void enforceConstraintsForSizeOnDropCreate(CreateRequest request) { + protected void enforceConstraintsForSizeOnDropCreate( + CreateRequest request) { CreateRequest createRequest = (CreateRequest) getTargetRequest(); if (createRequest.getSize() != null) { // ensure create request respects minimum and maximum size diff --git a/org.eclipse.gef/src/org/eclipse/gef/tools/DragEditPartsTracker.java b/org.eclipse.gef/src/org/eclipse/gef/tools/DragEditPartsTracker.java index 9f829879f..1c8370433 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/tools/DragEditPartsTracker.java +++ b/org.eclipse.gef/src/org/eclipse/gef/tools/DragEditPartsTracker.java @@ -107,8 +107,7 @@ private boolean acceptClone(KeyEvent e) { private boolean acceptSHIFT(KeyEvent e) { return isInState(STATE_DRAG_IN_PROGRESS | STATE_ACCESSIBLE_DRAG - | STATE_ACCESSIBLE_DRAG_IN_PROGRESS) - && e.keyCode == SWT.SHIFT; + | STATE_ACCESSIBLE_DRAG_IN_PROGRESS) && e.keyCode == SWT.SHIFT; } /** @@ -227,8 +226,8 @@ protected List createOperationSet() { if (getCurrentViewer() != null) { List list = ToolUtilities .getSelectionWithoutDependants(getCurrentViewer()); - ToolUtilities - .filterEditPartsUnderstanding(list, getTargetRequest()); + ToolUtilities.filterEditPartsUnderstanding(list, + getTargetRequest()); return list; } @@ -363,8 +362,8 @@ protected Collection getExclusionSet() { LayerManager layerManager = (LayerManager) getCurrentViewer() .getEditPartRegistry().get(LayerManager.ID); if (layerManager != null) { - exclusionSet.add(layerManager - .getLayer(LayerConstants.CONNECTION_LAYER)); + exclusionSet.add( + layerManager.getLayer(LayerConstants.CONNECTION_LAYER)); } } return exclusionSet; @@ -451,11 +450,12 @@ protected boolean handleKeyDown(KeyEvent e) { setStartLocation(getLocation()); switch (e.keyCode) { case SWT.ARROW_DOWN: - placeMouseInViewer(getLocation().getTranslated(0, accGetStep())); + placeMouseInViewer( + getLocation().getTranslated(0, accGetStep())); break; case SWT.ARROW_UP: - placeMouseInViewer(getLocation() - .getTranslated(0, -accGetStep())); + placeMouseInViewer( + getLocation().getTranslated(0, -accGetStep())); break; case SWT.ARROW_RIGHT: int stepping = accGetStep(); @@ -549,8 +549,8 @@ protected void repairStartLocation() { PrecisionPoint newStart = (PrecisionPoint) sourceRelativeStartPoint .getCopy(); figure.translateToAbsolute(newStart); - Point delta = new Point(newStart.x - getStartLocation().x, newStart.y - - getStartLocation().y); + Point delta = new Point(newStart.x - getStartLocation().x, + newStart.y - getStartLocation().y); setStartLocation(newStart); // sourceRectangle and compoundSrcRect need to be updated as well when // auto-scrolling @@ -599,8 +599,7 @@ protected void setTargetEditPart(EditPart editpart) { super.setTargetEditPart(editpart); snapToHelper = null; if (getTargetEditPart() != null && getOperationSet().size() > 0) - snapToHelper = getTargetEditPart().getAdapter( - SnapToHelper.class); + snapToHelper = getTargetEditPart().getAdapter(SnapToHelper.class); } /** @@ -634,9 +633,8 @@ protected void setState(int state) { } } - if (check - && isInState(STATE_DRAG | STATE_ACCESSIBLE_DRAG - | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) + if (check && isInState(STATE_DRAG | STATE_ACCESSIBLE_DRAG + | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) captureSourceDimensions(); } @@ -654,10 +652,10 @@ protected void updateTargetRequest() { request.setEditParts(getOperationSet()); Dimension delta = getDragMoveDelta(); - request.setConstrainedMove(getCurrentInput().isModKeyDown( - MODIFIER_CONSTRAINED_MOVE)); - request.setSnapToEnabled(!getCurrentInput().isModKeyDown( - MODIFIER_NO_SNAPPING)); + request.setConstrainedMove( + getCurrentInput().isModKeyDown(MODIFIER_CONSTRAINED_MOVE)); + request.setSnapToEnabled( + !getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING)); // constrains the move to dx=0, dy=0, or dx=dy if shift is depressed if (request.isConstrainedMove()) { @@ -714,9 +712,10 @@ protected void snapPoint(ChangeBoundsRequest request) { jointRect.translate(moveDelta); PrecisionPoint preciseDelta = new PrecisionPoint(moveDelta); - snapToHelper.snapPoint(request, PositionConstants.HORIZONTAL - | PositionConstants.VERTICAL, new PrecisionRectangle[] { - baseRect, jointRect }, preciseDelta); + snapToHelper.snapPoint(request, + PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, + new PrecisionRectangle[] { baseRect, jointRect }, + preciseDelta); request.setMoveDelta(preciseDelta); } } diff --git a/org.eclipse.gef/src/org/eclipse/gef/tools/ResizeTracker.java b/org.eclipse.gef/src/org/eclipse/gef/tools/ResizeTracker.java index 01a244eab..927773ac9 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/tools/ResizeTracker.java +++ b/org.eclipse.gef/src/org/eclipse/gef/tools/ResizeTracker.java @@ -113,8 +113,8 @@ public void activate() { super.activate(); if (owner != null) { if (getTargetEditPart() != null) - snapToHelper = getTargetEditPart().getAdapter( - SnapToHelper.class); + snapToHelper = getTargetEditPart() + .getAdapter(SnapToHelper.class); IFigure figure = owner.getFigure(); if (figure instanceof HandleBounds) @@ -298,12 +298,12 @@ protected void updateSourceRequest() { Point moveDelta = new Point(0, 0); Dimension resizeDelta = new Dimension(0, 0); - request.setConstrainedResize(getCurrentInput().isModKeyDown( - MODIFIER_CONSTRAINED_RESIZE)); - request.setCenteredResize(getCurrentInput().isModKeyDown( - MODIFIER_CENTERED_RESIZE)); - request.setSnapToEnabled(!getCurrentInput().isModKeyDown( - MODIFIER_NO_SNAPPING)); + request.setConstrainedResize( + getCurrentInput().isModKeyDown(MODIFIER_CONSTRAINED_RESIZE)); + request.setCenteredResize( + getCurrentInput().isModKeyDown(MODIFIER_CENTERED_RESIZE)); + request.setSnapToEnabled( + !getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING)); if (request.isConstrainedResize() && owner != null) { request.setConstrainedResize(true); @@ -384,24 +384,25 @@ protected void updateSourceRequest() { rect, result); if (request.isCenteredResize()) { if (result.preciseX() != 0.0) - result.setPreciseWidth(result.preciseWidth() - - result.preciseX()); + result.setPreciseWidth( + result.preciseWidth() - result.preciseX()); else if (result.preciseWidth() != 0.0) { result.setPreciseX(-result.preciseWidth()); result.setPreciseWidth(result.preciseWidth() * 2.0); } if (result.preciseY() != 0.0) - result.setPreciseHeight(result.preciseHeight() - - result.preciseY()); + result.setPreciseHeight( + result.preciseHeight() - result.preciseY()); else if (result.preciseHeight() != 0.0) { result.setPreciseY(-result.preciseHeight()); result.setPreciseHeight(result.preciseHeight() * 2.0); } } - PrecisionPoint preciseMove = new PrecisionPoint(result.preciseX() - + moveDelta.x, result.preciseY() + moveDelta.y); + PrecisionPoint preciseMove = new PrecisionPoint( + result.preciseX() + moveDelta.x, + result.preciseY() + moveDelta.y); PrecisionDimension preciseResize = new PrecisionDimension( result.preciseWidth() + resizeDelta.width, @@ -437,12 +438,12 @@ protected void enforceConstraintsForResize( owner.getFigure().translateToRelative(manipulatedConstraint); // validate constraint (maximum and minimum size are regarded to be // 'normalized', i.e. relative to this figure's bounds coordinates). - manipulatedConstraint.setSize(Dimension.max( - manipulatedConstraint.getSize(), - getMinimumSizeFor(changeBoundsRequest))); - manipulatedConstraint.setSize(Dimension.min( - manipulatedConstraint.getSize(), - getMaximumSizeFor(changeBoundsRequest))); + manipulatedConstraint + .setSize(Dimension.max(manipulatedConstraint.getSize(), + getMinimumSizeFor(changeBoundsRequest))); + manipulatedConstraint + .setSize(Dimension.min(manipulatedConstraint.getSize(), + getMaximumSizeFor(changeBoundsRequest))); // translate back to absolute owner.getFigure().translateToAbsolute(manipulatedConstraint); Dimension newSizeDelta = manipulatedConstraint.getSize() diff --git a/org.eclipse.gef/src/org/eclipse/gef/tools/SelectionTool.java b/org.eclipse.gef/src/org/eclipse/gef/tools/SelectionTool.java index d0ed46b6a..beed7e49c 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/tools/SelectionTool.java +++ b/org.eclipse.gef/src/org/eclipse/gef/tools/SelectionTool.java @@ -416,8 +416,7 @@ private boolean handleTraverseHandle(KeyEvent e) { getCurrentViewer().reveal(focus); AccessibleHandleProvider provider; - provider = focus - .getAdapter(AccessibleHandleProvider.class); + provider = focus.getAdapter(AccessibleHandleProvider.class); if (provider == null || provider.getAccessibleHandleLocations().isEmpty()) return false; @@ -439,8 +438,8 @@ private boolean handleTraverseHandle(KeyEvent e) { } Point loc = (Point) locations.get(handleIndex); - Point current = new Point(getCurrentViewer().getControl().toControl( - Display.getCurrent().getCursorLocation())); + Point current = new Point(getCurrentViewer().getControl() + .toControl(Display.getCurrent().getCursorLocation())); if (current.equals(loc)) { // The cursor is already at the location that it is to be moved to. @@ -471,7 +470,8 @@ private boolean handleTraverseHandle(KeyEvent e) { */ protected boolean handleViewerExited() { if (isInState(STATE_ACCESSIBLE_DRAG | STATE_ACCESSIBLE_DRAG_IN_PROGRESS - | STATE_TRAVERSE_HANDLE | STATE_DRAG | STATE_DRAG_IN_PROGRESS)) { + | STATE_TRAVERSE_HANDLE | STATE_DRAG + | STATE_DRAG_IN_PROGRESS)) { if (getDragTracker() != null) setDragTracker(null); setState(STATE_INITIAL); diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ActionBarContributor.java b/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ActionBarContributor.java index 1173e24d4..4b3fa6495 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ActionBarContributor.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ActionBarContributor.java @@ -148,8 +148,7 @@ public void init(IActionBars bars) { * @see org.eclipse.ui.IEditorActionBarContributor#setActiveEditor(IEditorPart) */ public void setActiveEditor(IEditorPart editor) { - ActionRegistry registry = editor - .getAdapter(ActionRegistry.class); + ActionRegistry registry = editor.getAdapter(ActionRegistry.class); IActionBars bars = getActionBars(); for (int i = 0; i < globalActionKeys.size(); i++) { String id = (String) globalActionKeys.get(i); diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PrintAction.java b/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PrintAction.java index 04d3f153d..fd22e4d94 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PrintAction.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/actions/PrintAction.java @@ -60,9 +60,8 @@ protected void init() { * @see org.eclipse.jface.action.Action#run() */ public void run() { - GraphicalViewer viewer; - viewer = getWorkbenchPart().getAdapter( - GraphicalViewer.class); + GraphicalViewer viewer = getWorkbenchPart() + .getAdapter(GraphicalViewer.class); PrintDialog dialog = new PrintDialog(viewer.getControl().getShell(), SWT.NULL); diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/actions/SelectAllAction.java b/org.eclipse.gef/src/org/eclipse/gef/ui/actions/SelectAllAction.java index d0198e9cd..9beb41915 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/actions/SelectAllAction.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/actions/SelectAllAction.java @@ -48,11 +48,10 @@ public SelectAllAction(IWorkbenchPart part) { * Selects all edit parts in the active workbench part. */ public void run() { - GraphicalViewer viewer = part - .getAdapter(GraphicalViewer.class); + GraphicalViewer viewer = part.getAdapter(GraphicalViewer.class); if (viewer != null) { - viewer.setSelection(new StructuredSelection( - getSelectableEditParts(viewer))); + viewer.setSelection( + new StructuredSelection(getSelectableEditParts(viewer))); } } diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/actions/WorkbenchPartAction.java b/org.eclipse.gef/src/org/eclipse/gef/ui/actions/WorkbenchPartAction.java index 1c342ef04..4fef8c005 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/actions/WorkbenchPartAction.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/actions/WorkbenchPartAction.java @@ -23,8 +23,8 @@ * obtained using the part's site. Anything can potentially be obtained using * {@link org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)}. */ -public abstract class WorkbenchPartAction extends Action implements Disposable, - UpdateAction { +public abstract class WorkbenchPartAction extends Action + implements Disposable, UpdateAction { private IWorkbenchPart workbenchPart; private boolean lazyEnablement = true; diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomComboContributionItem.java b/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomComboContributionItem.java index f025c8b1e..dabde4d85 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomComboContributionItem.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/actions/ZoomComboContributionItem.java @@ -38,8 +38,8 @@ * * @author Eric Bordeau */ -public class ZoomComboContributionItem extends ContributionItem implements - ZoomListener { +public class ZoomComboContributionItem extends ContributionItem + implements ZoomListener { private boolean forceSetText; private Combo combo; @@ -67,7 +67,8 @@ public ZoomComboContributionItem(IPartService partService) { * @param initString * the initial string displayed in the combo */ - public ZoomComboContributionItem(IPartService partService, String initString) { + public ZoomComboContributionItem(IPartService partService, + String initString) { this(partService, new String[] { initString }); } @@ -269,8 +270,8 @@ public void setZoomManager(ZoomManager zm) { private void handleWidgetDefaultSelected(SelectionEvent event) { if (zoomManager != null) { if (combo.getSelectionIndex() >= 0) - zoomManager.setZoomAsText(combo.getItem(combo - .getSelectionIndex())); + zoomManager.setZoomAsText( + combo.getItem(combo.getSelectionIndex())); else zoomManager.setZoomAsText(combo.getText()); } diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/palette/PaletteContextMenuProvider.java b/org.eclipse.gef/src/org/eclipse/gef/ui/palette/PaletteContextMenuProvider.java index 9fd9ec6f2..5320f0660 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/palette/PaletteContextMenuProvider.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/palette/PaletteContextMenuProvider.java @@ -64,14 +64,14 @@ public void buildContextMenu(IMenuManager menu) { menu.appendToGroup(GEFActionConstants.GROUP_VIEW, new LayoutAction( getPaletteViewer().getPaletteViewerPreferences())); menu.appendToGroup(GEFActionConstants.GROUP_VIEW, - new ChangeIconSizeAction(getPaletteViewer() - .getPaletteViewerPreferences())); + new ChangeIconSizeAction( + getPaletteViewer().getPaletteViewerPreferences())); if (getPaletteViewer().getCustomizer() != null) { menu.appendToGroup(GEFActionConstants.GROUP_REST, new CustomizeAction(getPaletteViewer())); } - menu.appendToGroup(GEFActionConstants.GROUP_REST, new SettingsAction( - getPaletteViewer())); + menu.appendToGroup(GEFActionConstants.GROUP_REST, + new SettingsAction(getPaletteViewer())); } } diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/parts/DomainEventDispatcher.java b/org.eclipse.gef/src/org/eclipse/gef/ui/parts/DomainEventDispatcher.java index e21be0fb6..11ab952b7 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/parts/DomainEventDispatcher.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/parts/DomainEventDispatcher.java @@ -64,8 +64,8 @@ public class DomainEventDispatcher extends SWTEventDispatcher { * * @author hudsonr */ - protected class EditPartAccessibilityDispatcher extends - AccessibilityDispatcher { + protected class EditPartAccessibilityDispatcher + extends AccessibilityDispatcher { private AccessibleEditPart get(int childID) { if (childID == ACC.CHILDID_SELF || childID == ACC.CHILDID_NONE) if (getViewer().getContents() != null) @@ -73,7 +73,8 @@ private AccessibleEditPart get(int childID) { .getAdapter(AccessibleEditPart.class); else return null; - return (AccessibleEditPart) accessibles.get(Integer.valueOf(childID)); + return (AccessibleEditPart) accessibles + .get(Integer.valueOf(childID)); } /** @@ -86,8 +87,7 @@ public void getChildAtPoint(AccessibleControlEvent e) { EditPart part = getViewer().findObjectAt(new Point(p.x, p.y)); if (part == null) return; - AccessibleEditPart acc = part - .getAdapter(AccessibleEditPart.class); + AccessibleEditPart acc = part.getAdapter(AccessibleEditPart.class); if (acc != null) e.childID = acc.getAccessibleID(); } @@ -132,8 +132,8 @@ public void getDescription(AccessibleEvent e) { * @see AccessibleControlListener#getFocus(AccessibleControlEvent) */ public void getFocus(AccessibleControlEvent e) { - AccessibleEditPart acc = getViewer() - .getFocusEditPart().getAdapter(AccessibleEditPart.class); + AccessibleEditPart acc = getViewer().getFocusEditPart() + .getAdapter(AccessibleEditPart.class); if (acc != null) e.childID = acc.getAccessibleID(); } @@ -281,7 +281,8 @@ public void dispatchKeyReleased(org.eclipse.swt.events.KeyEvent e) { /** * @see EventDispatcher#dispatchMouseDoubleClicked(org.eclipse.swt.events.MouseEvent) */ - public void dispatchMouseDoubleClicked(org.eclipse.swt.events.MouseEvent me) { + public void dispatchMouseDoubleClicked( + org.eclipse.swt.events.MouseEvent me) { if (!editorCaptured) { super.dispatchMouseDoubleClicked(me); if (draw2dBusy()) diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditor.java b/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditor.java index 90025b3af..0cd378ee9 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditor.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditor.java @@ -59,8 +59,8 @@ * * @author hudsonr */ -public abstract class GraphicalEditor extends EditorPart implements - CommandStackListener, ISelectionListener { +public abstract class GraphicalEditor extends EditorPart + implements CommandStackListener, ISelectionListener { private static class ActionIDList extends ArrayList { public boolean add(Object o) { @@ -69,7 +69,8 @@ public boolean add(Object o) { IAction action = (IAction) o; o = action.getId(); throw new IllegalArgumentException( - "Action IDs should be added to lists, not the action: " + action); //$NON-NLS-1$ + "Action IDs should be added to lists, not the action: " //$NON-NLS-1$ + + action); } catch (IllegalArgumentException exc) { exc.printStackTrace(); } @@ -109,8 +110,8 @@ public void commandStackChanged(EventObject event) { * extend or override this method as needed. */ protected void configureGraphicalViewer() { - getGraphicalViewer().getControl().setBackground( - ColorConstants.listBackground); + getGraphicalViewer().getControl() + .setBackground(ColorConstants.listBackground); } /** @@ -223,23 +224,25 @@ protected ActionRegistry getActionRegistry() { * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class type) { + @Override + public T getAdapter(final Class type) { if (type == org.eclipse.ui.views.properties.IPropertySheetPage.class) { - return new UndoablePropertySheetPage(getCommandStack(), + return type.cast(new UndoablePropertySheetPage(getCommandStack(), getActionRegistry().getAction(ActionFactory.UNDO.getId()), - getActionRegistry().getAction(ActionFactory.REDO.getId())); + getActionRegistry().getAction(ActionFactory.REDO.getId()))); } if (type == GraphicalViewer.class) - return getGraphicalViewer(); + return type.cast(getGraphicalViewer()); if (type == CommandStack.class) - return getCommandStack(); + return type.cast(getCommandStack()); if (type == ActionRegistry.class) - return getActionRegistry(); + return type.cast(getActionRegistry()); if (type == EditPart.class && getGraphicalViewer() != null) - return getGraphicalViewer().getRootEditPart(); + return type.cast(getGraphicalViewer().getRootEditPart()); if (type == IFigure.class && getGraphicalViewer() != null) - return ((GraphicalEditPart) getGraphicalViewer().getRootEditPart()) - .getFigure(); + return type.cast( + ((GraphicalEditPart) getGraphicalViewer().getRootEditPart()) + .getFigure()); return super.getAdapter(type); } diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithFlyoutPalette.java b/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithFlyoutPalette.java index 39a653f71..2f3632066 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithFlyoutPalette.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithFlyoutPalette.java @@ -91,21 +91,21 @@ public void createPartControl(Composite parent) { * @since 3.10 */ protected FlyoutPaletteComposite createPaletteComposite(Composite parent) { - return new FlyoutPaletteComposite(parent, SWT.NONE, - getSite().getPage(), getPaletteViewerProvider(), - getPalettePreferences()); + return new FlyoutPaletteComposite(parent, SWT.NONE, getSite().getPage(), + getPaletteViewerProvider(), getPalettePreferences()); } /** * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class type) { + @Override + public T getAdapter(final Class type) { if (type == PalettePage.class) { if (splitter == null) { page = createPalettePage(); - return page; + return type.cast(page); } - return createPalettePage(); + return type.cast(createPalettePage()); } return super.getAdapter(type); } @@ -125,8 +125,8 @@ protected Control getGraphicalControl() { * preferences */ protected FlyoutPreferences getPalettePreferences() { - return FlyoutPaletteComposite.createFlyoutPreferences(InternalGEFPlugin - .getDefault().getPluginPreferences()); + return FlyoutPaletteComposite.createFlyoutPreferences( + InternalGEFPlugin.getDefault().getPluginPreferences()); } /** diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerImpl.java b/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerImpl.java index ec260a947..81559d50b 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerImpl.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalViewerImpl.java @@ -60,8 +60,8 @@ * * @author hudsonr */ -public class GraphicalViewerImpl extends AbstractEditPartViewer implements - GraphicalViewer { +public class GraphicalViewerImpl extends AbstractEditPartViewer + implements GraphicalViewer { private final LightweightSystem lws = createLightweightSystem(); IFigure rootFigure; @@ -140,8 +140,8 @@ protected void handleFocusLost(FocusEvent fe) { * @see GraphicalViewer#findHandleAt(org.eclipse.draw2d.geometry.Point) */ public Handle findHandleAt(Point p) { - LayerManager layermanager = (LayerManager) getEditPartRegistry().get( - LayerManager.ID); + LayerManager layermanager = (LayerManager) getEditPartRegistry() + .get(LayerManager.ID); if (layermanager == null) return null; List list = new ArrayList(3); @@ -176,8 +176,8 @@ public boolean accept(IFigure figure) { && (condition == null || condition.evaluate(editpart)); } } - IFigure figure = getLightweightSystem().getRootFigure().findFigureAt( - pt.x, pt.y, new ConditionalTreeSearch(exclude)); + IFigure figure = getLightweightSystem().getRootFigure() + .findFigureAt(pt.x, pt.y, new ConditionalTreeSearch(exclude)); EditPart part = null; while (part == null && figure != null) { part = (EditPart) getVisualPartMap().get(figure); @@ -308,14 +308,12 @@ public void reveal(EditPart part) { return; EditPart current = part.getParent(); while (current != null) { - ExposeHelper helper = current - .getAdapter(ExposeHelper.class); + ExposeHelper helper = current.getAdapter(ExposeHelper.class); if (helper != null) helper.exposeDescendant(part); current = current.getParent(); } - AccessibleEditPart acc = part - .getAdapter(AccessibleEditPart.class); + AccessibleEditPart acc = part.getAdapter(AccessibleEditPart.class); if (acc != null) getControl().getAccessible().setFocus(acc.getAccessibleID()); } @@ -457,7 +455,8 @@ public void unregisterAccessibleEditPart(AccessibleEditPart acc) { } } - private static class MouseWheelDelegateHandler implements MouseWheelHandler { + private static class MouseWheelDelegateHandler + implements MouseWheelHandler { private static final MouseWheelHandler SINGLETON = new MouseWheelDelegateHandler(); private MouseWheelDelegateHandler() { diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/views/palette/PaletteView.java b/org.eclipse.gef/src/org/eclipse/gef/ui/views/palette/PaletteView.java index 8595e6e6d..e2825efc7 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/views/palette/PaletteView.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/views/palette/PaletteView.java @@ -18,7 +18,6 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.part.IPage; -import org.eclipse.ui.part.IPageBookViewPage; import org.eclipse.ui.part.MessagePage; import org.eclipse.ui.part.PageBook; import org.eclipse.ui.part.PageBookView; @@ -98,12 +97,11 @@ public void dispose() { */ protected PageRec doCreatePage(IWorkbenchPart part) { // Try to get a custom palette page - Object obj = part.getAdapter(PalettePage.class); + PalettePage page = part.getAdapter(PalettePage.class); - if (obj != null && obj instanceof IPage) { - IPage page = (IPage) obj; + if (page != null) { page.createControl(getPageBook()); - initPage((IPageBookViewPage) page); + initPage(page); return new PageRec(part, page); } // Use the default page by returning null diff --git a/org.eclipse.gef/src/org/eclipse/gef/ui/views/palette/PaletteViewerPage.java b/org.eclipse.gef/src/org/eclipse/gef/ui/views/palette/PaletteViewerPage.java index fb3631b34..d6171fca2 100644 --- a/org.eclipse.gef/src/org/eclipse/gef/ui/views/palette/PaletteViewerPage.java +++ b/org.eclipse.gef/src/org/eclipse/gef/ui/views/palette/PaletteViewerPage.java @@ -77,14 +77,16 @@ public void dispose() { /** * @see IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + @Override + public T getAdapter(final Class adapter) { if (adapter == EditPart.class && viewer != null) - return viewer.getEditPartRegistry().get(viewer.getPaletteRoot()); + return adapter.cast( + viewer.getEditPartRegistry().get(viewer.getPaletteRoot())); if (adapter == IFigure.class && viewer != null) { - Object obj = viewer.getEditPartRegistry().get( - viewer.getPaletteRoot()); + Object obj = viewer.getEditPartRegistry() + .get(viewer.getPaletteRoot()); if (obj instanceof GraphicalEditPart) - return ((GraphicalEditPart) obj).getFigure(); + return adapter.cast(((GraphicalEditPart) obj).getFigure()); } return null; }