Skip to content

Commit 62f5eca

Browse files
eclipse-platform-botakurtakov
authored andcommitted
Perform clean code of debug/org.eclipse.ui.console
1 parent b01dfa3 commit 62f5eca

File tree

8 files changed

+11
-19
lines changed

8 files changed

+11
-19
lines changed

debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/TextViewerGotoLineAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void run() {
111111
fLastLine= document.getLineOfOffset(document.getLength()) + 1;
112112
int startLine= selection == null ? 1 : fTextViewer.getTextWidget().getLineAtOffset(selection.x) + 1;
113113
String title= ConsoleMessages.TextViewerGotoLineAction_Go_To_Line_1;
114-
String message= MessageFormat.format(ConsoleMessages.TextViewerGotoLineAction_Enter_line_number__8, new Object[] {Integer.valueOf(fLastLine)});
114+
String message= MessageFormat.format(ConsoleMessages.TextViewerGotoLineAction_Enter_line_number__8, Integer.valueOf(fLastLine));
115115
String value= Integer.toString(startLine);
116116
Shell activeShell= fTextViewer.getTextWidget().getShell();
117117
InputDialog d= new InputDialog(activeShell, title, message, value, new NumberValidator());

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleDropDownAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ public void run() {
141141
@Override
142142
public void runWithEvent(Event event) {
143143
// Show menu on drop-down button, run action otherwise
144-
if (event.detail == SWT.ARROW && event.widget instanceof ToolItem) {
145-
ToolItem toolItem = (ToolItem) event.widget;
144+
if (event.detail == SWT.ARROW && event.widget instanceof ToolItem toolItem) {
146145
Control control = toolItem.getParent();
147146
Menu menu = getMenu(control);
148147

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleManager.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,7 @@ public void showConsoleView(final IConsole console) {
355355
*/
356356
private boolean shouldBringToTop(IConsole console, IViewPart consoleView) {
357357
boolean bringToTop = true;
358-
if (consoleView instanceof IConsoleView) {
359-
IConsoleView cView = (IConsoleView) consoleView;
358+
if (consoleView instanceof IConsoleView cView) {
360359
if (cView.isPinned()) {
361360
IConsole pinnedConsole = cView.getConsole();
362361
bringToTop = console.equals(pinnedConsole);
@@ -416,8 +415,7 @@ public IPatternMatchListener[] createPatternMatchListeners(IConsole console) {
416415
continue;
417416
}
418417

419-
if (console instanceof TextConsole && extension.isEnabledFor(console)) {
420-
TextConsole textConsole = (TextConsole) console;
418+
if (console instanceof TextConsole textConsole && extension.isEnabledFor(console)) {
421419
PatternMatchListener patternMatchListener = new PatternMatchListener(extension);
422420
try {
423421
textConsole.addPatternMatchListener(patternMatchListener);

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@ protected void updateTitle() {
260260
protected void updateHelp() {
261261
IConsole console = getConsole();
262262
String helpContextId = null;
263-
if (console instanceof AbstractConsole) {
264-
AbstractConsole abs = (AbstractConsole) console;
263+
if (console instanceof AbstractConsole abs) {
265264
helpContextId = abs.getHelpContextId();
266265
}
267266
if (helpContextId == null) {
@@ -474,8 +473,7 @@ protected void configureToolBar(IToolBarManager mgr) {
474473
mgr.add(fDisplayConsoleAction);
475474
if (fOpenConsoleAction != null) {
476475
mgr.add(fOpenConsoleAction);
477-
if (mgr instanceof ToolBarManager) {
478-
ToolBarManager tbm= (ToolBarManager) mgr;
476+
if (mgr instanceof ToolBarManager tbm) {
479477
final ToolBar tb= tbm.getControl();
480478
tb.addMouseListener(new MouseAdapter() {
481479
@Override
@@ -704,8 +702,7 @@ public void partDeactivated(IWorkbenchPartReference partRef) {
704702
* @return true if the specified part reference is the console view
705703
*/
706704
protected boolean isThisPart(IWorkbenchPartReference partRef) {
707-
if (partRef instanceof IViewReference) {
708-
IViewReference viewRef = (IViewReference) partRef;
705+
if (partRef instanceof IViewReference viewRef) {
709706
if (getViewSite() != null && viewRef.getId().equals(getViewSite().getId())) {
710707
String secId = viewRef.getSecondaryId();
711708
String mySec = null;

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IOConsolePartitioner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ private boolean offer(PendingPartition p) {
718718
/**
719719
* Holds data until updateJob can be run and the document can be updated.
720720
*/
721-
private class PendingPartition {
721+
private static class PendingPartition {
722722
private final CharSequence text;
723723
private final IOConsoleOutputStream stream;
724724

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ public void dispose() {
7575

7676
@Override
7777
public void runWithEvent(Event event) {
78-
if (event.widget instanceof ToolItem) {
79-
ToolItem toolItem= (ToolItem) event.widget;
78+
if (event.widget instanceof ToolItem toolItem) {
8079
Control control= toolItem.getParent();
8180
Menu menu= getMenu(control);
8281

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public Expression getEnablementExpression() throws CoreException {
8787
if (fEnablementExpression == null) {
8888
IConfigurationElement[] elements = fConfig.getChildren(ExpressionTagNames.ENABLEMENT);
8989
if (elements.length == 0) {
90-
String message = MessageFormat.format("{0} " + getLocalId() + " {1} " + getPluginId() + " {2}", new Object[] { ConsoleMessages.PatternMatchListenerExtension_3, ConsoleMessages.PatternMatchListenerExtension_4, ConsoleMessages.PatternMatchListenerExtension_5 }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
90+
String message = MessageFormat.format("{0} " + getLocalId() + " {1} " + getPluginId() + " {2}", ConsoleMessages.PatternMatchListenerExtension_3, ConsoleMessages.PatternMatchListenerExtension_4, ConsoleMessages.PatternMatchListenerExtension_5); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
9191
ConsolePlugin.log(new Status(IStatus.WARNING, ConsolePlugin.getUniqueIdentifier(), IStatus.OK, message, null));
9292
}
9393
IConfigurationElement enablement = elements.length > 0 ? elements[0] : null;

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ansi/commands/EnableDisableHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ public void updateElement(UIElement element, Map parameters) {
6464
// it has a "dummy" event that I've created.
6565
private static boolean wasMyEvent(ExecutionEvent executionEvent) {
6666
Object trigger = executionEvent.getTrigger();
67-
if (trigger instanceof Event) {
68-
Event internalEvent = (Event) trigger;
67+
if (trigger instanceof Event internalEvent) {
6968
if (internalEvent.time == 0 && internalEvent.type == 0) { // My event
7069
return true;
7170
}

0 commit comments

Comments
 (0)