Skip to content

Commit 87d1dc5

Browse files
vogellaclaude
vogella
and
claude
committed
Collapse inline Status allocations to ILog.of(Class) log sites
Replace Plugin.getDefault().getLog().log(new Status(...)) with ILog.of(MyClass.class).error(...) / .log(status) in non-activator classes to drop the activator round-trip and the Status allocation where applicable. Only touches sites where the class and the previously-used activator live in the same bundle, so log attribution is unchanged. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 61d50fa commit 87d1dc5

9 files changed

Lines changed: 21 additions & 41 deletions

File tree

‎debug/org.eclipse.debug.examples.core/src/org/eclipse/debug/examples/core/pda/model/PDADebugTarget.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.eclipse.core.resources.IMarkerDelta;
3232
import org.eclipse.core.resources.IResource;
3333
import org.eclipse.core.runtime.CoreException;
34+
import org.eclipse.core.runtime.ILog;
3435
import org.eclipse.core.runtime.IPath;
3536
import org.eclipse.core.runtime.IProgressMonitor;
3637
import org.eclipse.core.runtime.IStatus;
@@ -121,8 +122,7 @@ protected IStatus run(IProgressMonitor monitor) {
121122
event = PDAEvent.parseEvent(message);
122123
}
123124
catch (IllegalArgumentException e) {
124-
DebugCorePlugin.getDefault().getLog().log(
125-
new Status (IStatus.ERROR, "org.eclipse.debug.examples.core", "Error parsing PDA event", e)); //$NON-NLS-1$ //$NON-NLS-2$
125+
ILog.of(PDADebugTarget.class).error("Error parsing PDA event", e); //$NON-NLS-1$
126126
continue;
127127
}
128128
for (Object listener : fEventListeners.toArray()) {

‎terminal/bundles/org.eclipse.terminal.connector.local/src/org/eclipse/terminal/connector/local/launcher/LocalLauncherDelegate.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.eclipse.core.runtime.Assert;
3030
import org.eclipse.core.runtime.CoreException;
3131
import org.eclipse.core.runtime.IAdaptable;
32+
import org.eclipse.core.runtime.ILog;
3233
import org.eclipse.core.runtime.IPath;
3334
import org.eclipse.core.runtime.Path;
3435
import org.eclipse.core.runtime.Platform;
@@ -41,7 +42,6 @@
4142
import org.eclipse.terminal.connector.ITerminalConnector;
4243
import org.eclipse.terminal.connector.InMemorySettingsStore;
4344
import org.eclipse.terminal.connector.TerminalConnectorExtension;
44-
import org.eclipse.terminal.connector.local.activator.UIPlugin;
4545
import org.eclipse.terminal.connector.local.controls.LocalWizardConfigurationPanel;
4646
import org.eclipse.terminal.connector.process.ProcessSettings;
4747
import org.eclipse.terminal.view.core.ILineSeparatorConstants;
@@ -147,7 +147,7 @@ public CompletableFuture<?> execute(Map<String, Object> properties) {
147147
}
148148
} catch (CoreException ex) {
149149
if (Platform.inDebugMode()) {
150-
UIPlugin.getDefault().getLog().log(ex.getStatus());
150+
ILog.of(LocalLauncherDelegate.class).log(ex.getStatus());
151151
}
152152
}
153153
}

‎terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/actions/AbstractAction.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
import org.eclipse.core.commands.ParameterizedCommand;
1717
import org.eclipse.core.expressions.EvaluationContext;
1818
import org.eclipse.core.runtime.Assert;
19-
import org.eclipse.core.runtime.IStatus;
20-
import org.eclipse.core.runtime.Status;
19+
import org.eclipse.core.runtime.ILog;
2120
import org.eclipse.jface.viewers.IStructuredSelection;
2221
import org.eclipse.jface.viewers.StructuredSelection;
2322
import org.eclipse.osgi.util.NLS;
2423
import org.eclipse.swt.custom.CTabItem;
2524
import org.eclipse.terminal.control.ITerminalViewControl;
2625
import org.eclipse.terminal.view.ui.internal.Messages;
27-
import org.eclipse.terminal.view.ui.internal.UIPlugin;
2826
import org.eclipse.terminal.view.ui.internal.tabs.TabFolderManager;
2927
import org.eclipse.terminal.view.ui.internal.tabs.TabFolderToolbarHandler;
3028
import org.eclipse.ui.ISources;
@@ -118,11 +116,10 @@ protected void executeCommand(Object data) {
118116

119117
handlerSvc.executeCommandInContext(pCmd, null, context);
120118
} catch (Exception e) {
121-
IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
119+
ILog.of(AbstractAction.class).error(
122120
NLS.bind(Messages.AbstractAction_error_commandExecutionFailed, getCommandId(),
123121
e.getLocalizedMessage()),
124122
e);
125-
UIPlugin.getDefault().getLog().log(status);
126123
}
127124
}
128125
}

