diff --git a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java index 92763f069a0..3358d8e0568 100644 --- a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java +++ b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java @@ -91,11 +91,9 @@ private boolean isCaptionLine(Position position, IDocument document, int line) { private String getProjectionTextAtLine(ISourceViewer viewer, int line, int numberOfLines) { IAnnotationModel model= null; - if (viewer instanceof ISourceViewerExtension2) { - ISourceViewerExtension2 viewerExtension= (ISourceViewerExtension2) viewer; + if (viewer instanceof ISourceViewerExtension2 viewerExtension) { IAnnotationModel visual= viewerExtension.getVisualAnnotationModel(); - if (visual instanceof IAnnotationModelExtension) { - IAnnotationModelExtension modelExtension= (IAnnotationModelExtension) visual; + if (visual instanceof IAnnotationModelExtension modelExtension) { model= modelExtension.getAnnotationModel(ProjectionSupport.PROJECTION); } } diff --git a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationModel.java b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationModel.java index 377d1833c4c..41e2f9318b6 100644 --- a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationModel.java +++ b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationModel.java @@ -48,8 +48,7 @@ public ProjectionAnnotationModel() { * @param annotation the annotation */ public void collapse(Annotation annotation) { - if (annotation instanceof ProjectionAnnotation) { - ProjectionAnnotation projection= (ProjectionAnnotation) annotation; + if (annotation instanceof ProjectionAnnotation projection) { if (!projection.isCollapsed()) { projection.markCollapsed(); modifyAnnotation(projection, true); @@ -64,8 +63,7 @@ public void collapse(Annotation annotation) { * @param annotation the annotation */ public void expand(Annotation annotation) { - if (annotation instanceof ProjectionAnnotation) { - ProjectionAnnotation projection= (ProjectionAnnotation) annotation; + if (annotation instanceof ProjectionAnnotation projection) { if (projection.isCollapsed()) { projection.markExpanded(); modifyAnnotation(projection, true); @@ -80,9 +78,7 @@ public void expand(Annotation annotation) { * @param annotation the annotation */ public void toggleExpansionState(Annotation annotation) { - if (annotation instanceof ProjectionAnnotation) { - ProjectionAnnotation projection= (ProjectionAnnotation) annotation; - + if (annotation instanceof ProjectionAnnotation projection) { if (projection.isCollapsed()) projection.markExpanded(); else diff --git a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java index e77981dde03..70f32d10085 100644 --- a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java +++ b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java @@ -119,8 +119,7 @@ private ProjectionAnnotation findAnnotation(int line, boolean exact) { Iterator e= model.getAnnotationIterator(); while (e.hasNext()) { Object next= e.next(); - if (next instanceof ProjectionAnnotation) { - ProjectionAnnotation annotation= (ProjectionAnnotation) next; + if (next instanceof ProjectionAnnotation annotation) { Position p= model.getPosition(annotation); if (p == null) continue; @@ -235,8 +234,7 @@ public void mouseExit(MouseEvent e) { @Override public void setModel(IAnnotationModel model) { - if (model instanceof IAnnotationModelExtension) { - IAnnotationModelExtension extension= (IAnnotationModelExtension) model; + if (model instanceof IAnnotationModelExtension extension) { model= extension.getAnnotationModel(ProjectionSupport.PROJECTION); } super.setModel(model); diff --git a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java index b5ac2d91c01..abc630a793d 100644 --- a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java +++ b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java @@ -221,8 +221,7 @@ private void createSummaries(IProgressMonitor monitor, IAnnotationModel visualAn } if (!additions.isEmpty()) { - if (visualAnnotationModel instanceof IAnnotationModelExtension) { - IAnnotationModelExtension extension= (IAnnotationModelExtension)visualAnnotationModel; + if (visualAnnotationModel instanceof IAnnotationModelExtension extension) { if (!isCanceled(monitor)) extension.replaceAnnotations(null, additions); } else { @@ -279,8 +278,7 @@ private void createSummary(Map additions, IRegion[] summar private AnnotationBag findBagForType(Map bagMap, String annotationType) { AnnotationBag bag= bagMap.get(annotationType); - if (bag == null && fAnnotationAccess instanceof IAnnotationAccessExtension) { - IAnnotationAccessExtension extension= (IAnnotationAccessExtension) fAnnotationAccess; + if (bag == null && fAnnotationAccess instanceof IAnnotationAccessExtension extension) { Object[] superTypes= extension.getSupertypes(annotationType); for (int i= 0; i < superTypes.length && bag == null; i++) { bag= bagMap.get(superTypes[i]); diff --git a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java index 2c7adfc6870..01a13c48003 100644 --- a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java +++ b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java @@ -65,8 +65,7 @@ public ProjectionAnnotationsPainter(ISourceViewer sourceViewer, IAnnotationAcces @Override protected IAnnotationModel findAnnotationModel(ISourceViewer sourceViewer) { - if (sourceViewer instanceof ProjectionViewer) { - ProjectionViewer projectionViewer= (ProjectionViewer) sourceViewer; + if (sourceViewer instanceof ProjectionViewer projectionViewer) { return projectionViewer.getProjectionAnnotationModel(); } return null; @@ -84,8 +83,7 @@ protected boolean skip(Annotation annotation) { private static class ProjectionDrawingStrategy implements AnnotationPainter.IDrawingStrategy { @Override public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) { - if (annotation instanceof ProjectionAnnotation) { - ProjectionAnnotation projectionAnnotation= (ProjectionAnnotation) annotation; + if (annotation instanceof ProjectionAnnotation projectionAnnotation) { if (projectionAnnotation.isCollapsed()) { if (gc != null) { @@ -351,8 +349,7 @@ private IAnnotationHover createProjectionAnnotationHover() { @SuppressWarnings("unchecked") public T getAdapter(ISourceViewer viewer, Class required) { if (ProjectionAnnotationModel.class.equals(required)) { - if (viewer instanceof ProjectionViewer) { - ProjectionViewer projectionViewer= (ProjectionViewer) viewer; + if (viewer instanceof ProjectionViewer projectionViewer) { return (T) projectionViewer.getProjectionAnnotationModel(); } } diff --git a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java index 400c8e2021a..4dfee49d5af 100644 --- a/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java +++ b/bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java @@ -330,8 +330,7 @@ public void setProjectionSummary(ProjectionSummary projectionSummary) { * @param model the model to which the projection annotation model is added */ private void addProjectionAnnotationModel(IAnnotationModel model) { - if (model instanceof IAnnotationModelExtension) { - IAnnotationModelExtension extension= (IAnnotationModelExtension) model; + if (model instanceof IAnnotationModelExtension extension) { extension.addAnnotationModel(ProjectionSupport.PROJECTION, fProjectionAnnotationModel); model.addAnnotationModelListener(fAnnotationModelListener); } @@ -344,9 +343,8 @@ private void addProjectionAnnotationModel(IAnnotationModel model) { * @return the removed projection annotation model or null if there was none */ private IAnnotationModel removeProjectionAnnotationModel(IAnnotationModel model) { - if (model instanceof IAnnotationModelExtension) { + if (model instanceof IAnnotationModelExtension extension) { model.removeAnnotationModelListener(fAnnotationModelListener); - IAnnotationModelExtension extension= (IAnnotationModelExtension) model; return extension.removeAnnotationModel(ProjectionSupport.PROJECTION); } return null; @@ -387,8 +385,7 @@ protected IAnnotationModel createVisualAnnotationModel(IAnnotationModel annotati */ public ProjectionAnnotationModel getProjectionAnnotationModel() { IAnnotationModel model= getVisualAnnotationModel(); - if (model instanceof IAnnotationModelExtension) { - IAnnotationModelExtension extension= (IAnnotationModelExtension) model; + if (model instanceof IAnnotationModelExtension extension) { return (ProjectionAnnotationModel) extension.getAnnotationModel(ProjectionSupport.PROJECTION); } return null; @@ -401,9 +398,7 @@ protected ISlaveDocumentManager createSlaveDocumentManager() { @Override protected boolean updateSlaveDocument(IDocument slaveDocument, int modelRangeOffset, int modelRangeLength) throws BadLocationException { - if (slaveDocument instanceof ProjectionDocument) { - ProjectionDocument projection= (ProjectionDocument) slaveDocument; - + if (slaveDocument instanceof ProjectionDocument projection) { int offset= modelRangeOffset; int length= modelRangeLength; @@ -814,9 +809,7 @@ private void collapse(int offset, int length, boolean fireRedraw) throws BadLoca */ private void expand(int offset, int length, boolean fireRedraw) throws BadLocationException { IDocument slave= getVisibleDocument(); - if (slave instanceof ProjectionDocument) { - ProjectionDocument projection= (ProjectionDocument) slave; - + if (slave instanceof ProjectionDocument projection) { // expand addMasterDocumentRange(projection, offset, length); @@ -1100,8 +1093,7 @@ IRegion[] computeCollapsedRegions(Position position) { if (document == null) return null; - if (position instanceof IProjectionPosition) { - IProjectionPosition projPosition= (IProjectionPosition) position; + if (position instanceof IProjectionPosition projPosition) { return projPosition.computeProjectionRegions(document); } @@ -1308,9 +1300,7 @@ protected void handleDispose() { */ @Override protected void handleVisibleDocumentChanged(DocumentEvent event) { - if (fHandleProjectionChanges && event instanceof ProjectionDocumentEvent && isProjectionMode()) { - ProjectionDocumentEvent e= (ProjectionDocumentEvent) event; - + if (fHandleProjectionChanges && event instanceof ProjectionDocumentEvent e && isProjectionMode()) { DocumentEvent master= e.getMasterEvent(); if (master != null) fReplaceVisibleDocumentExecutionTrigger= master.getDocument(); @@ -1355,8 +1345,7 @@ public IRegion[] getCoveredModelRanges(IRegion modelRange) { if (fInformationMapping == null) return new IRegion[] { new Region(modelRange.getOffset(), modelRange.getLength()) }; - if (fInformationMapping instanceof IDocumentInformationMappingExtension) { - IDocumentInformationMappingExtension extension= (IDocumentInformationMappingExtension) fInformationMapping; + if (fInformationMapping instanceof IDocumentInformationMappingExtension extension) { try { return extension.getExactCoverage(modelRange); } catch (BadLocationException x) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java index c713f7cb87d..f34fb4ea1e8 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java @@ -153,8 +153,7 @@ public void showInformationControl(Rectangle subjectArea, Object information) { private Rectangle computeBoundsFromContent(IInformationControl informationControl, Rectangle controlBounds) { Rectangle result= Geometry.copy(controlBounds); - if (informationControl instanceof IInformationControlExtension3) { - IInformationControlExtension3 iControl3= (IInformationControlExtension3) informationControl; + if (informationControl instanceof IInformationControlExtension3 iControl3) { Rectangle trim= iControl3.computeTrim(); result= Geometry.add(result, trim); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java index 08ed671a85c..0129ec83a52 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java @@ -802,8 +802,7 @@ private int visualSizeIncrement(char character, int visual) { */ public SelectionProcessor(ITextViewer viewer) { this(viewer.getDocument(), viewer.getTextWidget().getTabs()); - if (viewer instanceof ITextViewerExtension) { - ITextViewerExtension ext= (ITextViewerExtension)viewer; + if (viewer instanceof ITextViewerExtension ext) { fRewriteTarget= ext.getRewriteTarget(); } fSelectionProvider= viewer.getSelectionProvider(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java index 3718ca3d407..35456f83cf3 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java @@ -207,9 +207,8 @@ public void handleEvent(Event event) { return; IInformationControl infoControl= getCurrentInformationControl2(); - if (infoControl != null && !infoControl.isFocusControl() && infoControl instanceof IInformationControlExtension3) { + if (infoControl != null && !infoControl.isFocusControl() && infoControl instanceof IInformationControlExtension3 iControl3) { // if (DEBUG) System.out.println("StickyHoverManager.Closer.handleEvent(): activeShell= " + fDisplay.getActiveShell()); //$NON-NLS-1$ - IInformationControlExtension3 iControl3= (IInformationControlExtension3) infoControl; Rectangle controlBounds= iControl3.getBounds(); if (controlBounds != null) { Point mouseLoc= event.display.map((Control) event.widget, null, event.x, event.y); @@ -319,8 +318,7 @@ public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) { @Override public boolean setFocus(IWidgetTokenOwner owner) { IInformationControl iControl= getCurrentInformationControl2(); - if (iControl instanceof IInformationControlExtension5) { - IInformationControlExtension5 iControl5= (IInformationControlExtension5) iControl; + if (iControl instanceof IInformationControlExtension5 iControl5) { if (iControl5.isVisible()) { iControl.setFocus(); return iControl.isFocusControl(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningDocumentFooterAnnotation.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningDocumentFooterAnnotation.java index 31c4883934b..15edfd5121b 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningDocumentFooterAnnotation.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningDocumentFooterAnnotation.java @@ -114,13 +114,7 @@ public void markDeleted(boolean deleted) { @Override public void draw(GC gc, StyledText textWidget, int offset, int length, Color color, int x, int y) { int singleLineHeight= super.getHeight(); - CodeMiningLineHeaderAnnotation.draw(fMinings, fBounds, singleLineHeight, fResolvedMinings, gc, textWidget, color, x, y, new Runnable() { - - @Override - public void run() { - redraw(); - } - }); + CodeMiningLineHeaderAnnotation.draw(fMinings, fBounds, singleLineHeight, fResolvedMinings, gc, textWidget, color, x, y, this::redraw); } @Override diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningLineHeaderAnnotation.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningLineHeaderAnnotation.java index 147cc56e39d..908850275d8 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningLineHeaderAnnotation.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/codemining/CodeMiningLineHeaderAnnotation.java @@ -204,13 +204,7 @@ static void disposeMinings(List minings) { @Override public void draw(GC gc, StyledText textWidget, int offset, int length, Color color, int x, int y) { int singleLineHeight= super.getHeight(); - draw(fMinings, fBounds, singleLineHeight, fResolvedMinings, gc, textWidget, color, x, y, new Runnable() { - - @Override - public void run() { - redraw(); - } - }); + draw(fMinings, fBounds, singleLineHeight, fResolvedMinings, gc, textWidget, color, x, y, this::redraw); } static void draw(List pMinings, List fBounds, int singleLineHeight, ICodeMining[] fResolvedMinings, GC gc, StyledText textWidget, Color color, diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java index 031c59d65c3..c851704b3fd 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java @@ -207,8 +207,7 @@ protected void computeInformation() { String information= null; Object d= item.getData(); - if (d instanceof ICompletionProposal) { - ICompletionProposal p= (ICompletionProposal) d; + if (d instanceof ICompletionProposal p) { information= p.getAdditionalProposalInfo(); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java index 6ca009a07d7..6ff47bb09b3 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java @@ -393,8 +393,7 @@ private void insertProposal(ICompletionProposal p, char trigger, int stateMask, IDocument document= fViewer.getDocument(); - if (fViewer instanceof ITextViewerExtension) { - ITextViewerExtension extension= (ITextViewerExtension) fViewer; + if (fViewer instanceof ITextViewerExtension extension) { target= extension.getRewriteTarget(); } @@ -406,11 +405,9 @@ private void insertProposal(ICompletionProposal p, char trigger, int stateMask, registry.register(fModificationEditingSupport); } - if (p instanceof ICompletionProposalExtension2) { - ICompletionProposalExtension2 e= (ICompletionProposalExtension2) p; + if (p instanceof ICompletionProposalExtension2 e) { e.apply(fViewer, trigger, stateMask, offset); - } else if (p instanceof ICompletionProposalExtension) { - ICompletionProposalExtension e= (ICompletionProposalExtension) p; + } else if (p instanceof ICompletionProposalExtension e) { e.apply(document, trigger, offset); } else { p.apply(document); @@ -426,8 +423,7 @@ private void insertProposal(ICompletionProposal p, char trigger, int stateMask, if (info != null) { int position; - if (p instanceof ICompletionProposalExtension) { - ICompletionProposalExtension e= (ICompletionProposalExtension) p; + if (p instanceof ICompletionProposalExtension e) { position= e.getContextInformationPosition(); } else { if (selection == null) @@ -470,8 +466,7 @@ public void hide() { unregister(); - if (fViewer instanceof IEditingSupportRegistry) { - IEditingSupportRegistry registry= (IEditingSupportRegistry) fViewer; + if (fViewer instanceof IEditingSupportRegistry registry) { registry.unregister(fFocusEditingSupport); } @@ -504,8 +499,7 @@ private void unregister() { styledText.removeKeyListener(fKeyListener); if (fLastProposal != null) { - if (fLastProposal instanceof ICompletionProposalExtension2) { - ICompletionProposalExtension2 extension= (ICompletionProposalExtension2) fLastProposal; + if (fLastProposal instanceof ICompletionProposalExtension2 extension) { extension.unselected(fViewer); } @@ -629,12 +623,10 @@ private int getTableHeightHint(Table table, int rows) { private boolean validateProposal(IDocument document, ICompletionProposal p, int offset, DocumentEvent event) { // detect selected - if (p instanceof ICompletionProposalExtension2) { - ICompletionProposalExtension2 e= (ICompletionProposalExtension2) p; + if (p instanceof ICompletionProposalExtension2 e) { if (e.validate(document, offset, event)) return true; - } else if (p instanceof ICompletionProposalExtension) { - ICompletionProposalExtension e= (ICompletionProposalExtension) p; + } else if (p instanceof ICompletionProposalExtension e) { if (e.isValidFor(document, offset)) return true; } @@ -684,8 +676,7 @@ public void documentChanged(DocumentEvent event) { document.addDocumentListener(fDocumentListener); - if (fViewer instanceof IEditingSupportRegistry) { - IEditingSupportRegistry registry= (IEditingSupportRegistry) fViewer; + if (fViewer instanceof IEditingSupportRegistry registry) { registry.register(fFocusEditingSupport); } @@ -787,8 +778,7 @@ public boolean verifyKey(VerifyEvent e) { default: ICompletionProposal p= getSelectedProposal(); - if (p instanceof ICompletionProposalExtension) { - ICompletionProposalExtension t= (ICompletionProposalExtension) p; + if (p instanceof ICompletionProposalExtension t) { char[] triggers= t.getTriggerCharacters(); if (contains(triggers, key)) { hide(); @@ -931,15 +921,13 @@ private ICompletionProposal[] computeFilteredProposals(int offset, DocumentEvent List filtered= new ArrayList<>(length); for (int i= 0; i < length; i++) { - if (proposals[i] instanceof ICompletionProposalExtension2) { + if (proposals[i] instanceof ICompletionProposalExtension2 p) { - ICompletionProposalExtension2 p= (ICompletionProposalExtension2) proposals[i]; if (p.validate(document, offset, event)) filtered.add(p); - } else if (proposals[i] instanceof ICompletionProposalExtension) { + } else if (proposals[i] instanceof ICompletionProposalExtension p) { - ICompletionProposalExtension p= (ICompletionProposalExtension) proposals[i]; if (p.isValidFor(document, offset)) filtered.add(p); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java index 7a6042143dc..8fbda719750 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java @@ -822,8 +822,7 @@ private void manageAutoActivation(boolean start) { if (fViewer != null && fAutoAssistListener == null) { fAutoAssistListener= new AutoAssistListener(); - if (fViewer instanceof ITextViewerExtension) { - ITextViewerExtension extension= (ITextViewerExtension) fViewer; + if (fViewer instanceof ITextViewerExtension extension) { extension.appendVerifyKeyListener(fAutoAssistListener); } else { StyledText textWidget= fViewer.getTextWidget(); @@ -834,8 +833,7 @@ private void manageAutoActivation(boolean start) { } else if (fAutoAssistListener != null) { - if (fViewer instanceof ITextViewerExtension) { - ITextViewerExtension extension= (ITextViewerExtension) fViewer; + if (fViewer instanceof ITextViewerExtension extension) { extension.removeVerifyKeyListener(fAutoAssistListener); } else { StyledText textWidget= fViewer.getTextWidget(); @@ -1096,11 +1094,9 @@ private boolean acquireWidgetToken(int type) { switch (type) { case CONTEXT_SELECTOR: case PROPOSAL_SELECTOR: - if (fViewer instanceof IWidgetTokenOwner) { - IWidgetTokenOwner owner= (IWidgetTokenOwner) fViewer; + if (fViewer instanceof IWidgetTokenOwner owner) { return owner.requestWidgetToken(this); - } else if (fViewer instanceof IWidgetTokenOwnerExtension) { - IWidgetTokenOwnerExtension extension= (IWidgetTokenOwnerExtension) fViewer; + } else if (fViewer instanceof IWidgetTokenOwnerExtension extension) { return extension.requestWidgetToken(this, WIDGET_PRIORITY); } } @@ -1149,8 +1145,7 @@ private void installKeyListener() { StyledText text= fViewer.getTextWidget(); if (isValid(text)) { - if (fViewer instanceof ITextViewerExtension) { - ITextViewerExtension e= (ITextViewerExtension) fViewer; + if (fViewer instanceof ITextViewerExtension e) { e.prependVerifyKeyListener(fInternalListener); } else { text.addVerifyKeyListener(fInternalListener); @@ -1177,8 +1172,7 @@ private void installKeyListener() { */ private void releaseWidgetToken(int type) { if (fListeners[CONTEXT_SELECTOR] == null && fListeners[PROPOSAL_SELECTOR] == null) { - if (fViewer instanceof IWidgetTokenOwner) { - IWidgetTokenOwner owner= (IWidgetTokenOwner) fViewer; + if (fViewer instanceof IWidgetTokenOwner owner) { owner.releaseWidgetToken(this); } } @@ -1217,8 +1211,7 @@ private void uninstallKeyListener() { StyledText text= fViewer.getTextWidget(); if (isValid(text)) { - if (fViewer instanceof ITextViewerExtension) { - ITextViewerExtension e= (ITextViewerExtension) fViewer; + if (fViewer instanceof ITextViewerExtension e) { e.removeVerifyKeyListener(fInternalListener); } else { text.removeVerifyKeyListener(fInternalListener); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java index 68005bfa7a4..007a6df1303 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java @@ -164,7 +164,7 @@ private void internalShowContextInfo(IContextInformation information, int offset if (validator != null) { ContextFrame current= new ContextFrame(); current.fInformation= information; - current.fBeginOffset= (information instanceof IContextInformationExtension) ? ((IContextInformationExtension) information).getContextInformationPosition() : offset; + current.fBeginOffset= (information instanceof IContextInformationExtension i) ? i.getContextInformationPosition() : offset; if (current.fBeginOffset == -1) current.fBeginOffset= offset; current.fOffset= offset; current.fVisibleOffset= fViewer.getTextWidget().getSelectionRange().x - (offset - current.fBeginOffset); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java index 29462b4848a..ad99a793f9f 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java @@ -67,8 +67,7 @@ public int hashCode() { public boolean equals(Object obj) { if (obj == this) return true; - if (obj instanceof Hunk) { - Hunk other= (Hunk) obj; + if (obj instanceof Hunk other) { return other.line == this.line && other.delta == this.delta && other.changed == this.changed; } return false; diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java index 0bf666e140c..99870496d46 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java @@ -1054,8 +1054,7 @@ private static int end(ILineRange range) { private ILineRange modelLinesToWidgetLines(ILineRange range) { int widgetStartLine= -1; int widgetEndLine= -1; - if (fViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fViewer; + if (fViewer instanceof ITextViewerExtension5 extension) { int modelEndLine= end(range); for (int modelLine= range.getStartLine(); modelLine < modelEndLine; modelLine++) { int widgetLine= extension.modelLine2WidgetLine(modelLine); @@ -1130,8 +1129,7 @@ private void updateOverviewAnnotations() { } } - if (fAnnotationModel instanceof IAnnotationModelExtension) { - IAnnotationModelExtension ext= (IAnnotationModelExtension) fAnnotationModel; + if (fAnnotationModel instanceof IAnnotationModelExtension ext) { ext.replaceAnnotations(fAnnotations.toArray(new Annotation[fAnnotations.size()]), added); } else { for (Annotation annotation : fAnnotations) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java index 842bd796138..e5b1a299768 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java @@ -57,8 +57,7 @@ public PostSelectionListener(IPostSelectionProvider postProvider) { @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection= event.getSelection(); - if (selection instanceof ITextSelection) { - ITextSelection ts= (ITextSelection) selection; + if (selection instanceof ITextSelection ts) { int offset= ts.getOffset(); setSelectedRevision(fPainter.getRevision(offset)); } @@ -144,8 +143,7 @@ void install(ITextViewer viewer) { fViewer= viewer; if (fViewer != null) { ISelectionProvider provider= fViewer.getSelectionProvider(); - if (provider instanceof IPostSelectionProvider) { - IPostSelectionProvider postProvider= (IPostSelectionProvider) provider; + if (provider instanceof IPostSelectionProvider postProvider) { fSelectionListener= new PostSelectionListener(postProvider); } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java index f35accda33f..b748887c7b8 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java @@ -122,8 +122,7 @@ public void start(Rectangle subjectArea) { fSubjectControl.addMouseMoveListener(this); fSubjectControl.addControlListener(this); fSubjectControl.addKeyListener(this); - if (fSubjectControl instanceof Scrollable) { - Scrollable scrollable= (Scrollable) fSubjectControl; + if (fSubjectControl instanceof Scrollable scrollable) { ScrollBar vBar= scrollable.getVerticalBar(); if (vBar != null) vBar.addSelectionListener(this); @@ -164,8 +163,7 @@ public void stop() { fSubjectControl.removeMouseMoveListener(this); fSubjectControl.removeControlListener(this); fSubjectControl.removeKeyListener(this); - if (fSubjectControl instanceof Scrollable) { - Scrollable scrollable= (Scrollable) fSubjectControl; + if (fSubjectControl instanceof Scrollable scrollable) { ScrollBar vBar= scrollable.getVerticalBar(); if (vBar != null) vBar.removeSelectionListener(this); @@ -257,9 +255,7 @@ public void handleEvent(Event event) { else if (!isReplaceInProgress()) { IInformationControl infoControl= getCurrentInformationControl(); // During isReplaceInProgress(), events can come from the replacing information control - if (event.widget instanceof Control && infoControl instanceof IInformationControlExtension5) { - Control control= (Control) event.widget; - IInformationControlExtension5 iControl5= (IInformationControlExtension5) infoControl; + if (event.widget instanceof Control control && infoControl instanceof IInformationControlExtension5 iControl5) { if (!(iControl5.containsControl(control))) hideInformationControl(); else if (event.type == SWT.MouseVerticalWheel && cancelReplacingDelay()) @@ -276,16 +272,13 @@ else if (event.type == SWT.MouseVerticalWheel && cancelReplacingDelay()) hideInformationControl(); else if (!isReplaceInProgress()) { IInformationControl infoControl= getCurrentInformationControl(); - if (event.widget instanceof Control && infoControl instanceof IInformationControlExtension5) { - Control control= (Control) event.widget; - final IInformationControlExtension5 iControl5= (IInformationControlExtension5) infoControl; + if (event.widget instanceof Control control && infoControl instanceof final IInformationControlExtension5 iControl5) { if (!(iControl5.containsControl(control))) { hideInformationControl(); } else if (cancelReplacingDelay()) { if (event.type == SWT.MouseUp) { stop(); // avoid that someone else replaces the info control before the async is exec'd - if (infoControl instanceof IDelayedInputChangeProvider) { - final IDelayedInputChangeProvider delayedICP= (IDelayedInputChangeProvider) infoControl; + if (infoControl instanceof final IDelayedInputChangeProvider delayedICP) { final IInputChangedListener inputChangeListener= new DelayedInputChangeListener(delayedICP, getInformationControlReplacer()); delayedICP.setDelayedInputChangeListener(inputChangeListener); // cancel automatic input updating after a small timeout: @@ -328,10 +321,8 @@ private void handleMouseMove(Event event) { // if (DEBUG) // System.out.println("AbstractHoverInformationControl.Closer.handleMouseMove():" + event); //$NON-NLS-1$ - if (!(event.widget instanceof Control)) + if (!(event.widget instanceof Control eventControl)) return; - Control eventControl= (Control) event.widget; - //transform coordinates to subject control: Point mouseLoc= event.display.map(eventControl, fSubjectControl, event.x, event.y); @@ -680,9 +671,7 @@ private boolean inKeepUpZone(int x, int y, Control subjectControl, Rectangle sub } } } - if (iControl instanceof IInformationControlExtension3) { - IInformationControlExtension3 iControl3= (IInformationControlExtension3) iControl; - + if (iControl instanceof IInformationControlExtension3 iControl3) { Rectangle iControlBounds= subjectControl.getDisplay().map(null, subjectControl, iControl3.getBounds()); Rectangle totalBounds= Geometry.copy(iControlBounds); if (blowUp && isReplaceInProgress()) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java index c04dfda403b..43f5179c973 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java @@ -610,8 +610,7 @@ public void setFallbackAnchors(Anchor[] fallbackAnchors) { * @since 3.0 */ protected void setCustomInformationControlCreator(IInformationControlCreator informationControlCreator) { - if (informationControlCreator != null && fCustomInformationControlCreator instanceof IInformationControlCreatorExtension) { - IInformationControlCreatorExtension extension= (IInformationControlCreatorExtension) fCustomInformationControlCreator; + if (informationControlCreator != null && fCustomInformationControlCreator instanceof IInformationControlCreatorExtension extension) { if (extension.canReplace(informationControlCreator)) return; } @@ -734,8 +733,7 @@ protected boolean isEnabled() { protected Point computeSizeConstraints(Control subjectControl, IInformationControl informationControl) { if (fSizeConstraints == null) { - if (informationControl instanceof IInformationControlExtension5) { - IInformationControlExtension5 iControl5= (IInformationControlExtension5) informationControl; + if (informationControl instanceof IInformationControlExtension5 iControl5) { fSizeConstraints= iControl5.computeSizeConstraints(fWidthConstraint, fHeightConstraint); if (fSizeConstraints != null) return Geometry.copy(fSizeConstraints); @@ -811,8 +809,7 @@ protected IInformationControl getInformationControl() { } else { creator= fCustomInformationControlCreator; - if (creator instanceof IInformationControlCreatorExtension) { - IInformationControlCreatorExtension extension= (IInformationControlCreatorExtension) creator; + if (creator instanceof IInformationControlCreatorExtension extension) { if (fInformationControl != null && extension.canReuse(fInformationControl)) return fInformationControl; } @@ -1139,8 +1136,7 @@ private void internalShowInformationControl(Rectangle subjectArea, Object inform if (informationControl != null) { Point sizeConstraints= computeSizeConstraints(fSubjectControl, fSubjectArea, informationControl); - if (informationControl instanceof IInformationControlExtension3) { - IInformationControlExtension3 iControl3= (IInformationControlExtension3) informationControl; + if (informationControl instanceof IInformationControlExtension3 iControl3) { Rectangle trim= iControl3.computeTrim(); sizeConstraints.x += trim.width; sizeConstraints.y += trim.height; @@ -1152,8 +1148,7 @@ private void internalShowInformationControl(Rectangle subjectArea, Object inform else informationControl.setInformation(information.toString()); - if (informationControl instanceof IInformationControlExtension) { - IInformationControlExtension extension= (IInformationControlExtension)informationControl; + if (informationControl instanceof IInformationControlExtension extension) { if (!extension.hasContents()) return; } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java index 6ecd48d1d09..4b871900019 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java @@ -137,8 +137,7 @@ private boolean updateHighlightLine() { */ private int getModelCaret() { int widgetCaret= fViewer.getTextWidget().getCaretOffset(); - if (fViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fViewer; + if (fViewer instanceof ITextViewerExtension5 extension) { return extension.widgetOffset2ModelOffset(widgetCaret); } IRegion visible= fViewer.getVisibleRegion(); @@ -157,9 +156,8 @@ private void drawHighlightLine(Position position) { return; int widgetOffset= 0; - if (fViewer instanceof ITextViewerExtension5) { + if (fViewer instanceof ITextViewerExtension5 extension) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fViewer; widgetOffset= extension.modelOffset2WidgetOffset(position.getOffset()); if (widgetOffset == -1) return; diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java index 76959053574..3114883ddd9 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java @@ -126,8 +126,7 @@ public void removeTextChangeListener(TextChangeListener listener) { * @since 3.0 */ private void repairLineInformation(IDocument document) { - if (document instanceof IRepairableDocument) { - IRepairableDocument repairable= (IRepairableDocument) document; + if (document instanceof IRepairableDocument repairable) { repairable.repairLineInformation(); } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java index 73c1c4ebff1..4482c6473c9 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java @@ -87,8 +87,7 @@ protected boolean isIncluded(Annotation annotation) { } private IAnnotationModel getAnnotationModel(ISourceViewer viewer) { - if (viewer instanceof ISourceViewerExtension2) { - ISourceViewerExtension2 extension= (ISourceViewerExtension2) viewer; + if (viewer instanceof ISourceViewerExtension2 extension) { return extension.getVisualAnnotationModel(); } return viewer.getAnnotationModel(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java index 4d1f21c652b..e40932c70ea 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java @@ -1278,8 +1278,7 @@ public void undo() { * @since 3.0 */ protected void selectAndReveal(int offset, int length) { - if (fTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fTextViewer; + if (fTextViewer instanceof ITextViewerExtension5 extension) { extension.exposeModelRange(new Region(offset, length)); } else if (!fTextViewer.overlapsWithVisibleRegion(offset, length)) fTextViewer.resetVisibleRegion(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java index a941d33b64f..43782181eb6 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java @@ -108,9 +108,8 @@ public int compareTo(Command object) { private boolean isEqual(Object object) { if (object == this) return true; - if (!(object instanceof Command)) + if (!(object instanceof final Command command)) return false; - final Command command= (Command) object; return command.fOffset == fOffset && command.fLength == fLength; } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/JFaceTextUtil.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/JFaceTextUtil.java index 2421c354d83..86d8cab3533 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/JFaceTextUtil.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/JFaceTextUtil.java @@ -216,8 +216,7 @@ public static ILineRange getVisibleModelLines(ITextViewer viewer) { */ public static int widgetLine2ModelLine(ITextViewer viewer, int widgetLine) { int modelLine; - if (viewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) viewer; + if (viewer instanceof ITextViewerExtension5 extension) { modelLine= extension.widgetLine2ModelLine(widgetLine); } else { try { @@ -245,8 +244,7 @@ public static int widgetLine2ModelLine(ITextViewer viewer, int widgetLine) { */ public static int modelLineToWidgetLine(ITextViewer viewer, final int modelLine) { int widgetLine; - if (viewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) viewer; + if (viewer instanceof ITextViewerExtension5 extension) { widgetLine= extension.modelLine2WidgetLine(modelLine); } else { IRegion region= viewer.getVisibleRegion(); @@ -365,8 +363,7 @@ public static Rectangle computeArea(IRegion region, ITextViewer textViewer) { * @since 3.4 */ private static IRegion modelRange2WidgetRange(IRegion region, ITextViewer textViewer) { - if (textViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) textViewer; + if (textViewer instanceof ITextViewerExtension5 extension) { return extension.modelRange2WidgetRange(region); } @@ -451,8 +448,7 @@ public static int getOffsetForCursorLocation(ITextViewer viewer) { widgetOffset--; } - if (viewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5)viewer; + if (viewer instanceof ITextViewerExtension5 extension) { return extension.widgetOffset2ModelOffset(widgetOffset); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java index 0bda43e1042..ac4aea7da22 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java @@ -108,10 +108,8 @@ public boolean equals(Object object) { if (object == this) return true; - if (!(object instanceof TextAttribute)) + if (!(object instanceof TextAttribute a)) return false; - TextAttribute a= (TextAttribute)object; - return (a.style == style && equals(a.foreground, foreground) && equals(a.background, background) && equals(a.font, font)); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java index e7cadf23cdb..6174d4451fa 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java @@ -172,8 +172,7 @@ public void setEvent(DocumentEvent e) { if (length != 0) { try { - if (e instanceof SlaveDocumentEvent) { - SlaveDocumentEvent slave= (SlaveDocumentEvent) e; + if (e instanceof SlaveDocumentEvent slave) { DocumentEvent master= slave.getMasterEvent(); if (master != null) preservedText= master.getDocument().get(master.getOffset(), master.getLength()); @@ -956,8 +955,7 @@ public void setReplaceAllMode(boolean replaceAll) { if (replaceAll) { - if (document instanceof IDocumentExtension4) { - IDocumentExtension4 extension= (IDocumentExtension4) document; + if (document instanceof IDocumentExtension4 extension) { fRewriteSession= extension.startRewriteSession(DocumentRewriteSessionType.SEQUENTIAL); } else { TextViewer.this.setRedraw(false); @@ -971,8 +969,7 @@ public void setReplaceAllMode(boolean replaceAll) { } else { - if (document instanceof IDocumentExtension4) { - IDocumentExtension4 extension= (IDocumentExtension4) document; + if (document instanceof IDocumentExtension4 extension) { extension.stopRewriteSession(fRewriteSession); } else { TextViewer.this.setRedraw(true); @@ -1162,8 +1159,7 @@ public void restore(boolean restoreViewport) { if (isConnected()) disconnect(); if (fSelections != null && fSelections.length > 0) { - if (fSelections[0] instanceof ColumnPosition) { - ColumnPosition cp= (ColumnPosition) fSelections[0]; + if (fSelections[0] instanceof ColumnPosition cp) { IDocument document= fDocument; try { int startLine= document.getLineOfOffset(cp.getOffset()); @@ -1233,13 +1229,11 @@ private void connect(IDocument document) { fUpdaterDocument.addPositionUpdater(fUpdater); ISelection selection= TextViewer.this.getSelection(); - if (selection instanceof IBlockTextSelection) { - IBlockTextSelection bts= (IBlockTextSelection) selection; + if (selection instanceof IBlockTextSelection bts) { int startVirtual= Math.max(0, bts.getStartColumn() - document.getLineInformationOfOffset(bts.getOffset()).getLength()); int endVirtual= Math.max(0, bts.getEndColumn() - document.getLineInformationOfOffset(bts.getOffset() + bts.getLength()).getLength()); fSelections= new Position[] { new ColumnPosition(bts.getOffset(), bts.getLength(), startVirtual, endVirtual) }; - } else if (selection instanceof IMultiTextSelection && ((IMultiTextSelection) selection).getRegions().length > 1) { - IMultiTextSelection multiSelection= (IMultiTextSelection) selection; + } else if (selection instanceof IMultiTextSelection multiSelection && multiSelection.getRegions().length > 1) { fSelections= Arrays.stream(multiSelection.getRegions()) .map(region -> new Position(region.getOffset(), region.getLength())) .toArray(Position[]::new); @@ -2234,8 +2228,7 @@ public boolean requestWidgetToken(IWidgetTokenKeeper requester, int priority) { return true; boolean accepted= false; - if (fWidgetTokenKeeper instanceof IWidgetTokenKeeperExtension) { - IWidgetTokenKeeperExtension extension= (IWidgetTokenKeeperExtension) fWidgetTokenKeeper; + if (fWidgetTokenKeeper instanceof IWidgetTokenKeeperExtension extension) { accepted= extension.requestWidgetToken(this, priority); } else { accepted= fWidgetTokenKeeper.requestWidgetToken(this); @@ -2432,9 +2425,7 @@ protected void validateSelectionRange(int[] selectionRange) { @Override public void setSelection(ISelection selection, boolean reveal) { - if (selection instanceof IBlockTextSelection && getTextWidget().getBlockSelection()) { - IBlockTextSelection s= (IBlockTextSelection) selection; - + if (selection instanceof IBlockTextSelection s && getTextWidget().getBlockSelection()) { try { int startLine= s.getStartLine(); int endLine= s.getEndLine(); @@ -2471,16 +2462,14 @@ public void setSelection(ISelection selection, boolean reveal) { } if (reveal) revealRange(s.getOffset(), s.getLength()); - } else if (selection instanceof IMultiTextSelection && ((IMultiTextSelection) selection).getRegions().length > 1) { - IMultiTextSelection multiSelection= (IMultiTextSelection) selection; + } else if (selection instanceof IMultiTextSelection multiSelection && multiSelection.getRegions().length > 1) { setSelectedRanges(Arrays.stream(multiSelection.getRegions()) .map(region -> new Region(region.getOffset(), region.getLength())) .toArray(IRegion[]::new)); if (reveal && multiSelection.getRegions().length > 0) { revealRange(multiSelection.getRegions()[0].getOffset(), multiSelection.getRegions()[0].getLength()); } - } else if (selection instanceof ITextSelection) { - ITextSelection s= (ITextSelection) selection; + } else if (selection instanceof ITextSelection s) { setSelectedRange(s.getOffset(), s.getLength()); if (reveal) revealRange(s.getOffset(), s.getLength()); @@ -2956,9 +2945,7 @@ protected IDocument createSlaveDocument(IDocument document) { */ @Deprecated protected boolean updateVisibleDocument(IDocument visibleDocument, int visibleRegionOffset, int visibleRegionLength) throws BadLocationException { - if (visibleDocument instanceof ChildDocument) { - ChildDocument childDocument= (ChildDocument) visibleDocument; - + if (visibleDocument instanceof ChildDocument childDocument) { IDocument document= childDocument.getParentDocument(); int line= document.getLineOfOffset(visibleRegionOffset); int offset= document.getLineOffset(line); @@ -3557,8 +3544,7 @@ protected IDocument getVisibleDocument() { protected int _getVisibleRegionOffset() { IDocument document= getVisibleDocument(); - if (document instanceof ChildDocument) { - ChildDocument cdoc= (ChildDocument) document; + if (document instanceof ChildDocument cdoc) { return cdoc.getParentDocumentRange().getOffset(); } @@ -3580,8 +3566,7 @@ public IRegion getVisibleRegion() { @Override public boolean overlapsWithVisibleRegion(int start, int length) { IDocument document= getVisibleDocument(); - if (document instanceof ChildDocument) { - ChildDocument cdoc= (ChildDocument) document; + if (document instanceof ChildDocument cdoc) { return cdoc.getParentDocumentRange().overlapsWith(start, length); } else if (document != null) { int size= document.getLength(); @@ -4108,8 +4093,7 @@ protected void ignoreAutoEditStrategies(boolean ignore) { fIgnoreAutoIndent= ignore; IDocument document= getDocument(); - if (document instanceof IDocumentExtension2) { - IDocumentExtension2 extension= (IDocumentExtension2) document; + if (document instanceof IDocumentExtension2 extension) { if (ignore) extension.ignorePostNotificationReplaces(); else @@ -4329,8 +4313,7 @@ protected void shift(boolean useDefaultPrefixes, boolean right, boolean ignoreWh lineCount += lines[j + 1] - lines[j] + 1; } - if (d instanceof IDocumentExtension4) { - IDocumentExtension4 extension= (IDocumentExtension4) d; + if (d instanceof IDocumentExtension4 extension) { rewriteSession= extension.startRewriteSession(DocumentRewriteSessionType.SEQUENTIAL); } else { setRedraw(false); @@ -4360,8 +4343,7 @@ protected void shift(boolean useDefaultPrefixes, boolean right, boolean ignoreWh if (partitioners != null) TextUtilities.addDocumentPartitioners(d, partitioners); - if (d instanceof IDocumentExtension4) { - IDocumentExtension4 extension= (IDocumentExtension4) d; + if (d instanceof IDocumentExtension4 extension) { extension.stopRewriteSession(rewriteSession); } else { stopSequentialRewriteMode(); @@ -4973,15 +4955,13 @@ protected void inputChanged(Object newInput, Object oldInput) { fMarkPosition= null; - if (oldDocument instanceof IDocumentExtension4) { - IDocumentExtension4 document= (IDocumentExtension4) oldDocument; + if (oldDocument instanceof IDocumentExtension4 document) { document.removeDocumentRewriteSessionListener(fDocumentRewriteSessionListener); } super.inputChanged(newInput, oldInput); - if (newInput instanceof IDocumentExtension4) { - IDocumentExtension4 document= (IDocumentExtension4) newInput; + if (newInput instanceof IDocumentExtension4 document) { document.addDocumentRewriteSessionListener(fDocumentRewriteSessionListener); } @@ -5018,8 +4998,7 @@ protected void enabledRedrawing() { * @since 3.0 */ protected void enabledRedrawing(int topIndex) { - if (fDocumentAdapter instanceof IDocumentAdapterExtension) { - IDocumentAdapterExtension extension= (IDocumentAdapterExtension) fDocumentAdapter; + if (fDocumentAdapter instanceof IDocumentAdapterExtension extension) { StyledText textWidget= getTextWidget(); if (textWidget != null && !textWidget.isDisposed()) { extension.resumeForwardingDocumentChanges(); @@ -5052,8 +5031,7 @@ protected void disableRedrawing() { if (fViewerState == null) fViewerState= new ViewerState(); - if (fDocumentAdapter instanceof IDocumentAdapterExtension) { - IDocumentAdapterExtension extension= (IDocumentAdapterExtension) fDocumentAdapter; + if (fDocumentAdapter instanceof IDocumentAdapterExtension extension) { extension.stopForwardingDocumentChanges(); } @@ -5118,8 +5096,7 @@ protected final boolean redraws() { @Deprecated protected final void startSequentialRewriteMode(boolean normalized) { IDocument document= getDocument(); - if (document instanceof IDocumentExtension) { - IDocumentExtension extension= (IDocumentExtension) document; + if (document instanceof IDocumentExtension extension) { extension.startSequentialRewrite(normalized); } } @@ -5133,8 +5110,7 @@ protected final void startSequentialRewriteMode(boolean normalized) { @Deprecated protected final void stopSequentialRewriteMode() { IDocument document= getDocument(); - if (document instanceof IDocumentExtension) { - IDocumentExtension extension= (IDocumentExtension) document; + if (document instanceof IDocumentExtension extension) { extension.stopSequentialRewrite(); } } @@ -5521,8 +5497,7 @@ public int widgetLineOfWidgetOffset(int widgetOffset) { @Override public boolean moveFocusToWidgetToken() { - if (fWidgetTokenKeeper instanceof IWidgetTokenKeeperExtension) { - IWidgetTokenKeeperExtension extension= (IWidgetTokenKeeperExtension) fWidgetTokenKeeper; + if (fWidgetTokenKeeper instanceof IWidgetTokenKeeperExtension extension) { return extension.setFocus(this); } return false; diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java index dcb48480598..3f3136e121d 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java @@ -259,8 +259,7 @@ private int computeOffsetAtLocation(int x, int y) { widgetOffset--; } - if (fTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fTextViewer; + if (fTextViewer instanceof ITextViewerExtension5 extension) { return extension.widgetOffset2ModelOffset(widgetOffset); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java index edfe22ca667..722b95c2dfc 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java @@ -378,8 +378,7 @@ public void undo() { * @param length the length of the range */ private void selectAndReveal(int offset, int length) { - if (fTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fTextViewer; + if (fTextViewer instanceof ITextViewerExtension5 extension) { extension.exposeModelRange(new Region(offset, length)); } else if (!fTextViewer.overlapsWithVisibleRegion(offset, length)) fTextViewer.resetVisibleRegion(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java index 3e57e35a2bb..8cddd155a2b 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java @@ -478,8 +478,7 @@ private static final boolean isOffsetSelected(StyledText widget, int offset) { * @return true if the line is folded */ private boolean isFoldedLine(int widgetLine) { - if (fTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5)fTextViewer; + if (fTextViewer instanceof ITextViewerExtension5 extension) { int modelLine= extension.widgetLine2ModelLine(widgetLine); int widgetLine2= extension.modelLine2WidgetLine(modelLine + 1); return widgetLine2 == -1; diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/codemining/DocumentFooterCodeMining.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/codemining/DocumentFooterCodeMining.java index 622e62e39df..f1c8889f10c 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/codemining/DocumentFooterCodeMining.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/codemining/DocumentFooterCodeMining.java @@ -10,7 +10,6 @@ ******************************************************************************/ package org.eclipse.jface.text.codemining; -import java.util.concurrent.Callable; import java.util.function.Consumer; import org.eclipse.swt.custom.StyledText; @@ -35,12 +34,6 @@ public DocumentFooterCodeMining(IDocument document, ICodeMiningProvider provider @Override public Point draw(GC gc, StyledText textWidget, Color color, int x, int y) { - return LineHeaderCodeMining.draw(getLabel(), gc, textWidget, x, y, new Callable() { - - @Override - public Point call() throws Exception { - return DocumentFooterCodeMining.super.draw(gc, textWidget, color, x, y); - } - }); + return LineHeaderCodeMining.draw(getLabel(), gc, textWidget, x, y, () -> DocumentFooterCodeMining.super.draw(gc, textWidget, color, x, y)); } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/codemining/LineHeaderCodeMining.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/codemining/LineHeaderCodeMining.java index 95b9f28e126..0dac2b87f92 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/codemining/LineHeaderCodeMining.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/codemining/LineHeaderCodeMining.java @@ -80,13 +80,7 @@ public LineHeaderCodeMining(Position position, ICodeMiningProvider provider, Con @Override public Point draw(GC gc, StyledText textWidget, Color color, int x, int y) { - return draw(getLabel(), gc, textWidget, x, y, new Callable() { - - @Override - public Point call() throws Exception { - return LineHeaderCodeMining.super.draw(gc, textWidget, color, x, y); - } - }); + return draw(getLabel(), gc, textWidget, x, y, () -> LineHeaderCodeMining.super.draw(gc, textWidget, color, x, y)); } static Point draw(String label, GC gc, StyledText textWidget, int x, int y, Callable superDrawCallable) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java index 3333639be6b..4ffe8063a06 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java @@ -513,8 +513,7 @@ public void handleTableSelectionChanged() { TableItem item= selection[0]; Object d= item.getData(); - if (d instanceof ICompletionProposal) { - ICompletionProposal p= (ICompletionProposal) d; + if (d instanceof ICompletionProposal p) { Timer timer= fTimer; if (timer != null) { timer.reset(p); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java index f426f8b7ce8..d87fe7aaee1 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java @@ -980,25 +980,21 @@ public boolean ownsFocusShell() { try { IDocument document= fContentAssistSubjectControlAdapter.getDocument(); - if (fViewer instanceof ITextViewerExtension) { - ITextViewerExtension extension= (ITextViewerExtension) fViewer; + if (fViewer instanceof ITextViewerExtension extension) { target= extension.getRewriteTarget(); } if (target != null) target.beginCompoundChange(); - if (fViewer instanceof IEditingSupportRegistry) { - IEditingSupportRegistry registry= (IEditingSupportRegistry) fViewer; + if (fViewer instanceof IEditingSupportRegistry registry) { registry.register(helper); } - if (p instanceof ICompletionProposalExtension2 && fViewer != null) { - ICompletionProposalExtension2 e= (ICompletionProposalExtension2) p; + if (p instanceof ICompletionProposalExtension2 e && fViewer != null) { e.apply(fViewer, trigger, stateMask, offset); - } else if (p instanceof ICompletionProposalExtension) { - ICompletionProposalExtension e= (ICompletionProposalExtension) p; + } else if (p instanceof ICompletionProposalExtension e) { e.apply(document, trigger, offset); } else { p.apply(document); @@ -1015,8 +1011,7 @@ public boolean ownsFocusShell() { if (info != null) { int contextInformationOffset; - if (p instanceof ICompletionProposalExtension) { - ICompletionProposalExtension e= (ICompletionProposalExtension) p; + if (p instanceof ICompletionProposalExtension e) { contextInformationOffset= e.getContextInformationPosition(); } else { if (selection == null) @@ -1033,8 +1028,7 @@ public boolean ownsFocusShell() { if (target != null) target.endCompoundChange(); - if (fViewer instanceof IEditingSupportRegistry) { - IEditingSupportRegistry registry= (IEditingSupportRegistry) fViewer; + if (fViewer instanceof IEditingSupportRegistry registry) { registry.unregister(helper); } fInserting= false; @@ -1079,8 +1073,7 @@ public void hide() { unregister(); - if (fViewer instanceof IEditingSupportRegistry) { - IEditingSupportRegistry registry= (IEditingSupportRegistry) fViewer; + if (fViewer instanceof IEditingSupportRegistry registry) { registry.unregister(fFocusHelper); } @@ -1130,8 +1123,7 @@ private void unregister() { } if (fLastProposal != null) { - if (fLastProposal instanceof ICompletionProposalExtension2 && fViewer != null) { - ICompletionProposalExtension2 extension= (ICompletionProposalExtension2) fLastProposal; + if (fLastProposal instanceof ICompletionProposalExtension2 extension && fViewer != null) { extension.unselected(fViewer); } fLastProposal= null; @@ -1266,8 +1258,7 @@ public boolean ownsFocusShell() { }; } - if (fViewer instanceof IEditingSupportRegistry) { - IEditingSupportRegistry registry= (IEditingSupportRegistry) fViewer; + if (fViewer instanceof IEditingSupportRegistry registry) { registry.register(fFocusHelper); } @@ -1413,8 +1404,7 @@ public boolean verifyKey(VerifyEvent e) { default: if (fContentAssistant.isCompletionProposalTriggerCharsEnabled()) { ICompletionProposal p= getSelectedProposal(); - if (p instanceof ICompletionProposalExtension) { - ICompletionProposalExtension t= (ICompletionProposalExtension) p; + if (p instanceof ICompletionProposalExtension t) { char[] triggers= t.getTriggerCharacters(); if (contains(triggers, key)) { e.doit= false; @@ -1563,18 +1553,16 @@ List computeFilteredProposals(int offset, DocumentEvent eve List filtered= new ArrayList<>(length); for (ICompletionProposal proposal : proposals) { - if (proposal instanceof ICompletionProposalExtension2) { + if (proposal instanceof ICompletionProposalExtension2 p) { - ICompletionProposalExtension2 p= (ICompletionProposalExtension2) proposal; try { if (p.validate(document, offset, event)) filtered.add(proposal); } catch (RuntimeException e) { // Make sure that poorly behaved completion proposers do not break filtering. } - } else if (proposal instanceof ICompletionProposalExtension) { + } else if (proposal instanceof ICompletionProposalExtension p) { - ICompletionProposalExtension p= (ICompletionProposalExtension) proposal; try { if (p.isValidFor(document, offset)) filtered.add(proposal); @@ -1616,8 +1604,7 @@ public void setFocus() { */ boolean canAutoInsert(ICompletionProposal proposal) { if (fContentAssistant.isAutoInserting()) { - if (proposal instanceof ICompletionProposalExtension4) { - ICompletionProposalExtension4 ext= (ICompletionProposalExtension4) proposal; + if (proposal instanceof ICompletionProposalExtension4 ext) { return ext.isAutoInsertable(); } return true; // default behavior before ICompletionProposalExtension4 was introduced diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java index bbec6b22266..f045753e91b 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java @@ -164,8 +164,7 @@ public IDocument getDocument() { public boolean prependVerifyKeyListener(VerifyKeyListener verifyKeyListener) { if (fContentAssistSubjectControl != null) { return fContentAssistSubjectControl.prependVerifyKeyListener(verifyKeyListener); - } else if (fViewer instanceof ITextViewerExtension) { - ITextViewerExtension e= (ITextViewerExtension) fViewer; + } else if (fViewer instanceof ITextViewerExtension e) { e.prependVerifyKeyListener(verifyKeyListener); return true; } else { @@ -183,8 +182,7 @@ public boolean prependVerifyKeyListener(VerifyKeyListener verifyKeyListener) { public boolean appendVerifyKeyListener(VerifyKeyListener verifyKeyListener) { if (fContentAssistSubjectControl != null) return fContentAssistSubjectControl.appendVerifyKeyListener(verifyKeyListener); - else if (fViewer instanceof ITextViewerExtension) { - ITextViewerExtension extension= (ITextViewerExtension)fViewer; + else if (fViewer instanceof ITextViewerExtension extension) { extension.appendVerifyKeyListener(verifyKeyListener); return true; } else { @@ -201,8 +199,7 @@ else if (fViewer instanceof ITextViewerExtension) { public void removeVerifyKeyListener(VerifyKeyListener verifyKeyListener) { if (fContentAssistSubjectControl != null) { fContentAssistSubjectControl.removeVerifyKeyListener(verifyKeyListener); - } else if (fViewer instanceof ITextViewerExtension) { - ITextViewerExtension extension= (ITextViewerExtension) fViewer; + } else if (fViewer instanceof ITextViewerExtension extension) { extension.removeVerifyKeyListener(verifyKeyListener); } else { StyledText textWidget= fViewer.getTextWidget(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java index a92d73cf265..3428fe00857 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java @@ -1711,17 +1711,13 @@ private boolean acquireWidgetToken(int type) { switch (type) { case CONTEXT_SELECTOR: case PROPOSAL_SELECTOR: - if (fContentAssistSubjectControl instanceof IWidgetTokenOwnerExtension) { - IWidgetTokenOwnerExtension extension= (IWidgetTokenOwnerExtension) fContentAssistSubjectControl; + if (fContentAssistSubjectControl instanceof IWidgetTokenOwnerExtension extension) { return extension.requestWidgetToken(this, WIDGET_PRIORITY); - } else if (fContentAssistSubjectControl instanceof IWidgetTokenOwner) { - IWidgetTokenOwner owner= (IWidgetTokenOwner) fContentAssistSubjectControl; + } else if (fContentAssistSubjectControl instanceof IWidgetTokenOwner owner) { return owner.requestWidgetToken(this); - } else if (fViewer instanceof IWidgetTokenOwnerExtension) { - IWidgetTokenOwnerExtension extension= (IWidgetTokenOwnerExtension) fViewer; + } else if (fViewer instanceof IWidgetTokenOwnerExtension extension) { return extension.requestWidgetToken(this, WIDGET_PRIORITY); - } else if (fViewer instanceof IWidgetTokenOwner) { - IWidgetTokenOwner owner= (IWidgetTokenOwner) fViewer; + } else if (fViewer instanceof IWidgetTokenOwner owner) { return owner.requestWidgetToken(this); } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java index ec9e7405778..b5701baf105 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java @@ -60,8 +60,7 @@ public ContextInformation(Image image, String contextDisplayString, String infor @Override public boolean equals(Object object) { - if (object instanceof IContextInformation) { - IContextInformation contextInformation= (IContextInformation) object; + if (object instanceof IContextInformation contextInformation) { boolean equals= fInformationDisplayString.equalsIgnoreCase(contextInformation.getInformationDisplayString()); if (fContextDisplayString != null) equals= equals && fContextDisplayString.equalsIgnoreCase(contextInformation.getContextDisplayString()); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java index efab33958ac..07266cbc3e7 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java @@ -94,8 +94,7 @@ public ContextFrame(IContextInformation information, int beginOffset, int offset @Override public boolean equals(Object obj) { - if (obj instanceof ContextFrame) { - ContextFrame frame= (ContextFrame) obj; + if (obj instanceof ContextFrame frame) { return fInformation.equals(frame.fInformation) && fBeginOffset == frame.fBeginOffset; } return super.equals(obj); @@ -291,7 +290,7 @@ private ContextFrame createContextFrame(IContextInformation information, int off IContextInformationValidator validator= fContentAssistSubjectControlAdapter.getContextInformationValidator(fContentAssistant, offset); if (validator != null) { - int beginOffset= (information instanceof IContextInformationExtension) ? ((IContextInformationExtension) information).getContextInformationPosition() : offset; + int beginOffset= (information instanceof IContextInformationExtension i) ? i.getContextInformationPosition() : offset; if (beginOffset == -1) beginOffset= offset; int visibleOffset= fContentAssistSubjectControlAdapter.getWidgetSelectionRange().x - (offset - beginOffset); IContextInformationPresenter presenter = fContentAssistSubjectControlAdapter.getContextInformationPresenter(fContentAssistant, offset); @@ -531,8 +530,7 @@ public void controlResized(ControlEvent e) { }); - if (fViewer instanceof ITextViewerExtension) { - final ITextViewerExtension textViewerExtension= (ITextViewerExtension)fViewer; + if (fViewer instanceof final ITextViewerExtension textViewerExtension) { final StyledText textWidget= fViewer.getTextWidget(); final VerifyKeyListener verifyListener= event -> { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java index 28d1e32dfa9..3d2cc5a139b 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java @@ -199,9 +199,7 @@ public void handleEvent(Event event) { else if (!fAdditionalInfoController.getInternalAccessor().isReplaceInProgress()) { IInformationControl infoControl= fAdditionalInfoController.getCurrentInformationControl2(); // During isReplaceInProgress(), events can come from the replacing information control - if (event.widget instanceof Control && infoControl instanceof IInformationControlExtension5) { - Control control= (Control) event.widget; - IInformationControlExtension5 iControl5= (IInformationControlExtension5) infoControl; + if (event.widget instanceof Control control && infoControl instanceof IInformationControlExtension5 iControl5) { if (!(iControl5.containsControl(control))) fAdditionalInfoController.hideInformationControl(); else if (event.type == SWT.MouseVerticalWheel) @@ -217,14 +215,11 @@ else if (event.type == SWT.MouseVerticalWheel) case SWT.MouseUp: if (fAdditionalInfoController == null || fAdditionalInfoController.getInternalAccessor().isReplaceInProgress()) break; - if (event.widget instanceof Control) { - Control control= (Control) event.widget; + if (event.widget instanceof Control control) { IInformationControl infoControl= fAdditionalInfoController.getCurrentInformationControl2(); - if (infoControl instanceof IInformationControlExtension5) { - final IInformationControlExtension5 iControl5= (IInformationControlExtension5) infoControl; + if (infoControl instanceof final IInformationControlExtension5 iControl5) { if (iControl5.containsControl(control)) { - if (infoControl instanceof IDelayedInputChangeProvider) { - final IDelayedInputChangeProvider delayedICP= (IDelayedInputChangeProvider) infoControl; + if (infoControl instanceof final IDelayedInputChangeProvider delayedICP) { final IInputChangedListener inputChangeListener= new DelayedInputChangeListener(delayedICP, fAdditionalInfoController.getInternalAccessor().getInformationControlReplacer()); delayedICP.setDelayedInputChangeListener(inputChangeListener); // cancel automatic input updating after a small timeout: @@ -244,9 +239,7 @@ else if (event.type == SWT.MouseVerticalWheel) InformationControlReplacer replacer= fAdditionalInfoController.getInternalAccessor().getInformationControlReplacer(); if (replacer != null && fContentAssistant != null) { IInformationControl iControl= replacer.getCurrentInformationControl2(); - if (event.widget instanceof Control && iControl instanceof IInformationControlExtension5) { - Control control= (Control) event.widget; - IInformationControlExtension5 iControl5= (IInformationControlExtension5) iControl; + if (event.widget instanceof Control control && iControl instanceof IInformationControlExtension5 iControl5) { if (iControl5.containsControl(control)) { control.getDisplay().asyncExec(() -> { if (fContentAssistant != null && !fContentAssistant.hasProposalPopupFocus()) diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java index eddea3a18dd..226adec7c62 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java @@ -305,8 +305,7 @@ protected void computeInformation() { return; Object info; - if (provider instanceof IInformationProviderExtension) { - IInformationProviderExtension extension= (IInformationProviderExtension) provider; + if (provider instanceof IInformationProviderExtension extension) { info= extension.getInformation2(fTextViewer, subject); } else { // backward compatibility code @@ -361,8 +360,7 @@ private Rectangle computeArea(IRegion region) { * @since 2.1 */ private IRegion modelRange2WidgetRange(IRegion region) { - if (fTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fTextViewer; + if (fTextViewer instanceof ITextViewerExtension5 extension) { return extension.modelRange2WidgetRange(region); } @@ -388,12 +386,10 @@ public void uninstall() { @Override protected void showInformationControl(Rectangle subjectArea) { - if (fTextViewer instanceof IWidgetTokenOwnerExtension && fTextViewer instanceof IWidgetTokenOwner) { - IWidgetTokenOwnerExtension extension= (IWidgetTokenOwnerExtension) fTextViewer; + if (fTextViewer instanceof IWidgetTokenOwnerExtension extension && fTextViewer instanceof IWidgetTokenOwner) { if (extension.requestWidgetToken(this, WIDGET_PRIORITY)) super.showInformationControl(subjectArea); - } else if (fTextViewer instanceof IWidgetTokenOwner) { - IWidgetTokenOwner owner= (IWidgetTokenOwner) fTextViewer; + } else if (fTextViewer instanceof IWidgetTokenOwner owner) { if (owner.requestWidgetToken(this)) super.showInformationControl(subjectArea); @@ -406,8 +402,7 @@ protected void hideInformationControl() { try { super.hideInformationControl(); } finally { - if (fTextViewer instanceof IWidgetTokenOwner) { - IWidgetTokenOwner owner= (IWidgetTokenOwner) fTextViewer; + if (fTextViewer instanceof IWidgetTokenOwner owner) { owner.releaseWidgetToken(this); } } @@ -418,8 +413,7 @@ protected void handleInformationControlDisposed() { try { super.handleInformationControlDisposed(); } finally { - if (fTextViewer instanceof IWidgetTokenOwner) { - IWidgetTokenOwner owner= (IWidgetTokenOwner) fTextViewer; + if (fTextViewer instanceof IWidgetTokenOwner owner) { owner.releaseWidgetToken(this); } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java index 0899d785ebc..4e6783ddc20 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java @@ -580,8 +580,7 @@ private class MySelectionListener implements ISelectionChangedListener { @Override public void selectionChanged(SelectionChangedEvent event) { ISelection selection= event.getSelection(); - if (selection instanceof ITextSelection) { - ITextSelection textsel= (ITextSelection) selection; + if (selection instanceof ITextSelection textsel) { if (event.getSelectionProvider() instanceof ITextViewer) { IDocument doc= ((ITextViewer) event.getSelectionProvider()).getDocument(); if (doc != null) { @@ -855,8 +854,7 @@ private void triggerContextInfo() { /** Trigger content assist on choice positions */ private void triggerContentAssist() { - if (fFramePosition instanceof ProposalPosition) { - ProposalPosition pp= (ProposalPosition) fFramePosition; + if (fFramePosition instanceof ProposalPosition pp) { ICompletionProposal[] choices= pp.getChoices(); if (choices != null && choices.length > 0) { fAssistant.setCompletions(choices); @@ -909,11 +907,9 @@ private void ensureAnnotationModelInstalled() { LinkedPositionAnnotations lpa= fCurrentTarget.fAnnotationModel; if (lpa != null) { ITextViewer viewer= fCurrentTarget.getViewer(); - if (viewer instanceof ISourceViewer) { - ISourceViewer sv= (ISourceViewer) viewer; + if (viewer instanceof ISourceViewer sv) { IAnnotationModel model= sv.getAnnotationModel(); - if (model instanceof IAnnotationModelExtension) { - IAnnotationModelExtension ext= (IAnnotationModelExtension) model; + if (model instanceof IAnnotationModelExtension ext) { IAnnotationModel ourModel= ext.getAnnotationModel(getUniqueKey()); if (ourModel == null) { ext.addAnnotationModel(getUniqueKey(), lpa); @@ -925,11 +921,9 @@ private void ensureAnnotationModelInstalled() { private void uninstallAnnotationModel(LinkedModeUITarget target) { ITextViewer viewer= target.getViewer(); - if (viewer instanceof ISourceViewer) { - ISourceViewer sv= (ISourceViewer) viewer; + if (viewer instanceof ISourceViewer sv) { IAnnotationModel model= sv.getAnnotationModel(); - if (model instanceof IAnnotationModelExtension) { - IAnnotationModelExtension ext= (IAnnotationModelExtension) model; + if (model instanceof IAnnotationModelExtension ext) { ext.removeAnnotationModel(getUniqueKey()); } } @@ -966,8 +960,7 @@ private void switchViewer(IDocument oldDoc, IDocument newDoc, LinkedPosition pos private void select() { ITextViewer viewer= fCurrentTarget.getViewer(); - if (viewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension5= (ITextViewerExtension5) viewer; + if (viewer instanceof ITextViewerExtension5 extension5) { extension5.exposeModelRange(new Region(fFramePosition.offset, fFramePosition.length)); } else if (!viewer.overlapsWithVisibleRegion(fFramePosition.offset, fFramePosition.length)) { viewer.resetVisibleRegion(); @@ -1056,8 +1049,7 @@ private void showSelection() { private void registerAutoEditVetoer(ITextViewer viewer) { try { String[] contentTypes= getContentTypes(viewer.getDocument()); - if (viewer instanceof ITextViewerExtension2) { - ITextViewerExtension2 vExtension= ((ITextViewerExtension2) viewer); + if (viewer instanceof ITextViewerExtension2 vExtension) { for (String contentType : contentTypes) { vExtension.prependAutoEditStrategy(fAutoEditVetoer, contentType); } @@ -1073,8 +1065,7 @@ private void registerAutoEditVetoer(ITextViewer viewer) { private void unregisterAutoEditVetoer(ITextViewer viewer) { try { String[] contentTypes= getContentTypes(viewer.getDocument()); - if (viewer instanceof ITextViewerExtension2) { - ITextViewerExtension2 vExtension= ((ITextViewerExtension2) viewer); + if (viewer instanceof ITextViewerExtension2 vExtension) { for (String contentType : contentTypes) { vExtension.removeAutoEditStrategy(fAutoEditVetoer, contentType); } @@ -1095,8 +1086,7 @@ private void unregisterAutoEditVetoer(ITextViewer viewer) { * @since 3.1 */ private String[] getContentTypes(IDocument document) throws BadPartitioningException { - if (document instanceof IDocumentExtension3) { - IDocumentExtension3 ext= (IDocumentExtension3) document; + if (document instanceof IDocumentExtension3 ext) { String[] partitionings= ext.getPartitionings(); Set contentTypes= new HashSet<>(20); for (String partitioning : partitionings) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java index 09a722ea99f..6e66e4a56ac 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java @@ -231,8 +231,7 @@ protected IRegion widgetRegion2ModelRegion(TextEvent e) { String text= e.getText(); int length= text == null ? 0 : text.length(); - if (fViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fViewer; + if (fViewer instanceof ITextViewerExtension5 extension) { return extension.widgetRange2ModelRange(new Region(e.getOffset(), length)); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java index eba0502c40f..42ea6c960a9 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java @@ -53,8 +53,7 @@ public class MonoReconciler extends AbstractReconciler { public MonoReconciler(IReconcilingStrategy strategy, boolean isIncremental) { Assert.isNotNull(strategy); fStrategy= strategy; - if (fStrategy instanceof IReconcilingStrategyExtension) { - IReconcilingStrategyExtension extension= (IReconcilingStrategyExtension)fStrategy; + if (fStrategy instanceof IReconcilingStrategyExtension extension) { extension.setProgressMonitor(getProgressMonitor()); } @@ -87,16 +86,14 @@ protected void reconcilerDocumentChanged(IDocument document) { @Override public void setProgressMonitor(IProgressMonitor monitor) { super.setProgressMonitor(monitor); - if (fStrategy instanceof IReconcilingStrategyExtension) { - IReconcilingStrategyExtension extension= (IReconcilingStrategyExtension) fStrategy; + if (fStrategy instanceof IReconcilingStrategyExtension extension) { extension.setProgressMonitor(monitor); } } @Override protected void initialProcess() { - if (fStrategy instanceof IReconcilingStrategyExtension) { - IReconcilingStrategyExtension extension= (IReconcilingStrategyExtension) fStrategy; + if (fStrategy instanceof IReconcilingStrategyExtension extension) { extension.initialReconcile(); } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java index 3cfbefc4883..ce983b087b7 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java @@ -103,8 +103,7 @@ public void setReconcilingStrategy(IReconcilingStrategy strategy, String content fStrategies.remove(contentType); else { fStrategies.put(contentType, strategy); - if (strategy instanceof IReconcilingStrategyExtension && getProgressMonitor() != null) { - IReconcilingStrategyExtension extension= (IReconcilingStrategyExtension) strategy; + if (strategy instanceof IReconcilingStrategyExtension extension && getProgressMonitor() != null) { extension.setProgressMonitor(getProgressMonitor()); } } @@ -200,8 +199,7 @@ public void setProgressMonitor(IProgressMonitor monitor) { Iterator e= fStrategies.values().iterator(); while (e.hasNext()) { IReconcilingStrategy strategy= e.next(); - if (strategy instanceof IReconcilingStrategyExtension) { - IReconcilingStrategyExtension extension= (IReconcilingStrategyExtension) strategy; + if (strategy instanceof IReconcilingStrategyExtension extension) { extension.setProgressMonitor(monitor); } } @@ -218,8 +216,7 @@ protected void initialProcess() { continue; contentTypes.add(contentType); IReconcilingStrategy s= getReconcilingStrategy(contentType); - if (s instanceof IReconcilingStrategyExtension) { - IReconcilingStrategyExtension e= (IReconcilingStrategyExtension) s; + if (s instanceof IReconcilingStrategyExtension e) { e.initialReconcile(); } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java index aa80985d407..60ea42caec9 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java @@ -331,8 +331,7 @@ protected void computeInformation() { int line= getHoverLine(event); - if (hover instanceof IAnnotationHoverExtension) { - IAnnotationHoverExtension extension= (IAnnotationHoverExtension) hover; + if (hover instanceof IAnnotationHoverExtension extension) { ILineRange range= extension.getHoverLineRange(fSourceViewer, line); setCustomInformationControlCreator(extension.getHoverControlCreator()); range= adaptLineRange(range, line); @@ -390,9 +389,7 @@ private ILineRange adaptLineRange(ILineRange lineRange, int line) { */ private ILineRange adaptLineRangeToFolding(ILineRange lineRange, int line) { - if (fSourceViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fSourceViewer; - + if (fSourceViewer instanceof ITextViewerExtension5 extension) { try { IRegion region= convertToRegion(lineRange); IRegion[] coverage= extension.getCoveredModelRanges(region); @@ -541,8 +538,7 @@ private IAnnotationHover getHover(MouseEvent event) { if (event == null || event.getSource() == null) return fAnnotationHover; - if (fVerticalRulerInfo instanceof CompositeRuler) { - CompositeRuler comp= (CompositeRuler) fVerticalRulerInfo; + if (fVerticalRulerInfo instanceof CompositeRuler comp) { for (Iterator it= comp.getDecoratorIterator(); it.hasNext();) { Object o= it.next(); if (o instanceof IVerticalRulerInfoExtension && o instanceof IVerticalRulerInfo) { @@ -576,8 +572,7 @@ private int getHoverLine(MouseEvent event) { * @throws BadLocationException if line is not valid in the viewer's document */ private int getWidgetLineNumber(int line) throws BadLocationException { - if (fSourceViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fSourceViewer; + if (fSourceViewer instanceof ITextViewerExtension5 extension) { return extension.modelLine2WidgetLine(line); } @@ -658,8 +653,7 @@ protected Point computeInformationControlLocation(Rectangle subjectArea, Point c MouseEvent event= getHoverEvent(); IAnnotationHover hover= getHover(event); - if (hover instanceof IAnnotationHoverExtension) { - IAnnotationHoverExtension extension= (IAnnotationHoverExtension) hover; + if (hover instanceof IAnnotationHoverExtension extension) { boolean allowMouseExit= extension.canHandleMouseCursor(); if (allowMouseExit) { return computeLocation(subjectArea, controlSize, ANCHOR_RIGHT); @@ -674,13 +668,11 @@ protected Point computeLocation(Rectangle subjectArea, Point controlSize, Anchor IAnnotationHover hover= getHover(event); boolean allowMouseExit= false; - if (hover instanceof IAnnotationHoverExtension) { - IAnnotationHoverExtension extension= (IAnnotationHoverExtension) hover; + if (hover instanceof IAnnotationHoverExtension extension) { allowMouseExit= extension.canHandleMouseCursor(); } boolean hideOnMouseWheel= true; - if (hover instanceof IAnnotationHoverExtension2) { - IAnnotationHoverExtension2 extension= (IAnnotationHoverExtension2) hover; + if (hover instanceof IAnnotationHoverExtension2 extension) { hideOnMouseWheel= !extension.canHandleMouseWheel(); } fHideOnMouseWheel= hideOnMouseWheel; diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java index 42e87fe7ed6..713055cc589 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java @@ -863,8 +863,7 @@ private Decoration getDecoration(Annotation annotation, Decoration decoration) { decoration.fPosition= position; decoration.fColor= color; - if (fAnnotationAccess instanceof IAnnotationAccessExtension) { - IAnnotationAccessExtension extension= (IAnnotationAccessExtension) fAnnotationAccess; + if (fAnnotationAccess instanceof IAnnotationAccessExtension extension) { decoration.fLayer= extension.getLayer(annotation); } else { decoration.fLayer= IAnnotationAccessExtension.DEFAULT_LAYER; @@ -893,8 +892,7 @@ private Object getPaintingStrategy(final String type) { return strategy; } - if (fAnnotationAccess instanceof IAnnotationAccessExtension) { - IAnnotationAccessExtension ext = (IAnnotationAccessExtension) fAnnotationAccess; + if (fAnnotationAccess instanceof IAnnotationAccessExtension ext) { Object[] sts = ext.getSupertypes(type); for (Object st : sts) { strategy= fPaintingStrategyId2PaintingStrategy.get(fAnnotationType2PaintingStrategyId.get(st)); @@ -928,8 +926,7 @@ private Color getColor(final Object annotationType) { return color; } - if (fAnnotationAccess instanceof IAnnotationAccessExtension) { - IAnnotationAccessExtension extension= (IAnnotationAccessExtension) fAnnotationAccess; + if (fAnnotationAccess instanceof IAnnotationAccessExtension extension) { Object[] superTypes= extension.getSupertypes(annotationType); if (superTypes != null) { for (Object superType : superTypes) { @@ -1012,8 +1009,7 @@ public void applyTextPresentation(TextPresentation tp) { continue; Position p= pp.fPosition; - if (fSourceViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension3= (ITextViewerExtension5) fSourceViewer; + if (fSourceViewer instanceof ITextViewerExtension5 extension3) { if (null == extension3.modelRange2WidgetRange(new Region(p.getOffset(), p.getLength()))) continue; } else if (!fSourceViewer.overlapsWithVisibleRegion(p.offset, p.length)) { @@ -1401,11 +1397,9 @@ private void drawDecoration(Decoration pp, GC gc, Annotation annotation, IRegion if (clippingRegion == null) return; - if (!(pp.fPaintingStrategy instanceof IDrawingStrategy)) + if (!(pp.fPaintingStrategy instanceof IDrawingStrategy drawingStrategy)) return; - IDrawingStrategy drawingStrategy= (IDrawingStrategy)pp.fPaintingStrategy; - int clippingOffset= clippingRegion.getOffset(); int clippingLength= clippingRegion.getLength(); @@ -1545,8 +1539,7 @@ private IRegion getWidgetRange(int modelOffset, int modelLength) { if (modelOffset == Integer.MAX_VALUE) return null; - if (fSourceViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fSourceViewer; + if (fSourceViewer instanceof ITextViewerExtension5 extension) { fReusableRegion.setOffset(modelOffset); fReusableRegion.setLength(modelLength); return extension.modelRange2WidgetRange(fReusableRegion); @@ -1579,8 +1572,7 @@ private IRegion getModelRange(int offset, int length) { if (offset == Integer.MAX_VALUE) return null; - if (fSourceViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fSourceViewer; + if (fSourceViewer instanceof ITextViewerExtension5 extension) { return extension.widgetRange2ModelRange(new Region(offset, length)); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java index 0355c8671a5..9233ebe0421 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java @@ -414,8 +414,7 @@ private void handleMouseMove(MouseEvent event) { * @param event the mouse scrolled event */ private void handleMouseScrolled(MouseEvent event) { - if (fCachedTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fCachedTextViewer; + if (fCachedTextViewer instanceof ITextViewerExtension5 extension) { StyledText textWidget= fCachedTextViewer.getTextWidget(); int topIndex= textWidget.getTopIndex(); int newTopIndex= Math.max(0, topIndex - event.count); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java index f57208b417d..d712d40ef35 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java @@ -462,9 +462,7 @@ private final ILineRange computeVisibleModelLines() { int topLine; IRegion coverage; - if (fCachedTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fCachedTextViewer; - + if (fCachedTextViewer instanceof ITextViewerExtension5 extension) { // ITextViewer.getTopIndex returns the fully visible line, but we want the partially // visible one int widgetTopLine= JFaceTextUtil.getPartialTopIndex(fCachedTextWidget); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java index 253281181a7..23f6b6b8a01 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java @@ -583,8 +583,7 @@ private void layoutTextViewer() { Control parent= fTextViewer.getTextWidget(); - if (fTextViewer instanceof ITextViewerExtension) { - ITextViewerExtension extension= (ITextViewerExtension) fTextViewer; + if (fTextViewer instanceof ITextViewerExtension extension) { parent= extension.getControl(); } @@ -712,8 +711,7 @@ public int toDocumentLineNumber(int y_coordinate) { */ protected final static int widgetLine2ModelLine(ITextViewer viewer, int widgetLine) { - if (viewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) viewer; + if (viewer instanceof ITextViewerExtension5 extension) { return extension.widgetLine2ModelLine(widgetLine); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java index c3de3fae821..b6d391bf3d4 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java @@ -157,8 +157,7 @@ private boolean isRulerLine(Position position, IDocument document, int line) { } private IAnnotationModel getAnnotationModel(ISourceViewer viewer) { - if (viewer instanceof ISourceViewerExtension2) { - ISourceViewerExtension2 extension= (ISourceViewerExtension2) viewer; + if (viewer instanceof ISourceViewerExtension2 extension) { return extension.getVisualAnnotationModel(); } return viewer.getAnnotationModel(); @@ -216,8 +215,7 @@ private List getAnnotationsForLine(ISourceViewer viewer, int line) { if (!isRulerLine(position, document, line)) continue; - if (annotation instanceof AnnotationBag) { - AnnotationBag bag= (AnnotationBag) annotation; + if (annotation instanceof AnnotationBag bag) { Iterator e= bag.iterator(); while (e.hasNext()) { annotation= e.next(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java index 347d567298c..f3f245f1829 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java @@ -147,8 +147,7 @@ private void startSelecting(boolean expandExistingSelection) { final StyledText textWidget= fCachedTextViewer.getTextWidget(); if (textWidget != null && !textWidget.isFocusControl()) textWidget.setFocus(); - if (expandExistingSelection && fCachedTextViewer instanceof ITextViewerExtension5 && textWidget != null) { - ITextViewerExtension5 extension5= ((ITextViewerExtension5)fCachedTextViewer); + if (expandExistingSelection && fCachedTextViewer instanceof ITextViewerExtension5 extension5 && textWidget != null) { // Find model cursor position int widgetCaret= textWidget.getCaretOffset(); int modelCaret= extension5.widgetOffset2ModelOffset(widgetCaret); @@ -217,8 +216,7 @@ private void expandSelection(int lineNumber) { } // Convert to model offset - if (fCachedTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5)fCachedTextViewer; + if (fCachedTextViewer instanceof ITextViewerExtension5 extension) { offset= extension.widgetOffset2ModelOffset(widgetOffset); } else { offset= widgetOffset + fCachedTextViewer.getVisibleRegion().getOffset(); @@ -228,8 +226,7 @@ private void expandSelection(int lineNumber) { // Convert to widget offset int lineEndWidgetOffset; - if (fCachedTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5)fCachedTextViewer; + if (fCachedTextViewer instanceof ITextViewerExtension5 extension) { lineEndWidgetOffset= extension.modelOffset2WidgetOffset(lineEndOffset); } else lineEndWidgetOffset= lineEndOffset - fCachedTextViewer.getVisibleRegion().getOffset(); @@ -530,11 +527,9 @@ protected void layout(boolean redraw) { } fRelayoutRequired= false; - if (fCachedTextViewer instanceof ITextViewerExtension) { - ITextViewerExtension extension= (ITextViewerExtension) fCachedTextViewer; + if (fCachedTextViewer instanceof ITextViewerExtension extension) { Control control= extension.getControl(); - if (control instanceof Composite && !control.isDisposed()) { - Composite composite= (Composite) control; + if (control instanceof Composite composite && !control.isDisposed()) { composite.layout(true); } } @@ -1027,8 +1022,7 @@ protected CompositeRuler getParentRuler() { * @since 3.10 */ void handleMouseScrolled(MouseEvent e) { - if (fCachedTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fCachedTextViewer; + if (fCachedTextViewer instanceof ITextViewerExtension5 extension) { StyledText textWidget= fCachedTextViewer.getTextWidget(); int topIndex= textWidget.getTopIndex(); int newTopIndex= Math.max(0, topIndex - e.count); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java index bf38f7e34be..64936fa3fd8 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java @@ -200,8 +200,7 @@ private void handleDrawRequest(GC gc) { if (length < 1) return; - if (fSourceViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fSourceViewer; + if (fSourceViewer instanceof ITextViewerExtension5 extension) { IRegion widgetRange= extension.modelRange2WidgetRange(new Region(offset, length)); if (widgetRange == null) return; @@ -303,8 +302,7 @@ public void paint(int reason) { IRegion pair; boolean characterPresentAtCaretLocation; - if (fMatcher instanceof ICharacterPairMatcherExtension) { - ICharacterPairMatcherExtension matcher= (ICharacterPairMatcherExtension)fMatcher; + if (fMatcher instanceof ICharacterPairMatcherExtension matcher) { pair= matcher.match(document, selection.getOffset(), selection.getLength()); characterPresentAtCaretLocation= (pair != null); if (pair == null && fHighlightEnclosingPeerCharacters) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java index 2b3fd2fb8c6..709217134e3 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java @@ -203,8 +203,7 @@ private void skip() { } private boolean isSubtype(Object annotationType) { - if (fAnnotationAccess instanceof IAnnotationAccessExtension) { - IAnnotationAccessExtension extension= (IAnnotationAccessExtension) fAnnotationAccess; + if (fAnnotationAccess instanceof IAnnotationAccessExtension extension) { return extension.isSubtype(annotationType, fType); } return fType.equals(annotationType); @@ -1007,8 +1006,7 @@ else if (lines[0] < 0) if (lines[1] > infos.maxLines) lines[1]= infos.maxLines; - if (fTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fTextViewer; + if (fTextViewer instanceof ITextViewerExtension5 extension) { lines[0]= extension.widgetLine2ModelLine(lines[0]); lines[1]= extension.widgetLine2ModelLine(lines[1]); } else { @@ -1154,8 +1152,7 @@ private void handleMouseMove(MouseEvent event) { * @param event the mouse scrolled event */ private void handleMouseScrolled(MouseEvent event) { - if (fTextViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) fTextViewer; + if (fTextViewer instanceof ITextViewerExtension5 extension) { StyledText textWidget= fTextViewer.getTextWidget(); int topIndex= textWidget.getTopIndex(); int newTopIndex= Math.max(0, topIndex - event.count); @@ -1268,8 +1265,7 @@ private boolean contains(Object annotationType, Map allowed, Se * @since 3.0 */ private boolean isCovered(Object annotationType, Set configured) { - if (fAnnotationAccess instanceof IAnnotationAccessExtension) { - IAnnotationAccessExtension extension= (IAnnotationAccessExtension) fAnnotationAccess; + if (fAnnotationAccess instanceof IAnnotationAccessExtension extension) { Iterator e= configured.iterator(); while (e.hasNext()) { if (extension.isSubtype(annotationType,e.next())) @@ -1356,8 +1352,7 @@ private Color findColor(Object annotationType) { if (color != null) return color; - if (fAnnotationAccess instanceof IAnnotationAccessExtension) { - IAnnotationAccessExtension extension= (IAnnotationAccessExtension) fAnnotationAccess; + if (fAnnotationAccess instanceof IAnnotationAccessExtension extension) { Object[] superTypes= extension.getSupertypes(annotationType); if (superTypes != null) { for (Object superType : superTypes) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java index 4b18e2cf592..6832b9cce5d 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java @@ -671,8 +671,7 @@ public void setDocument(IDocument document, IAnnotationModel annotationModel, in fVisualAnnotationModel= createVisualAnnotationModel(annotationModel); // Make sure the visual model uses the same lock as the underlying model - if (annotationModel instanceof ISynchronizable && fVisualAnnotationModel instanceof ISynchronizable) { - ISynchronizable sync= (ISynchronizable)fVisualAnnotationModel; + if (annotationModel instanceof ISynchronizable && fVisualAnnotationModel instanceof ISynchronizable sync) { sync.setLockObject(((ISynchronizable)annotationModel).getLockObject()); } @@ -693,8 +692,7 @@ public void setDocument(IDocument document, IAnnotationModel annotationModel, in @Override public IAnnotationModel getAnnotationModel() { - if (fVisualAnnotationModel instanceof IAnnotationModelExtension) { - IAnnotationModelExtension extension= (IAnnotationModelExtension) fVisualAnnotationModel; + if (fVisualAnnotationModel instanceof IAnnotationModelExtension extension) { return extension.getAnnotationModel(MODEL_ANNOTATION_MODEL); } return null; @@ -1017,8 +1015,7 @@ public void doOperation(int operation) { IFormattingContext context= null; DocumentRewriteSession rewriteSession= null; - if (document instanceof IDocumentExtension4) { - IDocumentExtension4 extension= (IDocumentExtension4) document; + if (document instanceof IDocumentExtension4 extension) { DocumentRewriteSessionType type= (selection.y == 0 && document.getLength() > 1000) || selection.y > 1000 ? DocumentRewriteSessionType.SEQUENTIAL : DocumentRewriteSessionType.UNRESTRICTED_SMALL; @@ -1034,8 +1031,7 @@ public void doOperation(int operation) { try { - if (fContentFormatter instanceof IContentFormatterExtension) { - final IContentFormatterExtension extension= (IContentFormatterExtension) fContentFormatter; + if (fContentFormatter instanceof final IContentFormatterExtension extension) { context= createFormattingContext(selection.x, selection.y); if (context == null) { return; @@ -1067,8 +1063,7 @@ public void doOperation(int operation) { } finally { - if (document instanceof IDocumentExtension4) { - IDocumentExtension4 extension= (IDocumentExtension4) document; + if (document instanceof IDocumentExtension4 extension) { extension.stopRewriteSession(rewriteSession); } else { target.endCompoundChange(); @@ -1095,13 +1090,11 @@ public void doOperation(int operation) { */ protected void updateSlaveDocuments(IDocument masterDocument) { ISlaveDocumentManager manager= getSlaveDocumentManager(); - if (manager instanceof ISlaveDocumentManagerExtension) { - ISlaveDocumentManagerExtension extension= (ISlaveDocumentManagerExtension) manager; + if (manager instanceof ISlaveDocumentManagerExtension extension) { IDocument[] slaves= extension.getSlaveDocuments(masterDocument); if (slaves != null) { for (IDocument slave : slaves) { - if (slave instanceof ChildDocument) { - ChildDocument child= (ChildDocument) slave; + if (slave instanceof ChildDocument child) { Position p= child.getParentDocumentRange(); try { @@ -1169,8 +1162,7 @@ public void setRangeIndication(int start, int length, boolean moveCursor) { revealRange(start, length); } - if (fRangeIndicator != null && fVisualAnnotationModel instanceof IAnnotationModelExtension) { - IAnnotationModelExtension extension= (IAnnotationModelExtension) fVisualAnnotationModel; + if (fRangeIndicator != null && fVisualAnnotationModel instanceof IAnnotationModelExtension extension) { extension.modifyAnnotationPosition(fRangeIndicator, new Position(start, length)); } } @@ -1243,8 +1235,7 @@ protected final IVerticalRuler getVerticalRuler() { */ public void addVerticalRulerColumn(IVerticalRulerColumn column) { IVerticalRuler ruler= getVerticalRuler(); - if (ruler instanceof CompositeRuler) { - CompositeRuler compositeRuler= (CompositeRuler)ruler; + if (ruler instanceof CompositeRuler compositeRuler) { compositeRuler.addDecorator(99, column); } } @@ -1257,8 +1248,7 @@ public void addVerticalRulerColumn(IVerticalRulerColumn column) { */ public void removeVerticalRulerColumn(IVerticalRulerColumn column) { IVerticalRuler ruler= getVerticalRuler(); - if (ruler instanceof CompositeRuler) { - CompositeRuler compositeRuler= (CompositeRuler)ruler; + if (ruler instanceof CompositeRuler compositeRuler) { compositeRuler.removeDecorator(column); } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java index bc98e5a3e26..6d3976a02b7 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java @@ -542,8 +542,7 @@ public int toDocumentLineNumber(int y_coordinate) { */ protected final static int widgetLine2ModelLine(ITextViewer viewer, int widgetLine) { - if (viewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension= (ITextViewerExtension5) viewer; + if (viewer instanceof ITextViewerExtension5 extension) { return extension.widgetLine2ModelLine(widgetLine); } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.java index e6bc1ed8819..3d77a6df519 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/inlined/InlinedAnnotationSupport.java @@ -107,8 +107,7 @@ public void applyTextPresentation(TextPresentation textPresentation) { ((IAnnotationModelExtension2) annotationModel) .getAnnotationIterator(region.getOffset(), region.getLength(), true, true) .forEachRemaining(annotation -> { - if (annotation instanceof LineContentAnnotation) { - LineContentAnnotation ann= (LineContentAnnotation) annotation; + if (annotation instanceof LineContentAnnotation ann) { StyleRange style= ann.updateStyle(null, fFontMetrics, fViewer, isAfterPosition(ann)); if (style != null) { if (fViewer instanceof ITextViewerExtension5 projectionViewer) { diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java index 05bd4148beb..6e989eb5ae0 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java @@ -44,8 +44,8 @@ public abstract class TemplateCompletionProcessor implements IContentAssistProce private static final class ProposalComparator implements Comparator { @Override public int compare(ICompletionProposal o1, ICompletionProposal o2) { - int r1= o1 instanceof TemplateProposal ? ((TemplateProposal) o1).getRelevance() : 0; - int r2= o2 instanceof TemplateProposal ? ((TemplateProposal) o2).getRelevance() : 0; + int r1= o1 instanceof TemplateProposal t ? t.getRelevance() : 0; + int r2= o2 instanceof TemplateProposal t ? t.getRelevance() : 0; return r2 - r1; } } diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java index 405b49c2041..38052fc368e 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java @@ -299,8 +299,7 @@ private int getCaretOffset(TemplateBuffer buffer) { */ protected final int getReplaceOffset() { int start; - if (fContext instanceof DocumentTemplateContext) { - DocumentTemplateContext docContext = (DocumentTemplateContext)fContext; + if (fContext instanceof DocumentTemplateContext docContext) { start= docContext.getStart(); } else { start= fRegion.getOffset(); @@ -318,8 +317,7 @@ protected final int getReplaceOffset() { */ protected final int getReplaceEndOffset() { int end; - if (fContext instanceof DocumentTemplateContext) { - DocumentTemplateContext docContext = (DocumentTemplateContext)fContext; + if (fContext instanceof DocumentTemplateContext docContext) { end= docContext.getEnd(); } else { end= fRegion.getOffset() + fRegion.getLength(); diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceData.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceData.java index dcfeff12b7b..5f29629fe42 100644 --- a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceData.java +++ b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplatePersistenceData.java @@ -47,7 +47,7 @@ public class TemplatePersistenceData extends org.eclipse.text.templates.Template */ public TemplatePersistenceData(org.eclipse.text.templates.TemplatePersistenceData data) { super(data.getTemplate(), data.isEnabled(), data.getId()); // these are ignored - this.ref= data instanceof TemplatePersistenceData ? ((TemplatePersistenceData) data).ref : data; // no double wrapping + this.ref= data instanceof TemplatePersistenceData t ? t.ref : data; // no double wrapping } public TemplatePersistenceData(Template template, boolean enabled) {