More warning fixes

8 files changed, 75 insertions, 78 deletions

diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/TestStateManager.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/TestStateManager.java
index 3a0f496de8..13ca67a7e5 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/TestStateManager.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/TestStateManager.java
@@ -18,7 +18,6 @@ import junit.framework.TestCase;
  * @author alvaro
  * 
  */
-@SuppressWarnings("nls")
 public class TestStateManager extends TestCase {
 
 	/**
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/experiment/StateExperimentManagerTextTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/experiment/StateExperimentManagerTextTest.java
index 7ba6e64d52..f070dcfd59 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/experiment/StateExperimentManagerTextTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/state/experiment/StateExperimentManagerTextTest.java
@@ -17,7 +17,6 @@ import org.eclipse.linuxtools.lttng.core.tests.LttngTestPreparation;
  * @author alvaro
  *
  */
-@SuppressWarnings("nls")
 public class StateExperimentManagerTextTest extends LttngTestPreparation {
 
 	/**
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java
index 9496abccad..ce29a75b6b 100644
--- a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java
@@ -79,7 +79,7 @@ public class JniTraceFactory {
             } else {
                 String errMsg = "Unrecognized/unsupported trace version\n\n" //$NON-NLS-1$
                         + "Library reported trace version " + traceVersion.getVersionAsString() + "\n\n" //$NON-NLS-1$ //$NON-NLS-2$
-                        + "Make sure that you installed the corresponding parsing library (liblttvtraceread-" + traceVersion.getVersionAsString() + ".so) " //$NON-NLS-1$ 
+                        + "Make sure that you installed the corresponding parsing library (liblttvtraceread-" + traceVersion.getVersionAsString() + ".so) " //$NON-NLS-1$ //$NON-NLS-2$ 
                         + "and that it can be found from either your LD_LIBRARY_PATH or the Trace Library Path (in LTTng project properties)\n\n" //$NON-NLS-1$
                         + "Refer to the LTTng User Guide for more information"; //$NON-NLS-1$
                 throw new JniException(errMsg);
diff --git a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java
index 4e649b8449..c492c18783 100644
--- a/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java
+++ b/lttng/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java
@@ -29,7 +29,7 @@ import org.eclipse.linuxtools.lttng.jni.exception.JniTraceVersionException;
  */
 public class JniTraceVersion {
 	
-	private static final String LTTVTRACEREAD_LOADER_LIBNAME = "lttvtraceread_loader";
+	private static final String LTTVTRACEREAD_LOADER_LIBNAME = "lttvtraceread_loader"; //$NON-NLS-1$
 
 	// Native access functions
 	protected native void ltt_getTraceVersion(String tracepath);
@@ -128,7 +128,7 @@ public class JniTraceVersion {
 			if (newTraceLibPath == null || newTraceLibPath.isEmpty()) {
 				// Load the C library here.
 				// If LD_LIBRARY_PATH is not set correctly this will raise a java.lang.UnsatisfiedLinkError
-				System.loadLibrary(LTTVTRACEREAD_LOADER_LIBNAME); //$NON-NLS-1$
+				System.loadLibrary(LTTVTRACEREAD_LOADER_LIBNAME); 
 			} else {
 				File loaderLib = new File(newTraceLibPath, System.mapLibraryName(LTTVTRACEREAD_LOADER_LIBNAME));
                 System.load(loaderLib.getCanonicalPath());
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java
index 246f6a83a4..2398ec1f6c 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/tracecontrol/actions/ImportToProject.java
@@ -270,10 +270,10 @@ public class ImportToProject implements IObjectActionDelegate, IWorkbenchWindowA
         try {
             folder.createLink(sourceFolder.toURI(), IResource.REPLACE, null);
             // Set the trace properties for this resource
-            // FIXME: update from extenstion point properties
+            // FIXME: update from extension point properties
             folder.setPersistentProperty(TmfTraceElement.TRACEBUNDLE, LTTngUiPlugin.PLUGIN_ID);
-            folder.setPersistentProperty(TmfTraceElement.TRACETYPE, "org.eclipse.linuxtools.lttng.tracetype.kernel");
-            folder.setPersistentProperty(TmfTraceElement.TRACEICON, "icons/obj16/tux2.png");
+            folder.setPersistentProperty(TmfTraceElement.TRACETYPE, "org.eclipse.linuxtools.lttng.tracetype.kernel"); //$NON-NLS-1$
+            folder.setPersistentProperty(TmfTraceElement.TRACEICON, "icons/obj16/tux2.png"); //$NON-NLS-1$
         } catch (CoreException e) {
             MessageDialog.openWarning(shell,
                     Messages.ImportToProject_ImportFailed,
diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
index b81d31bd1a..d43333b7fc 100644
--- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
+++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java
@@ -71,7 +71,7 @@ public class PerspectiveFactory implements IPerspectiveFactory {
 
         // Create the middle right folder
         IFolderLayout middleRightFolder = layout.createFolder(
-                "middleRightFolder", IPageLayout.BOTTOM, 0.40f, IPageLayout.ID_EDITOR_AREA); //$NON-NLS-1$ //$NON-NLS-2$
+                "middleRightFolder", IPageLayout.BOTTOM, 0.40f, IPageLayout.ID_EDITOR_AREA); //$NON-NLS-1$ 
         middleRightFolder.addView(EVENTS_VIEW_ID);
 
         // Create the bottom right folder
diff --git a/lttng/org.eclipse.linuxtools.lttng/feature.xml b/lttng/org.eclipse.linuxtools.lttng/feature.xml
index bbc61b082c..91d5044746 100644
--- a/lttng/org.eclipse.linuxtools.lttng/feature.xml
+++ b/lttng/org.eclipse.linuxtools.lttng/feature.xml
@@ -31,22 +31,21 @@
          name="Tracing and Monitoring Framework (TMF) (Incubation)"/>
 
    <requires>
-      <import plugin="org.eclipse.linuxtools.lttng.jni" version="0.3.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.tmf.core" version="0.3.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.rse.core" version="3.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.tm.tcf.core" version="0.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.filesystem" version="1.3.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.tmf.ui" version="0.3.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.lttng.core" version="0.3.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.tm.tcf" version="0.4.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.help" version="3.5.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.core" version="0.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng.jni" version="0.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.ui" version="0.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng.core" version="0.4.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java
index 2de859f062..7f4d6d4abe 100755
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/util/TmfFixedArrayTest.java
@@ -32,11 +32,11 @@ public class TmfFixedArrayTest extends TestCase {
     // ------------------------------------------------------------------------
     
     public TmfFixedArrayTest() {
-        fString1 = "First String";
-        fString2 = "Second String";
-        fString3 = "Third String";
-        fString4 = "Fourth String";
-        fString5 = "Fifth String";
+        fString1 = "First String"; //$NON-NLS-1$
+        fString2 = "Second String"; //$NON-NLS-1$
+        fString3 = "Third String"; //$NON-NLS-1$
+        fString4 = "Fourth String"; //$NON-NLS-1$
+        fString5 = "Fifth String"; //$NON-NLS-1$
         fFixedArray1 = new TmfFixedArray<String>(fString1, fString2, fString3);
         fFixedArray2 = new TmfFixedArray<String>(); // Empty array at the beginning
     }
@@ -56,9 +56,9 @@ public class TmfFixedArrayTest extends TestCase {
     // ------------------------------------------------------------------------
     
     public void testGet() throws Exception {
-        assertTrue("get", fString1.equals(fFixedArray1.get(0)));
-        assertTrue("get", fString2.equals(fFixedArray1.get(1)));
-        assertTrue("get", fString3.equals(fFixedArray1.get(2)));
+        assertTrue("get", fString1.equals(fFixedArray1.get(0))); //$NON-NLS-1$
+        assertTrue("get", fString2.equals(fFixedArray1.get(1))); //$NON-NLS-1$
+        assertTrue("get", fString3.equals(fFixedArray1.get(2))); //$NON-NLS-1$
         
         try {
             fFixedArray2.get(0);
@@ -71,10 +71,10 @@ public class TmfFixedArrayTest extends TestCase {
     
     public void testGetArray() throws Exception {
         String[] stringArray = fFixedArray1.getArray();
-        assertNotNull("getArray", stringArray);
-        assertTrue("getArray", fString1.equals(stringArray[0]));
-        assertTrue("getArray", fString2.equals(stringArray[1]));
-        assertTrue("getArray", fString3.equals(stringArray[2]));
+        assertNotNull("getArray", stringArray); //$NON-NLS-1$
+        assertTrue("getArray", fString1.equals(stringArray[0])); //$NON-NLS-1$
+        assertTrue("getArray", fString2.equals(stringArray[1])); //$NON-NLS-1$
+        assertTrue("getArray", fString3.equals(stringArray[2])); //$NON-NLS-1$
     }
     
     // ------------------------------------------------------------------------
@@ -82,11 +82,11 @@ public class TmfFixedArrayTest extends TestCase {
     // ------------------------------------------------------------------------
     
     public void testEqualsReflexivity() throws Exception {
-        assertTrue("equals", fFixedArray1.equals(fFixedArray1));
-        assertTrue("equals", fFixedArray2.equals(fFixedArray2));
+        assertTrue("equals", fFixedArray1.equals(fFixedArray1)); //$NON-NLS-1$
+        assertTrue("equals", fFixedArray2.equals(fFixedArray2)); //$NON-NLS-1$
         
-        assertTrue("equals", !fFixedArray1.equals(fFixedArray2));
-        assertTrue("equals", !fFixedArray2.equals(fFixedArray1));
+        assertTrue("equals", !fFixedArray1.equals(fFixedArray2)); //$NON-NLS-1$
+        assertTrue("equals", !fFixedArray2.equals(fFixedArray1)); //$NON-NLS-1$
     }
     
     @SuppressWarnings("unchecked")
@@ -94,11 +94,11 @@ public class TmfFixedArrayTest extends TestCase {
         TmfFixedArray<String> fixedArray1 = (TmfFixedArray<String>) fFixedArray1.clone();
         TmfFixedArray<String> fixedArray2 = (TmfFixedArray<String>) fFixedArray2.clone();
 
-        assertTrue("equals", fixedArray1.equals(fFixedArray1));
-        assertTrue("equals", fFixedArray1.equals(fixedArray1));
+        assertTrue("equals", fixedArray1.equals(fFixedArray1)); //$NON-NLS-1$
+        assertTrue("equals", fFixedArray1.equals(fixedArray1)); //$NON-NLS-1$
 
-        assertTrue("equals", fixedArray2.equals(fFixedArray2));
-        assertTrue("equals", fFixedArray2.equals(fixedArray2));
+        assertTrue("equals", fixedArray2.equals(fFixedArray2)); //$NON-NLS-1$
+        assertTrue("equals", fFixedArray2.equals(fixedArray2)); //$NON-NLS-1$
     }
     
     @SuppressWarnings("unchecked")
@@ -107,14 +107,14 @@ public class TmfFixedArrayTest extends TestCase {
         TmfFixedArray<String> fixedArray2 = (TmfFixedArray<String>) fFixedArray1.clone();
         TmfFixedArray<String> fixedArray3 = (TmfFixedArray<String>) fFixedArray1.clone();
 
-        assertTrue("equals", fixedArray1.equals(fixedArray2));
-        assertTrue("equals", fixedArray2.equals(fixedArray3));
-        assertTrue("equals", fixedArray1.equals(fixedArray3));
+        assertTrue("equals", fixedArray1.equals(fixedArray2)); //$NON-NLS-1$
+        assertTrue("equals", fixedArray2.equals(fixedArray3)); //$NON-NLS-1$
+        assertTrue("equals", fixedArray1.equals(fixedArray3)); //$NON-NLS-1$
     }
     
     public void testEqualsNull() throws Exception {
-        assertTrue("equals", !fFixedArray1.equals(null));
-        assertTrue("equals", !fFixedArray2.equals(null));
+        assertTrue("equals", !fFixedArray1.equals(null)); //$NON-NLS-1$
+        assertTrue("equals", !fFixedArray2.equals(null)); //$NON-NLS-1$
     }
     
     // ------------------------------------------------------------------------
@@ -125,14 +125,14 @@ public class TmfFixedArrayTest extends TestCase {
         TmfFixedArray<String> fixedArray         = new TmfFixedArray<String>();
         
         fixedArray = fixedArray.append(fString1, fString2, fString3);
-        assertEquals("append", 3, fixedArray.size());
-        assertTrue("append", fString1.equals(fixedArray.get(0)));
-        assertTrue("append", fString2.equals(fixedArray.get(1)));
-        assertTrue("append", fString3.equals(fixedArray.get(2)));
+        assertEquals("append", 3, fixedArray.size()); //$NON-NLS-1$
+        assertTrue("append", fString1.equals(fixedArray.get(0))); //$NON-NLS-1$
+        assertTrue("append", fString2.equals(fixedArray.get(1))); //$NON-NLS-1$
+        assertTrue("append", fString3.equals(fixedArray.get(2))); //$NON-NLS-1$
 
         fixedArray = fixedArray.append(fString4);
-        assertEquals("append", 4, fixedArray.size());
-        assertTrue("append", fString4.equals(fixedArray.get(3)));
+        assertEquals("append", 4, fixedArray.size()); //$NON-NLS-1$
+        assertTrue("append", fString4.equals(fixedArray.get(3))); //$NON-NLS-1$
     }
     
    
@@ -143,15 +143,15 @@ public class TmfFixedArrayTest extends TestCase {
         TmfFixedArray<String> fixedArray         = new TmfFixedArray<String>();
         
         fixedArray = fixedArray.append(fFixedArray1, fixedArrayToAppend1);
-        assertEquals("append", 4, fixedArray.size());
-        assertTrue("append", fString1.equals(fixedArray.get(0)));
-        assertTrue("append", fString2.equals(fixedArray.get(1)));
-        assertTrue("append", fString3.equals(fixedArray.get(2)));
-        assertTrue("append", fString4.equals(fixedArray.get(3)));
+        assertEquals("append", 4, fixedArray.size()); //$NON-NLS-1$
+        assertTrue("append", fString1.equals(fixedArray.get(0))); //$NON-NLS-1$
+        assertTrue("append", fString2.equals(fixedArray.get(1))); //$NON-NLS-1$
+        assertTrue("append", fString3.equals(fixedArray.get(2))); //$NON-NLS-1$
+        assertTrue("append", fString4.equals(fixedArray.get(3))); //$NON-NLS-1$
         
         fixedArray = fixedArray.append(fixedArrayToAppend2);
-        assertEquals("append", 5, fixedArray.size());
-        assertTrue("append", fString5.equals(fixedArray.get(4)));
+        assertEquals("append", 5, fixedArray.size()); //$NON-NLS-1$
+        assertTrue("append", fString5.equals(fixedArray.get(4))); //$NON-NLS-1$
     }
     
     // ------------------------------------------------------------------------
@@ -163,11 +163,11 @@ public class TmfFixedArrayTest extends TestCase {
         TmfFixedArray<String> fixedArray1 = (TmfFixedArray<String>) fFixedArray1.clone();
         TmfFixedArray<String> fixedArray2 = (TmfFixedArray<String>) fFixedArray2.clone();
 
-        assertTrue("hashCode", fixedArray1.hashCode() == fFixedArray1.hashCode());
-        assertTrue("hashCode", fFixedArray2.hashCode() == fixedArray2.hashCode());
+        assertTrue("hashCode", fixedArray1.hashCode() == fFixedArray1.hashCode()); //$NON-NLS-1$
+        assertTrue("hashCode", fFixedArray2.hashCode() == fixedArray2.hashCode()); //$NON-NLS-1$
 
-        assertTrue("hashCode", fFixedArray1.hashCode() != fixedArray2.hashCode());
-        assertTrue("hashCode", fFixedArray2.hashCode() != fixedArray1.hashCode());
+        assertTrue("hashCode", fFixedArray1.hashCode() != fixedArray2.hashCode()); //$NON-NLS-1$
+        assertTrue("hashCode", fFixedArray2.hashCode() != fixedArray1.hashCode()); //$NON-NLS-1$
     }
     
     // ------------------------------------------------------------------------
@@ -176,26 +176,26 @@ public class TmfFixedArrayTest extends TestCase {
 
     public void testToArray() {
         String[] expected1 = {fString1, fString2, fString3};
-        assertTrue("toArray", Arrays.equals(expected1, fFixedArray1.toArray()));
+        assertTrue("toArray", Arrays.equals(expected1, fFixedArray1.toArray())); //$NON-NLS-1$
         
         String[] expected2 = {};
-        assertTrue("toArray", Arrays.equals(expected2, fFixedArray2.toArray()));
+        assertTrue("toArray", Arrays.equals(expected2, fFixedArray2.toArray())); //$NON-NLS-1$
     }
 
     public void testToArrayArg() throws Exception {
         String[] stringArray = new String[3];
         fFixedArray1.toArray(stringArray);
-        assertTrue("toArrayArg", stringArray[0].equals(fFixedArray1.get(0)));
-        assertTrue("toArrayArg", stringArray[1].equals(fFixedArray1.get(1)));
-        assertTrue("toArrayArg", stringArray[2].equals(fFixedArray1.get(2)));
+        assertTrue("toArrayArg", stringArray[0].equals(fFixedArray1.get(0))); //$NON-NLS-1$
+        assertTrue("toArrayArg", stringArray[1].equals(fFixedArray1.get(1))); //$NON-NLS-1$
+        assertTrue("toArrayArg", stringArray[2].equals(fFixedArray1.get(2))); //$NON-NLS-1$
         
         String[] stringBigArray = new String[10];
         fFixedArray1.toArray(stringBigArray);
-        assertNull("toArrayArg", stringBigArray[3]);
+        assertNull("toArrayArg", stringBigArray[3]); //$NON-NLS-1$
         
         TmfFixedArray<Object> fFixedArrayObject  = new TmfFixedArray<Object>(fString1);
         stringArray = fFixedArrayObject.toArray(new String[0]);
-        assertTrue("toArrayArg", stringArray[0].equals(fString1));
+        assertTrue("toArrayArg", stringArray[0].equals(fString1)); //$NON-NLS-1$
     }
     
     // ------------------------------------------------------------------------
@@ -203,9 +203,9 @@ public class TmfFixedArrayTest extends TestCase {
     // ------------------------------------------------------------------------
 
     public void testSize() {
-        assertEquals("toArray", 3, fFixedArray1.size());
+        assertEquals("toArray", 3, fFixedArray1.size()); //$NON-NLS-1$
         
-        assertEquals("toArray", 0, fFixedArray2.size());
+        assertEquals("toArray", 0, fFixedArray2.size()); //$NON-NLS-1$
     }
     
     // ------------------------------------------------------------------------
@@ -215,17 +215,17 @@ public class TmfFixedArrayTest extends TestCase {
     public void testSubArray() throws Exception {
         TmfFixedArray<String> subArray = fFixedArray1.subArray(1);
         
-        assertEquals("SubArray", 2, subArray.size());
-        assertTrue("SubArray", fString2.equals(subArray.get(0)));
-        assertTrue("SubArray", fString3.equals(subArray.get(1)));
+        assertEquals("SubArray", 2, subArray.size()); //$NON-NLS-1$
+        assertTrue("SubArray", fString2.equals(subArray.get(0))); //$NON-NLS-1$
+        assertTrue("SubArray", fString3.equals(subArray.get(1))); //$NON-NLS-1$
     }
     
     public void testSubArray2() {
         TmfFixedArray<String> subArray = fFixedArray1.subArray(1, 2);
         
-        assertEquals("SubArray", 2, subArray.size());
-        assertTrue("SubArray", fString2.equals(subArray.get(0)));
-        assertTrue("SubArray", fString3.equals(subArray.get(1)));
+        assertEquals("SubArray", 2, subArray.size()); //$NON-NLS-1$
+        assertTrue("SubArray", fString2.equals(subArray.get(0))); //$NON-NLS-1$
+        assertTrue("SubArray", fString3.equals(subArray.get(1))); //$NON-NLS-1$
     }
     
     // ------------------------------------------------------------------------
@@ -233,19 +233,19 @@ public class TmfFixedArrayTest extends TestCase {
     // ------------------------------------------------------------------------
     
     public void testSet() throws Exception {
-        String[] newString = {"new FirstString", "new SecondString", "new ThirdString"};
+        String[] newString = {"new FirstString", "new SecondString", "new ThirdString"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         
         fFixedArray1.set(0, newString[0]);
-        assertTrue("getArray", newString[0].equals(newString[0]));
+        assertTrue("getArray", newString[0].equals(newString[0])); //$NON-NLS-1$
         
         fFixedArray1.set(1, newString[1]);
-        assertTrue("getArray", newString[1].equals(newString[1]));
+        assertTrue("getArray", newString[1].equals(newString[1])); //$NON-NLS-1$
         
         fFixedArray1.set(2, newString[2]);
-        assertTrue("getArray", newString[2].equals(newString[2]));
+        assertTrue("getArray", newString[2].equals(newString[2])); //$NON-NLS-1$
         
         try {
-            fFixedArray2.set(0, "newString");
+            fFixedArray2.set(0, "newString"); //$NON-NLS-1$
             fail();
         } catch (Exception e) {
             // Success
@@ -258,9 +258,9 @@ public class TmfFixedArrayTest extends TestCase {
 
     public void testToString() {
         String expected1 = Arrays.asList(fString1, fString2, fString3).toString();
-        assertEquals("toString", expected1, fFixedArray1.toString());
+        assertEquals("toString", expected1, fFixedArray1.toString()); //$NON-NLS-1$
 
         String expected2 = Arrays.asList().toString();
-        assertEquals("toString", expected2, fFixedArray2.toString());
+        assertEquals("toString", expected2, fFixedArray2.toString()); //$NON-NLS-1$
     }
 }