From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Tue, 9 Feb 2016 07:09:55 +0000 (+0100)
Subject: common: Add NonNull external annotation to File.getName
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=1940739880dd1ab8df77317d3f95d6be2ebb4cf2;p=deliverable%2Ftracecompass.git

common: Add NonNull external annotation to File.getName

Because it can't be null.

Change-Id: I81e9797e7e753a3cd04b8a580ec324f199569f71
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/66172
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Hudson CI
---

diff --git a/common/org.eclipse.tracecompass.common.core/annotations/java/io/File.eea b/common/org.eclipse.tracecompass.common.core/annotations/java/io/File.eea
new file mode 100644
index 0000000000..1d97bd4ae3
--- /dev/null
+++ b/common/org.eclipse.tracecompass.common.core/annotations/java/io/File.eea
@@ -0,0 +1,4 @@
+class java/io/File
+getName
+ ()Ljava/lang/String;
+ ()L1java/lang/String;
diff --git a/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/trace/CTFStreamInput.java b/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/trace/CTFStreamInput.java
index babc8ad04d..673fe6202a 100644
--- a/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/trace/CTFStreamInput.java
+++ b/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/trace/CTFStreamInput.java
@@ -104,11 +104,7 @@ public class CTFStreamInput implements IDefinitionScope {
     public CTFStreamInput(ICTFStream stream, File file) {
         fStream = stream;
         fFile = file;
-        String name = fFile.getName();
-        if (name == null) {
-            throw new IllegalStateException("File cannot have a null name"); //$NON-NLS-1$
-        }
-        fFileName = name;
+        fFileName = fFile.getName();
 
         fIndex = new StreamInputPacketIndex();
         /*