From 6be3b4492f533fbfb15106159bb74c5165c87c7b Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Tue, 23 Sep 2025 03:52:40 +0000 Subject: [PATCH 1/2] Perform clean code of bundles/org.eclipse.ui.genericeditor --- .../AnnotationHoverDelegate.java | 9 ++++-- .../AutoEditStrategyRegistry.java | 2 +- .../CharacterPairMatcherRegistry.java | 2 +- .../CompositeContentAssistProcessor.java | 4 +-- .../CompositeQuickAssistProcessor.java | 2 +- .../genericeditor/CompositeReconciler.java | 2 +- .../CompositeReconcilerStrategy.java | 2 +- .../ContentAssistProcessorRegistry.java | 4 +-- .../ContentTypeRelatedExtensionTracker.java | 10 +++--- .../DefaultWordHighlightReconciler.java | 2 +- .../DefaultWordHighlightStrategy.java | 11 ++++--- .../ExtensionBasedTextEditor.java | 31 ++++++++++++------- ...ExtensionBasedTextViewerConfiguration.java | 8 ++--- .../GenericContentTypeRelatedExtension.java | 2 +- .../GenericEditorContentAssistant.java | 8 ++--- .../genericeditor/GenericEditorPlugin.java | 3 +- .../GenericEditorWithContentTypeIcon.java | 4 +-- ...ericEditorWithIconAssociationOverride.java | 2 +- .../internal/genericeditor/IconsRegistry.java | 2 +- .../PresentationReconcilerRegistry.java | 4 +-- .../QuickAssistProcessorRegistry.java | 2 +- .../genericeditor/ReconcilerRegistry.java | 6 ++-- .../TextDoubleClickStrategyRegistry.java | 6 ++-- .../compare/GenericEditorViewer.java | 4 +-- .../folding/DefaultFoldingReconciler.java | 3 +- .../folding/IndentFoldingStrategy.java | 9 +++--- .../hover/CompositeTextHover.java | 8 ++--- .../hover/OrderedExtensionComparator.java | 2 +- .../hover/TextHoverRegistry.java | 6 ++-- .../markers/MarkerAnnotationHover.java | 9 +++--- .../MarkerResoltionQuickAssistProcessor.java | 3 +- .../MarkerResolutionCompletionProposal.java | 4 +-- ...ericEditorPluginPreferenceInitializer.java | 15 ++++++--- .../GenericEditorPreferencePage.java | 3 +- 34 files changed, 105 insertions(+), 89 deletions(-) diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AnnotationHoverDelegate.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AnnotationHoverDelegate.java index eb9998f4fbf..7071b8d2050 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AnnotationHoverDelegate.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AnnotationHoverDelegate.java @@ -42,16 +42,19 @@ protected boolean isIncluded(Annotation annotation) { return false; } AnnotationPreference preference= EditorsUI.getAnnotationPreferenceLookup().getAnnotationPreference(annotation); - if (preference == null) + if (preference == null) { return false; + } String key= preference.getTextPreferenceKey(); if (key != null) { - if (!EditorsUI.getPreferenceStore().getBoolean(key)) + if (!EditorsUI.getPreferenceStore().getBoolean(key)) { return false; + } } else { key= preference.getHighlightPreferenceKey(); - if (key == null || !EditorsUI.getPreferenceStore().getBoolean(key)) + if (key == null || !EditorsUI.getPreferenceStore().getBoolean(key)) { return false; + } } return true; } diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AutoEditStrategyRegistry.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AutoEditStrategyRegistry.java index f5941d101f6..0cba87160c0 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AutoEditStrategyRegistry.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/AutoEditStrategyRegistry.java @@ -40,7 +40,7 @@ public class AutoEditStrategyRegistry { private static final String EXTENSION_POINT_ID = GenericEditorPlugin.BUNDLE_ID + ".autoEditStrategies"; //$NON-NLS-1$ - private Map> extensions = new LinkedHashMap<>(); + private final Map> extensions = new LinkedHashMap<>(); private boolean outOfSync = true; /** diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CharacterPairMatcherRegistry.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CharacterPairMatcherRegistry.java index 58439d92a0a..08658ffdbf9 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CharacterPairMatcherRegistry.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CharacterPairMatcherRegistry.java @@ -37,7 +37,7 @@ public class CharacterPairMatcherRegistry { private static final String EXTENSION_POINT_ID = GenericEditorPlugin.BUNDLE_ID + ".characterPairMatchers"; //$NON-NLS-1$ - private Map> extensions = new HashMap<>(); + private final Map> extensions = new HashMap<>(); private boolean outOfSync = true; /** diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java index 0992061e3a8..bdeaa60a10c 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java @@ -33,11 +33,11 @@ */ public class CompositeContentAssistProcessor implements IContentAssistProcessorExtension, IContentAssistProcessor { - private List fContentAssistProcessors; + private final List fContentAssistProcessors; /** * Constructor - * + * * @param contentAssistProcessors the children that will actually populate the * output of this content assist processor. */ diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeQuickAssistProcessor.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeQuickAssistProcessor.java index 4fac97407aa..13f3ae4d48e 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeQuickAssistProcessor.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeQuickAssistProcessor.java @@ -31,7 +31,7 @@ */ public class CompositeQuickAssistProcessor implements IQuickAssistProcessor { - private List fProcessors; + private final List fProcessors; public CompositeQuickAssistProcessor(List processors) { this.fProcessors = processors; diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconciler.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconciler.java index 515a1ffa591..40e7ec3a6a0 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconciler.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconciler.java @@ -25,7 +25,7 @@ import org.eclipse.jface.text.reconciler.IReconcilingStrategy; public class CompositeReconciler implements IReconciler, IReconcilerExtension { - private List fReconcilers; + private final List fReconcilers; public CompositeReconciler(List reconcilers) { fReconcilers = reconcilers.stream().filter(Objects::nonNull).collect(Collectors.toList()); diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconcilerStrategy.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconcilerStrategy.java index 2c50ac3ad30..f942099ad36 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconcilerStrategy.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconcilerStrategy.java @@ -26,7 +26,7 @@ public class CompositeReconcilerStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension, ITextViewerLifecycle { - private List fReconcilingStrategies; + private final List fReconcilingStrategies; public CompositeReconcilerStrategy(List strategies) { this.fReconcilingStrategies = strategies; diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ContentAssistProcessorRegistry.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ContentAssistProcessorRegistry.java index 2c348573dd2..2239bb989ff 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ContentAssistProcessorRegistry.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ContentAssistProcessorRegistry.java @@ -49,7 +49,7 @@ public class ContentAssistProcessorRegistry { static class ContentAssistProcessorDelegate implements IContentAssistProcessor { private final IContentAssistProcessor delegate; - private IContentType targetContentType; + private final IContentType targetContentType; public ContentAssistProcessorDelegate(IContentAssistProcessor delegate, IContentType targetContentType) { this.delegate = delegate; @@ -128,7 +128,7 @@ public IContextInformationValidator getContextInformationValidator() { } } - private Map> extensions = new LinkedHashMap<>(); + private final Map> extensions = new LinkedHashMap<>(); private boolean outOfSync = true; /** diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ContentTypeRelatedExtensionTracker.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ContentTypeRelatedExtensionTracker.java index d2d5b9176a7..2f2876656ef 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ContentTypeRelatedExtensionTracker.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ContentTypeRelatedExtensionTracker.java @@ -34,11 +34,11 @@ */ final class ContentTypeRelatedExtensionTracker implements ServiceTrackerCustomizer> { - private BundleContext bundleContext; - private ServiceTracker> serviceTracker; + private final BundleContext bundleContext; + private final ServiceTracker> serviceTracker; private Consumer> addAction; private Consumer> removeAction; - private Display display; + private final Display display; ContentTypeRelatedExtensionTracker(BundleContext bundleContext, Class serviceType, Display display) { this.bundleContext = bundleContext; @@ -89,8 +89,8 @@ public Collection> getTracked() { } public static final class LazyServiceSupplier implements Supplier { - private ServiceReference reference; - private BundleContext bundleContext; + private final ServiceReference reference; + private final BundleContext bundleContext; private boolean disposed; private S serviceObject; private IContentType contentType; diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightReconciler.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightReconciler.java index 80d5d112b4d..7311e29e71b 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightReconciler.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightReconciler.java @@ -19,7 +19,7 @@ public class DefaultWordHighlightReconciler extends Reconciler { - private DefaultWordHighlightStrategy fStrategy; + private final DefaultWordHighlightStrategy fStrategy; public DefaultWordHighlightReconciler() { fStrategy = new DefaultWordHighlightStrategy(); diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java index 731a1b4afce..0597a6c0b2b 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java @@ -66,13 +66,12 @@ public class DefaultWordHighlightStrategy implements IReconcilingStrategy, IReco private Annotation[] fOccurrenceAnnotations = null; - private ISelectionChangedListener editorSelectionChangedListener = event -> applyHighlights(event.getSelection()); + private final ISelectionChangedListener editorSelectionChangedListener = event -> applyHighlights(event.getSelection()); private void applyHighlights(ISelection selection) { - if (!(selection instanceof ITextSelection)) { + if (!(selection instanceof ITextSelection textSelection)) { return; } - ITextSelection textSelection = (ITextSelection) selection; if (sourceViewer == null || !enabled) { removeOccurrenceAnnotations(); return; @@ -140,10 +139,12 @@ private static String findCurrentWord(String text, int offset) { if (m.lookingAt()) { wordEnd = m.group(); } - if (wordStart != null && wordEnd != null) + if (wordStart != null && wordEnd != null) { return wordStart + wordEnd; - if (wordStart != null) + } + if (wordStart != null) { return wordStart; + } return wordEnd; } diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextEditor.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextEditor.java index b37debc6bef..9c0dccfc354 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextEditor.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextEditor.java @@ -67,7 +67,7 @@ public class ExtensionBasedTextEditor extends TextEditor { private static final String HIGHLIGHT_BRACKET_AT_CARET_LOCATION = GenericEditorPreferenceConstants.EDITOR_HIGHLIGHT_BRACKET_AT_CARET_LOCATION; private static final String ENCLOSING_BRACKETS = GenericEditorPreferenceConstants.EDITOR_ENCLOSING_BRACKETS; - private ExtensionBasedTextViewerConfiguration configuration; + private final ExtensionBasedTextViewerConfiguration configuration; private Image contentTypeImage; private ImageDescriptor contentTypeImageDescripter; @@ -118,8 +118,9 @@ public void doOperation(int operation) { private boolean openFirstHyperlink() { ITextSelection sel = (ITextSelection) this.getSelection(); int offset = sel.getOffset(); - if (offset == -1) + if (offset == -1) { return false; + } IRegion region = new Region(offset, 0); IHyperlink hyperlink = findFirstHyperlink(region); @@ -134,22 +135,26 @@ private IHyperlink findFirstHyperlink(IRegion region) { int activeHyperlinkStateMask = getSourceViewerConfiguration().getHyperlinkStateMask(this); synchronized (fHyperlinkDetectors) { for (IHyperlinkDetector detector : fHyperlinkDetectors) { - if (detector == null) + if (detector == null) { continue; + } if (detector instanceof IHyperlinkDetectorExtension2) { int stateMask = ((IHyperlinkDetectorExtension2) detector).getStateMask(); - if (stateMask != -1 && stateMask != activeHyperlinkStateMask) + if (stateMask != -1 && stateMask != activeHyperlinkStateMask) { continue; - else if (stateMask == -1 && activeHyperlinkStateMask != fHyperlinkStateMask) + } else if (stateMask == -1 && activeHyperlinkStateMask != fHyperlinkStateMask) { continue; - } else if (activeHyperlinkStateMask != fHyperlinkStateMask) + } + } else if (activeHyperlinkStateMask != fHyperlinkStateMask) { continue; + } boolean canShowMultipleHyperlinks = fHyperlinkPresenter.canShowMultipleHyperlinks(); IHyperlink[] hyperlinks = detector.detectHyperlinks(this, region, canShowMultipleHyperlinks); - if (hyperlinks == null) + if (hyperlinks == null) { continue; + } Assert.isLegal(hyperlinks.length > 0); @@ -243,12 +248,14 @@ public void gotoMatchingBracket() { ISourceViewer sourceViewer = getSourceViewer(); IDocument document = sourceViewer.getDocument(); - if (document == null) + if (document == null) { return; + } IRegion selection = getSignedSelection(sourceViewer); - if (fPreviousSelections == null) + if (fPreviousSelections == null) { initializePreviousSelectionList(); + } ICharacterPairMatcherExtension fBracketMatcher = (ICharacterPairMatcherExtension) pairMatcher; IRegion region = fBracketMatcher.match(document, selection.getOffset(), selection.getLength()); @@ -283,16 +290,16 @@ public void gotoMatchingBracket() { int offset = region.getOffset(); int length = region.getLength(); - if (length < 1) + if (length < 1) { return; + } int anchor = pairMatcher.getAnchor(); // http://dev.eclipse.org/bugs/show_bug.cgi?id=34195 int targetOffset = (ICharacterPairMatcher.RIGHT == anchor) ? offset + 1 : offset + length - 1; boolean visible = false; - if (sourceViewer instanceof ITextViewerExtension5) { - ITextViewerExtension5 extension = (ITextViewerExtension5) sourceViewer; + if (sourceViewer instanceof ITextViewerExtension5 extension) { visible = (extension.modelOffset2WidgetOffset(targetOffset) > -1); } else { IRegion visibleRegion = sourceViewer.getVisibleRegion(); diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextViewerConfiguration.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextViewerConfiguration.java index 3695acc024c..c76ed1482ed 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextViewerConfiguration.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ExtensionBasedTextViewerConfiguration.java @@ -97,7 +97,7 @@ public final class ExtensionBasedTextViewerConfiguration extends TextSourceViewerConfiguration implements IDocumentPartitioningListener { - private ITextEditor editor; + private final ITextEditor editor; private Set resolvedContentTypes; private Set fallbackContentTypes = Set.of(); private IDocument watchedDocument; @@ -386,8 +386,8 @@ class ExtensionBaseInformationProvider public Object getInformation2(ITextViewer textViewer, IRegion subject) { currentHovers = new LinkedHashMap<>(); for (ITextHover hover : this.fHovers) { - Object res = hover instanceof ITextHoverExtension2 - ? ((ITextHoverExtension2) hover).getHoverInfo2(textViewer, subject) + Object res = hover instanceof ITextHoverExtension2 i + ? i.getHoverInfo2(textViewer, subject) : hover.getHoverInfo(textViewer, subject); if (res != null) { currentHovers.put(hover, res); @@ -432,7 +432,7 @@ public IInformationControlCreator getInformationPresenterControlCreator() { return null; } else if (currentHovers.size() == 1) { ITextHover hover = this.currentHovers.keySet().iterator().next(); - return hover instanceof ITextHoverExtension ? ((ITextHoverExtension) hover).getHoverControlCreator() + return hover instanceof ITextHoverExtension i ? i.getHoverControlCreator() : new AbstractReusableInformationControlCreator() { @Override protected IInformationControl doCreateInformationControl(Shell parent) { diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericContentTypeRelatedExtension.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericContentTypeRelatedExtension.java index 19baafee53a..17b23cfce15 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericContentTypeRelatedExtension.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericContentTypeRelatedExtension.java @@ -129,7 +129,7 @@ public boolean matches(ISourceViewer viewer, ITextEditor editor) { /** * Returns the name of the contribution. - * + * * @return the name of the contribution. */ public String getContributionName() { diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorContentAssistant.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorContentAssistant.java index ef0d7b84862..d2b7bdef8c8 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorContentAssistant.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorContentAssistant.java @@ -42,7 +42,7 @@ *
  • Using a ContentTypeRelatedExtensionTracker to dynamically track * IContentAssistProcessor in the OSGi service registry * - * + * * @author christoph */ public class GenericEditorContentAssistant extends ContentAssistant implements IPropertyChangeListener { @@ -55,7 +55,7 @@ public class GenericEditorContentAssistant extends ContentAssistant implements I /** * Creates a new GenericEditorContentAssistant instance for the given content * types and contentAssistProcessorTracker - * + * * @param contentAssistProcessorTracker the tracker to use for tracking * additional * {@link IContentAssistProcessor}s in the @@ -74,7 +74,7 @@ public GenericEditorContentAssistant( /** * Creates a new GenericEditorContentAssistant instance for the given content * types and contentAssistProcessorTracker - * + * * @param contentAssistProcessorTracker the tracker to use for tracking * additional * {@link IContentAssistProcessor}s in the @@ -118,7 +118,7 @@ protected IInformationControl doCreateInformationControl(Shell parent) { /** * Updates the {@link IContentAssistProcessor} registrations according to the * documents content-type tokens - * + * * @param document the document to use for updating the tokens */ public void updateTokens(IDocument document) { diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorPlugin.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorPlugin.java index 6d2dc2aa705..0039197aed5 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorPlugin.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorPlugin.java @@ -62,9 +62,10 @@ public void start(BundleContext context) throws Exception { if (PlatformUI.isWorkbenchRunning()) { themeListener = event -> { - if (IThemeManager.CHANGE_CURRENT_THEME.equals(event.getProperty())) + if (IThemeManager.CHANGE_CURRENT_THEME.equals(event.getProperty())) { GenericEditorPluginPreferenceInitializer .setThemeBasedPreferences(GenericEditorPreferenceConstants.getPreferenceStore(), true); + } }; PlatformUI.getWorkbench().getThemeManager().addPropertyChangeListener(themeListener); } diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithContentTypeIcon.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithContentTypeIcon.java index cdf7f5a0e20..237632ada44 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithContentTypeIcon.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithContentTypeIcon.java @@ -26,8 +26,8 @@ * "org.eclipse.ui.genericeditor.icons". */ public class GenericEditorWithContentTypeIcon implements IEditorDescriptor { - private IEditorDescriptor editorDescriptor; - private String fileName; + private final IEditorDescriptor editorDescriptor; + private final String fileName; public GenericEditorWithContentTypeIcon(String fileName, IEditorDescriptor editorDescriptor) { Assert.isNotNull(editorDescriptor); diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithIconAssociationOverride.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithIconAssociationOverride.java index 37136e44df0..20420cfa0a5 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithIconAssociationOverride.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/GenericEditorWithIconAssociationOverride.java @@ -29,7 +29,7 @@ */ public class GenericEditorWithIconAssociationOverride implements IEditorAssociationOverride { - private Map descriptorMap = new HashMap<>(); + private final Map descriptorMap = new HashMap<>(); @Override public IEditorDescriptor[] overrideEditors(IEditorInput editorInput, IContentType contentType, diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/IconsRegistry.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/IconsRegistry.java index d5909b9a6ba..539581c6e2a 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/IconsRegistry.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/IconsRegistry.java @@ -32,7 +32,7 @@ public class IconsRegistry { private static final String EXTENSION_POINT_ID = GenericEditorPlugin.BUNDLE_ID + ".icons"; //$NON-NLS-1$ - private Map extensions = new LinkedHashMap<>(); + private final Map extensions = new LinkedHashMap<>(); private boolean outOfSync = true; public IconsRegistry() { diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/PresentationReconcilerRegistry.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/PresentationReconcilerRegistry.java index 813bc92b234..904e4492308 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/PresentationReconcilerRegistry.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/PresentationReconcilerRegistry.java @@ -39,7 +39,7 @@ public class PresentationReconcilerRegistry { private static final String EXTENSION_POINT_ID = GenericEditorPlugin.BUNDLE_ID + ".presentationReconcilers"; //$NON-NLS-1$ - private Map> extensions = new HashMap<>(); + private final Map> extensions = new HashMap<>(); private boolean outOfSync = true; /** @@ -52,7 +52,7 @@ public PresentationReconcilerRegistry() { /** * Get the contributed {@link IPresentationReconciler}s that are relevant to * hook on source viewer according to document content types. - * + * * @param sourceViewer the source viewer we're hooking completion to. * @param editor the text editor * @param contentTypes the content types of the document we're editing. diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/QuickAssistProcessorRegistry.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/QuickAssistProcessorRegistry.java index b28a8d1c03d..23a1d8c0457 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/QuickAssistProcessorRegistry.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/QuickAssistProcessorRegistry.java @@ -32,7 +32,7 @@ public class QuickAssistProcessorRegistry { private static final String EXTENSION_POINT_ID = GenericEditorPlugin.BUNDLE_ID + ".quickAssistProcessors"; //$NON-NLS-1$ - private Map> extensions = new HashMap<>(); + private final Map> extensions = new HashMap<>(); private boolean outOfSync = true; /** diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ReconcilerRegistry.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ReconcilerRegistry.java index 7dadab13600..10fc06217db 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ReconcilerRegistry.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/ReconcilerRegistry.java @@ -48,9 +48,9 @@ public class ReconcilerRegistry { private static final String FOLDING_EXTENSION_POINT_ID = GenericEditorPlugin.BUNDLE_ID + ".foldingReconcilers"; //$NON-NLS-1$ private static final String FOLDING_RECONCILING_STRATEGY_ELT_NAME = "foldingReconcilingStrategy"; //$NON-NLS-1$ - private Map> extensions = new HashMap<>(); - private Map> highlightExtensions = new HashMap<>(); - private Map> foldingExtensions = new HashMap<>(); + private final Map> extensions = new HashMap<>(); + private final Map> highlightExtensions = new HashMap<>(); + private final Map> foldingExtensions = new HashMap<>(); private boolean outOfSync = true; private boolean highlightOutOfSync = true; private boolean foldingOutOfSync = true; diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/TextDoubleClickStrategyRegistry.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/TextDoubleClickStrategyRegistry.java index 203e0f481cf..3fd10030fb9 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/TextDoubleClickStrategyRegistry.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/TextDoubleClickStrategyRegistry.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2022 Avaloq Group AG (http://www.avaloq.com). - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. - * + * * SPDX-License-Identifier: EPL-2.0 * * Contributors: @@ -31,7 +31,7 @@ public class TextDoubleClickStrategyRegistry { private static final String EXTENSION_POINT_ID = GenericEditorPlugin.BUNDLE_ID + ".textDoubleClickStrategies"; //$NON-NLS-1$ - private Map> extensions = new LinkedHashMap<>(); + private final Map> extensions = new LinkedHashMap<>(); private boolean outOfSync = true; /** diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/compare/GenericEditorViewer.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/compare/GenericEditorViewer.java index 1d3bab81738..08cd25d7d05 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/compare/GenericEditorViewer.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/compare/GenericEditorViewer.java @@ -1,13 +1,13 @@ /******************************************************************************* * Copyright (c) 2024 Ole Osterhagen and others. -* +* * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 -* +* * Contributors: * Ole Osterhagen - initial API and implementation *******************************************************************************/ diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/folding/DefaultFoldingReconciler.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/folding/DefaultFoldingReconciler.java index cb88382f27a..8b6544ce992 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/folding/DefaultFoldingReconciler.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/folding/DefaultFoldingReconciler.java @@ -31,8 +31,7 @@ public DefaultFoldingReconciler() { @Override public void install(ITextViewer textViewer) { super.install(textViewer); - if (textViewer instanceof ProjectionViewer) { - ProjectionViewer viewer = (ProjectionViewer) textViewer; + if (textViewer instanceof ProjectionViewer viewer) { foldingStrategy.setViewer(viewer); } } diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/folding/IndentFoldingStrategy.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/folding/IndentFoldingStrategy.java index 60325a9162b..fcce730427a 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/folding/IndentFoldingStrategy.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/folding/IndentFoldingStrategy.java @@ -111,8 +111,9 @@ public void paint(GC gc, Canvas canvas, Rectangle rectangle) { public void markCollapsed() { /* workaround for BUG85874 */ // do not mark collapsed if annotation is not visible - if (visible) + if (visible) { super.markCollapsed(); + } } } @@ -401,8 +402,7 @@ private void updateAnnotation(List modifications, List modifications, List deletions) { - if (existingAnnotation instanceof FoldingAnnotation) { - FoldingAnnotation foldingAnnotation = (FoldingAnnotation) existingAnnotation; + if (existingAnnotation instanceof FoldingAnnotation foldingAnnotation) { Position oldPos = projectionAnnotationModel.getPosition(foldingAnnotation); // if a new position can be calculated then update the position of @@ -441,8 +441,7 @@ protected void markInvalidAnnotationsForDeletion(DirtyRegion dirtyRegion, List(this.currentHovers.keySet())); diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/hover/OrderedExtensionComparator.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/hover/OrderedExtensionComparator.java index d818a5ef471..7c51e676149 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/hover/OrderedExtensionComparator.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/hover/OrderedExtensionComparator.java @@ -29,7 +29,7 @@ */ class OrderedExtensionComparator implements Comparator { - private Map extensionsById; + private final Map extensionsById; public OrderedExtensionComparator(Collection extensions) { Assert.isNotNull(extensions); diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/hover/TextHoverRegistry.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/hover/TextHoverRegistry.java index 1d30371d856..39c6ee294d2 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/hover/TextHoverRegistry.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/hover/TextHoverRegistry.java @@ -54,9 +54,9 @@ static class TextHoverExtension extends GenericContentTypeRelatedExtension annotations = findMarkerAnnotations(viewer, new Region(offset, 0)); if (annotations.isEmpty()) { return null; diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerResoltionQuickAssistProcessor.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerResoltionQuickAssistProcessor.java index 44494a14991..e7e87c73e28 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerResoltionQuickAssistProcessor.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerResoltionQuickAssistProcessor.java @@ -52,8 +52,7 @@ public ICompletionProposal[] computeQuickAssistProposals(IQuickAssistInvocationC IAnnotationModel annotationModel = invocationContext.getSourceViewer().getAnnotationModel(); Collection annotations = new HashSet<>(); annotationModel.getAnnotationIterator().forEachRemaining(annotation -> { - if (annotation instanceof MarkerAnnotation) { - MarkerAnnotation markerAnnotation = (MarkerAnnotation) annotation; + if (annotation instanceof MarkerAnnotation markerAnnotation) { Position position = annotationModel.getPosition(annotation); int documentOffset = invocationContext.getOffset(); int annotationOffset = position.getOffset(); diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerResolutionCompletionProposal.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerResolutionCompletionProposal.java index bdaa16a3da2..d6f28c84111 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerResolutionCompletionProposal.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/markers/MarkerResolutionCompletionProposal.java @@ -11,8 +11,8 @@ public class MarkerResolutionCompletionProposal implements ICompletionProposal { - private IMarkerResolution markerResolution; - private IMarker marker; + private final IMarkerResolution markerResolution; + private final IMarker marker; public MarkerResolutionCompletionProposal(IMarker marker, IMarkerResolution markerResolution) { this.marker = marker; diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/preferences/GenericEditorPluginPreferenceInitializer.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/preferences/GenericEditorPluginPreferenceInitializer.java index a93f180da98..f990c48a1b4 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/preferences/GenericEditorPluginPreferenceInitializer.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/preferences/GenericEditorPluginPreferenceInitializer.java @@ -32,8 +32,9 @@ public void initializeDefaultPreferences() { public static void setThemeBasedPreferences(IPreferenceStore store, boolean fireEvent) { ColorRegistry registry = null; - if (PlatformUI.isWorkbenchRunning()) + if (PlatformUI.isWorkbenchRunning()) { registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(); + } setDefault(store, GenericEditorPreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR, findRGB(registry, IGenericEditorThemeConstants.EDITOR_MATCHING_BRACKETS_COLOR, new RGB(127, 0, 85)), @@ -57,13 +58,15 @@ private static void setDefault(IPreferenceStore store, String key, RGB newValue, } RGB oldValue = null; - if (store.isDefault(key)) + if (store.isDefault(key)) { oldValue = PreferenceConverter.getDefaultColor(store, key); + } PreferenceConverter.setDefault(store, key, newValue); - if (oldValue != null && !oldValue.equals(newValue)) + if (oldValue != null && !oldValue.equals(newValue)) { store.firePropertyChangeEvent(key, oldValue, newValue); + } } /** @@ -76,12 +79,14 @@ private static void setDefault(IPreferenceStore store, String key, RGB newValue, * @since 1.2 */ private static RGB findRGB(ColorRegistry registry, String key, RGB defaultRGB) { - if (registry == null) + if (registry == null) { return defaultRGB; + } RGB rgb = registry.getRGB(key); - if (rgb != null) + if (rgb != null) { return rgb; + } return defaultRGB; } diff --git a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/preferences/GenericEditorPreferencePage.java b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/preferences/GenericEditorPreferencePage.java index b76f2b5e360..5680eb73f05 100644 --- a/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/preferences/GenericEditorPreferencePage.java +++ b/bundles/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/preferences/GenericEditorPreferencePage.java @@ -185,8 +185,9 @@ private static String validateDelay(String value) { } try { int integer = parseInteger(value); - if (integer < 0) + if (integer < 0) { return NLS.bind(Messages.ContentAssistant_autoActivationDelay_InvalidInput, integer); + } } catch (NumberFormatException e) { return NLS.bind(Messages.ContentAssistant_autoActivationDelay_InvalidInput, value); } From 8b4be2f178f222f63f436054bd261cb84cc20a4f Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Tue, 23 Sep 2025 03:57:22 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.38 stream --- bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF index d7a202bda7d..bb17fd0563b 100644 --- a/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.ui.genericeditor;singleton:=true -Bundle-Version: 1.3.700.qualifier +Bundle-Version: 1.3.800.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.ui.workbench.texteditor;bundle-version="3.10.0",