assertEquals(new Long(0L), (Long)result.getLocationInfo().getTimestamp());
}
- /**
- * Run the CtfLocation clone() method test.
- */
- @Test
- public void testClone() {
- CtfLocation result = fixture.clone();
-
- assertNotNull(result);
- assertEquals(Long.valueOf(1), (Long)result.getLocationInfo().getTimestamp());
- }
-
/**
* Run the Long getLocation() method test.
*/
@Test
public void testToString_valid(){
CtfLocation fixture2 = new CtfLocation(new CtfLocationInfo(1337, 7331));
- assertEquals("CtfLocation: Element [1337/7331]",fixture2.toString()); //$NON-NLS-1$
+ assertEquals("CtfLocation [fLocationInfo=Element [1337/7331]]", fixture2.toString()); //$NON-NLS-1$
}
/**
@Test
public void testToString_invalid(){
CtfLocation fixture2 = new CtfLocation(new CtfLocationInfo(-1, -1));
- assertEquals("CtfLocation: INVALID",fixture2.toString()); //$NON-NLS-1$
+ assertEquals("CtfLocation [INVALID]", fixture2.toString()); //$NON-NLS-1$
}
}
* accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
- * Contributors: Matthew Khouzam - Initial API and implementation
+ * Contributors:
+ * Matthew Khouzam - Initial API and implementation
+ * Alexandre Montplaisir - Extends TmfLocation
*******************************************************************************/
package org.eclipse.linuxtools.tmf.core.ctfadaptor;
import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
-import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
+import org.eclipse.linuxtools.tmf.core.trace.TmfLocation;
/**
* The nugget of information that is unique to a location in a CTF trace.
* @version 1.0
* @author Matthew Khouzam
*/
-public final class CtfLocation implements ITmfLocation {
+public final class CtfLocation extends TmfLocation {
- private final CtfLocationInfo fLocation;
+ // ------------------------------------------------------------------------
+ // Attributes
+ // ------------------------------------------------------------------------
/**
* An invalid location
*/
public static final CtfLocationInfo INVALID_LOCATION = new CtfLocationInfo(-1, -1);
+ // ------------------------------------------------------------------------
+ // Constructors
+ // ------------------------------------------------------------------------
+
/**
- * Constructor for CtfLocation. Uses a default index of 0.
+ * Basic constructor for CtfLocation. Uses a default index of 0.
*
* @param timestamp
* The timestamp of this location
}
/**
- * Standard constructor
+ * Constructor using timestamp object and index
*
* @param timestamp
* The timestamp of this location
}
/**
- * Change this location's timestamp and index values.
+ * Constructor using a long value for the timestamp, and an index
*
* @param timestampValue
* The new timestamp
* @since 2.0
*/
public CtfLocation(final long timestampValue, final long index) {
- this(new CtfLocationInfo(timestampValue, index));
+ super(new CtfLocationInfo(timestampValue, index));
}
/**
- * Copy constructor
+ * Constructor using a pre-made locationInfo object
*
- * @param location
- * Other location to copy
+ * @param locationInfo
+ * The locationInfo object to use
* @since 2.0
*/
- public CtfLocation(final CtfLocationInfo location) {
- fLocation = location;
+ public CtfLocation(CtfLocationInfo locationInfo) {
+ super(locationInfo);
}
/**
- * Get the Location Data of this location
+ * Copy constructor
*
- * @return The CtfLocationData
- * @see org.eclipse.linuxtools.tmf.core.trace.ITmfLocation#getLocationInfo()
+ * @param location
+ * Other location to copy
* @since 2.0
*/
- @Override
- public CtfLocationInfo getLocationInfo() {
- return fLocation;
- }
-
- @Override
- public CtfLocation clone() {
- return new CtfLocation(new CtfLocationInfo(fLocation.getTimestamp(), fLocation.getIndex()));
+ public CtfLocation(final CtfLocation location) {
+ super(location);
}
+ // ------------------------------------------------------------------------
+ // TmfLocation
+ // ------------------------------------------------------------------------
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
+ /**
+ * @since 2.0
*/
@Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = (prime * result)
- + ((fLocation == null) ? 0 : fLocation.hashCode());
- return result;
+ public CtfLocationInfo getLocationInfo() {
+ return (CtfLocationInfo) super.getLocationInfo();
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (!(obj instanceof CtfLocation)) {
- return false;
- }
- CtfLocation other = (CtfLocation) obj;
- if (fLocation == null) {
- if (other.fLocation != null) {
- return false;
- }
- } else if (!fLocation.equals(other.fLocation)) {
- return false;
- }
- return true;
- }
+ // ------------------------------------------------------------------------
+ // Object
+ // ------------------------------------------------------------------------
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
@Override
public String toString() {
if( this.getLocationInfo().equals(CtfLocation.INVALID_LOCATION )) {
- return "CtfLocation: INVALID"; //$NON-NLS-1$
+ return getClass().getSimpleName() + " [INVALID]"; //$NON-NLS-1$
}
- return "CtfLocation: " + getLocationInfo().toString(); //$NON-NLS-1$
+ return super.toString();
}
}
// Constructors
// ------------------------------------------------------------------------
- /**
- * Default constructor (for the 'null' location)
- */
- @SuppressWarnings("unused")
- private TmfLocation() {
- fLocationInfo = null;
- }
-
/**
* Standard constructor.
*
- * @param locationInfo the concrete trace location
+ * @param locationInfo
+ * The concrete trace location
*/
public TmfLocation(final Comparable<?> locationInfo) {
fLocationInfo = locationInfo;
/**
* Copy constructor
*
- * @param location the original trace location
+ * @param location
+ * The original trace location
*/
public TmfLocation(final TmfLocation location) {
fLocationInfo = location.fLocationInfo;
// Getters
// ------------------------------------------------------------------------
- /* (non-Javadoc)
- * @see org.eclipse.linuxtools.tmf.core.trace.ITmfLocation#getLocationInfo()
- */
/**
* @since 2.0
*/
// Object
// ------------------------------------------------------------------------
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
final int prime = 31;
return result;
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(final Object obj) {
if (this == obj) {
@Override
@SuppressWarnings("nls")
public String toString() {
- return "TmfLocation [fLocation=" + fLocationInfo + "]";
+ return getClass().getSimpleName() + " [fLocationInfo=" + fLocationInfo.toString() + "]";
}
}
projects / deliverable / tracecompass.git / commitdiff
