diff options
author | Lars Vogel | 2020-10-20 09:38:32 +0000 |
---|---|---|
committer | Lars Vogel | 2020-10-20 11:02:25 +0000 |
commit | b74f7528de85755033a3a40f0a70439287c61f39 (patch) | |
tree | a3110b04f5ebb3504097907f47a931a1f82493c7 | |
parent | 25fac8a34b6dbf4715c94ca247adff8b056e7546 (diff) | |
download | eclipse.platform.team-b74f7528de85755033a3a40f0a70439287c61f39.tar.gz eclipse.platform.team-b74f7528de85755033a3a40f0a70439287c61f39.tar.xz eclipse.platform.team-b74f7528de85755033a3a40f0a70439287c61f39.zip |
Bug 568029 - Replace logging via activator with standard loggingY20201021-1200I20201021-1800
Change-Id: I22aafebc5edbb74bb8d7b0e4f7707588b3e7722c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
3 files changed, 10 insertions, 31 deletions
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/ComparePlugin.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/ComparePlugin.java index 37a7d91c9..77856016e 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/ComparePlugin.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/ComparePlugin.java @@ -13,9 +13,7 @@ *******************************************************************************/ package org.eclipse.compare.internal.core; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Plugin; -import org.eclipse.core.runtime.Status; import org.osgi.framework.BundleContext; /** @@ -59,18 +57,11 @@ public class ComparePlugin extends Plugin { return plugin; } - public static void log(Throwable e) { - log(new Status(IStatus.ERROR, PLUGIN_ID, 0, Messages.Activator_1, e)); - } - - public static void log(IStatus status) { - getDefault().getLog().log(status); - } - public void setCappingDisabled(boolean disable) { this.cappingDisabled = disable; } + public boolean isCappingDisabled() { return this.cappingDisabled; } diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java index 02f765fb8..34c10e311 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/FileDiffResult.java @@ -13,23 +13,12 @@ *******************************************************************************/ package org.eclipse.compare.internal.core.patch; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.eclipse.compare.internal.core.ComparePlugin; +import java.io.*; +import java.util.*; + import org.eclipse.compare.internal.core.Messages; -import org.eclipse.compare.patch.IFilePatchResult; -import org.eclipse.compare.patch.IHunk; -import org.eclipse.compare.patch.PatchConfiguration; -import org.eclipse.compare.patch.ReaderCreator; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.compare.patch.*; +import org.eclipse.core.runtime.*; import org.eclipse.osgi.util.NLS; public class FileDiffResult implements IFilePatchResult { @@ -332,7 +321,7 @@ public class FileDiffResult implements IFilePatchResult { try { bytes = contents.getBytes(charSet); } catch (UnsupportedEncodingException e) { - ComparePlugin.log(e); + Platform.getLog(FileDiffResult.class).error(Messages.Activator_1, e); } } if (bytes == null) { diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java index f7732e063..2192e0750 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java @@ -18,10 +18,9 @@ import java.io.BufferedReader; import java.io.IOException; import java.util.*; -import org.eclipse.compare.internal.core.ComparePlugin; +import org.eclipse.compare.internal.core.Messages; import org.eclipse.compare.patch.ReaderCreator; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.*; public class LineReader { /** @@ -36,7 +35,7 @@ public class LineReader { bufferedReader = new BufferedReader(content.createReader()); lines = readLines(bufferedReader); } catch (CoreException ex) { - ComparePlugin.log(ex); + Platform.getLog(LineReader.class).error(Messages.Activator_1, ex); } finally { if (bufferedReader != null) { try { |