Bug 552773 - Simplify logging in platform code base
Change-Id: Ib0fc0e41b41811676a959e84e88c9672d05ff006
Signed-off-by: Christoph Läubrich <laeubi@laeubi-soft.de>
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java
index d0e8e06..22e5a56 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetPlugin.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2016 IBM Corporation and others.
+ * Copyright (c) 2002, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Christoph Läubrich - Bug 552773 - Simplify logging in platform code base
*******************************************************************************/
package org.eclipse.ui.internal.cheatsheets;
@@ -132,8 +133,7 @@
documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
documentBuilder.setEntityResolver(new LocalEntityResolver());
} catch (Exception e) {
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, Messages.ERROR_CREATING_DOCUMENT_BUILDER, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(Messages.ERROR_CREATING_DOCUMENT_BUILDER, e);
}
}
return documentBuilder;
@@ -145,9 +145,7 @@
public static synchronized void logError(String message, Throwable ex) {
if (message == null)
message = ""; //$NON-NLS-1$
- Status errorStatus = new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK,
- message, ex);
- CheatSheetPlugin.getPlugin().getLog().log(errorStatus);
+ CheatSheetPlugin.getPlugin().getLog().error(message, ex);
}
@Override
@@ -258,8 +256,7 @@
@Override
public void handleException(Throwable e) {
String message = Messages.ERROR_READING_STATE_FILE;
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
});
}
@@ -287,8 +284,7 @@
// Do nothing, the file will not exist the first time the workbench in used.
} catch (Exception e) {
String message = Messages.ERROR_READING_STATE_FILE;
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
memento = null;
} finally {
try {
@@ -297,8 +293,7 @@
} catch (IOException e) {
// Not much to do, just catch the exception and keep going.
String message = Messages.ERROR_READING_STATE_FILE;
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
}
return memento;
@@ -327,8 +322,7 @@
@Override
public void handleException(Throwable e) {
String message = Messages.ERROR_WRITING_STATE_FILE;
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
});
}
@@ -360,8 +354,7 @@
writer.close();
} catch (IOException e) {
String message = Messages.ERROR_WRITING_STATE_FILE;
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
}
}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/OpenPerspective.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/OpenPerspective.java
index 0570052..979f289 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/OpenPerspective.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/actions/OpenPerspective.java
@@ -10,11 +10,10 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Christoph Läubrich - Bug 552773 - Simplify logging in platform code base
*******************************************************************************/
package org.eclipse.ui.internal.cheatsheets.actions;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.Action;
import org.eclipse.ui.IPerspectiveDescriptor;
import org.eclipse.ui.IWorkbench;
@@ -24,7 +23,6 @@
import org.eclipse.ui.cheatsheets.ICheatSheetAction;
import org.eclipse.ui.cheatsheets.ICheatSheetManager;
import org.eclipse.ui.internal.cheatsheets.CheatSheetPlugin;
-import org.eclipse.ui.internal.cheatsheets.ICheatSheetResource;
import org.eclipse.ui.internal.cheatsheets.Messages;
/**
@@ -59,8 +57,7 @@
IPerspectiveDescriptor perspective = workbench.getPerspectiveRegistry().findPerspectiveWithId(params[0]);
page.setPerspective(perspective);
} catch(Exception e) {
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, Messages.ERROR_OPENING_PERSPECTIVE, null);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(Messages.ERROR_OPENING_PERSPECTIVE, null);
}
}
}
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskEditorManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskEditorManager.java
index f51a8bc..4f36840 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskEditorManager.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskEditorManager.java
@@ -10,6 +10,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Christoph Läubrich - Bug 552773 - Simplify logging in platform code base
*******************************************************************************/
package org.eclipse.ui.internal.cheatsheets.composite.views;
@@ -19,14 +20,11 @@
import java.net.URL;
import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.internal.cheatsheets.CheatSheetPlugin;
-import org.eclipse.ui.internal.cheatsheets.ICheatSheetResource;
import org.eclipse.ui.internal.cheatsheets.Messages;
import org.eclipse.ui.internal.cheatsheets.registry.CheatSheetRegistryReader;
import org.eclipse.ui.internal.provisional.cheatsheets.TaskEditor;
@@ -58,8 +56,7 @@
extClass = bundle.loadClass(className);
} catch (Exception e) {
String message = NLS.bind(Messages.ERROR_LOADING_CLASS, (new Object[] {className}));
- Status status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
try {
if (extClass != null) {
@@ -68,8 +65,7 @@
}
} catch (Exception e) {
String message = NLS.bind(Messages.ERROR_CREATING_CLASS, (new Object[] {className}));
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
return editorInstance;
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskExplorerManager.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskExplorerManager.java
index bd0a203..eed4b90 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskExplorerManager.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/views/TaskExplorerManager.java
@@ -10,6 +10,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Christoph Läubrich - Bug 552773 - Simplify logging in platform code base
*******************************************************************************/
package org.eclipse.ui.internal.cheatsheets.composite.views;
@@ -21,15 +22,12 @@
import java.util.Map;
import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.internal.cheatsheets.CheatSheetPlugin;
-import org.eclipse.ui.internal.cheatsheets.ICheatSheetResource;
import org.eclipse.ui.internal.cheatsheets.Messages;
import org.eclipse.ui.internal.cheatsheets.registry.CheatSheetRegistryReader;
import org.eclipse.ui.internal.provisional.cheatsheets.TaskExplorer;
@@ -63,8 +61,7 @@
extClass = bundle.loadClass(className);
} catch (Exception e) {
String message = NLS.bind(Messages.ERROR_LOADING_CLASS, (new Object[] {className}));
- Status status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
try {
if (extClass != null) {
@@ -73,8 +70,7 @@
}
} catch (Exception e) {
String message = NLS.bind(Messages.ERROR_CREATING_CLASS, (new Object[] {className}));
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
return explorerInstance;
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java
index c55c21a..46d358e 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetElement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2018 IBM Corporation and others.
+ * Copyright (c) 2002, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,19 +10,17 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Christoph Läubrich - Bug 552773 - Simplify logging in platform code base
*******************************************************************************/
package org.eclipse.ui.internal.cheatsheets.registry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IPluginContribution;
import org.eclipse.ui.cheatsheets.CheatSheetListener;
import org.eclipse.ui.internal.cheatsheets.CheatSheetPlugin;
-import org.eclipse.ui.internal.cheatsheets.ICheatSheetResource;
import org.eclipse.ui.internal.cheatsheets.Messages;
import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.ui.model.WorkbenchAdapter;
@@ -171,8 +169,7 @@
extClass = bundle.loadClass(listenerClass);
} catch (Exception e) {
String message = NLS.bind(Messages.ERROR_LOADING_CLASS, (new Object[] {listenerClass}));
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
try {
if (extClass != null) {
@@ -180,8 +177,7 @@
}
} catch (Exception e) {
String message = NLS.bind(Messages.ERROR_CREATING_CLASS, (new Object[] {listenerClass}));
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
if (listener != null){
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetItemExtensionElement.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetItemExtensionElement.java
index d7e5a6c..516121a 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetItemExtensionElement.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/CheatSheetItemExtensionElement.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2002, 2017 IBM Corporation and others.
+ * Copyright (c) 2002, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Christoph Läubrich - Bug 552773 - Simplify logging in platform code base
*******************************************************************************/
package org.eclipse.ui.internal.cheatsheets.registry;
@@ -18,13 +19,10 @@
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.cheatsheets.AbstractItemExtensionElement;
import org.eclipse.ui.internal.cheatsheets.CheatSheetPlugin;
-import org.eclipse.ui.internal.cheatsheets.ICheatSheetResource;
import org.eclipse.ui.internal.cheatsheets.Messages;
import org.eclipse.ui.model.IWorkbenchAdapter;
import org.eclipse.ui.model.WorkbenchAdapter;
@@ -121,8 +119,7 @@
extClass = bundle.loadClass(className);
} catch (Exception e) {
String message = NLS.bind(Messages.ERROR_LOADING_CLASS, (new Object[] {className}));
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
try {
if (extClass != null) {
@@ -131,8 +128,7 @@
}
} catch (Exception e) {
String message = NLS.bind(Messages.ERROR_CREATING_CLASS, (new Object[] {className}));
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
}
if (extElement != null){
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/RegistryReader.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/RegistryReader.java
index 54f36b5..a88cfcb 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/RegistryReader.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/registry/RegistryReader.java
@@ -10,6 +10,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Christoph Läubrich - Bug 552773 - Simplify logging in platform code base
*******************************************************************************/
package org.eclipse.ui.internal.cheatsheets.registry;
@@ -17,8 +18,6 @@
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
import org.eclipse.ui.internal.cheatsheets.CheatSheetPlugin;
import org.eclipse.ui.internal.cheatsheets.ICheatSheetResource;
@@ -69,8 +68,7 @@
buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-2$//$NON-NLS-1$
buf.append("\n" + text); //$NON-NLS-1$
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, buf.toString(), null);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(buf.toString());
}
/**
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java
index 2605eca..be30048 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/views/CheatSheetViewer.java
@@ -12,6 +12,7 @@
* IBM Corporation - initial API and implementation
* Tom Hofmann, Perspectix AG - https://bugs.eclipse.org/bugs/show_bug.cgi?id=291750
* Asma Smaoui - CEA LIST - https://bugs.eclipse.org/bugs/show_bug.cgi?id=517379
+ * Christoph Läubrich - Bug 552773 - Simplify logging in platform code base
*******************************************************************************/
package org.eclipse.ui.internal.cheatsheets.views;
@@ -514,8 +515,7 @@
// Log the exception
String stateFile = saveHelper.getStateFile(currentID).toOSString();
String message = NLS.bind(Messages.ERROR_APPLYING_STATE_DATA_LOG, (new Object[] {stateFile, currentID}));
- IStatus status = new Status(IStatus.ERROR, ICheatSheetResource.CHEAT_SHEET_PLUGIN_ID, IStatus.OK, message, e);
- CheatSheetPlugin.getPlugin().getLog().log(status);
+ CheatSheetPlugin.getPlugin().getLog().error(message, e);
// Set the currentID to null so it is not saved during internalDispose()
currentID = null;
