From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Sun, 6 Dec 2015 22:23:48 +0000 (-0500)
Subject: common: Annotate some Class.get*Name methods
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=b30ff01f403df4cd4b1b21ca39618cd2a0651672;p=deliverable%2Ftracecompass.git

common: Annotate some Class.get*Name methods

This fixes a warning in AlgorithmManager. getName and getSimpleName
cannot return null whereas getCanonicalName can (anonymous, local
classes).

Change-Id: I2ee6ff668a93b47617389d2a3a25157af7184349
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/62077
Reviewed-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
---

diff --git a/common/org.eclipse.tracecompass.common.core/annotations/java/lang/Class.eea b/common/org.eclipse.tracecompass.common.core/annotations/java/lang/Class.eea
index 1d432187d6..29faa70b41 100644
--- a/common/org.eclipse.tracecompass.common.core/annotations/java/lang/Class.eea
+++ b/common/org.eclipse.tracecompass.common.core/annotations/java/lang/Class.eea
@@ -2,3 +2,12 @@ class java/lang/Class
 getAnnotation
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)TA;
  <A::Ljava/lang/annotation/Annotation;>(Ljava/lang/Class<TA;>;)T0A;
+getCanonicalName
+ ()Ljava/lang/String;
+ ()L0java/lang/String;
+getName
+ ()Ljava/lang/String;
+ ()L1java/lang/String;
+getSimpleName
+ ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/request/TmfRequestExecutor.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/request/TmfRequestExecutor.java
index cba3cae696..4eda5c05e2 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/request/TmfRequestExecutor.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/request/TmfRequestExecutor.java
@@ -14,6 +14,8 @@
 
 package org.eclipse.tracecompass.internal.tmf.core.request;
 
+import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
+
 import java.util.Queue;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -75,7 +77,8 @@ public class TmfRequestExecutor implements Executor {
      * Default constructor
      */
     public TmfRequestExecutor() {
-        String canonicalName = fExecutor.getClass().getCanonicalName();
+        // We know the canonical name is not null because we use ExecutorService only
+        String canonicalName = checkNotNull(fExecutor.getClass().getCanonicalName());
         fExecutorName = canonicalName.substring(canonicalName.lastIndexOf('.') + 1);
         if (TmfCoreTracer.isComponentTraced()) {
             TmfCoreTracer.trace(fExecutor + " created"); //$NON-NLS-1$