Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
Expand All @@ -52,7 +53,6 @@
import org.eclipse.ui.internal.registry.EditorRegistry;
import org.eclipse.ui.internal.registry.FileEditorMapping;
import org.eclipse.ui.internal.util.PrefUtil;
import org.eclipse.ui.tests.TestPlugin;
import org.eclipse.ui.tests.harness.util.ArrayUtil;
import org.eclipse.ui.tests.harness.util.CallHistory;
import org.eclipse.ui.tests.harness.util.FileUtil;
Expand Down Expand Up @@ -93,7 +93,7 @@ public void tearDown() throws CoreException {
try {
FileUtil.deleteProject(proj);
} catch (CoreException e) {
TestPlugin.getDefault().getLog().log(e.getStatus());
ILog.of(IEditorRegistryTest.class).log(e.getStatus());
throw e;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*******************************************************************************/
package org.eclipse.ui.tests.api.workbenchpart;

import org.eclipse.core.runtime.ILog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTError;
import org.eclipse.swt.events.SelectionAdapter;
Expand All @@ -25,7 +26,6 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.tests.TestPlugin;

public class HeavyResourceView extends ViewPart {

Expand Down Expand Up @@ -81,7 +81,7 @@ public void useAll() {
new Composite(tempShell, SWT.NONE);
}
} catch (SWTError e) {
TestPlugin.getDefault().getLog().log(WorkbenchPlugin.getStatus(e));
ILog.of(HeavyResourceView.class).log(WorkbenchPlugin.getStatus(e));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.IWizardPage;
Expand All @@ -44,7 +45,6 @@
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.registry.WorkingSetDescriptor;
import org.eclipse.ui.internal.registry.WorkingSetRegistry;
import org.eclipse.ui.tests.TestPlugin;
import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
import org.eclipse.ui.tests.harness.util.DialogCheck;
import org.eclipse.ui.tests.harness.util.FileUtil;
Expand Down Expand Up @@ -154,7 +154,7 @@ private void cleanupWorkspace() {
root.delete(true, null);
}
} catch (CoreException e1) {
TestPlugin.getDefault().getLog().log(e.getStatus());
ILog.of(UIWorkingSetWizardsAuto.class).log(e.getStatus());
throw createAssertionError(e);
}
} finally {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.eclipse.core.resources.mapping.ResourceMappingContext;
import org.eclipse.core.resources.mapping.ResourceTraversal;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ui.tests.TestPlugin;

public class TestResourceMapping extends ResourceMapping {

Expand Down Expand Up @@ -78,7 +78,7 @@ public TestResourceMapping[] getChildren() {
try {
children = ((IContainer) element).members();
} catch (CoreException e) {
TestPlugin.getDefault().getLog().log(e.getStatus());
ILog.of(TestResourceMapping.class).log(e.getStatus());
return new TestResourceMapping[0];
}
TestResourceMapping[] result = new TestResourceMapping[children.length];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.ui.tests.TestPlugin;
import org.osgi.framework.FrameworkUtil;

/**
Expand Down Expand Up @@ -77,7 +77,7 @@ private void openError(Exception e) {

IStatus status = new Status(IStatus.ERROR, bundleId, 0, msg, e);

TestPlugin.getDefault().getLog().log(status);
ILog.of(RemoveMarkersAction.class).log(status);

ErrorDialog.openError(window.getShell(), "Error", msg, status);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.Collections;
import java.util.concurrent.TimeUnit;

import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
Expand All @@ -35,7 +36,6 @@
import org.eclipse.ui.internal.progress.ProgressInfoItem;
import org.eclipse.ui.internal.progress.TaskInfo;
import org.eclipse.ui.progress.IProgressConstants;
import org.eclipse.ui.tests.TestPlugin;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -168,8 +168,8 @@ public void testItemOrder() throws Exception {
job.schedule();
scheduleOrder.append(job.getName()).append(", ");
}
TestPlugin.getDefault().getLog()
.log(new Status(IStatus.OK, TestPlugin.PLUGIN_ID, scheduleOrder.toString()));
ILog.of(ProgressViewTests.class)
.log(new Status(IStatus.OK, ProgressViewTests.class, scheduleOrder.toString()));

// Wait for all jobs to be running
for (DummyJob job : allJobs) {
Expand Down
Loading