‎terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/actions/NewTerminalViewAction.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
import org.eclipse.core.commands.Command;
1616
import org.eclipse.core.commands.ParameterizedCommand;
1717
import org.eclipse.core.runtime.Assert;
18-
import org.eclipse.core.runtime.IStatus;
18+
import org.eclipse.core.runtime.ILog;
1919
import org.eclipse.core.runtime.Platform;
20-
import org.eclipse.core.runtime.Status;
2120
import org.eclipse.jface.action.IAction;
2221
import org.eclipse.terminal.view.ui.ITerminalsView;
2322
import org.eclipse.terminal.view.ui.internal.ImageConsts;
@@ -64,9 +63,7 @@ public void run() {
6463
} catch (Exception e) {
6564
// If the platform is in debug mode, we print the exception to the log view
6665
if (Platform.inDebugMode()) {
67-
IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
68-
Messages.AbstractTriggerCommandHandler_error_executionFailed, e);
69-
UIPlugin.getDefault().getLog().log(status);
66+
ILog.of(NewTerminalViewAction.class).error(Messages.AbstractTriggerCommandHandler_error_executionFailed, e);
7067
}
7168
}
7269
}

‎terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/handler/AbstractTriggerCommandHandler.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
import org.eclipse.core.expressions.EvaluationContext;
1818
import org.eclipse.core.expressions.IEvaluationContext;
1919
import org.eclipse.core.runtime.Assert;
20-
import org.eclipse.core.runtime.IStatus;
20+
import org.eclipse.core.runtime.ILog;
2121
import org.eclipse.core.runtime.Platform;
22-
import org.eclipse.core.runtime.Status;
2322
import org.eclipse.jface.viewers.ISelection;
2423
import org.eclipse.terminal.view.ui.internal.Messages;
25-
import org.eclipse.terminal.view.ui.internal.UIPlugin;
2624
import org.eclipse.ui.ISources;
2725
import org.eclipse.ui.PlatformUI;
2826
import org.eclipse.ui.commands.ICommandService;
@@ -59,9 +57,7 @@ protected void triggerCommand(String commandId, ISelection selection) {
5957
} catch (Exception e) {
6058
// If the platform is in debug mode, we print the exception to the log view
6159
if (Platform.inDebugMode()) {
62-
IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
63-
Messages.AbstractTriggerCommandHandler_error_executionFailed, e);
64-
UIPlugin.getDefault().getLog().log(status);
60+
ILog.of(AbstractTriggerCommandHandler.class).error(Messages.AbstractTriggerCommandHandler_error_executionFailed, e);
6561
}
6662
}
6763
}

‎terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/preferences/PreferencePage.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.Map;
2323

2424
import org.eclipse.core.runtime.CoreException;
25+
import org.eclipse.core.runtime.ILog;
2526
import org.eclipse.core.runtime.IPath;
2627
import org.eclipse.core.runtime.Path;
2728
import org.eclipse.core.runtime.Platform;
@@ -313,7 +314,7 @@ public void widgetSelected(SelectionEvent e) {
313314
dialog.setFilterPath(resolved);
314315
} catch (CoreException ex) {
315316
if (Platform.inDebugMode()) {
316-
UIPlugin.getDefault().getLog().log(ex.getStatus());
317+
ILog.of(PreferencePage.class).log(ex.getStatus());
317318
}
318319
}
319320
}
@@ -676,7 +677,7 @@ public boolean performOk() {
676677
p.toFile().canRead() && p.toFile().isDirectory() ? text.trim() : ""); //$NON-NLS-1$
677678
} catch (CoreException e) {
678679
if (Platform.inDebugMode()) {
679-
UIPlugin.getDefault().getLog().log(e.getStatus());
680+
ILog.of(PreferencePage.class).log(e.getStatus());
680681
}
681682
}
682683
}

