diff options
author | René Purrio | 2018-01-05 11:22:27 +0000 |
---|---|---|
committer | René Purrio | 2018-01-05 11:22:27 +0000 |
commit | 71eeeb63bd19b1263f0378d09b7d92a5108e3b44 (patch) | |
tree | f59764a7780ee87ef56108ef804754958e0a3d2e | |
parent | 3df8f29f3617867ae37ef815827c463878f4f218 (diff) | |
download | eclipse.platform.text-71eeeb63bd19b1263f0378d09b7d92a5108e3b44.tar.gz eclipse.platform.text-71eeeb63bd19b1263f0378d09b7d92a5108e3b44.tar.xz eclipse.platform.text-71eeeb63bd19b1263f0378d09b7d92a5108e3b44.zip |
Bug 529422 - [sonar] Resolve "instanceof will always return true"I20180107-2000I20180106-1500I20180105-2000
Change-Id: Ied3aa2abbe2512409101930307d19ffd3ef8e1b9
Signed-off-by: René Purrio <rpurrio@itemis.de>
4 files changed, 15 insertions, 18 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java index 93d98c27c00..8b25555254d 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java @@ -180,8 +180,8 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi @Override public void removeSelectionListener(SelectionListener selectionListener) { fCombo.removeSelectionListener(selectionListener); - Object listener= fModifyListeners.get(selectionListener); - if (listener instanceof Listener) - fCombo.removeListener(SWT.Modify, (Listener)listener); + Listener listener= fModifyListeners.get(selectionListener); + if (listener != null) + fCombo.removeListener(SWT.Modify, listener); } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java index b47cccde215..6ceb3529b3d 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java @@ -160,8 +160,8 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis @Override public void removeSelectionListener(SelectionListener selectionListener) { fText.removeSelectionListener(selectionListener); - Object listener= fModifyListeners.get(selectionListener); - if (listener instanceof Listener) - fText.removeListener(SWT.Modify, (Listener)listener); + Listener listener= fModifyListeners.get(selectionListener); + if (listener != null) + fText.removeListener(SWT.Modify, listener); } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java index 5ff9b3e6ad5..6c82dc1fbfa 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java @@ -14,7 +14,6 @@ package org.eclipse.jface.text; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.jface.preference.FontFieldEditor; @@ -79,9 +78,8 @@ public class PropagatingFontFieldEditor extends FontFieldEditor { */ private void checkForDefault() { if (presentsDefaultValue()) { - Control c= getValueControl(fParent); - if (c instanceof Label) - ((Label) c).setText(fDefaultFontLabel); + Label label= getValueControl(fParent); + label.setText(fDefaultFontLabel); } } diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java index e3d8d49a332..64f36b690a5 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java @@ -272,14 +272,13 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem @Override public void mouseMove(MouseEvent e) { if (fTable.equals(e.getSource())) { - Object o= fTable.getItem(new Point(e.x, e.y)); - if (fLastItem == null ^ o == null) { - fTable.setCursor(o == null ? null : fTable.getDisplay().getSystemCursor(SWT.CURSOR_HAND)); + TableItem item= fTable.getItem(new Point(e.x, e.y)); + if (fLastItem == null ^ item == null) { + fTable.setCursor(item == null ? null : fTable.getDisplay().getSystemCursor(SWT.CURSOR_HAND)); } - if (o instanceof TableItem) { - TableItem item= (TableItem) o; - if (!o.equals(fLastItem)) { - fLastItem= (TableItem) o; + if (item != null) { + if (!item.equals(fLastItem)) { + fLastItem= item; fTable.setSelection(new TableItem[] { fLastItem }); } else if (e.y < fTable.getItemHeight() / 4) { // Scroll up @@ -296,7 +295,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem fTable.setSelection(new TableItem[] { fLastItem }); } } - } else if (o == null) { + } else { fLastItem= null; } } |