Fixed a few annotations and removed the JNI's prefs file to put it in lime with the...

diff --git a/org.eclipse.linuxtools.lttng.jni/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.lttng.jni/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index b6b7fb0..0000000
--- a/org.eclipse.linuxtools.lttng.jni/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Feb 01 15:09:25 EST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java
index fd3100daa721b76916ed3f11457aad699f191a3e..e18cb9cd9d576faa4faa2738613d33f5163acb73 100644 (file)
--- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java
+++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java
@@ -8,7 +8,6 @@ import junit.framework.TestCase;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.lttng.event.LttngLocation;
-import org.eclipse.linuxtools.lttng.event.LttngTimestamp;
 import org.eclipse.linuxtools.lttng.tests.LTTngCoreTestPlugin;
 import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
 import org.eclipse.linuxtools.tmf.event.TmfEvent;

diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java
index f63628b22e057816279a5d7fa7c25402024da265..592f56975cc21c65c6ec72edebb719b7a45c2e7f 100644 (file)
--- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java
+++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngLocation.java
@@ -84,6 +84,7 @@ public class LttngLocation implements ITmfLocation {
        }
        
        
+       @Override
        public String toString() {
                return "\tLttngLocation[ Last : " + lastReadTime + "  Current : " + currentTime + " ]";
        }

diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java
index aa422b9923b23a195dd342cab36cb935f9810edf..21b919c099109f0fe359db1f8f4d855c4b336ee6 100644 (file)
--- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java
+++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java
@@ -31,6 +31,7 @@ public class TmfExperimentLocation implements ITmfLocation {
                return fLocations;
        }
 
+       @Override
        public TmfExperimentLocation clone() {
                ITmfLocation[] locations = new ITmfLocation[fLocations.length];
                for (int i = 0; i < fLocations.length; i++) {

diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java
index 04c9e0593b4139ec25a54c017551bd05c20a9720..c1996c62654f2f62da8941901478a3cfa40a444f 100644 (file)
--- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java
+++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java
@@ -33,6 +33,7 @@ public class TmfLocation<T> implements ITmfLocation {
                return fLocation;
        }
 
+       @Override
        @SuppressWarnings("unchecked")
        public TmfLocation<T> clone() {
                try {