‎terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/view/TerminalsView.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
import org.eclipse.core.expressions.IEvaluationContext;
2525
import org.eclipse.core.runtime.Assert;
2626
import org.eclipse.core.runtime.IAdaptable;
27+
import org.eclipse.core.runtime.ILog;
2728
import org.eclipse.core.runtime.IPath;
28-
import org.eclipse.core.runtime.IStatus;
2929
import org.eclipse.core.runtime.Platform;
30-
import org.eclipse.core.runtime.Status;
3130
import org.eclipse.jface.resource.JFaceResources;
3231
import org.eclipse.jface.viewers.ISelection;
3332
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -56,7 +55,6 @@
5655
import org.eclipse.swt.widgets.Control;
5756
import org.eclipse.terminal.view.ui.ITerminalsView;
5857
import org.eclipse.terminal.view.ui.internal.Messages;
59-
import org.eclipse.terminal.view.ui.internal.UIPlugin;
6058
import org.eclipse.terminal.view.ui.internal.tabs.TabFolderManager;
6159
import org.eclipse.terminal.view.ui.internal.tabs.TabFolderMenuHandler;
6260
import org.eclipse.terminal.view.ui.internal.tabs.TabFolderToolbarHandler;
@@ -734,9 +732,7 @@ public boolean show(ShowInContext context) {
734732
} catch (Exception e) {
735733
// If the platform is in debug mode, we print the exception to the log view
736734
if (Platform.inDebugMode()) {
737-
IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
738-
Messages.AbstractTriggerCommandHandler_error_executionFailed, e);
739-
UIPlugin.getDefault().getLog().log(status);
735+
ILog.of(TerminalsView.class).error(Messages.AbstractTriggerCommandHandler_error_executionFailed, e);
740736
}
741737
}
742738
}

‎terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/InputStreamMonitor.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@
1919
import java.util.Queue;
2020

2121
import org.eclipse.core.runtime.Assert;
22-
import org.eclipse.core.runtime.IStatus;
23-
import org.eclipse.core.runtime.Status;
22+
import org.eclipse.core.runtime.ILog;
2423
import org.eclipse.osgi.util.NLS;
2524
import org.eclipse.terminal.connector.ITerminalControl;
2625
import org.eclipse.terminal.view.core.ILineSeparatorConstants;
2726
import org.eclipse.terminal.view.ui.internal.Messages;
28-
import org.eclipse.terminal.view.ui.internal.UIPlugin;
2927
import org.eclipse.ui.services.IDisposable;
3028

3129
/**
@@ -265,10 +263,8 @@ protected void writeStream() {
265263
} catch (IOException e) {
266264
// IOException received. If this is happening when already disposed -> ignore
267265
if (!disposed && !disposalComing) {
268-
IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
269-
NLS.bind(Messages.InputStreamMonitor_error_writingToStream, e.getLocalizedMessage()),
270-
e);
271-
UIPlugin.getDefault().getLog().log(status);
266+
ILog.of(InputStreamMonitor.class).error(
267+
NLS.bind(Messages.InputStreamMonitor_error_writingToStream, e.getLocalizedMessage()), e);
272268
}
273269
} catch (InterruptedException e) {
274270
break;

‎terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/streams/OutputStreamMonitor.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
import java.util.List;
1919

2020
import org.eclipse.core.runtime.Assert;
21-
import org.eclipse.core.runtime.IStatus;
21+
import org.eclipse.core.runtime.ILog;
2222
import org.eclipse.core.runtime.ListenerList;
23-
import org.eclipse.core.runtime.Status;
2423
import org.eclipse.osgi.util.NLS;
2524
import org.eclipse.terminal.connector.ITerminalControl;
2625
import org.eclipse.terminal.view.core.ILineSeparatorConstants;
@@ -220,18 +219,16 @@ void readStream() {
220219
} catch (IOException e) {
221220
// IOException received. If this is happening when already disposed -> ignore
222221
if (!disposed && !disposalComing) {
223-
IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
222+
ILog.of(OutputStreamMonitor.class).error(
224223
NLS.bind(Messages.OutputStreamMonitor_error_readingFromStream, e.getLocalizedMessage()), e);
225-
UIPlugin.getDefault().getLog().log(status);
226224
}
227225
break;
228226
} catch (NullPointerException e) {
229227
// killing the stream monitor while reading can cause an NPE
230228
// when reading from the stream
231229
if (!disposed && thread != null && !disposalComing) {
232-
IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
230+
ILog.of(OutputStreamMonitor.class).error(
233231
NLS.bind(Messages.OutputStreamMonitor_error_readingFromStream, e.getLocalizedMessage()), e);
234-
UIPlugin.getDefault().getLog().log(status);
235232
}
236233
break;
237234
}

0 commit comments

Comments
 (0)