Rename 'locationData' to 'locationInfo' (for lack of a better name...)
authorFrancois Chouinard <fchouinard@gmail.com>
Wed, 19 Sep 2012 17:18:43 +0000 (13:18 -0400)
committerFrancois Chouinard <fchouinard@gmail.com>
Fri, 21 Sep 2012 18:16:27 +0000 (14:16 -0400)
Change-Id: I1980f6bd4f9a522804d6b782be1bb32261f917df
Signed-off-by: Francois Chouinard <fchouinard@gmail.com>
Reviewed-on: https://git.eclipse.org/r/7841
Tested-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
IP-Clean: Alexandre Montplaisir <alexmonthy@voxpopuli.im>

22 files changed:
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfLocationTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentCheckpointIndexTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfStringLocation.java
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfExperimentLocation.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/trace/TmfLocationArray.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIterator.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfIteratorManager.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfLocation.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfLightweightContext.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfTrace.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfLocation.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfExperiment.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLocation.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfLongLocation.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTimestampLocation.java
org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java

index 5791da7ac3a76bec0358766c6d2b28ab3183f9a1..0f3378d82a2e947fdd85984c06f376494f87e088 100644 (file)
@@ -72,7 +72,7 @@ public class CtfLocationTest {
         CtfLocation result = new CtfLocation(location);
 
         assertNotNull(result);
-        assertEquals(Long.valueOf(1), (Long)result.getLocationData().getTimestamp());
+        assertEquals(Long.valueOf(1), (Long)result.getLocationInfo().getTimestamp());
     }
 
     /**
@@ -84,7 +84,7 @@ public class CtfLocationTest {
         CtfLocation result = new CtfLocation(timestamp);
 
         assertNotNull(result);
-        assertEquals(new Long(0L), (Long)result.getLocationData().getTimestamp());
+        assertEquals(new Long(0L), (Long)result.getLocationInfo().getTimestamp());
     }
 
     /**
@@ -95,7 +95,7 @@ public class CtfLocationTest {
         CtfLocation result = fixture.clone();
 
         assertNotNull(result);
-        assertEquals(Long.valueOf(1), (Long)result.getLocationData().getTimestamp());
+        assertEquals(Long.valueOf(1), (Long)result.getLocationInfo().getTimestamp());
     }
 
     /**
@@ -103,7 +103,7 @@ public class CtfLocationTest {
      */
     @Test
     public void testGetLocation() {
-        CtfLocationData location = fixture.getLocationData();
+        CtfLocationData location = fixture.getLocationInfo();
         Long result = location.getTimestamp();
         assertNotNull(result);
         assertEquals("1", result.toString()); //$NON-NLS-1$
index 79bee5853419e96b1ce90f83312066158267aec1..b2353c6919afec35bda9b67b1b7335067d503f52 100644 (file)
@@ -131,7 +131,7 @@ public class TmfExperimentCheckpointIndexTest extends TestCase {
         for (int i = 0; i < checkpoints.size(); i++) {
             ITmfCheckpoint checkpoint = checkpoints.get(i);
             TmfExperimentLocation expLocation = (TmfExperimentLocation) checkpoint.getLocation();
-            TmfLocationArray locations = expLocation.getLocationData();
+            TmfLocationArray locations = expLocation.getLocationInfo();
             ITmfContext[] trcContexts = new ITmfContext[2];
             trcContexts[0] = new TmfContext(locations.getLocations()[0], (i * pageSize) / 2);
             trcContexts[1] = new TmfContext(locations.getLocations()[1], (i * pageSize) / 2);
@@ -189,7 +189,7 @@ public class TmfExperimentCheckpointIndexTest extends TestCase {
         for (int i = 0; i < checkpoints.size(); i++) {
             ITmfCheckpoint checkpoint = checkpoints.get(i);
             TmfExperimentLocation expLocation = (TmfExperimentLocation) checkpoint.getLocation();
-            TmfLocationArray locations = expLocation.getLocationData();
+            TmfLocationArray locations = expLocation.getLocationInfo();
             ITmfContext[] trcContexts = new ITmfContext[2];
             trcContexts[0] = new TmfContext(locations.getLocations()[0], (i * pageSize) / 2);
             trcContexts[1] = new TmfContext(locations.getLocations()[1], (i * pageSize) / 2);
index 1f8c964d58839cdefdf4371d629a923e5efe740c..b1f7e86f80be57deca6dc7cac8aa89b4437e6e1a 100644 (file)
@@ -69,10 +69,10 @@ public class TmfLocationTest extends TestCase {
     // ------------------------------------------------------------------------
 
     public void testTmfLocation() {
-        assertNull("TmfLocation", fLocation1.getLocationData());
-        assertEquals("TmfLocation", aString, fLocation2.getLocationData());
-        assertEquals("TmfLocation", aLong, fLocation3.getLocationData());
-        assertEquals("TmfLocation", aTimestamp, fLocation4.getLocationData());
+        assertNull("TmfLocation", fLocation1.getLocationInfo());
+        assertEquals("TmfLocation", aString, fLocation2.getLocationInfo());
+        assertEquals("TmfLocation", aLong, fLocation3.getLocationInfo());
+        assertEquals("TmfLocation", aTimestamp, fLocation4.getLocationInfo());
     }
 
     public void testTmfLocationCopy() {
@@ -81,10 +81,10 @@ public class TmfLocationTest extends TestCase {
         TmfLongLocation location3 = new TmfLongLocation(fLocation3);
         TmfTimestampLocation location4 = new TmfTimestampLocation(fLocation4);
 
-        assertNull("TmfLocation", location1.getLocationData());
-        assertEquals("TmfLocation", aString, location2.getLocationData());
-        assertEquals("TmfLocation", aLong, location3.getLocationData());
-        assertEquals("TmfLocation", aTimestamp, location4.getLocationData());
+        assertNull("TmfLocation", location1.getLocationInfo());
+        assertEquals("TmfLocation", aString, location2.getLocationInfo());
+        assertEquals("TmfLocation", aLong, location3.getLocationInfo());
+        assertEquals("TmfLocation", aTimestamp, location4.getLocationInfo());
     }
 
     // ------------------------------------------------------------------------
@@ -103,15 +103,15 @@ public class TmfLocationTest extends TestCase {
             assertEquals("clone", fLocation3, location3);
             assertEquals("clone", fLocation4, location4);
 
-            assertEquals("clone", fLocation1.getLocationData(), location1.getLocationData());
-            assertEquals("clone", fLocation2.getLocationData(), location2.getLocationData());
-            assertEquals("clone", fLocation3.getLocationData(), location3.getLocationData());
-            assertEquals("clone", fLocation4.getLocationData(), location4.getLocationData());
+            assertEquals("clone", fLocation1.getLocationInfo(), location1.getLocationInfo());
+            assertEquals("clone", fLocation2.getLocationInfo(), location2.getLocationInfo());
+            assertEquals("clone", fLocation3.getLocationInfo(), location3.getLocationInfo());
+            assertEquals("clone", fLocation4.getLocationInfo(), location4.getLocationInfo());
 
-            assertNull("clone", location1.getLocationData());
-            assertEquals("clone", aString, location2.getLocationData());
-            assertEquals("clone", aLong, location3.getLocationData());
-            assertEquals("clone", aTimestamp, location4.getLocationData());
+            assertNull("clone", location1.getLocationInfo());
+            assertEquals("clone", aString, location2.getLocationInfo());
+            assertEquals("clone", aLong, location3.getLocationInfo());
+            assertEquals("clone", aTimestamp, location4.getLocationInfo());
         } catch (InternalError e) {
             fail("clone()");
         }
index ae805bb1451186a0e7d7156d9f7315bcf3d24752..2ebcfae5200f91b7d6962318cce189029c5bf210 100644 (file)
@@ -28,12 +28,12 @@ public class TmfStringLocation extends TmfLocation {
     }
 
     public TmfStringLocation(TmfStringLocation other) {
-        super(other.getLocationData());
+        super(other.getLocationInfo());
     }
 
     @Override
     public TmfStringLocation clone() {
-        return new TmfStringLocation((String) getLocationData());
+        return new TmfStringLocation((String) getLocationInfo());
     }
 
 }
index 8ee1ce49f97f3ab17b43fefc4e659ec223589b72..0dfd93ef6ed9ee243824487623ccb842b4db19ce 100644 (file)
@@ -82,7 +82,7 @@ public class TmfEventParserStub implements ITmfEventParser {
 
         long location = 0;
         if (context != null && context.getLocation() != null) {
-            location = (Long) context.getLocation().getLocationData();
+            location = (Long) context.getLocation().getLocationInfo();
             try {
                 stream.seek(location);
 
index fed0590eb3105e8f4fe7d50cbf20aa23c49fb5a9..e6639cae2f99d89700ba3632a23404ad146074a8 100644 (file)
@@ -222,7 +222,7 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser {
                     long loc  = 0;
                     long rank = 0;
                     if (location != null) {
-                        loc = (Long) location.getLocationData();
+                        loc = (Long) location.getLocationInfo();
                         rank = ITmfContext.UNKNOWN_RANK;
                     }
                     if (loc != fTrace.getFilePointer()) {
@@ -270,8 +270,8 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser {
         fLock.lock();
         try {
             if (fTrace != null) {
-                if (location.getLocationData() instanceof Long) {
-                    return (double) ((Long) location.getLocationData()) / fTrace.length();
+                if (location.getLocationInfo() instanceof Long) {
+                    return (double) ((Long) location.getLocationInfo()) / fTrace.length();
                 }
             }
         } catch (final IOException e) {
index 5713159b475d14f7bd8d5d0e5f91b2e9369b5526..0ac87ff1b6cad763f2b4355d29f50b929e6cd2c7 100644 (file)
@@ -53,7 +53,7 @@ public class TmfExperimentLocation implements ITmfLocation {
      * @param location the other experiment location
      */
     public TmfExperimentLocation(TmfExperimentLocation location) {
-        this(location.getLocationData());
+        this(location.getLocationInfo());
     }
 
     // ------------------------------------------------------------------------
@@ -66,7 +66,7 @@ public class TmfExperimentLocation implements ITmfLocation {
     @Override
     public TmfExperimentLocation clone() {
 //        super.clone(); // To keep FindBugs happy
-        TmfLocationArray array = getLocationData();
+        TmfLocationArray array = getLocationInfo();
         TmfLocationArray clones = array.clone();
         return new TmfExperimentLocation(clones);
     }
@@ -82,7 +82,7 @@ public class TmfExperimentLocation implements ITmfLocation {
     @SuppressWarnings("nls")
     public String toString() {
         StringBuilder result = new StringBuilder("[TmfExperimentLocation");
-        ITmfLocation[] locations = getLocationData().getLocations();
+        ITmfLocation[] locations = getLocationInfo().getLocations();
         for (ITmfLocation location : locations) {
             result.append("[" + location + "]");
         }
@@ -119,7 +119,7 @@ public class TmfExperimentLocation implements ITmfLocation {
      * @see org.eclipse.linuxtools.tmf.core.trace.ITmfLocation#getLocationData()
      */
     @Override
-    public TmfLocationArray getLocationData() {
+    public TmfLocationArray getLocationInfo() {
         return fLocation;
     }
 
index 2ec9ef1227b8b66db5338f8c9ad764e18c6b165c..41c35566f332f9f47ce2589c75bd0faecc98cd2f 100644 (file)
@@ -83,8 +83,8 @@ public class TmfLocationArray implements Comparable<TmfLocationArray>, Cloneable
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public int compareTo(TmfLocationArray o) {
         for (int i = 0; i < fLocations.length; i++) {
-            Comparable l1 = fLocations[i].getLocationData();
-            Comparable l2 = o.fLocations[i].getLocationData();
+            Comparable l1 = fLocations[i].getLocationInfo();
+            Comparable l2 = o.fLocations[i].getLocationInfo();
             int result = l1.compareTo(l2);
             if (result != 0) {
                 return result;
index 0d980c48e547464f10b19ede95c46e670b9df91d..6e981c3b9315a87ce2c8e809e33245fd134be89b 100644 (file)
@@ -185,7 +185,7 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext,
     @Override
     public CtfIterator clone() {
         CtfIterator clone = null;
-        clone = new CtfIterator(ctfTmfTrace, this.getLocation().getLocationData(), curRank);
+        clone = new CtfIterator(ctfTmfTrace, this.getLocation().getLocationInfo(), curRank);
         return clone;
     }
 
@@ -207,7 +207,7 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext,
     public void setLocation(final ITmfLocation location) {
         // FIXME alex: isn't there a cleaner way than a cast here?
         this.curLocation = (CtfLocation) location;
-        seek(((CtfLocation) location).getLocationData());
+        seek(((CtfLocation) location).getLocationInfo());
     }
 
     /**
@@ -248,8 +248,8 @@ public class CtfIterator extends CTFTraceReader implements ITmfContext,
      */
     @Override
     public boolean advance() {
-        long index = curLocation.getLocationData().getIndex();
-        long timestamp = curLocation.getLocationData().getTimestamp();
+        long index = curLocation.getLocationInfo().getIndex();
+        long timestamp = curLocation.getLocationInfo().getTimestamp();
         boolean ret = super.advance();
 
         if (ret) {
index fe45b96910faecd97deb0d3172979c2c807ad05f..b6c2977ade9bb0b7ca69d9c584268d4ea41921c0 100644 (file)
@@ -142,7 +142,7 @@ class CtfTraceManager {
                  */
                 retVal = replaceRandomElement(context);
             }
-            final CtfLocationData location = (CtfLocationData) context.getLocation().getLocationData();
+            final CtfLocationData location = (CtfLocationData) context.getLocation().getLocationInfo();
             retVal.seek( location);
         }
         return retVal;
index 282f9fb7b8285bc4134aca0a0899fd89cfe1c669..7ca9fb0ac9be811eee957c875cb776517a5c12a6 100644 (file)
@@ -93,11 +93,11 @@ public class CtfLocation implements ITmfLocation, Cloneable {
      * Get the Location Data of this location
      *
      * @return The CtfLocationData
-     * @see org.eclipse.linuxtools.tmf.core.trace.ITmfLocation#getLocationData()
+     * @see org.eclipse.linuxtools.tmf.core.trace.ITmfLocation#getLocationInfo()
      * @since 2.0
      */
     @Override
-    public CtfLocationData getLocationData() {
+    public CtfLocationData getLocationInfo() {
         return fLocation;
     }
 
@@ -149,10 +149,10 @@ public class CtfLocation implements ITmfLocation, Cloneable {
      */
     @Override
     public String toString() {
-        if( this.getLocationData().equals(CtfLocation.INVALID_LOCATION )) {
+        if( this.getLocationInfo().equals(CtfLocation.INVALID_LOCATION )) {
             return "CtfLocation: INVALID"; //$NON-NLS-1$
         }
-        return "CtfLocation: " + getLocationData().toString(); //$NON-NLS-1$
+        return "CtfLocation: " + getLocationInfo().toString(); //$NON-NLS-1$
     }
 
 
index cb1d0dc06c5ada645197a63fb188a4878ab26f3e..d0ead87744fa4cb33b32b1dff350442a792fde8a 100644 (file)
@@ -85,7 +85,7 @@ public class CtfTmfLightweightContext implements ITmfContext {
     @Override
     public void setLocation(ITmfLocation location) {
         curLocation = (CtfLocation) location;
-        getIterator().seek(curLocation.getLocationData());
+        getIterator().seek(curLocation.getLocationInfo());
     }
 
     @Override
@@ -120,7 +120,7 @@ public class CtfTmfLightweightContext implements ITmfContext {
      * @return success or not
      */
     public synchronized boolean advance() {
-        final CtfLocationData curLocationData = this.curLocation.getLocationData();
+        final CtfLocationData curLocationData = this.curLocation.getLocationInfo();
         boolean retVal = getIterator().advance();
         CtfTmfEvent currentEvent = getIterator().getCurrentEvent();
 
index b6d564ca8c6c98db5850b42aa34a19126353ab90..40abf1aa1db649cd5e898741a3a0be85d7310673 100644 (file)
@@ -166,8 +166,8 @@ public class CtfTmfTrace extends TmfTrace implements ITmfEventParser {
         final CtfLocation curLocation = (CtfLocation) location;
         final CtfTmfLightweightContext context = new CtfTmfLightweightContext(this);
         context.setLocation(curLocation);
-        context.seek(curLocation.getLocationData());
-        final CtfLocationData currentTime = ((CtfLocationData)context.getLocation().getLocationData());
+        context.seek(curLocation.getLocationInfo());
+        final CtfLocationData currentTime = ((CtfLocationData)context.getLocation().getLocationInfo());
         final long startTime = getIterator(this, context).getStartTime();
         final long endTime = getIterator(this, context).getEndTime();
         return ((double) currentTime.getTimestamp() - startTime)
@@ -209,7 +209,7 @@ public class CtfTmfTrace extends TmfTrace implements ITmfEventParser {
             currentLocation = new CtfLocation(new CtfLocationData(0L, 0L));
             context.setRank(0);
         }
-        if (currentLocation.getLocationData() == CtfLocation.INVALID_LOCATION) {
+        if (currentLocation.getLocationInfo() == CtfLocation.INVALID_LOCATION) {
             ((CtfTmfTimestamp) getEndTime()).setType(TimestampType.NANOS);
             currentLocation.setLocation(getEndTime().getValue() + 1, 0L);
         }
@@ -249,7 +249,7 @@ public class CtfTmfTrace extends TmfTrace implements ITmfEventParser {
     public synchronized CtfTmfEvent getNext(final ITmfContext context) {
         CtfTmfEvent event = null;
         if (context instanceof CtfTmfLightweightContext) {
-            if (CtfLocation.INVALID_LOCATION.equals(context.getLocation().getLocationData())) {
+            if (CtfLocation.INVALID_LOCATION.equals(context.getLocation().getLocationInfo())) {
                 return null;
             }
             CtfTmfLightweightContext ctfContext = (CtfTmfLightweightContext) context;
index d5e497784fdc42df3bbb27b12fde972ba45a1774..ccf856268eb6a52f9bbdaa0e54c2850f17d17a94 100644 (file)
@@ -13,7 +13,6 @@
 
 package org.eclipse.linuxtools.tmf.core.trace;
 
-
 /**
  * The generic trace location in TMF.
  * <p>
@@ -23,7 +22,7 @@ package org.eclipse.linuxtools.tmf.core.trace;
  * <p>
  * This location is trace-specific and must be comparable.
  *
- * @version 1.0
+ * @version 2.0
  * @author Francois Chouinard
  */
 public interface ITmfLocation {
@@ -33,10 +32,12 @@ public interface ITmfLocation {
     // ------------------------------------------------------------------------
 
     /**
-     * @return the location
+     * Returns the concrete trace location information
+     *
+     * @return the location information
      * @since 2.0
      */
-    public Comparable<?> getLocationData();
+    public Comparable<?> getLocationInfo();
 
     // ------------------------------------------------------------------------
     // Operations
index c217e676b681cc3fdae4dc73006aaf141a2bf734..c28d1ae7ed2961e36e9605a858cba2cf1e73dd60 100644 (file)
@@ -133,8 +133,8 @@ public class TmfCheckpoint implements ITmfCheckpoint, Cloneable {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public int compareTo(final ITmfCheckpoint other) {
         if (fTimestamp == null || other.getTimestamp() == null) {
-            final Comparable location1 = getLocation().getLocationData();
-            final Comparable location2 = other.getLocation().getLocationData();
+            final Comparable location1 = getLocation().getLocationInfo();
+            final Comparable location2 = other.getLocation().getLocationInfo();
             return location1.compareTo(location2);
         }
         return fTimestamp.compareTo(other.getTimestamp(), false);
index c181110066234fe1cf1d6c45c048ffd6234fd218..f20d6ec8084a9ab18d4955f7246c7e3e1608c5e6 100644 (file)
@@ -288,9 +288,9 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser {
 
         for (int i = 0; i < fTraces.length; i++) {
             // Get the relevant trace attributes
-            final ITmfLocation trcLocation = expLocation.getLocationData().getLocations()[i];
+            final ITmfLocation trcLocation = expLocation.getLocationInfo().getLocations()[i];
             context.getContexts()[i] = fTraces[i].seekEvent(trcLocation);
-            expLocation.getLocationData().getLocations()[i] = context.getContexts()[i].getLocation().clone();
+            expLocation.getLocationInfo().getLocations()[i] = context.getContexts()[i].getLocation().clone();
             context.getEvents()[i] = fTraces[i].getNext(context.getContexts()[i]);
         }
 
@@ -404,7 +404,7 @@ public class TmfExperiment extends TmfTrace implements ITmfEventParser {
 
                 TmfExperimentLocation location = (TmfExperimentLocation) expContext.getLocation();
                 if (location != null) {
-                    location.getLocationData().getLocations()[trace] = traceContext.getLocation().clone();
+                    location.getLocationInfo().getLocations()[trace] = traceContext.getLocation().clone();
                 }
 
                 fExperimentContext = expContext.clone();
index bf80132bbf843f0c86b934db12851bed9f089548..7590e9c3f09d242385eb7a74e3b9950083bc4db3 100644 (file)
 package org.eclipse.linuxtools.tmf.core.trace;
 
 /**
- * A convenience implementation on of ITmfLocation. The generic class (L) must
- * be comparable.
+ * A abstract implementation of ITmfLocation. The concrete classes must provide
+ * comparable location information.
  *
- * @version 1.0
+ * @version 2.0
  * @author Francois Chouinard
  */
 public abstract class TmfLocation implements ITmfLocation, Cloneable {
@@ -26,7 +26,7 @@ public abstract class TmfLocation implements ITmfLocation, Cloneable {
     // Attributes
     // ------------------------------------------------------------------------
 
-    private Comparable<?> fLocationData;
+    private Comparable<?> fLocationInfo;
 
     // ------------------------------------------------------------------------
     // Constructors
@@ -42,65 +42,46 @@ public abstract class TmfLocation implements ITmfLocation, Cloneable {
     /**
      * Standard constructor.
      *
-     * @param locationData the trace location
+     * @param locationInfo the concrete trace location
      */
-    public TmfLocation(final Comparable<?> locationData) {
-        fLocationData = locationData;
+    public TmfLocation(final Comparable<?> locationInfo) {
+        fLocationInfo = locationInfo;
     }
 
     /**
      * Copy constructor
      *
-     * @param location the original location
+     * @param location the original trace location
      */
     public TmfLocation(final TmfLocation location) {
-        fLocationData = location.fLocationData;
+        fLocationInfo = location.fLocationInfo;
     }
 
     // ------------------------------------------------------------------------
     // Getters
     // ------------------------------------------------------------------------
 
+    /* (non-Javadoc)
+     * @see org.eclipse.linuxtools.tmf.core.trace.ITmfLocation#getLocationInfo()
+     */
     /**
      * @since 2.0
      */
     @Override
-    public Comparable<?> getLocationData() {
-        return fLocationData;
+    public Comparable<?> getLocationInfo() {
+        return fLocationInfo;
     }
 
     // ------------------------------------------------------------------------
     // Cloneable
     // ------------------------------------------------------------------------
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#clone()
+     */
     @Override
     public abstract TmfLocation clone();
 
-//    /* (non-Javadoc)
-//     * @see java.lang.Object#clone()
-//     */
-//    @Override
-//    @SuppressWarnings("unchecked")
-//    public TmfLocation<L> clone() {
-//        TmfLocation<L> clone = null;
-//        try {
-//            clone = (TmfLocation<L>) super.clone();
-//            if (fLocationData != null) {
-//                final Class<?> clazz = fLocationData.getClass();
-//                final Method method = clazz.getMethod("clone", new Class[0]); //$NON-NLS-1$
-//                final Object copy = method.invoke(this.fLocationData, new Object[0]);
-//                clone.fLocationData = (L) copy;
-//            } else {
-//                clone.fLocationData = null;
-//            }
-//        } catch (final CloneNotSupportedException e) {
-//        } catch (final NoSuchMethodException e) {
-//        } catch (final Exception e) {
-//            throw new InternalError(e.toString());
-//        }
-//        return clone;
-//    }
-
     // ------------------------------------------------------------------------
     // Object
     // ------------------------------------------------------------------------
@@ -112,7 +93,7 @@ public abstract class TmfLocation implements ITmfLocation, Cloneable {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + ((fLocationData != null) ? fLocationData.hashCode() : 0);
+        result = prime * result + ((fLocationInfo != null) ? fLocationInfo.hashCode() : 0);
         return result;
     }
 
@@ -131,11 +112,11 @@ public abstract class TmfLocation implements ITmfLocation, Cloneable {
             return false;
         }
         final TmfLocation other = (TmfLocation) obj;
-        if (fLocationData == null) {
-            if (other.fLocationData != null) {
+        if (fLocationInfo == null) {
+            if (other.fLocationInfo != null) {
                 return false;
             }
-        } else if (!fLocationData.equals(other.fLocationData)) {
+        } else if (!fLocationInfo.equals(other.fLocationInfo)) {
             return false;
         }
         return true;
@@ -144,7 +125,7 @@ public abstract class TmfLocation implements ITmfLocation, Cloneable {
     @Override
     @SuppressWarnings("nls")
     public String toString() {
-        return "TmfLocation [fLocation=" + fLocationData + "]";
+        return "TmfLocation [fLocation=" + fLocationInfo + "]";
     }
 
 }
index 0bf5b7369d9522b80a347a92bd68841d4c920d66..f4ed38a7ee0968317b60648395d644782b0602de 100644 (file)
@@ -33,11 +33,11 @@ public class TmfLongLocation extends TmfLocation {
      * @param other the other location
      */
     public TmfLongLocation(TmfLongLocation other) {
-        super(other.getLocationData());
+        super(other.getLocationInfo());
     }
 
     @Override
     public TmfLongLocation clone() {
-        return new TmfLongLocation((Long) getLocationData());
+        return new TmfLongLocation((Long) getLocationInfo());
     }
 }
index 3562878e715fa5d251f1dec4bfddd39677718d2a..4e9370ccc9d2e06af2cc9128f0ef5180ba7e8649 100644 (file)
@@ -34,11 +34,11 @@ public class TmfTimestampLocation extends TmfLocation {
      * @param other the other location
      */
     public TmfTimestampLocation(TmfTimestampLocation other) {
-        super(other.getLocationData());
+        super(other.getLocationInfo());
     }
 
     @Override
     public TmfTimestampLocation clone() {
-        return new TmfTimestampLocation((ITmfTimestamp) getLocationData());
+        return new TmfTimestampLocation((ITmfTimestamp) getLocationInfo());
     }
 }
index d4dd9f1aad2b9ba72b58515ea1918359005aec06..77fab28140e9cb6d15d6e077c37d04e5ea778197 100644 (file)
@@ -69,7 +69,7 @@ public class TmfUml2SDTestTrace implements ITmfEventParser {
 
         long location = 0;
         if (context != null) {
-            location = (Long) context.getLocation().getLocationData();
+            location = (Long) context.getLocation().getLocationInfo();
         }
 
         try {
index c12031e5afc8033edc481497be587827658516d9..945ae912e09145af6fbc309e7ff45c3ce9f75f0d 100644 (file)
@@ -89,8 +89,8 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEventParser {
         try {\r
             if (location == null) {\r
                 fFile.seek(0);\r
-            } else if (location.getLocationData() instanceof Long) {\r
-                fFile.seek((Long) location.getLocationData());\r
+            } else if (location.getLocationInfo() instanceof Long) {\r
+                fFile.seek((Long) location.getLocationInfo());\r
             }\r
             String line;\r
             long rawPos = fFile.getFilePointer();\r
@@ -149,8 +149,8 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEventParser {
             return 0;\r
         }\r
         try {\r
-            if (location.getLocationData() instanceof Long) {\r
-                return (double) ((Long) location.getLocationData()) / fFile.length();\r
+            if (location.getLocationInfo() instanceof Long) {\r
+                return (double) ((Long) location.getLocationInfo()) / fFile.length();\r
             }\r
         } catch (final IOException e) {\r
             Activator.getDefault().logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$\r
@@ -190,7 +190,7 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEventParser {
         }\r
 \r
         final CustomTxtTraceContext context = (CustomTxtTraceContext) tmfContext;\r
-        if (!(context.getLocation().getLocationData() instanceof Long) || NULL_LOCATION.equals(context.getLocation())) {\r
+        if (!(context.getLocation().getLocationInfo() instanceof Long) || NULL_LOCATION.equals(context.getLocation())) {\r
             return null;\r
         }\r
 \r
index 98bb835bccd51caabbca975e4fd62f4ee214283b..93e1fbbd115301c515e54ba8744e43ba0f6bdd77 100644 (file)
@@ -101,8 +101,8 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser {
         try {\r
             if (location == null) {\r
                 fFile.seek(0);\r
-            } else if (location.getLocationData() instanceof Long) {\r
-                fFile.seek((Long) location.getLocationData());\r
+            } else if (location.getLocationInfo() instanceof Long) {\r
+                fFile.seek((Long) location.getLocationInfo());\r
             }\r
             String line;\r
             final String recordElementStart = "<" + fRecordInputElement.elementName; //$NON-NLS-1$\r
@@ -154,8 +154,8 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser {
             return 0;\r
         }\r
         try {\r
-            if (location.getLocationData() instanceof Long) {\r
-                return (double) ((Long) location.getLocationData()) / fFile.length();\r
+            if (location.getLocationInfo() instanceof Long) {\r
+                return (double) ((Long) location.getLocationInfo()) / fFile.length();\r
             }\r
         } catch (final IOException e) {\r
             Activator.getDefault().logError("Error getting location ration. File: " + getPath(), e); //$NON-NLS-1$\r
@@ -195,15 +195,15 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser {
         }\r
 \r
         final CustomXmlTraceContext context = (CustomXmlTraceContext) tmfContext;\r
-        if (!(context.getLocation().getLocationData() instanceof Long) || NULL_LOCATION.equals(context.getLocation())) {\r
+        if (!(context.getLocation().getLocationInfo() instanceof Long) || NULL_LOCATION.equals(context.getLocation())) {\r
             return null;\r
         }\r
 \r
         CustomXmlEvent event = null;\r
         try {\r
-            if (fFile.getFilePointer() != (Long)context.getLocation().getLocationData() + 1)\r
+            if (fFile.getFilePointer() != (Long)context.getLocation().getLocationInfo() + 1)\r
             {\r
-                fFile.seek((Long)context.getLocation().getLocationData() + 1); // +1 is for the <\r
+                fFile.seek((Long)context.getLocation().getLocationInfo() + 1); // +1 is for the <\r
             }\r
             final StringBuffer elementBuffer = new StringBuffer("<"); //$NON-NLS-1$\r
             readElement(elementBuffer, fFile);\r
This page took 0.042089 seconds and 5 git commands to generate.