Fix a pile of Javadoc warnings

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core.tests / src / org / eclipse / linuxtools / tmf / core / tests / uml2sd / TmfSyncSequenceDiagramEventTest.java

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java
index c314099bd8bd54e4d5cbcc2129be33b87022c145..2de6f23b719a012506e5d9db9dc4c2c4521f6f83 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2011 Ericsson
- * 
+ *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
  * accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *   Bernd Hufmann - Initial API and implementation
  *******************************************************************************/
@@ -13,8 +13,10 @@ package org.eclipse.linuxtools.tmf.core.tests.uml2sd;
 
 import junit.framework.TestCase;
 
+import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
+import org.eclipse.linuxtools.tmf.core.event.ITmfEventType;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
+import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.uml2sd.TmfSyncSequenceDiagramEvent;
@@ -22,7 +24,7 @@ import org.eclipse.linuxtools.tmf.core.uml2sd.TmfSyncSequenceDiagramEvent;
 @SuppressWarnings("nls")
 public class TmfSyncSequenceDiagramEventTest extends TestCase {
 
-    private final String fContext = TmfEventType.DEFAULT_CONTEXT_ID; 
+    private final String fContext = ITmfEventType.DEFAULT_CONTEXT_ID;
     private final String fTypeId  = "Some type";
     private final String fLabel0  = "label1";
     private final String fLabel1  = "label2";
@@ -30,16 +32,15 @@ public class TmfSyncSequenceDiagramEventTest extends TestCase {
 
     private final TmfTimestamp fTimestamp1 = new TmfTimestamp(12345, (byte) 2, 5);
     private final String       fSource     = "Source";
-    private final TmfEventType fType       = new TmfEventType(fContext, fTypeId, fLabels);
+    private final TmfEventType fType       = new TmfEventType(fContext, fTypeId, TmfEventField.makeRoot(fLabels));
     private final String       fReference  = "Some reference";
 
     private final TmfEvent fEvent1;
-    private final TmfEventContent fContent1;
+    private final TmfEventField fContent1;
 
     public TmfSyncSequenceDiagramEventTest () {
-        fEvent1 = new TmfEvent(fTimestamp1, fSource, fType, fReference);
-        fContent1 = new TmfEventContent(fEvent1, "Some content");
-        fEvent1.setContent(fContent1);
+        fContent1 = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, "Some content");
+        fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference);
     }
 
     @Override
@@ -49,7 +50,7 @@ public class TmfSyncSequenceDiagramEventTest extends TestCase {
     @Override
     public void tearDown() throws Exception {
     }
-    
+
     public void testTmfSyncSequenceDiagramEvent() {
         TmfSyncSequenceDiagramEvent event = null;
         try {
@@ -59,7 +60,7 @@ public class TmfSyncSequenceDiagramEventTest extends TestCase {
             // success
             assertTrue("testTmfSyncSequenceDiagramEvent", e.getMessage().contains("startEvent=null"));
         }
-        
+
         try {
             event = new TmfSyncSequenceDiagramEvent(fEvent1, null, null, null);
             fail();
@@ -67,7 +68,7 @@ public class TmfSyncSequenceDiagramEventTest extends TestCase {
             // success
             assertTrue("testTmfSyncSequenceDiagramEvent", e.getMessage().contains("sender=null"));
         }
-        
+
         try {
             event = new TmfSyncSequenceDiagramEvent(fEvent1, "sender", null, null);
             fail();
@@ -83,7 +84,7 @@ public class TmfSyncSequenceDiagramEventTest extends TestCase {
             // success
             assertTrue("testTmfSyncSequenceDiagramEvent", e.getMessage().contains("name=null"));
         }
-        
+
         try {
             event = new TmfSyncSequenceDiagramEvent(fEvent1, "sender", "receiver", "signal");
             // success
@@ -91,7 +92,7 @@ public class TmfSyncSequenceDiagramEventTest extends TestCase {
             assertEquals("testTmfSyncSequenceDiagramEvent", "sender", event.getSender());
             assertEquals("testTmfSyncSequenceDiagramEvent", "receiver", event.getReceiver());
             assertEquals("testTmfSyncSequenceDiagramEvent", "signal", event.getName());
-            
+
         } catch (IllegalArgumentException e) {
             fail();
         }