ctf.core: Remove direct Eclipse platform dependency from ctf.core

Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
eclipse-tracecompass · Mar 11, 2024 · 3c0c642 · 3c0c642
1 parent ea8e9ed
commit 3c0c642
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 95 deletions.
diff --git a/ctf/org.eclipse.tracecompass.ctf.core/META-INF/MANIFEST.MF b/ctf/org.eclipse.tracecompass.ctf.core/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.ctf.core;singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.tracecompass.common.core,
+Require-Bundle: org.eclipse.tracecompass.common.core,
  org.eclipse.tracecompass.ctf.parser,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
 Export-Package: org.eclipse.tracecompass.ctf.core,

diff --git a/...acecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/CtfCoreLoggerUtil.java b/...acecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/CtfCoreLoggerUtil.java
@@ -17,10 +17,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-
 /**
  * The class for adding logging Utility to the CTF plug-in.
  */
@@ -33,21 +29,7 @@ public class CtfCoreLoggerUtil {
     /**
      * Flag to indicate if platform is running
      */
-    public static final boolean IS_PLATFORM_RUNNING;
-    private static Logger LOGGER;
-    static {
-        boolean result = false;
-        try {
-            result = Platform.isRunning();
-        } catch (Exception exception) {
-            // Assume that we aren't running.
-        }
-        IS_PLATFORM_RUNNING = result;
-        if (!result) {
-            LOGGER = Logger.getLogger(CtfCoreLoggerUtil.class.getName());
-        }
-    }
-
+    private static Logger LOGGER = Logger.getLogger(CtfCoreLoggerUtil.class.getName());
 
     /**
      * The plug-in ID
@@ -76,11 +58,7 @@ private CtfCoreLoggerUtil() {
      *            The message
      */
     public static void logInfo(String msg) {
-        if (IS_PLATFORM_RUNNING) {
-            Platform.getLog(CtfCoreLoggerUtil.class).log(new Status(IStatus.INFO, PLUGIN_ID, msg));
-        } else {
-            LOGGER.log(Level.INFO, msg);
-        }
+        LOGGER.log(Level.INFO, msg);
     }
 
     /**
@@ -92,11 +70,7 @@ public static void logInfo(String msg) {
      *            The cause
      */
     public static void logError(String msg, Exception e) {
-        if (IS_PLATFORM_RUNNING) {
-            Platform.getLog(CtfCoreLoggerUtil.class).log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e));
-        } else {
-            LOGGER.log(Level.SEVERE, msg, e);
-        }
+        LOGGER.log(Level.SEVERE, msg, e);
     }
 
     /**
@@ -106,10 +80,6 @@ public static void logError(String msg, Exception e) {
      *            The error message
      */
     public static void logWarning(String msg) {
-        if (IS_PLATFORM_RUNNING) {
-            Platform.getLog(CtfCoreLoggerUtil.class).log(new Status(IStatus.WARNING, PLUGIN_ID, msg));
-        } else {
-            LOGGER.log(Level.WARNING, msg);
-        }
+        LOGGER.log(Level.WARNING, msg);
     }
 }
diff --git a/...pass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/Messages.java b/...pass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/Messages.java
diff --git a/...tf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/messages.properties b/...tf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/messages.properties
diff --git a/.../tracecompass/internal/ctf/core/event/metadata/tsdl/integer/IntegerDeclarationParser.java b/.../tracecompass/internal/ctf/core/event/metadata/tsdl/integer/IntegerDeclarationParser.java
@@ -29,7 +29,6 @@
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.CTFJsonMetadataNode;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ICommonTreeParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.JsonStructureFieldMemberMetadataNode;
-import org.eclipse.tracecompass.internal.ctf.core.event.metadata.Messages;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.MetadataStrings;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ParseException;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.AlignmentParser;
@@ -204,7 +203,7 @@ public IntegerDeclaration parse(ICTFMetadataNode integer, ICommonTreeParserParam
                         clock = ClockMapParser.INSTANCE.parse(rightNode, null);
                         break;
                     default:
-                        CtfCoreLoggerUtil.logWarning(Messages.IOStructGen_UnknownIntegerAttributeWarning + " " + left); //$NON-NLS-1$
+                        CtfCoreLoggerUtil.logWarning("Unknown integer attribute: " + left); //$NON-NLS-1$
                         break;
                     }
                 } else {

diff --git a/...se/tracecompass/internal/ctf/core/event/metadata/tsdl/stream/StreamDeclarationParser.java b/...se/tracecompass/internal/ctf/core/event/metadata/tsdl/stream/StreamDeclarationParser.java
@@ -28,7 +28,6 @@
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.CTFJsonMetadataNode;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.JsonDataStreamMetadataNode;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.JsonStructureFieldMetadataNode;
-import org.eclipse.tracecompass.internal.ctf.core.event.metadata.Messages;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.MetadataStrings;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ParseException;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TypeSpecifierListParser;
@@ -242,7 +241,7 @@ public CTFStream parse(ICTFMetadataNode streamDecl, ICommonTreeParserParameter p
 
                 stream.setPacketContext((StructDeclaration) packetContextDecl);
             } else {
-                CtfCoreLoggerUtil.logWarning(Messages.IOStructGen_UnknownStreamAttributeWarning + ' ' + left);
+                CtfCoreLoggerUtil.logWarning("Unknown stream attribute: " + left); //$NON-NLS-1$
             }
         }
         return stream;

diff --git a/...ipse/tracecompass/internal/ctf/core/event/metadata/tsdl/trace/TraceDeclarationParser.java b/...ipse/tracecompass/internal/ctf/core/event/metadata/tsdl/trace/TraceDeclarationParser.java
@@ -32,7 +32,6 @@
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.AbstractScopedCommonTreeParser;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.CTFAntlrMetadataNode;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.JsonPreambleMetadataNode;
-import org.eclipse.tracecompass.internal.ctf.core.event.metadata.Messages;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.MetadataStrings;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ParseException;
 import org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.ByteOrderParser;
@@ -219,7 +218,7 @@ public CTFTrace parse(ICTFMetadataNode traceDecl, ICommonTreeParserParameter par
 
                 trace.setPacketHeader((StructDeclaration) packetHeaderDecl);
             } else {
-                CtfCoreLoggerUtil.logWarning(Messages.IOStructGen_UnknownTraceAttributeWarning + " " + left); //$NON-NLS-1$
+                CtfCoreLoggerUtil.logWarning("Unknown trace attribute: " + left); //$NON-NLS-1$
             }
         }
         return trace;