From 085d898f12d2857b8735164165fa3bcec1d59b7d Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Fri, 13 Apr 2012 14:48:11 -0400 Subject: [PATCH] Fix tabs/spaces for ITmfEvent --- .../tmf/core/tests/event/AllTests.java | 20 +- .../core/tests/event/TmfEventFieldTest.java | 42 +- .../tmf/core/tests/event/TmfEventTest.java | 158 +++---- .../tests/event/TmfEventTypeManagerTest.java | 34 +- .../core/tests/event/TmfEventTypeTest.java | 76 ++- .../tests/event/TmfSimpleTimestampTest.java | 110 ++--- .../core/tests/event/TmfTimeRangeTest.java | 432 +++++++++--------- .../core/tests/event/TmfTimestampTest.java | 198 ++++---- .../tmf/tests/stubs/CreateTestFiles.java | 44 +- .../tests/stubs/component/TmfClientStub.java | 32 +- .../stubs/component/TmfDataProviderStub.java | 54 +-- .../stubs/component/TmfEventProviderStub.java | 50 +- .../TmfSyntheticEventProviderStub.java | 118 +++-- .../stubs/event/TmfSyntheticEventStub.java | 12 +- .../stubs/request/TmfDataRequestStub.java | 24 +- .../stubs/request/TmfEventRequestStub.java | 32 +- .../tests/stubs/trace/TmfEventParserStub.java | 106 +++-- .../tmf/tests/stubs/trace/TmfTraceStub.java | 174 ++++--- .../linuxtools/tmf/core/event/ITmfEvent.java | 4 +- .../tmf/core/event/ITmfEventField.java | 2 +- .../tmf/core/event/ITmfEventType.java | 6 +- .../tmf/core/event/ITmfTimestamp.java | 4 +- .../linuxtools/tmf/core/event/TmfEvent.java | 40 +- .../tmf/core/event/TmfEventField.java | 57 ++- .../tmf/core/event/TmfEventType.java | 58 +-- .../tmf/core/event/TmfEventTypeManager.java | 26 +- .../tmf/core/event/TmfSimpleTimestamp.java | 22 +- .../tmf/core/event/TmfTimeRange.java | 32 +- .../tmf/core/event/TmfTimestamp.java | 63 ++- .../linuxtools/tmf/core/trace/ITmfTrace.java | 8 +- .../linuxtools/tmf/core/trace/TmfTrace.java | 151 +++--- 31 files changed, 1074 insertions(+), 1115 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java index 70f7848c42..f26e5ddc1e 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/AllTests.java @@ -25,18 +25,18 @@ import org.eclipse.linuxtools.internal.tmf.core.TmfCorePlugin; @SuppressWarnings("nls") public class AllTests { - public static Test suite() { - TestSuite suite = new TestSuite("Test suite for " + TmfCorePlugin.PLUGIN_ID + ".event"); //$NON-NLS-1$; - //$JUnit-BEGIN$ - suite.addTestSuite(TmfTimestampTest.class); + public static Test suite() { + final TestSuite suite = new TestSuite("Test suite for " + TmfCorePlugin.PLUGIN_ID + ".event"); //$NON-NLS-1$; + //$JUnit-BEGIN$ + suite.addTestSuite(TmfTimestampTest.class); suite.addTestSuite(TmfSimpleTimestampTest.class); - suite.addTestSuite(TmfTimeRangeTest.class); - suite.addTestSuite(TmfEventFieldTest.class); + suite.addTestSuite(TmfTimeRangeTest.class); + suite.addTestSuite(TmfEventFieldTest.class); suite.addTestSuite(TmfEventTypeTest.class); - suite.addTestSuite(TmfEventTest.class); + suite.addTestSuite(TmfEventTest.class); suite.addTestSuite(TmfEventTypeManagerTest.class); - //$JUnit-END$ - return suite; - } + //$JUnit-END$ + return suite; + } } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java index 4ecf554fd7..dcfc605113 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java @@ -36,9 +36,9 @@ public class TmfEventFieldTest extends TestCase { private final Object fValue1 = "Value"; private final Object fValue2 = Integer.valueOf(10); - private TmfEventField fField1 = new TmfEventField(fFieldName1, fValue1); - private TmfEventField fField2 = new TmfEventField(fFieldName2, fValue2, null); - private TmfEventField fField3 = new TmfEventField(fFieldName1, fValue2, null); + private final TmfEventField fField1 = new TmfEventField(fFieldName1, fValue1); + private final TmfEventField fField2 = new TmfEventField(fFieldName2, fValue2, null); + private final TmfEventField fField3 = new TmfEventField(fFieldName1, fValue2, null); private final String fStructRootFieldName = "Root-S"; private final String[] fStructFieldNames = new String[] { fFieldName1, fFieldName2 }; @@ -60,7 +60,7 @@ public class TmfEventFieldTest extends TestCase { /** * @param name the test name */ - public TmfEventFieldTest(String name) { + public TmfEventFieldTest(final String name) { super(name); } @@ -98,7 +98,7 @@ public class TmfEventFieldTest extends TestCase { assertSame("getField(index)", fStructTerminalField1, fStructRootField.getField(0)); assertSame("getField(index)", fStructTerminalField2, fStructRootField.getField(1)); - String[] names = fStructRootField.getFieldNames(); + final String[] names = fStructRootField.getFieldNames(); assertEquals("getFieldNames length", 2, names.length); for (int i = 0; i < names.length; i++) { assertSame("getFieldNames", fStructFieldNames[i], names[i]); @@ -135,7 +135,7 @@ public class TmfEventFieldTest extends TestCase { assertSame("getField(index)", fField1, fRootField.getField(0)); assertSame("getField(index)", fField2, fRootField.getField(1)); - String[] names = fRootField.getFieldNames(); + final String[] names = fRootField.getFieldNames(); assertEquals("getFieldNames length", 2, names.length); for (int i = 0; i < names.length; i++) { assertSame("getFieldNames", fFieldNames[i], names[i]); @@ -149,12 +149,12 @@ public class TmfEventFieldTest extends TestCase { try { new TmfEventField(null, fValue1, null); fail("Invalid (null) field name"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { } } public void testTerminalCopyConstructor() { - TmfEventField copy = new TmfEventField(fField1); + final TmfEventField copy = new TmfEventField(fField1); assertSame("getName", fFieldName1, copy.getName()); assertSame("getValue", fValue1, copy.getValue()); assertNull("getFields", copy.getFields()); @@ -173,7 +173,7 @@ public class TmfEventFieldTest extends TestCase { assertSame("getField(index)", fField1, fRootField.getField(0)); assertSame("getField(index)", fField2, fRootField.getField(1)); - String[] names = fRootField.getFieldNames(); + final String[] names = fRootField.getFieldNames(); assertEquals("getFieldNames length", 2, names.length); for (int i = 0; i < names.length; i++) { assertSame("getFieldNames", fFieldNames[i], names[i]); @@ -186,7 +186,7 @@ public class TmfEventFieldTest extends TestCase { try { new TmfEventField(null); fail("TmfEventField: null arguemnt"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { } } @@ -196,24 +196,24 @@ public class TmfEventFieldTest extends TestCase { private static class MyField extends TmfEventField { - public MyField(String id, Object value) { + public MyField(final String id, final Object value) { super(id, value); } - public MyField(TmfEventField field) { + public MyField(final TmfEventField field) { super(field); } @Override - public void setValue(Object value, ITmfEventField[] subfields) { + public void setValue(final Object value, final ITmfEventField[] subfields) { super.setValue(value, subfields); } } public void testSetValue() { - TmfEventField field = new TmfEventField(fFieldName1, fValue1, null); + final TmfEventField field = new TmfEventField(fFieldName1, fValue1, null); - MyField myField = new MyField(field); + final MyField myField = new MyField(field); assertSame("getValue", fValue1, myField.getValue()); myField.setValue(fValue2, null); assertSame("getValue", fValue2, myField.getValue()); @@ -286,11 +286,11 @@ public class TmfEventFieldTest extends TestCase { } public void testEqualsSymmetry() throws Exception { - TmfEventField copy0 = new TmfEventField(fField1); + final TmfEventField copy0 = new TmfEventField(fField1); assertTrue("equals", fField1.equals(copy0)); assertTrue("equals", copy0.equals(fField1)); - - TmfEventField copy3 = new TmfEventField(fField2); + + final TmfEventField copy3 = new TmfEventField(fField2); assertTrue("equals", fField2.equals(copy3)); assertTrue("equals", copy3.equals(fField2)); } @@ -328,7 +328,7 @@ public class TmfEventFieldTest extends TestCase { } public void testNonEqualValues() throws Exception { - TmfEventField copy1 = new TmfEventField(fFieldName1, fValue1); + final TmfEventField copy1 = new TmfEventField(fFieldName1, fValue1); TmfEventField copy2 = new TmfEventField(fFieldName1, fValue1); assertTrue("equals", copy1.equals(copy2)); assertTrue("equals", copy2.equals(copy1)); @@ -354,11 +354,11 @@ public class TmfEventFieldTest extends TestCase { // ------------------------------------------------------------------------ public void testToString() { - String expected1 = "TmfEventField [fFieldId=" + fFieldName1 + ", fValue=" + fValue1.toString() + "]"; + final String expected1 = "TmfEventField [fFieldId=" + fFieldName1 + ", fValue=" + fValue1.toString() + "]"; TmfEventField field = new TmfEventField(fFieldName1, fValue1, null); assertEquals("toString", expected1, field.toString()); - String expected2 = "TmfEventField [fFieldId=" + fFieldName1 + ", fValue=" + fValue2.toString() + "]"; + final String expected2 = "TmfEventField [fFieldId=" + fFieldName1 + ", fValue=" + fValue2.toString() + "]"; field = new TmfEventField(fFieldName1, fValue2, null); assertEquals("toString", expected2, field.toString()); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java index 80017bed96..33beb803e3 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java @@ -86,7 +86,7 @@ public class TmfEventTest extends TestCase { /** * @param name the test name */ - public TmfEventTest(String name) { + public TmfEventTest(final String name) { super(name); } @@ -105,18 +105,18 @@ public class TmfEventTest extends TestCase { // ------------------------------------------------------------------------ private TmfTraceStub openTrace() { - String DIRECTORY = "testfiles"; - String TEST_STREAM = "A-Test-10K"; - String path = DIRECTORY + File.separator + TEST_STREAM; + final String DIRECTORY = "testfiles"; + final String TEST_STREAM = "A-Test-10K"; + final String path = DIRECTORY + File.separator + TEST_STREAM; TmfTraceStub trace = null; try { - URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(path), null); - File test = new File(FileLocator.toFileURL(location).toURI()); + final URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(path), null); + final File test = new File(FileLocator.toFileURL(location).toURI()); trace = new TmfTraceStub(test.toURI().getPath(), 500, false); - } catch (URISyntaxException e) { + } catch (final URISyntaxException e) { e.printStackTrace(); - } catch (IOException e) { + } catch (final IOException e) { e.printStackTrace(); } return trace; @@ -127,7 +127,7 @@ public class TmfEventTest extends TestCase { // ------------------------------------------------------------------------ public void testDefaultConstructor() { - ITmfEvent event = new TmfEvent(); + final ITmfEvent event = new TmfEvent(); assertNull("getTrace", event.getTrace()); assertEquals("getRank", -1, event.getRank()); assertNull("getTimestamp", event.getTimestamp()); @@ -156,7 +156,7 @@ public class TmfEventTest extends TestCase { } public void testNoRankConstructor() { - TmfEvent event = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference1); + final TmfEvent event = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference1); assertNull("getTrace", event.getTrace()); assertEquals("getRank", -1, event.getRank()); assertEquals("getTimestamp", fTimestamp1, event.getTimestamp()); @@ -167,7 +167,7 @@ public class TmfEventTest extends TestCase { } public void testNoRankContentConstructor() { - TmfEvent event = new TmfEvent(null, fTimestamp1, fSource, fType, fReference1); + final TmfEvent event = new TmfEvent(null, fTimestamp1, fSource, fType, fReference1); assertNull("getTrace", event.getTrace()); assertEquals("getRank", -1, event.getRank()); assertEquals("getTimestamp", fTimestamp1, event.getTimestamp()); @@ -178,7 +178,7 @@ public class TmfEventTest extends TestCase { } public void testNoTraceRankContentConstructor() { - TmfEvent event = new TmfEvent(fTimestamp1, fSource, fType, fReference1); + final TmfEvent event = new TmfEvent(fTimestamp1, fSource, fType, fReference1); assertNull("getTrace", event.getTrace()); assertEquals("getRank", -1, event.getRank()); assertEquals("getTimestamp", fTimestamp1, event.getTimestamp()); @@ -189,8 +189,8 @@ public class TmfEventTest extends TestCase { } public void testConstructorWithTrace() { - ITmfTrace trace = openTrace(); - TmfEvent event = new TmfEvent(trace, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final ITmfTrace trace = openTrace(); + final TmfEvent event = new TmfEvent(trace, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertNotNull("getTrace", event.getTrace()); assertEquals("getRank", 0, event.getRank()); assertEquals("getTimestamp", fTimestamp1, event.getTimestamp()); @@ -202,7 +202,7 @@ public class TmfEventTest extends TestCase { } public void testTmfEventCopy() { - TmfEvent event = new TmfEvent(fEvent1); + final TmfEvent event = new TmfEvent(fEvent1); assertNull("getTrace", event.getTrace()); assertEquals("getRank", 0, event.getRank()); assertEquals("getTimestamp", fTimestamp1, event.getTimestamp()); @@ -216,7 +216,7 @@ public class TmfEventTest extends TestCase { try { new TmfEvent(null); fail("null copy"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { // Success } } @@ -226,43 +226,43 @@ public class TmfEventTest extends TestCase { // ------------------------------------------------------------------------ private static class TestEvent extends TmfEvent { - - public TestEvent(ITmfEvent event) { + + public TestEvent(final ITmfEvent event) { super(event); } @Override - public void setTrace(ITmfTrace trace) { + public void setTrace(final ITmfTrace trace) { super.setTrace(trace); } @Override - public void setRank(long rank) { + public void setRank(final long rank) { super.setRank(rank); } @Override - public void setTimestamp(ITmfTimestamp timestamp) { + public void setTimestamp(final ITmfTimestamp timestamp) { super.setTimestamp(timestamp); } @Override - public void setSource(String source) { + public void setSource(final String source) { super.setSource(source); } @Override - public void setType(ITmfEventType type) { + public void setType(final ITmfEventType type) { super.setType(type); } @Override - public void setContent(ITmfEventField content) { + public void setContent(final ITmfEventField content) { super.setContent(content); } @Override - public void setReference(String reference) { + public void setReference(final String reference) { super.setReference(reference); } @@ -271,22 +271,22 @@ public class TmfEventTest extends TestCase { private ITmfTrace setupTrace() { ITmfTrace trace = null; try { - URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(fTracePath), null); - File test = new File(FileLocator.toFileURL(location).toURI()); + final URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(fTracePath), null); + final File test = new File(FileLocator.toFileURL(location).toURI()); trace = new TmfTraceStub(test.toURI().getPath(), 500, false); - } catch (URISyntaxException e) { + } catch (final URISyntaxException e) { e.printStackTrace(); - } catch (IOException e) { + } catch (final IOException e) { e.printStackTrace(); } return trace; } public void testSetTrace() { - ITmfTrace trace = setupTrace(); + final ITmfTrace trace = setupTrace(); assertNotNull(trace); - TestEvent event = new TestEvent(fEvent1); + final TestEvent event = new TestEvent(fEvent1); assertNull("setTrace", event.getTrace()); event.setTrace(trace); @@ -294,12 +294,12 @@ public class TmfEventTest extends TestCase { event.setTrace(null); assertNull("setTrace", event.getTrace()); - + trace.dispose(); } public void testSetRank() { - TestEvent event = new TestEvent(fEvent1); + final TestEvent event = new TestEvent(fEvent1); assertEquals("setRank", 0, event.getRank()); event.setRank(1); @@ -313,7 +313,7 @@ public class TmfEventTest extends TestCase { } public void testSetTimestamp() { - TestEvent event = new TestEvent(fEvent1); + final TestEvent event = new TestEvent(fEvent1); assertEquals("setTimestamp", fTimestamp1, event.getTimestamp()); event.setTimestamp(fTimestamp2); @@ -327,10 +327,10 @@ public class TmfEventTest extends TestCase { } public void testSetSource() { - TestEvent event = new TestEvent(fEvent1); + final TestEvent event = new TestEvent(fEvent1); assertEquals("setSource", fSource, event.getSource()); - String source2 = "another source"; + final String source2 = "another source"; event.setSource(source2); assertEquals("setContent", source2, event.getSource()); @@ -342,12 +342,12 @@ public class TmfEventTest extends TestCase { } public void testSetType() { - TestEvent event = new TestEvent(fEvent1); + final TestEvent event = new TestEvent(fEvent1); assertEquals("setType", fType, event.getType()); - String typeId = "OtherTestType"; - String[] labels = new String[] { fLabel2, fLabel1 }; - TmfEventType newType = new TmfEventType(fContext, typeId, TmfEventField.makeRoot(labels)); + final String typeId = "OtherTestType"; + final String[] labels = new String[] { fLabel2, fLabel1 }; + final TmfEventType newType = new TmfEventType(fContext, typeId, TmfEventField.makeRoot(labels)); event.setType(newType); assertEquals("setType", newType, event.getType()); @@ -360,7 +360,7 @@ public class TmfEventTest extends TestCase { } public void testSetContent() { - TestEvent event = new TestEvent(fEvent1); + final TestEvent event = new TestEvent(fEvent1); assertEquals("setContent", fContent1, event.getContent()); event.setContent(fContent2); @@ -374,7 +374,7 @@ public class TmfEventTest extends TestCase { } public void testSetReference() { - TestEvent event = new TestEvent(fEvent1); + final TestEvent event = new TestEvent(fEvent1); assertEquals("setReference", fReference1, event.getReference()); event.setReference(fReference2); @@ -394,7 +394,7 @@ public class TmfEventTest extends TestCase { public static class MyEvent extends TmfEvent { @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { return super.equals(other); } @Override @@ -404,7 +404,7 @@ public class TmfEventTest extends TestCase { } public void testClone1() throws Exception { - ITmfEvent clone = fEvent1.clone(); + final ITmfEvent clone = fEvent1.clone(); assertTrue("clone", fEvent1.clone().equals(fEvent1)); assertTrue("clone", clone.clone().equals(clone)); @@ -414,8 +414,8 @@ public class TmfEventTest extends TestCase { } public void testClone2() throws Exception { - TmfEvent event = new MyEvent(); - TmfEvent clone = event.clone(); + final TmfEvent event = new MyEvent(); + final TmfEvent clone = event.clone(); assertTrue("clone", event.clone().equals(event)); assertTrue("clone", clone.clone().equals(clone)); @@ -431,21 +431,21 @@ public class TmfEventTest extends TestCase { public void testHashCode() throws Exception { TmfEvent event1 = new TmfEvent(); TmfEvent event2 = new TmfEvent(); - + assertTrue("hashCode", event1.hashCode() == event2.hashCode()); - ITmfTrace trace = openTrace(); + final ITmfTrace trace = openTrace(); event1 = new TmfEvent(trace, 0, fTimestamp1, fSource, fType, fContent1, fReference1); event2 = new TmfEvent(trace, 1, fTimestamp2, fSource, fType, fContent2, fReference2); - TmfEvent event1b = new TmfEvent(event1); - TmfEvent event2b = new TmfEvent(event2); + final TmfEvent event1b = new TmfEvent(event1); + final TmfEvent event2b = new TmfEvent(event2); assertTrue("hashCode", event1.hashCode() == event1b.hashCode()); assertTrue("hashCode", event2.hashCode() == event2b.hashCode()); assertTrue("hashCode", event1.hashCode() != event2.hashCode()); assertTrue("hashCode", event2.hashCode() != event1.hashCode()); - + trace.dispose(); } @@ -462,8 +462,8 @@ public class TmfEventTest extends TestCase { } public void testEqualsSymmetry() throws Exception { - TmfEvent event1 = new TmfEvent(fEvent1); - TmfEvent event2 = new TmfEvent(fEvent2); + final TmfEvent event1 = new TmfEvent(fEvent1); + final TmfEvent event2 = new TmfEvent(fEvent2); assertTrue("equals", event1.equals(fEvent1)); assertTrue("equals", fEvent1.equals(event1)); @@ -473,9 +473,9 @@ public class TmfEventTest extends TestCase { } public void testEqualsTransivity() throws Exception { - TmfEvent event1 = new TmfEvent(fEvent1); - TmfEvent event2 = new TmfEvent(fEvent1); - TmfEvent event3 = new TmfEvent(fEvent1); + final TmfEvent event1 = new TmfEvent(fEvent1); + final TmfEvent event2 = new TmfEvent(fEvent1); + final TmfEvent event3 = new TmfEvent(fEvent1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event3)); @@ -491,12 +491,12 @@ public class TmfEventTest extends TestCase { assertFalse("equals", fEvent1.equals(fEvent1.getType())); assertFalse("equals", fEvent1.equals(null)); } - + public void testNonEqualTraces() throws Exception { - ITmfTrace trace1 = openTrace(); - ITmfTrace trace2 = openTrace(); + final ITmfTrace trace1 = openTrace(); + final ITmfTrace trace2 = openTrace(); - TmfEvent event1 = new TmfEvent(trace1, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final TmfEvent event1 = new TmfEvent(trace1, 0, fTimestamp1, fSource, fType, fContent1, fReference1); TmfEvent event2 = new TmfEvent(trace1, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); @@ -504,7 +504,7 @@ public class TmfEventTest extends TestCase { event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); - + event2 = new TmfEvent(trace2, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); @@ -512,9 +512,9 @@ public class TmfEventTest extends TestCase { trace1.dispose(); trace2.dispose(); } - + public void testNonEqualRanks() throws Exception { - TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); @@ -523,9 +523,9 @@ public class TmfEventTest extends TestCase { assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); } - + public void testNonEqualTimestamps() throws Exception { - TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); @@ -538,9 +538,9 @@ public class TmfEventTest extends TestCase { assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); } - + public void testNonEqualSources() throws Exception { - TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); @@ -553,16 +553,16 @@ public class TmfEventTest extends TestCase { assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); } - + public void testNonEqualTypes() throws Exception { - TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); - String typeId = "OtherTestType"; - String[] labels = new String[] { fLabel2, fLabel1 }; - TmfEventType newType = new TmfEventType(fContext, typeId, TmfEventField.makeRoot(labels)); + final String typeId = "OtherTestType"; + final String[] labels = new String[] { fLabel2, fLabel1 }; + final TmfEventType newType = new TmfEventType(fContext, typeId, TmfEventField.makeRoot(labels)); event2 = new TmfEvent(null, 0, fTimestamp1, fSource, newType, fContent1, fReference1); assertFalse("equals", event1.equals(event2)); @@ -572,9 +572,9 @@ public class TmfEventTest extends TestCase { assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); } - + public void testNonEqualContents() throws Exception { - TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); @@ -587,9 +587,9 @@ public class TmfEventTest extends TestCase { assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); } - + public void testNonEqualReferences() throws Exception { - TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); + final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1); assertTrue("equals", event1.equals(event2)); assertTrue("equals", event2.equals(event1)); @@ -602,17 +602,17 @@ public class TmfEventTest extends TestCase { assertFalse("equals", event1.equals(event2)); assertFalse("equals", event2.equals(event1)); } - + // ------------------------------------------------------------------------ // toString // ------------------------------------------------------------------------ public void testToString() { - String expected1 = "TmfEvent [fTimestamp=" + fTimestamp1 + ", fTrace=null, fRank=0, fSource=" + fSource + final String expected1 = "TmfEvent [fTimestamp=" + fTimestamp1 + ", fTrace=null, fRank=0, fSource=" + fSource + ", fType=" + fType + ", fContent=" + fContent1 + ", fReference=" + fReference1 + "]"; assertEquals("toString", expected1, fEvent1.toString()); - String expected2 = "TmfEvent [fTimestamp=" + fTimestamp2 + ", fTrace=null, fRank=1, fSource=" + fSource + final String expected2 = "TmfEvent [fTimestamp=" + fTimestamp2 + ", fTrace=null, fRank=1, fSource=" + fSource + ", fType=" + fType + ", fContent=" + fContent2 + ", fReference=" + fReference2 + "]"; assertEquals("toString", expected2, fEvent2.toString()); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java index cded721241..5216666c7e 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java @@ -46,7 +46,7 @@ public class TmfEventTypeManagerTest extends TestCase { private final String fLabel0 = "label1"; private final String fLabel1 = "label2"; - + private final String[] fLabels0 = new String[] { }; private final String[] fLabels1 = new String[] { fLabel0, fLabel1 }; private final String[] fLabels2 = new String[] { fLabel1, fLabel0, fLabel1 }; @@ -63,7 +63,7 @@ public class TmfEventTypeManagerTest extends TestCase { /** * @param name the test name */ - public TmfEventTypeManagerTest(String name) { + public TmfEventTypeManagerTest(final String name) { super(name); } @@ -88,7 +88,7 @@ public class TmfEventTypeManagerTest extends TestCase { fInstance.add(fContext2, fType2); fInstance.add(fContext2, fType3); - String[] contexts = fInstance.getContexts(); + final String[] contexts = fInstance.getContexts(); Arrays.sort(contexts); assertEquals("getContexts", 2, contexts.length); assertEquals("getContexts", fContext1, contexts[0]); @@ -104,18 +104,18 @@ public class TmfEventTypeManagerTest extends TestCase { ITmfEventType[] types = fInstance.getTypes(fContext1); assertEquals("getTypes", 2, types.length); - if (fType0 == types[0]) { + if (fType0 == types[0]) assertSame("getTypes", fType1, types[1]); - } else { + else { assertSame("getTypes", fType0, types[1]); assertSame("getTypes", fType1, types[0]); } types = fInstance.getTypes(fContext2); assertEquals("getTypes", 2, types.length); - if (fType2 == types[0]) { + if (fType2 == types[0]) assertSame("getTypes", fType3, types[1]); - } else { + else { assertSame("getTypes", fType2, types[1]); assertSame("getTypes", fType3, types[0]); } @@ -168,7 +168,7 @@ public class TmfEventTypeManagerTest extends TestCase { fInstance.clear(fContext1); - String[] contexts = fInstance.getContexts(); + final String[] contexts = fInstance.getContexts(); assertEquals("clear context", 1, contexts.length); assertEquals("clear context", fContext2, contexts[0]); @@ -182,9 +182,9 @@ public class TmfEventTypeManagerTest extends TestCase { types = fInstance.getTypes(fContext2); assertEquals("clear context", 2, types.length); - if (fType2 == types[0]) { + if (fType2 == types[0]) assertSame("clear context", fType3, types[1]); - } else { + else { assertSame("clear context", fType2, types[1]); assertSame("clear context", fType3, types[0]); } @@ -194,11 +194,11 @@ public class TmfEventTypeManagerTest extends TestCase { fInstance.clear(); fInstance.add(fContext1, fType0); - String[] contexts = fInstance.getContexts(); + final String[] contexts = fInstance.getContexts(); assertEquals("add", 1, contexts.length); assertEquals("add", fContext1, contexts[0]); - ITmfEventType[] types = fInstance.getTypes(contexts[0]); + final ITmfEventType[] types = fInstance.getTypes(contexts[0]); assertEquals("add", 1, types.length); assertSame("add", fType0, types[0]); @@ -216,7 +216,7 @@ public class TmfEventTypeManagerTest extends TestCase { fInstance.add(fContext2, fType2); fInstance.add(fContext2, fType3); - String[] contexts = fInstance.getContexts(); + final String[] contexts = fInstance.getContexts(); Arrays.sort(contexts); assertEquals("add", 2, contexts.length); assertEquals("add", fContext1, contexts[0]); @@ -224,18 +224,18 @@ public class TmfEventTypeManagerTest extends TestCase { ITmfEventType[] types = fInstance.getTypes(fContext1); assertEquals("add", 2, types.length); - if (fType0 == types[0]) { + if (fType0 == types[0]) assertSame("add", fType1, types[1]); - } else { + else { assertSame("add", fType0, types[1]); assertSame("add", fType1, types[0]); } types = fInstance.getTypes(fContext2); assertEquals("add", 2, types.length); - if (fType2 == types[0]) { + if (fType2 == types[0]) assertSame("add", fType3, types[1]); - } else { + else { assertSame("add", fType2, types[1]); assertSame("add", fType3, types[0]); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java index ed8a86c22f..76238f741c 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java @@ -39,7 +39,7 @@ public class TmfEventTypeTest extends TestCase { private final String fLabel0 = "label1"; private final String fLabel1 = "label2"; - + private final String[] fLabels0 = new String[] { }; private final String[] fLabels1 = new String[] { fLabel0, fLabel1 }; private final String[] fLabels2 = new String[] { fLabel1, fLabel0, fLabel1 }; @@ -56,7 +56,7 @@ public class TmfEventTypeTest extends TestCase { /** * @param name the test name */ - public TmfEventTypeTest(String name) { + public TmfEventTypeTest(final String name) { super(name); } @@ -75,7 +75,7 @@ public class TmfEventTypeTest extends TestCase { // ------------------------------------------------------------------------ public void testDefaultConstructor() { - ITmfEventType type = new TmfEventType(); + final ITmfEventType type = new TmfEventType(); assertEquals("getContext", TmfEventType.DEFAULT_CONTEXT_ID, type.getContext()); assertEquals("getName", TmfEventType.DEFAULT_TYPE_ID, type.getName()); assertNull("getRootField", type.getRootField()); @@ -84,37 +84,34 @@ public class TmfEventTypeTest extends TestCase { } public void testFullConstructor() { - ITmfEventType type0 = new TmfEventType(fContext1, fTypeId1, TmfEventField.makeRoot(fLabels0)); + final ITmfEventType type0 = new TmfEventType(fContext1, fTypeId1, TmfEventField.makeRoot(fLabels0)); assertEquals("getContext", fContext1, type0.getContext()); assertEquals("getName", fTypeId1, type0.getName()); assertEquals("getRootField", TmfEventField.makeRoot(fLabels0), type0.getRootField()); - String[] labels0 = type0.getFieldNames(); + final String[] labels0 = type0.getFieldNames(); assertEquals("getFieldNames length", fLabels0.length, labels0.length); - for (int i = 0; i < labels0.length; i++) { + for (int i = 0; i < labels0.length; i++) assertEquals("getFieldNames", fLabels0[i], labels0[i]); - } assertNull("getFieldName", type0.getFieldName(labels0.length)); - ITmfEventType type1 = new TmfEventType(fContext1, fTypeId1, TmfEventField.makeRoot(fLabels1)); + final ITmfEventType type1 = new TmfEventType(fContext1, fTypeId1, TmfEventField.makeRoot(fLabels1)); assertEquals("getContext", fContext1, type1.getContext()); assertEquals("getName", fTypeId1, type1.getName()); assertEquals("getRootField", TmfEventField.makeRoot(fLabels1), type1.getRootField()); - String[] labels1 = type1.getFieldNames(); + final String[] labels1 = type1.getFieldNames(); assertEquals("getFieldNames length", fLabels1.length, labels1.length); - for (int i = 0; i < labels1.length; i++) { + for (int i = 0; i < labels1.length; i++) assertEquals("getFieldNames", fLabels1[i], labels1[i]); - } assertNull("getFieldName", type1.getFieldName(labels1.length)); - ITmfEventType type2 = new TmfEventType(fContext2, fTypeId2, TmfEventField.makeRoot(fLabels2)); + final ITmfEventType type2 = new TmfEventType(fContext2, fTypeId2, TmfEventField.makeRoot(fLabels2)); assertEquals("getContext", fContext2, type2.getContext()); assertEquals("getName", fTypeId2, type2.getName()); assertEquals("getRootField", TmfEventField.makeRoot(fLabels2), type2.getRootField()); - String[] labels2 = type2.getFieldNames(); + final String[] labels2 = type2.getFieldNames(); assertEquals("getFieldNames length", fLabels2.length, labels2.length); - for (int i = 0; i < labels2.length; i++) { + for (int i = 0; i < labels2.length; i++) assertEquals("getFieldNames", fLabels2[i], labels2[i]); - } assertNull("getFieldName", type2.getFieldName(labels2.length)); } @@ -122,28 +119,27 @@ public class TmfEventTypeTest extends TestCase { try { new TmfEventType(null, fTypeId1, null); fail("TmfEventType: null context"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { } try { new TmfEventType(fContext1, null, null); fail("TmfEventType: null type"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { } } public void testCopyConstructor() { - TmfEventType original = new TmfEventType(fContext1, fTypeId1, TmfEventField.makeRoot(fLabels1)); - TmfEventType copy = new TmfEventType(original); + final TmfEventType original = new TmfEventType(fContext1, fTypeId1, TmfEventField.makeRoot(fLabels1)); + final TmfEventType copy = new TmfEventType(original); assertEquals("getContext", fContext1, copy.getContext()); assertEquals("getName", fTypeId1, copy.getName()); assertEquals("getRootField", TmfEventField.makeRoot(fLabels1), copy.getRootField()); - String[] labels1 = copy.getFieldNames(); + final String[] labels1 = copy.getFieldNames(); assertEquals("getFieldNames length", fLabels1.length, labels1.length); - for (int i = 0; i < labels1.length; i++) { + for (int i = 0; i < labels1.length; i++) assertEquals("getFieldNames", fLabels1[i], labels1[i]); - } assertNull("getFieldName", copy.getFieldName(labels1.length)); } @@ -151,7 +147,7 @@ public class TmfEventTypeTest extends TestCase { try { new TmfEventType(null); fail("TmfEventType: null argument"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { } } @@ -162,7 +158,7 @@ public class TmfEventTypeTest extends TestCase { public static class MyEventType extends TmfEventType { @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { return super.equals(other); } @@ -173,7 +169,7 @@ public class TmfEventTypeTest extends TestCase { } public void testClone() throws Exception { - ITmfEventType clone = fType1.clone(); + final ITmfEventType clone = fType1.clone(); assertTrue("clone", fType1.clone().equals(fType1)); assertTrue("clone", clone.clone().equals(clone)); @@ -183,8 +179,8 @@ public class TmfEventTypeTest extends TestCase { } public void testClone2() throws Exception { - ITmfEventType type = new TmfEventType(); - ITmfEventType clone = type.clone(); + final ITmfEventType type = new TmfEventType(); + final ITmfEventType clone = type.clone(); assertTrue("clone", type.clone().equals(type)); assertTrue("clone", clone.clone().equals(clone)); @@ -198,7 +194,7 @@ public class TmfEventTypeTest extends TestCase { // ------------------------------------------------------------------------ public void testHashCode() throws Exception { - TmfEventType copy1 = new TmfEventType(fType0); + final TmfEventType copy1 = new TmfEventType(fType0); assertTrue("hashCode", fType0.hashCode() == copy1.hashCode()); assertTrue("hashCode", fType0.hashCode() != fType3.hashCode()); @@ -217,15 +213,15 @@ public class TmfEventTypeTest extends TestCase { } public void testEqualsSymmetry() throws Exception { - TmfEventType copy0 = new TmfEventType(fType0); + final TmfEventType copy0 = new TmfEventType(fType0); assertTrue("equals", fType0.equals(copy0)); assertTrue("equals", copy0.equals(fType0)); - - TmfEventType copy1 = new TmfEventType(fType1); + + final TmfEventType copy1 = new TmfEventType(fType1); assertTrue("equals", fType1.equals(copy1)); assertTrue("equals", copy1.equals(fType1)); - - TmfEventType copy2 = new TmfEventType(fType2); + + final TmfEventType copy2 = new TmfEventType(fType2); assertTrue("equals", fType2.equals(copy2)); assertTrue("equals", copy2.equals(fType2)); } @@ -261,23 +257,23 @@ public class TmfEventTypeTest extends TestCase { assertFalse("equals", fType2.equals(fType3)); assertFalse("equals", fType3.equals(fType0)); } - + public void testNonEqualsClasses() throws Exception { assertFalse("equals", fType1.equals(fLabels1)); } - + // ------------------------------------------------------------------------ // toString // ------------------------------------------------------------------------ public void testToString() { - String expected1 = "TmfEventType [fContext=" + TmfEventType.DEFAULT_CONTEXT_ID + - ", fTypeId=" + TmfEventType.DEFAULT_TYPE_ID + "]"; - TmfEventType type1 = new TmfEventType(); + final String expected1 = "TmfEventType [fContext=" + TmfEventType.DEFAULT_CONTEXT_ID + + ", fTypeId=" + TmfEventType.DEFAULT_TYPE_ID + "]"; + final TmfEventType type1 = new TmfEventType(); assertEquals("toString", expected1, type1.toString()); - String expected2 = "TmfEventType [fContext=" + fContext1 + ", fTypeId=" + fTypeId1 + "]"; - TmfEventType type2 = new TmfEventType(fContext1, fTypeId1, TmfEventField.makeRoot(fLabels1)); + final String expected2 = "TmfEventType [fContext=" + fContext1 + ", fTypeId=" + fTypeId1 + "]"; + final TmfEventType type2 = new TmfEventType(fContext1, fTypeId1, TmfEventField.makeRoot(fLabels1)); assertEquals("toString", expected2, type2.toString()); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java index fb974c7685..1bfd3f630f 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java @@ -26,38 +26,38 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @SuppressWarnings("nls") public class TmfSimpleTimestampTest extends TestCase { - // ------------------------------------------------------------------------ - // Variables - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ + // Variables + // ------------------------------------------------------------------------ - private final ITmfTimestamp ts0 = new TmfSimpleTimestamp(); - private final ITmfTimestamp ts1 = new TmfSimpleTimestamp(12345); + private final ITmfTimestamp ts0 = new TmfSimpleTimestamp(); + private final ITmfTimestamp ts1 = new TmfSimpleTimestamp(12345); private final ITmfTimestamp ts2 = new TmfSimpleTimestamp(-1234); - // ------------------------------------------------------------------------ - // Housekeping - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ + // Housekeping + // ------------------------------------------------------------------------ - /** - * @param name the test name - */ - public TmfSimpleTimestampTest(String name) { - super(name); - } + /** + * @param name the test name + */ + public TmfSimpleTimestampTest(final String name) { + super(name); + } - @Override - protected void setUp() throws Exception { - super.setUp(); - } + @Override + protected void setUp() throws Exception { + super.setUp(); + } - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } - // ------------------------------------------------------------------------ - // Constructors - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ + // Constructors + // ------------------------------------------------------------------------ public void testDefaultConstructor() throws Exception { assertEquals("getValue", 0, ts0.getValue()); @@ -72,7 +72,7 @@ public class TmfSimpleTimestampTest extends TestCase { } public void testCopyConstructor() throws Exception { - ITmfTimestamp copy = new TmfSimpleTimestamp(ts1); + final ITmfTimestamp copy = new TmfSimpleTimestamp(ts1); assertEquals("getValue", ts1.getValue(), copy.getValue()); assertEquals("getscale", ts1.getScale(), copy.getScale()); @@ -84,25 +84,25 @@ public class TmfSimpleTimestampTest extends TestCase { } public void testCopyBadTimestamp() throws Exception { - ITmfTimestamp ts0a = new TmfTimestamp(0, 1, 0); - ITmfTimestamp ts0b = new TmfTimestamp(0, 0, 1); + final ITmfTimestamp ts0a = new TmfTimestamp(0, 1, 0); + final ITmfTimestamp ts0b = new TmfTimestamp(0, 0, 1); try { new TmfSimpleTimestamp(null); fail("TmfSimpleTimestamp: null argument"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { } try { new TmfSimpleTimestamp(ts0a); fail("TmfSimpleTimestamp: bad scale"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { } try { new TmfSimpleTimestamp(ts0b); fail("TmfSimpleTimestamp: bad precision"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { } } @@ -113,7 +113,7 @@ public class TmfSimpleTimestampTest extends TestCase { public static class MyTimestamp extends TmfSimpleTimestamp { @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { return super.equals(other); } @@ -124,7 +124,7 @@ public class TmfSimpleTimestampTest extends TestCase { } public void testClone() throws Exception { - ITmfTimestamp clone = ts0.clone(); + final ITmfTimestamp clone = ts0.clone(); assertTrue("clone", ts0.clone().equals(ts0)); assertTrue("clone", clone.clone().equals(clone)); @@ -134,8 +134,8 @@ public class TmfSimpleTimestampTest extends TestCase { } public void testClone2() throws Exception { - MyTimestamp timestamp = new MyTimestamp(); - MyTimestamp clone = timestamp.clone(); + final MyTimestamp timestamp = new MyTimestamp(); + final MyTimestamp clone = timestamp.clone(); assertTrue("clone", timestamp.clone().equals(timestamp)); assertTrue("clone", clone.clone().equals(clone)); @@ -164,24 +164,24 @@ public class TmfSimpleTimestampTest extends TestCase { } public void testEqualsSymmetry() throws Exception { - ITmfTimestamp ts0copy = new TmfSimpleTimestamp(ts0); + final ITmfTimestamp ts0copy = new TmfSimpleTimestamp(ts0); assertTrue("equals", ts0.equals(ts0copy)); assertTrue("equals", ts0copy.equals(ts0)); - ITmfTimestamp ts1copy = new TmfSimpleTimestamp(ts1); + final ITmfTimestamp ts1copy = new TmfSimpleTimestamp(ts1); assertTrue("equals", ts1.equals(ts1copy)); assertTrue("equals", ts1copy.equals(ts1)); } public void testEqualsTransivity() throws Exception { - ITmfTimestamp ts0copy1 = new TmfSimpleTimestamp(ts0); - ITmfTimestamp ts0copy2 = new TmfSimpleTimestamp(ts0copy1); + final ITmfTimestamp ts0copy1 = new TmfSimpleTimestamp(ts0); + final ITmfTimestamp ts0copy2 = new TmfSimpleTimestamp(ts0copy1); assertTrue("equals", ts0.equals(ts0copy1)); assertTrue("equals", ts0copy1.equals(ts0copy2)); assertTrue("equals", ts0.equals(ts0copy2)); - ITmfTimestamp ts1copy1 = new TmfSimpleTimestamp(ts1); - ITmfTimestamp ts1copy2 = new TmfSimpleTimestamp(ts1copy1); + final ITmfTimestamp ts1copy1 = new TmfSimpleTimestamp(ts1); + final ITmfTimestamp ts1copy2 = new TmfSimpleTimestamp(ts1copy1); assertTrue("equals", ts1.equals(ts1copy1)); assertTrue("equals", ts1copy1.equals(ts1copy2)); assertTrue("equals", ts1.equals(ts1copy2)); @@ -212,9 +212,9 @@ public class TmfSimpleTimestampTest extends TestCase { // ------------------------------------------------------------------------ public void testHashCode() throws Exception { - ITmfTimestamp ts0copy = new TmfTimestamp(ts0); - ITmfTimestamp ts1copy = new TmfTimestamp(ts1); - ITmfTimestamp ts2copy = new TmfTimestamp(ts2); + final ITmfTimestamp ts0copy = new TmfTimestamp(ts0); + final ITmfTimestamp ts1copy = new TmfTimestamp(ts1); + final ITmfTimestamp ts2copy = new TmfTimestamp(ts2); assertTrue("hashCode", ts0.hashCode() == ts0copy.hashCode()); assertTrue("hashCode", ts1.hashCode() == ts1copy.hashCode()); @@ -276,9 +276,9 @@ public class TmfSimpleTimestampTest extends TestCase { // ------------------------------------------------------------------------ public void testBasicCompareTo() throws Exception { - ITmfTimestamp ts1 = new TmfSimpleTimestamp(900); - ITmfTimestamp ts2 = new TmfSimpleTimestamp(1000); - ITmfTimestamp ts3 = new TmfSimpleTimestamp(1100); + final ITmfTimestamp ts1 = new TmfSimpleTimestamp(900); + final ITmfTimestamp ts2 = new TmfSimpleTimestamp(1000); + final ITmfTimestamp ts3 = new TmfSimpleTimestamp(1100); assertTrue(ts1.compareTo(ts1) == 0); @@ -293,9 +293,9 @@ public class TmfSimpleTimestampTest extends TestCase { } public void testCompareTo() throws Exception { - ITmfTimestamp ts0a = new TmfTimestamp(0, 2, 0); - ITmfTimestamp ts1a = new TmfTimestamp(123450, -1); - ITmfTimestamp ts2a = new TmfTimestamp(-12340, -1); + final ITmfTimestamp ts0a = new TmfTimestamp(0, 2, 0); + final ITmfTimestamp ts1a = new TmfTimestamp(123450, -1); + final ITmfTimestamp ts2a = new TmfTimestamp(-12340, -1); assertTrue(ts1.compareTo(ts1) == 0); @@ -307,7 +307,7 @@ public class TmfSimpleTimestampTest extends TestCase { // ------------------------------------------------------------------------ // getDelta // ------------------------------------------------------------------------ - + public void testDelta() throws Exception { // Delta for same scale and precision (delta > 0) TmfTimestamp ts0 = new TmfSimpleTimestamp(10); @@ -328,11 +328,11 @@ public class TmfSimpleTimestampTest extends TestCase { public void testDelta2() throws Exception { // Delta for different scale and same precision (delta > 0) - TmfTimestamp ts0 = new TmfSimpleTimestamp(10); - TmfTimestamp ts1 = new TmfTimestamp(1, 1); - TmfTimestamp exp = new TmfTimestamp(0, 0); + final TmfTimestamp ts0 = new TmfSimpleTimestamp(10); + final TmfTimestamp ts1 = new TmfTimestamp(1, 1); + final TmfTimestamp exp = new TmfTimestamp(0, 0); - ITmfTimestamp delta = ts0.getDelta(ts1); + final ITmfTimestamp delta = ts0.getDelta(ts1); assertEquals("getDelta", 0, delta.compareTo(exp, false)); } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java index 97a7bee490..216677e259 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java @@ -27,32 +27,32 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @SuppressWarnings("nls") public class TmfTimeRangeTest extends TestCase { - // ------------------------------------------------------------------------ - // Housekeeping - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ + // Housekeeping + // ------------------------------------------------------------------------ - public TmfTimeRangeTest(String name) { - super(name); - } + public TmfTimeRangeTest(final String name) { + super(name); + } - @Override - protected void setUp() throws Exception { - super.setUp(); - } + @Override + protected void setUp() throws Exception { + super.setUp(); + } - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } - // ------------------------------------------------------------------------ - // Constructors - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ + // Constructors + // ------------------------------------------------------------------------ public void testConstructor() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range = new TmfTimeRange(ts1, ts2); + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range = new TmfTimeRange(ts1, ts2); assertEquals("startTime", ts1, range.getStartTime()); assertEquals("endTime", ts2, range.getEndTime()); @@ -62,52 +62,52 @@ public class TmfTimeRangeTest extends TestCase { try { new TmfTimeRange(TmfTimestamp.BIG_BANG, null); fail("TmfTimeRange: bad end time"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { // Success } try { new TmfTimeRange(null, TmfTimestamp.BIG_CRUNCH); fail("TmfTimeRange: bad start time"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { // Success } } public void testOpenRange1() throws Exception { - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, ts2); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, ts2); assertEquals("startTime", TmfTimestamp.BIG_BANG, range.getStartTime()); assertEquals("endTime", ts2, range.getEndTime()); } public void testOpenRange2() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - TmfTimeRange range = new TmfTimeRange(ts1, TmfTimestamp.BIG_CRUNCH); + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final TmfTimeRange range = new TmfTimeRange(ts1, TmfTimestamp.BIG_CRUNCH); assertEquals("startTime", ts1, range.getStartTime()); assertEquals("endTime", TmfTimestamp.BIG_CRUNCH, range.getEndTime()); } public void testOpenRange3() throws Exception { - TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); + final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); assertEquals("startTime", TmfTimestamp.BIG_BANG, range.getStartTime()); assertEquals("endTime", TmfTimestamp.BIG_CRUNCH, range.getEndTime()); } public void testCopyConstructor() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range0 = new TmfTimeRange(ts1, ts2); - TmfTimeRange range1 = new TmfTimeRange(range0); + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range0 = new TmfTimeRange(ts1, ts2); + final TmfTimeRange range1 = new TmfTimeRange(range0); assertEquals("startTime", ts1, range1.getStartTime()); assertEquals("endTime", ts2, range1.getEndTime()); - TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - TmfTimeRange range3 = new TmfTimeRange(range2); + final TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); + final TmfTimeRange range3 = new TmfTimeRange(range2); assertEquals("startTime", TmfTimestamp.BIG_BANG, range3.getStartTime()); assertEquals("endTime", TmfTimestamp.BIG_CRUNCH, range3.getEndTime()); @@ -117,7 +117,7 @@ public class TmfTimeRangeTest extends TestCase { try { new TmfTimeRange(null); fail("TmfTimeRange: null argument"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { // Success } } @@ -127,11 +127,11 @@ public class TmfTimeRangeTest extends TestCase { // ------------------------------------------------------------------------ public void testClone() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range = new TmfTimeRange(ts1, ts2); - TmfTimeRange clone = range.clone(); + final TmfTimeRange range = new TmfTimeRange(ts1, ts2); + final TmfTimeRange clone = range.clone(); assertTrue("clone", range.clone().equals(range)); assertTrue("clone", clone.clone().equals(clone)); @@ -140,163 +140,163 @@ public class TmfTimeRangeTest extends TestCase { assertEquals("clone", ts1, clone.getStartTime()); assertEquals("clone", ts2, clone.getEndTime()); } - + // ------------------------------------------------------------------------ // hashCode // ------------------------------------------------------------------------ public void testHashCode() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); - TmfTimeRange range1b = new TmfTimeRange(range1); - TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - TmfTimeRange range2b = new TmfTimeRange(range2); + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); + final TmfTimeRange range1b = new TmfTimeRange(range1); + final TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); + final TmfTimeRange range2b = new TmfTimeRange(range2); assertTrue("hashCode", range1.hashCode() == range1b.hashCode()); assertTrue("hashCode", range2.hashCode() == range2b.hashCode()); assertTrue("hashCode", range1.hashCode() != range2.hashCode()); } - - // ------------------------------------------------------------------------ - // equals - // ------------------------------------------------------------------------ - - public void testEqualsReflexivity() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); - TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - - assertTrue("equals", range1.equals(range1)); - assertTrue("equals", range2.equals(range2)); - - assertTrue("equals", !range1.equals(range2)); - assertTrue("equals", !range2.equals(range1)); - } - - public void testEqualsSymmetry() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range1a = new TmfTimeRange(ts1, ts2); - TmfTimeRange range1b = new TmfTimeRange(ts1, ts2); - - TmfTimeRange range2a = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - TmfTimeRange range2b = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); - - assertTrue("equals", range1a.equals(range1b)); - assertTrue("equals", range1b.equals(range1a)); - - assertTrue("equals", range2a.equals(range2b)); - assertTrue("equals", range2b.equals(range2a)); - } - - public void testEqualsTransivity() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range1a = new TmfTimeRange(ts1, ts2); - TmfTimeRange range1b = new TmfTimeRange(ts1, ts2); - TmfTimeRange range1c = new TmfTimeRange(ts1, ts2); - - assertTrue("equals", range1a.equals(range1b)); - assertTrue("equals", range1b.equals(range1c)); - assertTrue("equals", range1a.equals(range1c)); - } - - public void testEqualsNull() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); - - assertTrue("equals", !range1.equals(null)); - } - + + // ------------------------------------------------------------------------ + // equals + // ------------------------------------------------------------------------ + + public void testEqualsReflexivity() throws Exception { + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); + final TmfTimeRange range2 = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); + + assertTrue("equals", range1.equals(range1)); + assertTrue("equals", range2.equals(range2)); + + assertTrue("equals", !range1.equals(range2)); + assertTrue("equals", !range2.equals(range1)); + } + + public void testEqualsSymmetry() throws Exception { + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range1a = new TmfTimeRange(ts1, ts2); + final TmfTimeRange range1b = new TmfTimeRange(ts1, ts2); + + final TmfTimeRange range2a = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); + final TmfTimeRange range2b = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); + + assertTrue("equals", range1a.equals(range1b)); + assertTrue("equals", range1b.equals(range1a)); + + assertTrue("equals", range2a.equals(range2b)); + assertTrue("equals", range2b.equals(range2a)); + } + + public void testEqualsTransivity() throws Exception { + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range1a = new TmfTimeRange(ts1, ts2); + final TmfTimeRange range1b = new TmfTimeRange(ts1, ts2); + final TmfTimeRange range1c = new TmfTimeRange(ts1, ts2); + + assertTrue("equals", range1a.equals(range1b)); + assertTrue("equals", range1b.equals(range1c)); + assertTrue("equals", range1a.equals(range1c)); + } + + public void testEqualsNull() throws Exception { + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); + + assertTrue("equals", !range1.equals(null)); + } + public void testEqualsBadType() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); assertTrue("equals", !range1.equals(ts1)); } - + public void testEqualStartTime() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - ITmfTimestamp ts3 = new TmfTimestamp(12355); + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final ITmfTimestamp ts3 = new TmfTimestamp(12355); - TmfTimeRange range1 = new TmfTimeRange(ts1, ts3); - TmfTimeRange range2 = new TmfTimeRange(ts2, ts3); - TmfTimeRange range3 = new TmfTimeRange(ts1, ts2); + final TmfTimeRange range1 = new TmfTimeRange(ts1, ts3); + final TmfTimeRange range2 = new TmfTimeRange(ts2, ts3); + final TmfTimeRange range3 = new TmfTimeRange(ts1, ts2); assertTrue("equals", !range1.equals(range2)); assertTrue("equals", !range1.equals(range3)); } - + public void testEqualsEndTime() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - ITmfTimestamp ts3 = new TmfTimestamp(12355); + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final ITmfTimestamp ts3 = new TmfTimestamp(12355); - TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); - TmfTimeRange range2 = new TmfTimeRange(ts1, ts3); - TmfTimeRange range3 = new TmfTimeRange(ts2, ts3); + final TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); + final TmfTimeRange range2 = new TmfTimeRange(ts1, ts3); + final TmfTimeRange range3 = new TmfTimeRange(ts2, ts3); assertTrue("equals", !range1.equals(range2)); assertTrue("equals", !range1.equals(range3)); } - + // ------------------------------------------------------------------------ // toString // ------------------------------------------------------------------------ public void testToString() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range = new TmfTimeRange(ts1, ts2); + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range = new TmfTimeRange(ts1, ts2); - String expected = "TmfTimeRange [fStartTime=" + ts1 + ", fEndTime=" + ts2 + "]"; + final String expected = "TmfTimeRange [fStartTime=" + ts1 + ", fEndTime=" + ts2 + "]"; assertEquals("toString", expected, range.toString()); } - - // ------------------------------------------------------------------------ - // contains - // ------------------------------------------------------------------------ - public void testContainsTimestamp() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(12345); - ITmfTimestamp ts2 = new TmfTimestamp(12350); - TmfTimeRange range = new TmfTimeRange(ts1, ts2); + // ------------------------------------------------------------------------ + // contains + // ------------------------------------------------------------------------ + + public void testContainsTimestamp() throws Exception { + final ITmfTimestamp ts1 = new TmfTimestamp(12345); + final ITmfTimestamp ts2 = new TmfTimestamp(12350); + final TmfTimeRange range = new TmfTimeRange(ts1, ts2); - assertTrue("contains (lower bound)", range.contains(new TmfTimestamp(12345))); - assertTrue("contains (higher bound)", range.contains(new TmfTimestamp(12350))); - assertTrue("contains (within bounds)", range.contains(new TmfTimestamp(12346))); + assertTrue("contains (lower bound)", range.contains(new TmfTimestamp(12345))); + assertTrue("contains (higher bound)", range.contains(new TmfTimestamp(12350))); + assertTrue("contains (within bounds)", range.contains(new TmfTimestamp(12346))); - assertFalse("contains (low value)", range.contains(new TmfTimestamp(12340))); - assertFalse("contains (high value)", range.contains(new TmfTimestamp(12351))); + assertFalse("contains (low value)", range.contains(new TmfTimestamp(12340))); + assertFalse("contains (high value)", range.contains(new TmfTimestamp(12351))); assertTrue("contains (zero)", range.contains(TmfTimestamp.ZERO)); - } + } public void testContainsRange() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(10); - ITmfTimestamp ts2 = new TmfTimestamp(20); - ITmfTimestamp ts3 = new TmfTimestamp(30); - ITmfTimestamp ts4 = new TmfTimestamp(40); - ITmfTimestamp ts5 = new TmfTimestamp(50); - ITmfTimestamp ts6 = new TmfTimestamp(60); - ITmfTimestamp ts7 = new TmfTimestamp(70); - ITmfTimestamp ts8 = new TmfTimestamp(80); + final ITmfTimestamp ts1 = new TmfTimestamp(10); + final ITmfTimestamp ts2 = new TmfTimestamp(20); + final ITmfTimestamp ts3 = new TmfTimestamp(30); + final ITmfTimestamp ts4 = new TmfTimestamp(40); + final ITmfTimestamp ts5 = new TmfTimestamp(50); + final ITmfTimestamp ts6 = new TmfTimestamp(60); + final ITmfTimestamp ts7 = new TmfTimestamp(70); + final ITmfTimestamp ts8 = new TmfTimestamp(80); // Reference range - TmfTimeRange range0 = new TmfTimeRange(ts3, ts6); + final TmfTimeRange range0 = new TmfTimeRange(ts3, ts6); // Start time below range - TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); - TmfTimeRange range2 = new TmfTimeRange(ts2, ts3); - TmfTimeRange range3 = new TmfTimeRange(ts2, ts4); - TmfTimeRange range4 = new TmfTimeRange(ts2, ts6); - TmfTimeRange range5 = new TmfTimeRange(ts2, ts7); + final TmfTimeRange range1 = new TmfTimeRange(ts1, ts2); + final TmfTimeRange range2 = new TmfTimeRange(ts2, ts3); + final TmfTimeRange range3 = new TmfTimeRange(ts2, ts4); + final TmfTimeRange range4 = new TmfTimeRange(ts2, ts6); + final TmfTimeRange range5 = new TmfTimeRange(ts2, ts7); assertFalse("contains", range0.contains(range1)); assertFalse("contains", range0.contains(range2)); @@ -305,10 +305,10 @@ public class TmfTimeRangeTest extends TestCase { assertFalse("contains", range0.contains(range5)); // End time above range - TmfTimeRange range6 = new TmfTimeRange(ts3, ts7); - TmfTimeRange range7 = new TmfTimeRange(ts4, ts7); - TmfTimeRange range8 = new TmfTimeRange(ts6, ts7); - TmfTimeRange range9 = new TmfTimeRange(ts7, ts8); + final TmfTimeRange range6 = new TmfTimeRange(ts3, ts7); + final TmfTimeRange range7 = new TmfTimeRange(ts4, ts7); + final TmfTimeRange range8 = new TmfTimeRange(ts6, ts7); + final TmfTimeRange range9 = new TmfTimeRange(ts7, ts8); assertFalse("contains", range0.contains(range6)); assertFalse("contains", range0.contains(range7)); @@ -316,10 +316,10 @@ public class TmfTimeRangeTest extends TestCase { assertFalse("contains", range0.contains(range9)); // Within range - TmfTimeRange range10 = new TmfTimeRange(ts3, ts4); - TmfTimeRange range11 = new TmfTimeRange(ts3, ts6); - TmfTimeRange range12 = new TmfTimeRange(ts4, ts5); - TmfTimeRange range13 = new TmfTimeRange(ts4, ts6); + final TmfTimeRange range10 = new TmfTimeRange(ts3, ts4); + final TmfTimeRange range11 = new TmfTimeRange(ts3, ts6); + final TmfTimeRange range12 = new TmfTimeRange(ts4, ts5); + final TmfTimeRange range13 = new TmfTimeRange(ts4, ts6); assertTrue("contains", range0.contains(range10)); assertTrue("contains", range0.contains(range11)); @@ -327,64 +327,64 @@ public class TmfTimeRangeTest extends TestCase { assertTrue("contains", range0.contains(range13)); } - // ------------------------------------------------------------------------ - // getIntersection - // ------------------------------------------------------------------------ - - public void testGetIntersection() throws Exception { - - ITmfTimestamp ts1a = new TmfTimestamp(1000); - ITmfTimestamp ts1b = new TmfTimestamp(2000); - TmfTimeRange range1 = new TmfTimeRange(ts1a, ts1b); - - ITmfTimestamp ts2a = new TmfTimestamp(2000); - ITmfTimestamp ts2b = new TmfTimestamp(3000); - TmfTimeRange range2 = new TmfTimeRange(ts2a, ts2b); - - ITmfTimestamp ts3a = new TmfTimestamp(3000); - ITmfTimestamp ts3b = new TmfTimestamp(4000); - TmfTimeRange range3 = new TmfTimeRange(ts3a, ts3b); - - ITmfTimestamp ts4a = new TmfTimestamp(1500); - ITmfTimestamp ts4b = new TmfTimestamp(2500); - TmfTimeRange range4 = new TmfTimeRange(ts4a, ts4b); - - ITmfTimestamp ts5a = new TmfTimestamp(1500); - ITmfTimestamp ts5b = new TmfTimestamp(2000); - TmfTimeRange range5 = new TmfTimeRange(ts5a, ts5b); - - ITmfTimestamp ts6a = new TmfTimestamp(2000); - ITmfTimestamp ts6b = new TmfTimestamp(2500); - TmfTimeRange range6 = new TmfTimeRange(ts6a, ts6b); - - ITmfTimestamp ts7a = new TmfTimestamp(1500); - ITmfTimestamp ts7b = new TmfTimestamp(3500); - TmfTimeRange range7 = new TmfTimeRange(ts7a, ts7b); - - ITmfTimestamp ts8a = new TmfTimestamp(2250); - ITmfTimestamp ts8b = new TmfTimestamp(2750); - TmfTimeRange range8 = new TmfTimeRange(ts8a, ts8b); - - assertEquals("getIntersection (below - not contiguous)", null, range1.getIntersection(range3)); - assertEquals("getIntersection (above - not contiguous)", null, range3.getIntersection(range1)); - - assertEquals("getIntersection (below - contiguous)", new TmfTimeRange(ts1b, ts1b), range1.getIntersection(range2)); - assertEquals("getIntersection (above - contiguous)", new TmfTimeRange(ts3a, ts3a), range3.getIntersection(range2)); - - assertEquals("getIntersection (below - overlap)", new TmfTimeRange(ts2a, ts4b), range2.getIntersection(range4)); - assertEquals("getIntersection (above - overlap)", new TmfTimeRange(ts2a, ts4b), range4.getIntersection(range2)); - - assertEquals("getIntersection (within - overlap1)", range6, range2.getIntersection(range6)); - assertEquals("getIntersection (within - overlap2)", range6, range6.getIntersection(range2)); - - assertEquals("getIntersection (within - overlap3)", range5, range1.getIntersection(range5)); - assertEquals("getIntersection (within - overlap4)", range5, range5.getIntersection(range1)); - - assertEquals("getIntersection (within - overlap5)", range8, range2.getIntersection(range8)); - assertEquals("getIntersection (within - overlap6)", range8, range8.getIntersection(range2)); - - assertEquals("getIntersection (accross1)", range2, range2.getIntersection(range7)); - assertEquals("getIntersection (accross2)", range2, range7.getIntersection(range2)); - } + // ------------------------------------------------------------------------ + // getIntersection + // ------------------------------------------------------------------------ + + public void testGetIntersection() throws Exception { + + final ITmfTimestamp ts1a = new TmfTimestamp(1000); + final ITmfTimestamp ts1b = new TmfTimestamp(2000); + final TmfTimeRange range1 = new TmfTimeRange(ts1a, ts1b); + + final ITmfTimestamp ts2a = new TmfTimestamp(2000); + final ITmfTimestamp ts2b = new TmfTimestamp(3000); + final TmfTimeRange range2 = new TmfTimeRange(ts2a, ts2b); + + final ITmfTimestamp ts3a = new TmfTimestamp(3000); + final ITmfTimestamp ts3b = new TmfTimestamp(4000); + final TmfTimeRange range3 = new TmfTimeRange(ts3a, ts3b); + + final ITmfTimestamp ts4a = new TmfTimestamp(1500); + final ITmfTimestamp ts4b = new TmfTimestamp(2500); + final TmfTimeRange range4 = new TmfTimeRange(ts4a, ts4b); + + final ITmfTimestamp ts5a = new TmfTimestamp(1500); + final ITmfTimestamp ts5b = new TmfTimestamp(2000); + final TmfTimeRange range5 = new TmfTimeRange(ts5a, ts5b); + + final ITmfTimestamp ts6a = new TmfTimestamp(2000); + final ITmfTimestamp ts6b = new TmfTimestamp(2500); + final TmfTimeRange range6 = new TmfTimeRange(ts6a, ts6b); + + final ITmfTimestamp ts7a = new TmfTimestamp(1500); + final ITmfTimestamp ts7b = new TmfTimestamp(3500); + final TmfTimeRange range7 = new TmfTimeRange(ts7a, ts7b); + + final ITmfTimestamp ts8a = new TmfTimestamp(2250); + final ITmfTimestamp ts8b = new TmfTimestamp(2750); + final TmfTimeRange range8 = new TmfTimeRange(ts8a, ts8b); + + assertEquals("getIntersection (below - not contiguous)", null, range1.getIntersection(range3)); + assertEquals("getIntersection (above - not contiguous)", null, range3.getIntersection(range1)); + + assertEquals("getIntersection (below - contiguous)", new TmfTimeRange(ts1b, ts1b), range1.getIntersection(range2)); + assertEquals("getIntersection (above - contiguous)", new TmfTimeRange(ts3a, ts3a), range3.getIntersection(range2)); + + assertEquals("getIntersection (below - overlap)", new TmfTimeRange(ts2a, ts4b), range2.getIntersection(range4)); + assertEquals("getIntersection (above - overlap)", new TmfTimeRange(ts2a, ts4b), range4.getIntersection(range2)); + + assertEquals("getIntersection (within - overlap1)", range6, range2.getIntersection(range6)); + assertEquals("getIntersection (within - overlap2)", range6, range6.getIntersection(range2)); + + assertEquals("getIntersection (within - overlap3)", range5, range1.getIntersection(range5)); + assertEquals("getIntersection (within - overlap4)", range5, range5.getIntersection(range1)); + + assertEquals("getIntersection (within - overlap5)", range8, range2.getIntersection(range8)); + assertEquals("getIntersection (within - overlap6)", range8, range8.getIntersection(range2)); + + assertEquals("getIntersection (accross1)", range2, range2.getIntersection(range7)); + assertEquals("getIntersection (accross2)", range2, range7.getIntersection(range2)); + } } diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java index 0f6c96463b..0d56dc77ff 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java @@ -26,39 +26,39 @@ import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; @SuppressWarnings("nls") public class TmfTimestampTest extends TestCase { - // ------------------------------------------------------------------------ - // Variables - // ------------------------------------------------------------------------ - - private final ITmfTimestamp ts0 = new TmfTimestamp(); - private final ITmfTimestamp ts1 = new TmfTimestamp(12345); - private final ITmfTimestamp ts2 = new TmfTimestamp(12345, -1); - private final ITmfTimestamp ts3 = new TmfTimestamp(12345, 2, 5); - - // ------------------------------------------------------------------------ - // Housekeping - // ------------------------------------------------------------------------ - - /** - * @param name the test name - */ - public TmfTimestampTest(String name) { - super(name); - } - - @Override - protected void setUp() throws Exception { - super.setUp(); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } - - // ------------------------------------------------------------------------ - // Constructors - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ + // Variables + // ------------------------------------------------------------------------ + + private final ITmfTimestamp ts0 = new TmfTimestamp(); + private final ITmfTimestamp ts1 = new TmfTimestamp(12345); + private final ITmfTimestamp ts2 = new TmfTimestamp(12345, -1); + private final ITmfTimestamp ts3 = new TmfTimestamp(12345, 2, 5); + + // ------------------------------------------------------------------------ + // Housekeping + // ------------------------------------------------------------------------ + + /** + * @param name the test name + */ + public TmfTimestampTest(final String name) { + super(name); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + + // ------------------------------------------------------------------------ + // Constructors + // ------------------------------------------------------------------------ public void testDefaultConstructor() throws Exception { assertEquals("getValue", 0, ts0.getValue()); @@ -85,8 +85,8 @@ public class TmfTimestampTest extends TestCase { } public void testCopyConstructor() throws Exception { - ITmfTimestamp ts = new TmfTimestamp(12345, 2, 5); - ITmfTimestamp copy = new TmfTimestamp(ts); + final ITmfTimestamp ts = new TmfTimestamp(12345, 2, 5); + final ITmfTimestamp copy = new TmfTimestamp(ts); assertEquals("getValue", ts.getValue(), copy.getValue()); assertEquals("getscale", ts.getScale(), copy.getScale()); @@ -101,26 +101,26 @@ public class TmfTimestampTest extends TestCase { try { new TmfTimestamp(null); fail("TmfTimestamp: null argument"); - } catch (IllegalArgumentException e) { + } catch (final IllegalArgumentException e) { } } public void testCopyConstructorBigBang() throws Exception { - ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.BIG_BANG); + final ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.BIG_BANG); assertEquals("getValue", TmfTimestamp.BIG_BANG.getValue(), ts.getValue()); assertEquals("getscale", TmfTimestamp.BIG_BANG.getScale(), ts.getScale()); assertEquals("getPrecision", TmfTimestamp.BIG_BANG.getPrecision(), ts.getPrecision()); } public void testCopyConstructorBigCrunch() throws Exception { - ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.BIG_CRUNCH); + final ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.BIG_CRUNCH); assertEquals("getValue", TmfTimestamp.BIG_CRUNCH.getValue(), ts.getValue()); assertEquals("getscale", TmfTimestamp.BIG_CRUNCH.getScale(), ts.getScale()); assertEquals("getPrecision", TmfTimestamp.BIG_CRUNCH.getPrecision(), ts.getPrecision()); } public void testCopyConstructorZero() throws Exception { - ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.ZERO); + final ITmfTimestamp ts = new TmfTimestamp(TmfTimestamp.ZERO); assertEquals("getValue", TmfTimestamp.ZERO.getValue(), ts.getValue()); assertEquals("getscale", TmfTimestamp.ZERO.getScale(), ts.getScale()); assertEquals("getPrecision", TmfTimestamp.ZERO.getPrecision(), ts.getPrecision()); @@ -133,7 +133,7 @@ public class TmfTimestampTest extends TestCase { public static class MyTimestamp extends TmfTimestamp { @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { return super.equals(other); } @@ -144,7 +144,7 @@ public class TmfTimestampTest extends TestCase { } public void testClone() throws Exception { - ITmfTimestamp clone = ts0.clone(); + final ITmfTimestamp clone = ts0.clone(); assertTrue("clone", ts0.clone().equals(ts0)); assertTrue("clone", clone.clone().equals(clone)); @@ -154,8 +154,8 @@ public class TmfTimestampTest extends TestCase { } public void testClone2() throws Exception { - MyTimestamp timestamp = new MyTimestamp(); - MyTimestamp clone = timestamp.clone(); + final MyTimestamp timestamp = new MyTimestamp(); + final MyTimestamp clone = timestamp.clone(); assertTrue("clone", timestamp.clone().equals(timestamp)); assertTrue("clone", clone.clone().equals(clone)); @@ -169,9 +169,9 @@ public class TmfTimestampTest extends TestCase { // ------------------------------------------------------------------------ public void testHashCode() throws Exception { - ITmfTimestamp ts0copy = new TmfTimestamp(ts0); - ITmfTimestamp ts1copy = new TmfTimestamp(ts1); - ITmfTimestamp ts2copy = new TmfTimestamp(ts2); + final ITmfTimestamp ts0copy = new TmfTimestamp(ts0); + final ITmfTimestamp ts1copy = new TmfTimestamp(ts1); + final ITmfTimestamp ts2copy = new TmfTimestamp(ts2); assertTrue("hashCode", ts0.hashCode() == ts0copy.hashCode()); assertTrue("hashCode", ts1.hashCode() == ts1copy.hashCode()); @@ -179,7 +179,7 @@ public class TmfTimestampTest extends TestCase { assertTrue("hashCode", ts0.hashCode() != ts1.hashCode()); } - + // ------------------------------------------------------------------------ // equals // ------------------------------------------------------------------------ @@ -193,34 +193,34 @@ public class TmfTimestampTest extends TestCase { } public void testEqualsSymmetry() throws Exception { - ITmfTimestamp ts0copy = new TmfTimestamp(ts0); + final ITmfTimestamp ts0copy = new TmfTimestamp(ts0); assertTrue("equals", ts0.equals(ts0copy)); assertTrue("equals", ts0copy.equals(ts0)); - ITmfTimestamp ts1copy = new TmfTimestamp(ts1); + final ITmfTimestamp ts1copy = new TmfTimestamp(ts1); assertTrue("equals", ts1.equals(ts1copy)); assertTrue("equals", ts1copy.equals(ts1)); - ITmfTimestamp ts2copy = new TmfTimestamp(ts2); + final ITmfTimestamp ts2copy = new TmfTimestamp(ts2); assertTrue("equals", ts2.equals(ts2copy)); assertTrue("equals", ts2copy.equals(ts2)); } public void testEqualsTransivity() throws Exception { - ITmfTimestamp ts0copy1 = new TmfTimestamp(ts0); - ITmfTimestamp ts0copy2 = new TmfTimestamp(ts0copy1); + final ITmfTimestamp ts0copy1 = new TmfTimestamp(ts0); + final ITmfTimestamp ts0copy2 = new TmfTimestamp(ts0copy1); assertTrue("equals", ts0.equals(ts0copy1)); assertTrue("equals", ts0copy1.equals(ts0copy2)); assertTrue("equals", ts0.equals(ts0copy2)); - ITmfTimestamp ts1copy1 = new TmfTimestamp(ts1); - ITmfTimestamp ts1copy2 = new TmfTimestamp(ts1copy1); + final ITmfTimestamp ts1copy1 = new TmfTimestamp(ts1); + final ITmfTimestamp ts1copy2 = new TmfTimestamp(ts1copy1); assertTrue("equals", ts1.equals(ts1copy1)); assertTrue("equals", ts1copy1.equals(ts1copy2)); assertTrue("equals", ts1.equals(ts1copy2)); - ITmfTimestamp ts2copy1 = new TmfTimestamp(ts2); - ITmfTimestamp ts2copy2 = new TmfTimestamp(ts2copy1); + final ITmfTimestamp ts2copy1 = new TmfTimestamp(ts2); + final ITmfTimestamp ts2copy2 = new TmfTimestamp(ts2copy1); assertTrue("equals", ts2.equals(ts2copy1)); assertTrue("equals", ts2copy1.equals(ts2copy2)); assertTrue("equals", ts2.equals(ts2copy2)); @@ -234,7 +234,7 @@ public class TmfTimestampTest extends TestCase { public void testEqualsNonTimestamp() throws Exception { assertFalse("equals", ts0.equals(ts0.toString())); } - + // ------------------------------------------------------------------------ // toString // ------------------------------------------------------------------------ @@ -273,7 +273,7 @@ public class TmfTimestampTest extends TestCase { } public void testNormalizeOffsetLowerLimits() throws Exception { - ITmfTimestamp ref = new TmfTimestamp(Long.MIN_VALUE + 5); + final ITmfTimestamp ref = new TmfTimestamp(Long.MIN_VALUE + 5); ITmfTimestamp ts = ref.normalize(-4, 0); assertEquals("getValue", Long.MIN_VALUE + 1, ts.getValue()); @@ -292,7 +292,7 @@ public class TmfTimestampTest extends TestCase { } public void testNormalizeOffsetUpperLimits() throws Exception { - ITmfTimestamp ref = new TmfTimestamp(Long.MAX_VALUE - 5); + final ITmfTimestamp ref = new TmfTimestamp(Long.MAX_VALUE - 5); ITmfTimestamp ts = ref.normalize(4, 0); assertEquals("getValue", Long.MAX_VALUE - 1, ts.getValue()); @@ -323,13 +323,13 @@ public class TmfTimestampTest extends TestCase { } public void testNormalizedScaleLimits() throws Exception { - int MAX_SCALE_DIFF = 19; + final int MAX_SCALE_DIFF = 19; // Test below limit try { ts1.normalize(0, +MAX_SCALE_DIFF - 1); ts1.normalize(0, -MAX_SCALE_DIFF + 1); - } catch (ArithmeticException e) { + } catch (final ArithmeticException e) { fail("normalize: scale error"); } @@ -339,7 +339,7 @@ public class TmfTimestampTest extends TestCase { fail("normalize: scale error"); ts1.normalize(0, -MAX_SCALE_DIFF); fail("normalize: scale error"); - } catch (ArithmeticException e) { + } catch (final ArithmeticException e) { } // Test over limit @@ -348,19 +348,19 @@ public class TmfTimestampTest extends TestCase { fail("normalize: scale error"); ts1.normalize(0, -MAX_SCALE_DIFF - 1); fail("normalize: scale error"); - } catch (ArithmeticException e) { + } catch (final ArithmeticException e) { } } public void testNormalizeOffsetAndScaleTrivial() throws Exception { - ITmfTimestamp ts = ts0.normalize(0, 0); + final ITmfTimestamp ts = ts0.normalize(0, 0); assertEquals("getValue", 0, ts.getValue()); assertEquals("getscale", 0, ts.getScale()); assertEquals("getPrecision", 0, ts.getPrecision()); } public void testNormalizeOffsetAndScale() throws Exception { - int SCALE = 12; + final int SCALE = 12; ITmfTimestamp ts = ts0.normalize(0, SCALE); assertEquals("getValue", 0, ts.getValue()); @@ -406,16 +406,16 @@ public class TmfTimestampTest extends TestCase { assertEquals("getscale", SCALE, ts.getScale()); assertEquals("getPrecision", 0, ts.getPrecision()); } - + // ------------------------------------------------------------------------ // compareTo // ------------------------------------------------------------------------ public void testBasicCompareTo() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(900, 0, 50); - ITmfTimestamp ts2 = new TmfTimestamp(1000, 0, 50); - ITmfTimestamp ts3 = new TmfTimestamp(1100, 0, 50); - ITmfTimestamp ts4 = new TmfTimestamp(1000, 0, 75); + final ITmfTimestamp ts1 = new TmfTimestamp(900, 0, 50); + final ITmfTimestamp ts2 = new TmfTimestamp(1000, 0, 50); + final ITmfTimestamp ts3 = new TmfTimestamp(1100, 0, 50); + final ITmfTimestamp ts4 = new TmfTimestamp(1000, 0, 75); assertTrue(ts1.compareTo(ts1) == 0); @@ -433,10 +433,10 @@ public class TmfTimestampTest extends TestCase { } public void testCompareToCornerCases1() throws Exception { - ITmfTimestamp ts0a = new TmfTimestamp(ts0); - ITmfTimestamp ts0b = new TmfTimestamp(ts0.getValue(), ts0.getScale() + 1); - ITmfTimestamp ts0c = new TmfTimestamp(ts0.getValue() + 1, ts0.getScale()); - ITmfTimestamp ts0d = new TmfTimestamp(ts0.getValue() + 1, ts0.getScale() + 1); + final ITmfTimestamp ts0a = new TmfTimestamp(ts0); + final ITmfTimestamp ts0b = new TmfTimestamp(ts0.getValue(), ts0.getScale() + 1); + final ITmfTimestamp ts0c = new TmfTimestamp(ts0.getValue() + 1, ts0.getScale()); + final ITmfTimestamp ts0d = new TmfTimestamp(ts0.getValue() + 1, ts0.getScale() + 1); assertTrue("compareTo", ts0.compareTo(ts0, false) == 0); assertTrue("compareTo", ts0.compareTo(ts0a, false) == 0); @@ -446,9 +446,9 @@ public class TmfTimestampTest extends TestCase { } public void testCompareToCornerCases2() throws Exception { - ITmfTimestamp ts0a = new TmfTimestamp(Long.MAX_VALUE, Integer.MAX_VALUE - 1); - ITmfTimestamp ts0b = new TmfTimestamp(0, Integer.MAX_VALUE); - ITmfTimestamp ts0c = new TmfTimestamp(Long.MAX_VALUE, Integer.MAX_VALUE); + final ITmfTimestamp ts0a = new TmfTimestamp(Long.MAX_VALUE, Integer.MAX_VALUE - 1); + final ITmfTimestamp ts0b = new TmfTimestamp(0, Integer.MAX_VALUE); + final ITmfTimestamp ts0c = new TmfTimestamp(Long.MAX_VALUE, Integer.MAX_VALUE); assertTrue("compareTo", ts0a.compareTo(ts0b, false)== 1); assertTrue("compareTo", ts0a.compareTo(ts0c, false)== -1); @@ -461,9 +461,9 @@ public class TmfTimestampTest extends TestCase { } public void testCompareToCornerCases3() throws Exception { - ITmfTimestamp ts0a = new TmfTimestamp(Long.MIN_VALUE, Integer.MAX_VALUE - 1); - ITmfTimestamp ts0b = new TmfTimestamp(0, Integer.MAX_VALUE); - ITmfTimestamp ts0c = new TmfTimestamp(Long.MIN_VALUE, Integer.MAX_VALUE); + final ITmfTimestamp ts0a = new TmfTimestamp(Long.MIN_VALUE, Integer.MAX_VALUE - 1); + final ITmfTimestamp ts0b = new TmfTimestamp(0, Integer.MAX_VALUE); + final ITmfTimestamp ts0c = new TmfTimestamp(Long.MIN_VALUE, Integer.MAX_VALUE); assertTrue("compareTo", ts0a.compareTo(ts0b, false)== -1); assertTrue("compareTo", ts0a.compareTo(ts0c, false)== 1); @@ -476,10 +476,10 @@ public class TmfTimestampTest extends TestCase { } public void testCompareToSameScale() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(900, 0, 50); - ITmfTimestamp ts2 = new TmfTimestamp(1000, 0, 50); - ITmfTimestamp ts3 = new TmfTimestamp(1100, 0, 50); - ITmfTimestamp ts4 = new TmfTimestamp(1000, 0, 75); + final ITmfTimestamp ts1 = new TmfTimestamp(900, 0, 50); + final ITmfTimestamp ts2 = new TmfTimestamp(1000, 0, 50); + final ITmfTimestamp ts3 = new TmfTimestamp(1100, 0, 50); + final ITmfTimestamp ts4 = new TmfTimestamp(1000, 0, 75); assertTrue(ts1.compareTo(ts1, false) == 0); @@ -497,10 +497,10 @@ public class TmfTimestampTest extends TestCase { } public void testCompareToDifferentScale() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(9000, -1, 50); - ITmfTimestamp ts2 = new TmfTimestamp(1000, 0, 50); - ITmfTimestamp ts3 = new TmfTimestamp(110, 1, 50); - ITmfTimestamp ts4 = new TmfTimestamp(1, 3, 75); + final ITmfTimestamp ts1 = new TmfTimestamp(9000, -1, 50); + final ITmfTimestamp ts2 = new TmfTimestamp(1000, 0, 50); + final ITmfTimestamp ts3 = new TmfTimestamp(110, 1, 50); + final ITmfTimestamp ts4 = new TmfTimestamp(1, 3, 75); assertTrue("CompareTo", ts1.compareTo(ts1, false) == 0); @@ -518,10 +518,10 @@ public class TmfTimestampTest extends TestCase { } public void testCompareToWithinPrecision() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(900, 0, 50); - ITmfTimestamp ts2 = new TmfTimestamp(1000, 0, 50); - ITmfTimestamp ts3 = new TmfTimestamp(1100, 0, 50); - ITmfTimestamp ts4 = new TmfTimestamp(1000, 0, 75); + final ITmfTimestamp ts1 = new TmfTimestamp(900, 0, 50); + final ITmfTimestamp ts2 = new TmfTimestamp(1000, 0, 50); + final ITmfTimestamp ts3 = new TmfTimestamp(1100, 0, 50); + final ITmfTimestamp ts4 = new TmfTimestamp(1000, 0, 75); assertTrue("CompareTo", ts1.compareTo(ts1, true) == 0); @@ -539,10 +539,10 @@ public class TmfTimestampTest extends TestCase { } public void testCompareToLargeScale1() throws Exception { - ITmfTimestamp ts1 = new TmfTimestamp(-1, 100); - ITmfTimestamp ts2 = new TmfTimestamp(-1000, -100); - ITmfTimestamp ts3 = new TmfTimestamp(1, 100); - ITmfTimestamp ts4 = new TmfTimestamp(1000, -100); + final ITmfTimestamp ts1 = new TmfTimestamp(-1, 100); + final ITmfTimestamp ts2 = new TmfTimestamp(-1000, -100); + final ITmfTimestamp ts3 = new TmfTimestamp(1, 100); + final ITmfTimestamp ts4 = new TmfTimestamp(1000, -100); assertTrue("CompareTo", ts1.compareTo(ts2, false) < 0); assertTrue("CompareTo", ts1.compareTo(ts3, false) < 0); @@ -562,8 +562,8 @@ public class TmfTimestampTest extends TestCase { } public void testCompareToLargeScale2() throws Exception { - ITmfTimestamp ts0a = new TmfTimestamp(0, Integer.MAX_VALUE); - ITmfTimestamp ts0b = new TmfTimestamp(1, Integer.MAX_VALUE); + final ITmfTimestamp ts0a = new TmfTimestamp(0, Integer.MAX_VALUE); + final ITmfTimestamp ts0b = new TmfTimestamp(1, Integer.MAX_VALUE); assertTrue("CompareTo", ts0a.compareTo(ts0, false) == 0); assertTrue("CompareTo", ts0.compareTo(ts0a, false) == 0); @@ -575,7 +575,7 @@ public class TmfTimestampTest extends TestCase { // ------------------------------------------------------------------------ // getDelta // ------------------------------------------------------------------------ - + public void testDelta() throws Exception { // Delta for same scale and precision (delta > 0) ITmfTimestamp ts0 = new TmfTimestamp(10, 9); diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java index 56f65e53d7..7bf67d2fdf 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/CreateTestFiles.java @@ -39,41 +39,40 @@ public class CreateTestFiles { // Constants // ======================================================================== - private static final String DIRECTORY = "testfiles"; -// private static final String FILE_NAMES[] = { "Test-10", "Test-1K", "Test-10K", "Test-100K" }; -// private static final int FILE_SIZES[] = { 10 , 1000 , 10000 , 100000 }; - private static final String FILE_NAMES[] = { "Test-10K" }; + private static final String DIRECTORY = "testfiles"; + // private static final String FILE_NAMES[] = { "Test-10", "Test-1K", "Test-10K", "Test-100K" }; + // private static final int FILE_SIZES[] = { 10 , 1000 , 10000 , 100000 }; + private static final String FILE_NAMES[] = { "Test-10K" }; private static final int FILE_SIZES[] = { 10000 }; - private static final int NB_SOURCES = 15; - private static final int NB_TYPES = 7; + private static final int NB_SOURCES = 15; + private static final int NB_TYPES = 7; // ======================================================================== // Constructors // ======================================================================== - /** + /** * @param args */ - public static void main(String[] args) { - + public static void main(final String[] args) { + try { System.out.println("Creating test files in directory: " + new File(".").getCanonicalPath() + File.separator + DIRECTORY); - } catch (IOException e) { + } catch (final IOException e) { e.printStackTrace(); } - for (int i = 0; i < FILE_SIZES.length; i++) { + for (int i = 0; i < FILE_SIZES.length; i++) try { - createTestFile("testfiles" + File.separator + "O-" + FILE_NAMES[i], FILE_SIZES[i], true, true); - createTestFile("testfiles" + File.separator + "E-" + FILE_NAMES[i], FILE_SIZES[i], true, false); + createTestFile("testfiles" + File.separator + "O-" + FILE_NAMES[i], FILE_SIZES[i], true, true); + createTestFile("testfiles" + File.separator + "E-" + FILE_NAMES[i], FILE_SIZES[i], true, false); createTestFile("testfiles" + File.separator + "R-" + FILE_NAMES[i], FILE_SIZES[i], false, false); - } catch (FileNotFoundException e) { - } catch (IOException e) { + } catch (final FileNotFoundException e) { + } catch (final IOException e) { } - } - System.out.println("Done."); + System.out.println("Done."); } // ======================================================================== @@ -87,24 +86,23 @@ public class CreateTestFiles { * @throws FileNotFoundException * @throws IOException */ - private static void createTestFile(String file, int size, boolean monotonic, boolean odd) throws FileNotFoundException, IOException { + private static void createTestFile(final String file, final int size, final boolean monotonic, final boolean odd) throws FileNotFoundException, IOException { DataOutputStream out; System.out.println("Creating " + file); out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file))); - Random generator = new Random(19580427 + size); + final Random generator = new Random(19580427 + size); long ts = (monotonic && odd) ? -1 : 0; for (int i = 0; i < size; i++) { ts += monotonic ? 2 : generator.nextInt(10); - int sourceIndex = i % NB_SOURCES; - int typeIndex = i % NB_TYPES; + final int sourceIndex = i % NB_SOURCES; + final int typeIndex = i % NB_TYPES; out.writeLong(ts); // Timestamp out.writeUTF("Source-" + sourceIndex); // Source out.writeUTF("Type-" + typeIndex); // Type out.writeInt(i + 1); // Reference (event #) - for (int j = 0; j < typeIndex; j++) { + for (int j = 0; j < typeIndex; j++) out.writeUTF("Field-" + sourceIndex + "-" + j); - } } out.flush(); out.close(); diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java index 7e4615fa35..998fac6d0a 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfClientStub.java @@ -25,21 +25,21 @@ import org.eclipse.linuxtools.tmf.tests.stubs.event.TmfSyntheticEventStub; @SuppressWarnings("nls") public class TmfClientStub extends TmfComponent { - private TmfDataProvider[] fProviders; - - public TmfClientStub() { - super("TmfClientStub"); - } - - @SuppressWarnings("unchecked") - public void findProvider() { - fProviders = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfSyntheticEventStub.class, TmfSyntheticEventProviderStub.class); -// TmfEventRequest request; - System.out.println(fProviders.length); - } - - public void triggeRequest() { -// TmfEventRequest request; - } + private TmfDataProvider[] fProviders; + + public TmfClientStub() { + super("TmfClientStub"); + } + + @SuppressWarnings("unchecked") + public void findProvider() { + fProviders = (TmfDataProvider[]) TmfProviderManager.getProviders(TmfSyntheticEventStub.class, TmfSyntheticEventProviderStub.class); + // TmfEventRequest request; + System.out.println(fProviders.length); + } + + public void triggeRequest() { + // TmfEventRequest request; + } } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java index 1eaef70f10..a279396bc2 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java @@ -40,42 +40,42 @@ public class TmfDataProviderStub extends TmfDataProvider { private TmfTraceStub fTrace; - public TmfDataProviderStub(String path) throws IOException { - super("TmfDataProviderStub", TmfEvent.class); - URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(path), null); - try { - File test = new File(FileLocator.toFileURL(location).toURI()); - fTrace = new TmfTraceStub(test.getPath(), true); - } catch (URISyntaxException e) { - e.printStackTrace(); - } + public TmfDataProviderStub(final String path) throws IOException { + super("TmfDataProviderStub", TmfEvent.class); + final URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(path), null); + try { + final File test = new File(FileLocator.toFileURL(location).toURI()); + fTrace = new TmfTraceStub(test.getPath(), true); + } catch (final URISyntaxException e) { + e.printStackTrace(); + } } public TmfDataProviderStub() throws IOException { - this(DIRECTORY + File.separator + TEST_STREAM); + this(DIRECTORY + File.separator + TEST_STREAM); } - + // ------------------------------------------------------------------------ // TmfProvider // ------------------------------------------------------------------------ - @Override - public ITmfContext armRequest(ITmfDataRequest request) { - if (request instanceof ITmfEventRequest) { - ITmfContext context = fTrace.seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); - return context; - } - return null; - } + @Override + public ITmfContext armRequest(final ITmfDataRequest request) { + if (request instanceof ITmfEventRequest) { + final ITmfContext context = fTrace.seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); + return context; + } + return null; + } - @Override - public TmfEvent getNext(ITmfContext context) { - return fTrace.getNext(context); - } + @Override + public TmfEvent getNext(final ITmfContext context) { + return fTrace.getNext(context); + } - @Override - public boolean isCompleted(ITmfDataRequest request, TmfEvent data, int nbRead) { - return false; - } + @Override + public boolean isCompleted(final ITmfDataRequest request, final TmfEvent data, final int nbRead) { + return false; + } } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java index 1d155378a8..69682adad4 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java @@ -40,43 +40,43 @@ public class TmfEventProviderStub extends TmfEventProvider { private TmfTraceStub fTrace; - public TmfEventProviderStub(String path) throws IOException { - super(path, TmfEvent.class); - URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(path), null); - try { - File test = new File(FileLocator.toFileURL(location).toURI()); - fTrace = new TmfTraceStub(test.getPath(), true); - } catch (URISyntaxException e) { - e.printStackTrace(); - } + public TmfEventProviderStub(final String path) throws IOException { + super(path, TmfEvent.class); + final URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(path), null); + try { + final File test = new File(FileLocator.toFileURL(location).toURI()); + fTrace = new TmfTraceStub(test.getPath(), true); + } catch (final URISyntaxException e) { + e.printStackTrace(); + } } public TmfEventProviderStub() throws IOException { - this(DIRECTORY + File.separator + TEST_STREAM); + this(DIRECTORY + File.separator + TEST_STREAM); } @Override public void dispose() { - fTrace.dispose(); - super.dispose(); + fTrace.dispose(); + super.dispose(); } - + // ------------------------------------------------------------------------ // TmfEventProvider // ------------------------------------------------------------------------ - @Override - public ITmfContext armRequest(ITmfDataRequest request) { - if (request instanceof ITmfEventRequest) { - ITmfContext context = fTrace.seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); - return context; - } - return null; - } + @Override + public ITmfContext armRequest(final ITmfDataRequest request) { + if (request instanceof ITmfEventRequest) { + final ITmfContext context = fTrace.seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); + return context; + } + return null; + } - @Override - public TmfEvent getNext(ITmfContext context) { - return fTrace.getNext(context); - } + @Override + public TmfEvent getNext(final ITmfContext context) { + return fTrace.getNext(context); + } } \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java index 6eb3829f53..1792340435 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java @@ -38,74 +38,72 @@ public class TmfSyntheticEventProviderStub extends TmfEventProvider request) { + @SuppressWarnings("unchecked") + @Override + public ITmfContext armRequest(final ITmfDataRequest request) { - // Get the TmfSyntheticEventStub provider - ITmfDataProvider[] eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class); - ITmfDataProvider provider = eventProviders[0]; + // Get the TmfSyntheticEventStub provider + final ITmfDataProvider[] eventProviders = (ITmfDataProvider[]) TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class); + final ITmfDataProvider provider = eventProviders[0]; - // make sure we have the right type of request - if (!(request instanceof ITmfEventRequest)) { - request.cancel(); - return null; - } + // make sure we have the right type of request + if (!(request instanceof ITmfEventRequest)) { + request.cancel(); + return null; + } - TmfEventRequest eventRequest = (TmfEventRequest) request; - TmfTimeRange range = eventRequest.getRange(); + final TmfEventRequest eventRequest = (TmfEventRequest) request; + final TmfTimeRange range = eventRequest.getRange(); final TmfEventRequest subRequest = - new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { - @Override - public void handleData(TmfEvent event) { - super.handleData(event); - if (event != null) - handleIncomingData(event); - else - request.done(); - } - }; + new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) { + @Override + public void handleData(final TmfEvent event) { + super.handleData(event); + if (event != null) + handleIncomingData(event); + else + request.done(); + } + }; provider.sendRequest(subRequest); // Return a dummy context return new TmfContext(); - } - - // Queue 2 synthetic events per base event - private void handleIncomingData(TmfEvent e) { - queueResult(new TmfSyntheticEventStub(e)); - queueResult(new TmfSyntheticEventStub(e)); - } - - private static final int TIMEOUT = 10000; - - @Override - public TmfSyntheticEventStub getNext(ITmfContext context) { - TmfSyntheticEventStub data = null; - try { - data = fDataQueue.poll(TIMEOUT, TimeUnit.MILLISECONDS); - if (data == null) { - throw new InterruptedException(); - } - } - catch (InterruptedException e) { - } - return data; - } - - public void queueResult(TmfSyntheticEventStub data) { - boolean ok = false; - try { - ok = fDataQueue.offer(data, TIMEOUT, TimeUnit.MILLISECONDS); - if (!ok) { - throw new InterruptedException(); - } - } - catch (InterruptedException e) { - } - } + } + + // Queue 2 synthetic events per base event + private void handleIncomingData(final TmfEvent e) { + queueResult(new TmfSyntheticEventStub(e)); + queueResult(new TmfSyntheticEventStub(e)); + } + + private static final int TIMEOUT = 10000; + + @Override + public TmfSyntheticEventStub getNext(final ITmfContext context) { + TmfSyntheticEventStub data = null; + try { + data = fDataQueue.poll(TIMEOUT, TimeUnit.MILLISECONDS); + if (data == null) + throw new InterruptedException(); + } + catch (final InterruptedException e) { + } + return data; + } + + public void queueResult(final TmfSyntheticEventStub data) { + boolean ok = false; + try { + ok = fDataQueue.offer(data, TIMEOUT, TimeUnit.MILLISECONDS); + if (!ok) + throw new InterruptedException(); + } + catch (final InterruptedException e) { + } + } } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfSyntheticEventStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfSyntheticEventStub.java index e4f5ad73b5..818badc039 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfSyntheticEventStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/event/TmfSyntheticEventStub.java @@ -22,11 +22,11 @@ import org.eclipse.linuxtools.tmf.core.event.TmfEvent; public class TmfSyntheticEventStub extends TmfEvent { - public TmfSyntheticEventStub(TmfEvent event) { - super(event); - } - public TmfSyntheticEventStub(TmfSyntheticEventStub other) { - super(other); - } + public TmfSyntheticEventStub(final TmfEvent event) { + super(event); + } + public TmfSyntheticEventStub(final TmfSyntheticEventStub other) { + super(other); + } } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java index 2a25c774bf..0ca66da714 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfDataRequestStub.java @@ -27,7 +27,7 @@ public class TmfDataRequestStub extends TmfDataRequest { * * @param dataType */ - public TmfDataRequestStub(Class dataType) { + public TmfDataRequestStub(final Class dataType) { super(dataType); } @@ -35,7 +35,7 @@ public class TmfDataRequestStub extends TmfDataRequest { * @param dataType * @param index */ - public TmfDataRequestStub(Class dataType, int index) { + public TmfDataRequestStub(final Class dataType, final int index) { super(dataType, index); } @@ -44,8 +44,8 @@ public class TmfDataRequestStub extends TmfDataRequest { * @param index * @param nbRequested */ - public TmfDataRequestStub(Class dataType, int index, int nbRequested) { - super(dataType, index, nbRequested); + public TmfDataRequestStub(final Class dataType, final int index, final int nbRequested) { + super(dataType, index, nbRequested); } /** @@ -54,16 +54,16 @@ public class TmfDataRequestStub extends TmfDataRequest { * @param nbRequested * @param blockSize */ - public TmfDataRequestStub(Class dataType, int index, int nbRequested, int blockSize) { + public TmfDataRequestStub(final Class dataType, final int index, final int nbRequested, final int blockSize) { super(dataType, index, nbRequested, blockSize); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleData(org.eclipse.linuxtools.tmf.core.event.ITmfEvent) - */ - @Override - public void handleData(T data) { - super.handleData(data); - } + /* (non-Javadoc) + * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleData(org.eclipse.linuxtools.tmf.core.event.ITmfEvent) + */ + @Override + public void handleData(final T data) { + super.handleData(data); + } } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java index 99923d1b3d..52393ecea7 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/request/TmfEventRequestStub.java @@ -26,16 +26,16 @@ public class TmfEventRequestStub extends TmfEventRequest /** * @param dataType */ - public TmfEventRequestStub(Class dataType) { - super(dataType); + public TmfEventRequestStub(final Class dataType) { + super(dataType); } /** * @param dataType * @param range */ - public TmfEventRequestStub(Class dataType, TmfTimeRange range) { - super(dataType, range); + public TmfEventRequestStub(final Class dataType, final TmfTimeRange range) { + super(dataType, range); } /** @@ -43,25 +43,25 @@ public class TmfEventRequestStub extends TmfEventRequest * @param range * @param nbRequested */ - public TmfEventRequestStub(Class dataType, TmfTimeRange range, int nbRequested) { - super(dataType, range, nbRequested); + public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final int nbRequested) { + super(dataType, range, nbRequested); } - + /** * @param dataType * @param range * @param nbRequested * @param blockSize */ - public TmfEventRequestStub(Class dataType, TmfTimeRange range, int nbRequested, int blockSize) { - super(dataType, range, nbRequested, blockSize); + public TmfEventRequestStub(final Class dataType, final TmfTimeRange range, final int nbRequested, final int blockSize) { + super(dataType, range, nbRequested, blockSize); } - /* (non-Javadoc) - * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleData(org.eclipse.linuxtools.tmf.core.event.ITmfEvent) - */ - @Override - public void handleData(T data) { - super.handleData(data); - } + /* (non-Javadoc) + * @see org.eclipse.linuxtools.tmf.core.request.TmfDataRequest#handleData(org.eclipse.linuxtools.tmf.core.event.ITmfEvent) + */ + @Override + public void handleData(final T data) { + super.handleData(data); + } } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java index f7238fc7e0..fcf8dfbf35 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java @@ -40,7 +40,7 @@ public class TmfEventParserStub implements ITmfEventParser { // Attributes // ------------------------------------------------------------------------ - private static final int NB_TYPES = 10; + private static final int NB_TYPES = 10; private final TmfEventType[] fTypes; // ------------------------------------------------------------------------ @@ -48,17 +48,17 @@ public class TmfEventParserStub implements ITmfEventParser { // ------------------------------------------------------------------------ public TmfEventParserStub() { - fTypes = new TmfEventType[NB_TYPES]; - for (int i = 0; i < NB_TYPES; i++) { - Vector fields = new Vector(); - for (int j = 1; j <= i; j++) { - String field = "Fmt-" + i + "-Fld-" + j; - fields.add(field); - } - String[] fieldArray = new String[i]; - ITmfEventField rootField = TmfEventField.makeRoot(fields.toArray(fieldArray)); - fTypes[i] = new TmfEventType("UnitTest", "Type-" + i, rootField); - } + fTypes = new TmfEventType[NB_TYPES]; + for (int i = 0; i < NB_TYPES; i++) { + final Vector fields = new Vector(); + for (int j = 1; j <= i; j++) { + final String field = "Fmt-" + i + "-Fld-" + j; + fields.add(field); + } + final String[] fieldArray = new String[i]; + final ITmfEventField rootField = TmfEventField.makeRoot(fields.toArray(fieldArray)); + fTypes[i] = new TmfEventType("UnitTest", "Type-" + i, rootField); + } } // ------------------------------------------------------------------------ @@ -67,52 +67,48 @@ public class TmfEventParserStub implements ITmfEventParser { static final String typePrefix = "Type-"; @Override - @SuppressWarnings("unchecked") - public ITmfEvent parseNextEvent(ITmfTrace eventStream, ITmfContext context) throws IOException { + @SuppressWarnings("unchecked") + public ITmfEvent parseNextEvent(final ITmfTrace eventStream, final ITmfContext context) throws IOException { - if (! (eventStream instanceof TmfTraceStub)) { + if (! (eventStream instanceof TmfTraceStub)) return null; - } - // Highly inefficient... - RandomAccessFile stream = ((TmfTraceStub) eventStream).getStream(); -// String name = eventStream.getName(); -// name = name.substring(name.lastIndexOf('/') + 1); - - // no need to use synchronized since it's already cover by the calling method - - long location = 0; - if (context != null) - location = ((TmfLocation) (context.getLocation())).getLocation(); - stream.seek(location); - - try { - long ts = stream.readLong(); - String source = stream.readUTF(); - String type = stream.readUTF(); - Integer reference = stream.readInt(); - int typeIndex = Integer.parseInt(type.substring(typePrefix.length())); - String[] fields = new String[typeIndex]; - for (int i = 0; i < typeIndex; i++) { - fields[i] = stream.readUTF(); - } - - StringBuffer content = new StringBuffer("["); - if (typeIndex > 0) { - content.append(fields[0]); - } - for (int i = 1; i < typeIndex; i++) { - content.append(", ").append(fields[i]); - } - content.append("]"); - - TmfEventField root = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content.toString()); - ITmfEvent event = new TmfEvent(eventStream, - new TmfTimestamp(ts, -3, 0), // millisecs - source, fTypes[typeIndex], root, reference.toString()); - return event; - } catch (EOFException e) { - } + // Highly inefficient... + final RandomAccessFile stream = ((TmfTraceStub) eventStream).getStream(); + // String name = eventStream.getName(); + // name = name.substring(name.lastIndexOf('/') + 1); + + // no need to use synchronized since it's already cover by the calling method + + long location = 0; + if (context != null) + location = ((TmfLocation) (context.getLocation())).getLocation(); + stream.seek(location); + + try { + final long ts = stream.readLong(); + final String source = stream.readUTF(); + final String type = stream.readUTF(); + final Integer reference = stream.readInt(); + final int typeIndex = Integer.parseInt(type.substring(typePrefix.length())); + final String[] fields = new String[typeIndex]; + for (int i = 0; i < typeIndex; i++) + fields[i] = stream.readUTF(); + + final StringBuffer content = new StringBuffer("["); + if (typeIndex > 0) + content.append(fields[0]); + for (int i = 1; i < typeIndex; i++) + content.append(", ").append(fields[i]); + content.append("]"); + + final TmfEventField root = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content.toString()); + final ITmfEvent event = new TmfEvent(eventStream, + new TmfTimestamp(ts, -3, 0), // millisecs + source, fTypes[typeIndex], root, reference.toString()); + return event; + } catch (final EOFException e) { + } return null; } diff --git a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java index d45025aa08..8fc5f0fdc3 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java +++ b/org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java @@ -47,8 +47,8 @@ public class TmfTraceStub extends TmfTrace { private ITmfEventParser fParser; // The synchronization lock - private ReentrantLock fLock = new ReentrantLock(); - + private final ReentrantLock fLock = new ReentrantLock(); + // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ @@ -57,7 +57,7 @@ public class TmfTraceStub extends TmfTrace { * @param path * @throws FileNotFoundException */ - public TmfTraceStub(String path) throws FileNotFoundException { + public TmfTraceStub(final String path) throws FileNotFoundException { this(path, DEFAULT_INDEX_PAGE_SIZE, false); } @@ -66,7 +66,7 @@ public class TmfTraceStub extends TmfTrace { * @param cacheSize * @throws FileNotFoundException */ - public TmfTraceStub(String path, int cacheSize) throws FileNotFoundException { + public TmfTraceStub(final String path, final int cacheSize) throws FileNotFoundException { this(path, cacheSize, false); } @@ -75,23 +75,23 @@ public class TmfTraceStub extends TmfTrace { * @param waitForCompletion * @throws FileNotFoundException */ - public TmfTraceStub(String path, boolean waitForCompletion) throws FileNotFoundException { + public TmfTraceStub(final String path, final boolean waitForCompletion) throws FileNotFoundException { this(path, DEFAULT_INDEX_PAGE_SIZE, waitForCompletion); } - + /** * @param path * @param cacheSize * @param waitForCompletion * @throws FileNotFoundException */ - public TmfTraceStub(String path, int cacheSize, boolean waitForCompletion) throws FileNotFoundException { + public TmfTraceStub(final String path, final int cacheSize, final boolean waitForCompletion) throws FileNotFoundException { super(null, TmfEvent.class, path, cacheSize, false); fTrace = new RandomAccessFile(path, "r"); fParser = new TmfEventParserStub(); } - + /** * @param path * @param cacheSize @@ -99,26 +99,26 @@ public class TmfTraceStub extends TmfTrace { * @param parser * @throws FileNotFoundException */ - public TmfTraceStub(String path, int cacheSize, boolean waitForCompletion, ITmfEventParser parser) throws FileNotFoundException { + public TmfTraceStub(final String path, final int cacheSize, final boolean waitForCompletion, final ITmfEventParser parser) throws FileNotFoundException { super(path, TmfEvent.class, path, cacheSize, false); fTrace = new RandomAccessFile(path, "r"); fParser = parser; } - + /** */ @Override - public TmfTraceStub clone() { - TmfTraceStub clone = null; - try { - clone = (TmfTraceStub) super.clone(); - clone.fTrace = new RandomAccessFile(getPath(), "r"); - clone.fParser = new TmfEventParserStub(); - } catch (FileNotFoundException e) { - } - return clone; + public TmfTraceStub clone() { + TmfTraceStub clone = null; + try { + clone = (TmfTraceStub) super.clone(); + clone.fTrace = new RandomAccessFile(getPath(), "r"); + clone.fParser = new TmfEventParserStub(); + } catch (final FileNotFoundException e) { + } + return clone; } - + // ------------------------------------------------------------------------ // Accessors // ------------------------------------------------------------------------ @@ -131,10 +131,10 @@ public class TmfTraceStub extends TmfTrace { // Operators // ------------------------------------------------------------------------ - @Override - @SuppressWarnings("unchecked") - public TmfContext seekLocation(ITmfLocation location) { - fLock.lock(); + @Override + @SuppressWarnings("unchecked") + public TmfContext seekLocation(final ITmfLocation location) { + fLock.lock(); try { if (fTrace != null) { // Position the trace at the requested location and @@ -145,52 +145,49 @@ public class TmfTraceStub extends TmfTrace { loc = ((TmfLocation) location).getLocation(); rank = ITmfContext.UNKNOWN_RANK; } - if (loc != fTrace.getFilePointer()) { + if (loc != fTrace.getFilePointer()) fTrace.seek(loc); - } - TmfContext context = new TmfContext(getCurrentLocation(), rank); + final TmfContext context = new TmfContext(getCurrentLocation(), rank); return context; } - } catch (IOException e) { - e.printStackTrace(); - } + } catch (final IOException e) { + e.printStackTrace(); + } finally{ fLock.unlock(); } - return null; + return null; } - @Override - public TmfContext seekLocation(double ratio) { - fLock.lock(); + @Override + public TmfContext seekLocation(final double ratio) { + fLock.lock(); try { if (fTrace != null) { - ITmfLocation location = new TmfLocation(Long.valueOf((long) (ratio * fTrace.length()))); - TmfContext context = seekLocation(location); + final ITmfLocation location = new TmfLocation(Long.valueOf((long) (ratio * fTrace.length()))); + final TmfContext context = seekLocation(location); context.setRank(ITmfContext.UNKNOWN_RANK); return context; } - } catch (IOException e) { + } catch (final IOException e) { e.printStackTrace(); } finally { fLock.unlock(); } - + return null; } @Override @SuppressWarnings("rawtypes") - public double getLocationRatio(ITmfLocation location) { + public double getLocationRatio(final ITmfLocation location) { fLock.lock(); try { - if (fTrace != null) { - if (location.getLocation() instanceof Long) { + if (fTrace != null) + if (location.getLocation() instanceof Long) return (double) ((Long) location.getLocation()) / fTrace.length(); - } - } - } catch (IOException e) { + } catch (final IOException e) { e.printStackTrace(); } finally { fLock.unlock(); @@ -199,13 +196,30 @@ public class TmfTraceStub extends TmfTrace { } @Override - public TmfLocation getCurrentLocation() { + public TmfLocation getCurrentLocation() { fLock.lock(); try { - if (fTrace != null) { + if (fTrace != null) return new TmfLocation(fTrace.getFilePointer()); + } catch (final IOException e) { + e.printStackTrace(); + } finally { + fLock.unlock(); + } + return null; + } + + @Override + public ITmfEvent parseEvent(final ITmfContext context) { + fLock.lock(); + try { + // parseNextEvent will update the context + if (fTrace != null) { + final ITmfEvent event = fParser.parseNextEvent(this, context.clone()); + return event; } - } catch (IOException e) { + } + catch (final IOException e) { e.printStackTrace(); } finally { fLock.unlock(); @@ -213,53 +227,35 @@ public class TmfTraceStub extends TmfTrace { return null; } - @Override - public ITmfEvent parseEvent(ITmfContext context) { - fLock.lock(); - try { - // parseNextEvent will update the context - if (fTrace != null) { - ITmfEvent event = fParser.parseNextEvent(this, context.clone()); - return event; - } - } - catch (IOException e) { - e.printStackTrace(); - } finally { - fLock.unlock(); - } - return null; - } + @Override + public void setTimeRange(final TmfTimeRange range) { + super.setTimeRange(range); + } - @Override - public void setTimeRange(TmfTimeRange range) { - super.setTimeRange(range); + @Override + public void setStartTime(final ITmfTimestamp startTime) { + super.setStartTime(startTime); } - @Override - public void setStartTime(ITmfTimestamp startTime) { - super.setStartTime(startTime); + @Override + public void setEndTime(final ITmfTimestamp endTime) { + super.setEndTime(endTime); } - @Override - public void setEndTime(ITmfTimestamp endTime) { - super.setEndTime(endTime); + @Override + public void dispose() { + fLock.lock(); + try { + if (fTrace != null) { + fTrace.close(); + fTrace = null; + } + } catch (final IOException e) { + // Ignore + } finally { + fLock.unlock(); + } + super.dispose(); } - - @Override - public void dispose() { - fLock.lock(); - try { - if (fTrace != null) { - fTrace.close(); - fTrace = null; - } - } catch (IOException e) { - // Ignore - } finally { - fLock.unlock(); - } - super.dispose(); - } } \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java index 9cd5c73f19..2b6be5ebab 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEvent.java @@ -37,7 +37,7 @@ public interface ITmfEvent extends Cloneable { // ------------------------------------------------------------------------ /** - * Pre-defined event attributes + * Pre-defined event attributes */ public static final String EVENT_FIELD_TIMESTAMP = ":timestamp:"; //$NON-NLS-1$ public static final String EVENT_FIELD_SOURCE = ":source:"; //$NON-NLS-1$ @@ -92,5 +92,5 @@ public interface ITmfEvent extends Cloneable { * @return a clone of the event */ public ITmfEvent clone(); - + } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventField.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventField.java index 41e1b837ee..5c4bcf789c 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventField.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventField.java @@ -28,7 +28,7 @@ public interface ITmfEventField extends Cloneable { * The root field id (the main container) */ public static final String ROOT_FIELD_ID = ":root:"; //$NON-NLS-1$ - + // ------------------------------------------------------------------------ // Getters // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java index 045b9f8ffb..cf0ecaf734 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfEventType.java @@ -27,15 +27,15 @@ public interface ITmfEventType extends Cloneable { // ------------------------------------------------------------------------ /** - * The default event type content + * The default event type content */ public static final String DEFAULT_CONTEXT_ID = "TmfContext"; //$NON-NLS-1$ /** - * The default event type name + * The default event type name */ public static final String DEFAULT_TYPE_ID = "TmfType"; //$NON-NLS-1$ - + // ------------------------------------------------------------------------ // Getters // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java index 0c074dba50..8bb3f3e7e9 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java @@ -74,7 +74,7 @@ public interface ITmfTimestamp extends Cloneable, Comparable { public int compareTo(ITmfTimestamp ts, boolean withinPrecision); /** - * Returns the difference between [this] and [ts] as a timestamp + * Returns the difference between [this] and [ts] as a timestamp * * @param ts the other timestamp * @return the time difference (this - other) as an ITmfTimestamp @@ -89,7 +89,7 @@ public interface ITmfTimestamp extends Cloneable, Comparable { * @return a clone of the timestamp */ public ITmfTimestamp clone(); - + // ------------------------------------------------------------------------ // Comparable // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java index af67ecf457..f01a1650bc 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java @@ -52,8 +52,8 @@ public class TmfEvent implements ITmfEvent { /** * Constructor - no rank */ - public TmfEvent(ITmfTrace trace, ITmfTimestamp timestamp, String source, - ITmfEventType type, ITmfEventField content, String reference) + public TmfEvent(final ITmfTrace trace, final ITmfTimestamp timestamp, final String source, + final ITmfEventType type, final ITmfEventField content, final String reference) { this(trace, -1, timestamp, source, type, content, reference); } @@ -61,8 +61,8 @@ public class TmfEvent implements ITmfEvent { /** * Constructor - no rank, no content */ - public TmfEvent(ITmfTrace trace, ITmfTimestamp timestamp, String source, - ITmfEventType type, String reference) + public TmfEvent(final ITmfTrace trace, final ITmfTimestamp timestamp, final String source, + final ITmfEventType type, final String reference) { this(trace, -1, timestamp, source, type, null, reference); } @@ -70,7 +70,7 @@ public class TmfEvent implements ITmfEvent { /** * Constructor - no rank, no content, no trace */ - public TmfEvent(ITmfTimestamp timestamp, String source, ITmfEventType type, String reference) + public TmfEvent(final ITmfTimestamp timestamp, final String source, final ITmfEventType type, final String reference) { this(null, -1, timestamp, source, type, null, reference); } @@ -86,8 +86,8 @@ public class TmfEvent implements ITmfEvent { * @param content the event content (payload) * @param reference the event reference */ - public TmfEvent(ITmfTrace trace, long rank, ITmfTimestamp timestamp, String source, - ITmfEventType type, ITmfEventField content, String reference) + public TmfEvent(final ITmfTrace trace, final long rank, final ITmfTimestamp timestamp, final String source, + final ITmfEventType type, final ITmfEventField content, final String reference) { fTrace = trace; fRank = rank; @@ -103,7 +103,7 @@ public class TmfEvent implements ITmfEvent { * * @param event the original event */ - public TmfEvent(ITmfEvent event) { + public TmfEvent(final ITmfEvent event) { if (event == null) throw new IllegalArgumentException(); fTrace = event.getTrace(); @@ -182,49 +182,49 @@ public class TmfEvent implements ITmfEvent { /** * @param trace the new event trace */ - protected void setTrace(ITmfTrace trace) { + protected void setTrace(final ITmfTrace trace) { fTrace = trace; } /** * @param rank the new event rank */ - protected void setRank(long rank) { + protected void setRank(final long rank) { fRank = rank; } /** * @param timestamp the new event timestamp */ - protected void setTimestamp(ITmfTimestamp timestamp) { + protected void setTimestamp(final ITmfTimestamp timestamp) { fTimestamp = timestamp; } /** * @param source the new event source */ - protected void setSource(String source) { + protected void setSource(final String source) { fSource = source; } /** * @param type the new event type */ - protected void setType(ITmfEventType type) { + protected void setType(final ITmfEventType type) { fType = type; } /** * @param content the event new content */ - protected void setContent(ITmfEventField content) { + protected void setContent(final ITmfEventField content) { fContent = content; } /** * @param reference the new event reference */ - protected void setReference(String reference) { + protected void setReference(final String reference) { fReference = reference; } @@ -247,7 +247,7 @@ public class TmfEvent implements ITmfEvent { clone.fType = fType != null ? fType.clone() : null; clone.fContent = fContent != null ? fContent.clone() : null; clone.fReference = fReference; - } catch (CloneNotSupportedException e) { + } catch (final CloneNotSupportedException e) { } return clone; } @@ -277,14 +277,14 @@ public class TmfEvent implements ITmfEvent { * @see java.lang.Object#equals(java.lang.Object) */ @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) return true; if (obj == null) return false; if (!(obj instanceof TmfEvent)) return false; - TmfEvent other = (TmfEvent) obj; + final TmfEvent other = (TmfEvent) obj; if (fTrace == null) { if (other.fTrace != null) return false; @@ -327,8 +327,8 @@ public class TmfEvent implements ITmfEvent { @SuppressWarnings("nls") public String toString() { return "TmfEvent [fTimestamp=" + fTimestamp + ", fTrace=" + fTrace + ", fRank=" + fRank - + ", fSource=" + fSource + ", fType=" + fType + ", fContent=" + fContent - + ", fReference=" + fReference + "]"; + + ", fSource=" + fSource + ", fType=" + fType + ", fContent=" + fContent + + ", fReference=" + fReference + "]"; } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java index 4bfad18740..b76963e52c 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java @@ -36,7 +36,7 @@ public class TmfEventField implements ITmfEventField { private String[] fFieldNames; private Map fNameMapping; - + // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ @@ -54,7 +54,7 @@ public class TmfEventField implements ITmfEventField { * @param name the event field id * @param fields the list of subfields */ - public TmfEventField(String name, ITmfEventField[] fields) { + public TmfEventField(final String name, final ITmfEventField[] fields) { this(name, null, fields); } @@ -64,7 +64,7 @@ public class TmfEventField implements ITmfEventField { * @param name the event field id * @param value the event field value */ - public TmfEventField(String name, Object value) { + public TmfEventField(final String name, final Object value) { this(name, value, null); } @@ -75,10 +75,9 @@ public class TmfEventField implements ITmfEventField { * @param value the event field value * @param fields the list of subfields */ - public TmfEventField(String name, Object value, ITmfEventField[] fields) { - if (name == null) { + public TmfEventField(final String name, final Object value, final ITmfEventField[] fields) { + if (name == null) throw new IllegalArgumentException(); - } fName = name; fValue = value; fFields = (fields != null) ? Arrays.copyOf(fields, fields.length) : null; @@ -90,13 +89,13 @@ public class TmfEventField implements ITmfEventField { * * @param field the other event field */ - public TmfEventField(TmfEventField field) { - if (field == null) - throw new IllegalArgumentException(); - fName = field.fName; - fValue = field.fValue; - fFields = field.fFields; - fFieldNames = field.fFieldNames; + public TmfEventField(final TmfEventField field) { + if (field == null) + throw new IllegalArgumentException(); + fName = field.fName; + fValue = field.fValue; + fFields = field.fFields; + fFieldNames = field.fFieldNames; populateStructs(); } @@ -132,11 +131,10 @@ public class TmfEventField implements ITmfEventField { * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventField#getFieldName(int) */ @Override - public String getFieldName(int index) { - ITmfEventField field = getField(index); - if (field != null) { + public String getFieldName(final int index) { + final ITmfEventField field = getField(index); + if (field != null) return field.getName(); - } return null; } @@ -152,7 +150,7 @@ public class TmfEventField implements ITmfEventField { * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventField#getField(java.lang.String) */ @Override - public ITmfEventField getField(String name) { + public ITmfEventField getField(final String name) { return fNameMapping.get(name); } @@ -160,7 +158,7 @@ public class TmfEventField implements ITmfEventField { * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventField#getField(int) */ @Override - public ITmfEventField getField(int index) { + public ITmfEventField getField(final int index) { if (fFields != null && index >= 0 && index < fFields.length) return fFields[index]; return null; @@ -174,7 +172,7 @@ public class TmfEventField implements ITmfEventField { * @param value new field raw value * @param fields the corresponding fields */ - protected void setValue(Object value, ITmfEventField[] fields) { + protected void setValue(final Object value, final ITmfEventField[] fields) { fValue = value; fFields = (fields != null) ? Arrays.copyOf(fields, fields.length) : null; populateStructs(); @@ -190,12 +188,11 @@ public class TmfEventField implements ITmfEventField { * @param labels the list of labels * @return the (flat) root list */ - public final static ITmfEventField makeRoot(String[] labels) { - ITmfEventField[] fields = new ITmfEventField[labels.length]; - for (int i = 0; i < labels.length; i++) { + public final static ITmfEventField makeRoot(final String[] labels) { + final ITmfEventField[] fields = new ITmfEventField[labels.length]; + for (int i = 0; i < labels.length; i++) fields[i] = new TmfEventField(labels[i], null); - } - ITmfEventField rootField = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, fields); + final ITmfEventField rootField = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, fields); return rootField; } @@ -203,11 +200,11 @@ public class TmfEventField implements ITmfEventField { * Populate the subfield names and the name map */ private void populateStructs() { - int nbFields = (fFields != null) ? fFields.length : 0; + final int nbFields = (fFields != null) ? fFields.length : 0; fFieldNames = new String[nbFields]; fNameMapping = new HashMap(); for (int i = 0; i < nbFields; i++) { - String name = fFields[i].getName(); + final String name = fFields[i].getName(); fFieldNames[i] = name; fNameMapping.put(name, fFields[i]); } @@ -229,7 +226,7 @@ public class TmfEventField implements ITmfEventField { clone.fValue = fValue; clone.fFields = (fFields != null) ? fFields.clone() : null; clone.populateStructs(); - } catch (CloneNotSupportedException e) { + } catch (final CloneNotSupportedException e) { } return clone; } @@ -254,14 +251,14 @@ public class TmfEventField implements ITmfEventField { * @see java.lang.Object#equals(java.lang.Object) */ @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) return true; if (obj == null) return false; if (!(obj instanceof TmfEventField)) return false; - TmfEventField other = (TmfEventField) obj; + final TmfEventField other = (TmfEventField) obj; if (!fName.equals(other.fName)) return false; if (fValue == null) { diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java index 4edb7e3fb5..b683b5c7f2 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java @@ -25,20 +25,20 @@ public class TmfEventType implements ITmfEventType { // Attributes // ------------------------------------------------------------------------ - private String fContext; - private String fTypeId; - private ITmfEventField fRootField; + private String fContext; + private String fTypeId; + private ITmfEventField fRootField; // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ - /** - * Default constructor - */ - public TmfEventType() { - this(DEFAULT_CONTEXT_ID, DEFAULT_TYPE_ID, null); - } + /** + * Default constructor + */ + public TmfEventType() { + this(DEFAULT_CONTEXT_ID, DEFAULT_TYPE_ID, null); + } /** * Full constructor @@ -47,7 +47,7 @@ public class TmfEventType implements ITmfEventType { * @param typeId the type name * @param root the root field */ - public TmfEventType(String context, String typeId, ITmfEventField root) { + public TmfEventType(final String context, final String typeId, final ITmfEventField root) { if (context == null || typeId == null) throw new IllegalArgumentException(); fContext = context; @@ -58,18 +58,18 @@ public class TmfEventType implements ITmfEventType { TmfEventTypeManager.getInstance().add(context, this); } - /** - * Copy constructor - * - * @param type the other type - */ - public TmfEventType(ITmfEventType type) { - if (type == null) - throw new IllegalArgumentException(); - fContext = type.getContext(); - fTypeId = type.getName(); - fRootField = type.getRootField(); - } + /** + * Copy constructor + * + * @param type the other type + */ + public TmfEventType(final ITmfEventType type) { + if (type == null) + throw new IllegalArgumentException(); + fContext = type.getContext(); + fTypeId = type.getName(); + fRootField = type.getRootField(); + } // ------------------------------------------------------------------------ // ITmfEventType @@ -79,9 +79,9 @@ public class TmfEventType implements ITmfEventType { * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventType#getContext() */ @Override - public String getContext() { - return fContext; - } + public String getContext() { + return fContext; + } /* (non-Javadoc) * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventType#getName() @@ -111,7 +111,7 @@ public class TmfEventType implements ITmfEventType { * @see org.eclipse.linuxtools.tmf.core.event.ITmfEventType#getFieldName(int) */ @Override - public String getFieldName(int index) { + public String getFieldName(final int index) { return (fRootField != null) ? fRootField.getFieldName(index) : null; } @@ -131,7 +131,7 @@ public class TmfEventType implements ITmfEventType { clone.fTypeId = fTypeId; clone.fRootField = (fRootField != null) ? fRootField.clone() : null; } - catch (CloneNotSupportedException e) { + catch (final CloneNotSupportedException e) { } return clone; } @@ -156,14 +156,14 @@ public class TmfEventType implements ITmfEventType { * @see java.lang.Object#equals(java.lang.Object) */ @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) return true; if (obj == null) return false; if (!(obj instanceof TmfEventType)) return false; - TmfEventType other = (TmfEventType) obj; + final TmfEventType other = (TmfEventType) obj; if (!fContext.equals(other.fContext)) return false; if (!fTypeId.equals(other.fTypeId)) diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java index e9266f1b4d..56e5be9b08 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java @@ -32,7 +32,7 @@ public final class TmfEventTypeManager { private static TmfEventTypeManager fEventTypeManager = null; // The available types, per context - private HashMap> fEventTypes; + private final HashMap> fEventTypes; // ------------------------------------------------------------------------ // Constructors @@ -49,9 +49,8 @@ public final class TmfEventTypeManager { * @return the TmfEventTypeManager singleton */ public static synchronized TmfEventTypeManager getInstance() { - if (fEventTypeManager == null) { + if (fEventTypeManager == null) fEventTypeManager = new TmfEventTypeManager(); - } return fEventTypeManager; } @@ -65,11 +64,10 @@ public final class TmfEventTypeManager { * @param context the target context * @param type the type to add */ - public synchronized void add(String context, ITmfEventType type) { + public synchronized void add(final String context, final ITmfEventType type) { HashMap types = fEventTypes.get(context); - if (types == null) { + if (types == null) types = new HashMap(); - } types.put(type.getName(), type); fEventTypes.put(context, types); } @@ -89,11 +87,10 @@ public final class TmfEventTypeManager { * @param context the context to look into * @return the list of types defined for that context */ - public synchronized ITmfEventType[] getTypes(String context) { - HashMap types = fEventTypes.get(context); - if (types != null) { + public synchronized ITmfEventType[] getTypes(final String context) { + final HashMap types = fEventTypes.get(context); + if (types != null) return types.values().toArray(new ITmfEventType[types.size()]); - } return null; } @@ -104,11 +101,10 @@ public final class TmfEventTypeManager { * @param typeId the type ID * @return the corresponding type */ - public synchronized ITmfEventType getType(String context, String typeId) { - HashMap types = fEventTypes.get(context); - if (types != null) { + public synchronized ITmfEventType getType(final String context, final String typeId) { + final HashMap types = fEventTypes.get(context); + if (types != null) return types.get(typeId); - } return null; } @@ -117,7 +113,7 @@ public final class TmfEventTypeManager { * * @param context the context to remove */ - public synchronized void clear(String context) { + public synchronized void clear(final String context) { fEventTypes.remove(context); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfSimpleTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfSimpleTimestamp.java index 10d917d28d..2dd8022c78 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfSimpleTimestamp.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfSimpleTimestamp.java @@ -35,7 +35,7 @@ public class TmfSimpleTimestamp extends TmfTimestamp { * * @param value the timestamp value */ - public TmfSimpleTimestamp(long value) { + public TmfSimpleTimestamp(final long value) { super(value, 0, 0); } @@ -44,7 +44,7 @@ public class TmfSimpleTimestamp extends TmfTimestamp { * * @param timestamp the timestamp to copy */ - public TmfSimpleTimestamp(ITmfTimestamp timestamp) { + public TmfSimpleTimestamp(final ITmfTimestamp timestamp) { if (timestamp == null || timestamp.getScale() != 0 || timestamp.getPrecision() != 0) throw new IllegalArgumentException(); fValue = timestamp.getValue(); @@ -60,10 +60,9 @@ public class TmfSimpleTimestamp extends TmfTimestamp { * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#normalize(long, int) */ @Override - public ITmfTimestamp normalize(long offset, int scale) throws ArithmeticException { - if (scale == 0) { + public ITmfTimestamp normalize(final long offset, final int scale) throws ArithmeticException { + if (scale == 0) return new TmfSimpleTimestamp(fValue + offset); - } return super.normalize(offset, scale); } @@ -71,9 +70,9 @@ public class TmfSimpleTimestamp extends TmfTimestamp { * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#compareTo(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp, boolean) */ @Override - public int compareTo(ITmfTimestamp ts, boolean withinPrecision) { + public int compareTo(final ITmfTimestamp ts, final boolean withinPrecision) { if (ts instanceof TmfSimpleTimestamp) { - long delta = fValue - ts.getValue(); + final long delta = fValue - ts.getValue(); return (delta == 0) ? 0 : (delta > 0) ? 1 : -1; } return super.compareTo(ts, withinPrecision); @@ -83,10 +82,9 @@ public class TmfSimpleTimestamp extends TmfTimestamp { * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#getDelta(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp) */ @Override - public ITmfTimestamp getDelta(ITmfTimestamp ts) { - if (ts instanceof TmfSimpleTimestamp) { + public ITmfTimestamp getDelta(final ITmfTimestamp ts) { + if (ts instanceof TmfSimpleTimestamp) return new TmfSimpleTimestamp(fValue - ts.getValue()); - } return super.getDelta(ts); } @@ -118,14 +116,14 @@ public class TmfSimpleTimestamp extends TmfTimestamp { * @see org.eclipse.linuxtools.tmf.core.event.TmfTimestamp#equals(java.lang.Object) */ @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { if (this == other) return true; if (other == null) return false; if (!(other instanceof TmfSimpleTimestamp)) return super.equals(other); - TmfSimpleTimestamp ts = (TmfSimpleTimestamp) other; + final TmfSimpleTimestamp ts = (TmfSimpleTimestamp) other; return compareTo(ts, false) == 0; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java index 4bc9fc4ec2..58da4c3b66 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimeRange.java @@ -28,13 +28,13 @@ public final class TmfTimeRange implements Cloneable { * The full possible time range */ public static final TmfTimeRange ETERNITY = - new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); + new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH); /** * The null time range */ public static final TmfTimeRange NULL_RANGE = - new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_BANG); + new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_BANG); // ------------------------------------------------------------------------ // Attributes @@ -60,10 +60,9 @@ public final class TmfTimeRange implements Cloneable { * @param startTime start of the time range * @param endTime end of the time range */ - public TmfTimeRange(ITmfTimestamp startTime, ITmfTimestamp endTime) { - if (startTime == null || endTime == null) { + public TmfTimeRange(final ITmfTimestamp startTime, final ITmfTimestamp endTime) { + if (startTime == null || endTime == null) throw new IllegalArgumentException(); - } fStartTime = startTime; fEndTime = endTime; } @@ -73,10 +72,9 @@ public final class TmfTimeRange implements Cloneable { * * @param range the other time range */ - public TmfTimeRange(TmfTimeRange range) { - if (range == null) { + public TmfTimeRange(final TmfTimeRange range) { + if (range == null) throw new IllegalArgumentException(); - } fStartTime = range.getStartTime(); fEndTime = range.getEndTime(); } @@ -109,7 +107,7 @@ public final class TmfTimeRange implements Cloneable { * @param ts the timestamp to check * @return true if [startTime] <= [ts] <= [endTime] */ - public boolean contains(ITmfTimestamp ts) { + public boolean contains(final ITmfTimestamp ts) { // Zero acts as a "universal donor" timestamp if (ts.equals(TmfTimestamp.ZERO)) return true; @@ -122,9 +120,9 @@ public final class TmfTimeRange implements Cloneable { * @param range the other time range * @return true if [range] is fully contained */ - public boolean contains(TmfTimeRange range) { - ITmfTimestamp startTime = range.getStartTime(); - ITmfTimestamp endTime = range.getEndTime(); + public boolean contains(final TmfTimeRange range) { + final ITmfTimestamp startTime = range.getStartTime(); + final ITmfTimestamp endTime = range.getEndTime(); return (fStartTime.compareTo(startTime, true) <= 0) && (fEndTime.compareTo(endTime, true) >= 0); } @@ -138,12 +136,12 @@ public final class TmfTimeRange implements Cloneable { * @param range the other time range * @return the intersection time range, or null if no intersection exists */ - public TmfTimeRange getIntersection(TmfTimeRange range) { + public TmfTimeRange getIntersection(final TmfTimeRange range) { if (fStartTime.compareTo(range.fEndTime, true) > 0 || fEndTime.compareTo(range.fStartTime, true) < 0) return null; // no intersection return new TmfTimeRange(fStartTime.compareTo(range.fStartTime, true) < 0 ? range.fStartTime - : fStartTime, fEndTime.compareTo(range.fEndTime, true) > 0 ? range.fEndTime + : fStartTime, fEndTime.compareTo(range.fEndTime, true) > 0 ? range.fEndTime : fEndTime); } @@ -162,7 +160,7 @@ public final class TmfTimeRange implements Cloneable { clone.fStartTime = fStartTime.clone(); clone.fEndTime = fEndTime.clone(); } - catch (CloneNotSupportedException e) { + catch (final CloneNotSupportedException e) { } return clone; } @@ -187,14 +185,14 @@ public final class TmfTimeRange implements Cloneable { * @see java.lang.Object#equals(java.lang.Object) */ @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) return true; if (obj == null) return false; if (!(obj instanceof TmfTimeRange)) return false; - TmfTimeRange other = (TmfTimeRange) obj; + final TmfTimeRange other = (TmfTimeRange) obj; if (!fEndTime.equals(other.fEndTime)) return false; if (!fStartTime.equals(other.fStartTime)) diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java index a8392fdca6..436fcd668c 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java @@ -28,19 +28,19 @@ public class TmfTimestamp implements ITmfTimestamp { /** * The beginning of time */ - public static final ITmfTimestamp BIG_BANG = + public static final ITmfTimestamp BIG_BANG = new TmfTimestamp(Long.MIN_VALUE, Integer.MAX_VALUE, 0); /** * The end of time */ - public static final ITmfTimestamp BIG_CRUNCH = + public static final ITmfTimestamp BIG_CRUNCH = new TmfTimestamp(Long.MAX_VALUE, Integer.MAX_VALUE, 0); - + /** * Zero */ - public static final ITmfTimestamp ZERO = + public static final ITmfTimestamp ZERO = new TmfTimestamp(0, 0, 0); // ------------------------------------------------------------------------ @@ -78,7 +78,7 @@ public class TmfTimestamp implements ITmfTimestamp { * * @param value the timestamp value */ - public TmfTimestamp(long value) { + public TmfTimestamp(final long value) { this(value, 0, 0); } @@ -88,7 +88,7 @@ public class TmfTimestamp implements ITmfTimestamp { * @param value the timestamp value * @param scale the timestamp scale */ - public TmfTimestamp(long value, int scale) { + public TmfTimestamp(final long value, final int scale) { this(value, scale, 0); } @@ -99,7 +99,7 @@ public class TmfTimestamp implements ITmfTimestamp { * @param scale the timestamp scale * @param precision the timestamp precision */ - public TmfTimestamp(long value, int scale, int precision) { + public TmfTimestamp(final long value, final int scale, final int precision) { fValue = value; fScale = scale; fPrecision = Math.abs(precision); @@ -110,7 +110,7 @@ public class TmfTimestamp implements ITmfTimestamp { * * @param timestamp the timestamp to copy */ - public TmfTimestamp(ITmfTimestamp timestamp) { + public TmfTimestamp(final ITmfTimestamp timestamp) { if (timestamp == null) throw new IllegalArgumentException(); fValue = timestamp.getValue(); @@ -172,7 +172,7 @@ public class TmfTimestamp implements ITmfTimestamp { * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#normalize(long, int) */ @Override - public ITmfTimestamp normalize(long offset, int scale) throws ArithmeticException { + public ITmfTimestamp normalize(final long offset, final int scale) throws ArithmeticException { long value = fValue; int precision = fPrecision; @@ -183,12 +183,11 @@ public class TmfTimestamp implements ITmfTimestamp { // First, scale the timestamp if (fScale != scale) { - int scaleDiff = Math.abs(fScale - scale); - if (scaleDiff >= scalingFactors.length) { + final int scaleDiff = Math.abs(fScale - scale); + if (scaleDiff >= scalingFactors.length) throw new ArithmeticException("Scaling exception"); //$NON-NLS-1$ - } - long scalingFactor = scalingFactors[scaleDiff]; + final long scalingFactor = scalingFactors[scaleDiff]; if (scale < fScale) { value *= scalingFactor; precision *= scalingFactor; @@ -199,11 +198,10 @@ public class TmfTimestamp implements ITmfTimestamp { } // Then, apply the offset - if (offset < 0) { + if (offset < 0) value = (value < Long.MIN_VALUE - offset) ? Long.MIN_VALUE : value + offset; - } else { + else value = (value > Long.MAX_VALUE - offset) ? Long.MAX_VALUE : value + offset; - } return new TmfTimestamp(value, scale, precision); } @@ -212,7 +210,7 @@ public class TmfTimestamp implements ITmfTimestamp { * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#compareTo(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp, boolean) */ @Override - public int compareTo(ITmfTimestamp ts, boolean withinPrecision) { + public int compareTo(final ITmfTimestamp ts, final boolean withinPrecision) { // Check the corner cases (we can't use equals() because it uses compareTo()...) if (this == ts || (fValue == ts.getValue() && fScale == ts.getScale())) @@ -221,20 +219,19 @@ public class TmfTimestamp implements ITmfTimestamp { return -1; if ((fValue == BIG_CRUNCH.getValue() && fScale == BIG_CRUNCH.getScale()) || (ts.getValue() == BIG_BANG.getValue() && ts.getScale() == BIG_BANG.getScale())) return 1; - + try { - ITmfTimestamp nts = ts.normalize(0, fScale); - long delta = fValue - nts.getValue(); - if ((delta == 0) || (withinPrecision && (Math.abs(delta) <= (fPrecision + nts.getPrecision())))) { + final ITmfTimestamp nts = ts.normalize(0, fScale); + final long delta = fValue - nts.getValue(); + if ((delta == 0) || (withinPrecision && (Math.abs(delta) <= (fPrecision + nts.getPrecision())))) return 0; - } return (delta > 0) ? 1 : -1; } - catch (ArithmeticException e) { + catch (final ArithmeticException e) { // Scaling error. We can figure it out nonetheless. // First, look at the sign of the mantissa - long value = ts.getValue(); + final long value = ts.getValue(); if (fValue == 0 && value == 0) return 0; if (fValue < 0 && value >= 0) @@ -243,8 +240,8 @@ public class TmfTimestamp implements ITmfTimestamp { return 1; // Otherwise, just compare the scales - int scale = ts.getScale(); - return (fScale > scale) ? (fValue >= 0) ? 1 : -1 : (fValue >= 0) ? -1 : 1; + final int scale = ts.getScale(); + return (fScale > scale) ? (fValue >= 0) ? 1 : -1 : (fValue >= 0) ? -1 : 1; } } @@ -252,9 +249,9 @@ public class TmfTimestamp implements ITmfTimestamp { * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#getDelta(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp) */ @Override - public ITmfTimestamp getDelta(ITmfTimestamp ts) { - ITmfTimestamp nts = ts.normalize(0, fScale); - long value = fValue - nts.getValue(); + public ITmfTimestamp getDelta(final ITmfTimestamp ts) { + final ITmfTimestamp nts = ts.normalize(0, fScale); + final long value = fValue - nts.getValue(); return new TmfTimestamp(value, fScale, fPrecision + nts.getPrecision()); } @@ -273,7 +270,7 @@ public class TmfTimestamp implements ITmfTimestamp { clone.fValue = fValue; clone.fScale = fScale; clone.fPrecision = fPrecision; - } catch (CloneNotSupportedException e) { + } catch (final CloneNotSupportedException e) { } return clone; } @@ -286,7 +283,7 @@ public class TmfTimestamp implements ITmfTimestamp { * @see org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp#compareTo(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp) */ @Override - public int compareTo(ITmfTimestamp ts) { + public int compareTo(final ITmfTimestamp ts) { return compareTo(ts, false); } @@ -311,14 +308,14 @@ public class TmfTimestamp implements ITmfTimestamp { * @see java.lang.Object#equals(java.lang.Object) */ @Override - public boolean equals(Object other) { + public boolean equals(final Object other) { if (this == other) return true; if (other == null) return false; if (!(other instanceof TmfTimestamp)) return false; - TmfTimestamp ts = (TmfTimestamp) other; + final TmfTimestamp ts = (TmfTimestamp) other; return compareTo(ts, false) == 0; } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java index 4fc217f2f4..40677c1a62 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfTrace.java @@ -32,7 +32,7 @@ public interface ITmfTrace extends ITmfComponent, Cloneable // ------------------------------------------------------------------------ // Initializers // ------------------------------------------------------------------------ - + /** * Initialize a newly instantiated "empty" trace object. This is used to * parameterize an ITmfTrace instantiated with its parameterless constructor. @@ -123,7 +123,7 @@ public interface ITmfTrace extends ITmfComponent, Cloneable /** * Position the trace at the specified location. The null location - * is used to indicate that the first trace event. + * is used to indicate that the first trace event. * * @param location the trace specific location (null for 1st event) * @return a context which can later be used to read the corresponding event @@ -136,7 +136,7 @@ public interface ITmfTrace extends ITmfComponent, Cloneable * * The notion of ratio (0.0 <= r <= 1.0) is trace specific and left * voluntarily vague. Typically, it would refer to the event proportional - * rank or timestamp in the trace file. + * rank or timestamp in the trace file. * * @param ratio the proportional 'rank' in the trace * @return a context which can later be used to read the corresponding event @@ -218,5 +218,5 @@ public interface ITmfTrace extends ITmfComponent, Cloneable * @return a clone of the trace */ public ITmfTrace clone() throws CloneNotSupportedException; - + } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java index da41d1d59d..3883e6b0fc 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java @@ -78,10 +78,10 @@ public abstract class TmfTrace extends TmfEventProvider private ITmfTimestamp fEndTime = TmfTimestamp.BIG_BANG; /** - * The trace streaming interval (0 = no streaming) + * The trace streaming interval (0 = no streaming) */ protected long fStreamingInterval = 0; - + // The resource used for persistent properties for this trace private IResource fResource; @@ -106,7 +106,7 @@ public abstract class TmfTrace extends TmfEventProvider * @param indexTrace whether to start indexing the trace or not * @throws FileNotFoundException */ - protected TmfTrace(String name, Class type, String path, int indexPageSize, boolean indexTrace) throws FileNotFoundException { + protected TmfTrace(final String name, final Class type, final String path, final int indexPageSize, final boolean indexTrace) throws FileNotFoundException { this(name, type, path, 0, indexPageSize, indexTrace); } @@ -120,7 +120,7 @@ public abstract class TmfTrace extends TmfEventProvider * @param indexTrace whether to start indexing the trace or not * @throws FileNotFoundException */ - protected TmfTrace(String name, Class type, String path, long interval, int indexPageSize, boolean indexTrace) throws FileNotFoundException { + protected TmfTrace(final String name, final Class type, final String path, final long interval, final int indexPageSize, final boolean indexTrace) throws FileNotFoundException { super(); initTrace(name, path, type); fStreamingInterval = interval; @@ -135,7 +135,7 @@ public abstract class TmfTrace extends TmfEventProvider * @param trace the original trace */ @SuppressWarnings("unchecked") - public TmfTrace(ITmfTrace trace) throws FileNotFoundException { + public TmfTrace(final ITmfTrace trace) throws FileNotFoundException { super(); if (trace == null) throw new IllegalArgumentException(); @@ -158,14 +158,14 @@ public abstract class TmfTrace extends TmfEventProvider TmfTrace clone = null; try { clone = (TmfTrace) super.clone(); -// clone.fTrace = fTrace; -// clone.fRank = fRank; -// clone.fTimestamp = fTimestamp != null ? fTimestamp.clone() : null; -// clone.fSource = fSource; -// clone.fType = fType != null ? fType.clone() : null; -// clone.fContent = fContent != null ? fContent.clone() : null; -// clone.fReference = fReference; - } catch (CloneNotSupportedException e) { + // clone.fTrace = fTrace; + // clone.fRank = fRank; + // clone.fTimestamp = fTimestamp != null ? fTimestamp.clone() : null; + // clone.fSource = fSource; + // clone.fType = fType != null ? fType.clone() : null; + // clone.fContent = fContent != null ? fContent.clone() : null; + // clone.fReference = fReference; + } catch (final CloneNotSupportedException e) { } return clone; } @@ -178,18 +178,16 @@ public abstract class TmfTrace extends TmfEventProvider * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#initTrace(java.lang.String, java.lang.String, java.lang.Class) */ @Override - public void initTrace(String name, String path, Class type) throws FileNotFoundException { + public void initTrace(final String name, final String path, final Class type) throws FileNotFoundException { fPath = path; String traceName = name; - // If no display name was provided, extract it from the trace path - if (traceName == null) { + // If no display name was provided, extract it from the trace path + if (traceName == null) if (path != null) { - int sep = path.lastIndexOf(Path.SEPARATOR); + final int sep = path.lastIndexOf(Path.SEPARATOR); traceName = (sep >= 0) ? path.substring(sep + 1) : path; - } else { - traceName = ""; //$NON-NLS-1$ - } - } + } else + traceName = ""; //$NON-NLS-1$ super.init(traceName, type); } @@ -197,8 +195,8 @@ public abstract class TmfTrace extends TmfEventProvider * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#validate(org.eclipse.core.resources.IProject, java.lang.String) */ @Override - public boolean validate(IProject project, String path) { - File file = new File(path); + public boolean validate(final IProject project, final String path) { + final File file = new File(path); return file.exists(); } @@ -207,7 +205,7 @@ public abstract class TmfTrace extends TmfEventProvider * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#setResource(org.eclipse.core.resources.IResource) */ @Override - public void setResource(IResource resource) { + public void setResource(final IResource resource) { fResource = resource; } @@ -294,19 +292,18 @@ public abstract class TmfTrace extends TmfEventProvider @Override @SuppressWarnings({ "unchecked" }) - public void indexTrace(boolean waitForCompletion) { + public void indexTrace(final boolean waitForCompletion) { // The monitoring job final Job job = new Job("Indexing " + getName() + "...") { //$NON-NLS-1$ //$NON-NLS-2$ @Override - protected IStatus run(IProgressMonitor monitor) { - while (!monitor.isCanceled()) { + protected IStatus run(final IProgressMonitor monitor) { + while (!monitor.isCanceled()) try { Thread.sleep(100); - } catch (InterruptedException e) { + } catch (final InterruptedException e) { return Status.OK_STATUS; } - } monitor.done(); return Status.OK_STATUS; } @@ -318,25 +315,24 @@ public abstract class TmfTrace extends TmfEventProvider // Build a background request for all the trace data. The index is // updated as we go by getNextEvent(). - ITmfEventRequest request = new TmfEventRequest(ITmfEvent.class, TmfTimeRange.ETERNITY, + final ITmfEventRequest request = new TmfEventRequest(ITmfEvent.class, TmfTimeRange.ETERNITY, TmfDataRequest.ALL_DATA, fIndexPageSize, ITmfDataRequest.ExecutionType.BACKGROUND) - { + { ITmfTimestamp startTime = null; ITmfTimestamp lastTime = null; @Override - public void handleData(ITmfEvent event) { + public void handleData(final ITmfEvent event) { super.handleData(event); if (event != null) { - ITmfTimestamp timestamp = event.getTimestamp(); + final ITmfTimestamp timestamp = event.getTimestamp(); if (startTime == null) startTime = timestamp.clone(); lastTime = timestamp.clone(); // Update the trace status at regular intervals - if ((getNbRead() % fIndexPageSize) == 0) { + if ((getNbRead() % fIndexPageSize) == 0) updateTraceStatus(); - } } } @@ -352,7 +348,7 @@ public abstract class TmfTrace extends TmfEventProvider } private synchronized void updateTraceStatus() { - int nbRead = getNbRead(); + final int nbRead = getNbRead(); if (nbRead != 0) { fStartTime = startTime; fEndTime = lastTime; @@ -360,15 +356,15 @@ public abstract class TmfTrace extends TmfEventProvider notifyListeners(); } } - }; + }; - // Submit the request and wait for completion if required - sendRequest((ITmfDataRequest) request); - if (waitForCompletion) - try { - request.waitForCompletion(); - } catch (InterruptedException e) { - } + // Submit the request and wait for completion if required + sendRequest((ITmfDataRequest) request); + if (waitForCompletion) + try { + request.waitForCompletion(); + } catch (final InterruptedException e) { + } } private void notifyListeners() { @@ -383,12 +379,11 @@ public abstract class TmfTrace extends TmfEventProvider * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#seekEvent(org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp) */ @Override - public ITmfContext seekEvent(ITmfTimestamp ts) { + public ITmfContext seekEvent(final ITmfTimestamp ts) { ITmfTimestamp timestamp = ts; - if (timestamp == null) { + if (timestamp == null) timestamp = TmfTimestamp.BIG_BANG; - } // First, find the right checkpoint int index = Collections.binarySearch(fCheckpoints, new TmfCheckpoint(timestamp, null)); @@ -396,27 +391,24 @@ public abstract class TmfTrace extends TmfEventProvider // In the very likely case that the checkpoint was not found, bsearch // returns its negated would-be location (not an offset...). From that // index, we can then position the stream and get the event. - if (index < 0) { + if (index < 0) index = Math.max(0, -(index + 2)); - } // Position the stream at the checkpoint ITmfLocation location; synchronized (fCheckpoints) { if (!fCheckpoints.isEmpty()) { - if (index >= fCheckpoints.size()) { + if (index >= fCheckpoints.size()) index = fCheckpoints.size() - 1; - } location = fCheckpoints.elementAt(index).getLocation(); - } else { + } else location = null; - } } - ITmfContext context = seekLocation(location); + final ITmfContext context = seekLocation(location); context.setRank(index * fIndexPageSize); // And locate the event - ITmfContext nextEventContext = context.clone(); // Must use clone() to get the right subtype... + final ITmfContext nextEventContext = context.clone(); // Must use clone() to get the right subtype... ITmfEvent event = getNextEvent(nextEventContext); while (event != null && event.getTimestamp().compareTo(timestamp, false) < 0) { context.setLocation(nextEventContext.getLocation().clone()); @@ -431,31 +423,29 @@ public abstract class TmfTrace extends TmfEventProvider * @see org.eclipse.linuxtools.tmf.core.trace.ITmfTrace#seekEvent(long) */ @Override - public ITmfContext seekEvent(long rank) { + public ITmfContext seekEvent(final long rank) { // Position the stream at the previous checkpoint int index = (int) rank / fIndexPageSize; ITmfLocation location; synchronized (fCheckpoints) { - if (fCheckpoints.isEmpty()) { + if (fCheckpoints.isEmpty()) location = null; - } else { - if (index >= fCheckpoints.size()) { + else { + if (index >= fCheckpoints.size()) index = fCheckpoints.size() - 1; - } location = fCheckpoints.elementAt(index).getLocation(); } } - ITmfContext context = seekLocation(location); + final ITmfContext context = seekLocation(location); long pos = index * fIndexPageSize; context.setRank(pos); if (pos < rank) { ITmfEvent event = getNextEvent(context); - while (event != null && ++pos < rank) { + while (event != null && ++pos < rank) event = getNextEvent(context); - } } return context; @@ -482,8 +472,8 @@ public abstract class TmfTrace extends TmfEventProvider * @return the corresponding event rank */ @Override - public long getRank(ITmfTimestamp timestamp) { - ITmfContext context = seekEvent(timestamp); + public long getRank(final ITmfTimestamp timestamp) { + final ITmfContext context = seekEvent(timestamp); return context.getRank(); } @@ -491,16 +481,16 @@ public abstract class TmfTrace extends TmfEventProvider // Operators // ------------------------------------------------------------------------ - protected void setTimeRange(TmfTimeRange range) { + protected void setTimeRange(final TmfTimeRange range) { fStartTime = range.getStartTime(); fEndTime = range.getEndTime(); } - protected void setStartTime(ITmfTimestamp startTime) { + protected void setStartTime(final ITmfTimestamp startTime) { fStartTime = startTime; } - protected void setEndTime(ITmfTimestamp endTime) { + protected void setEndTime(final ITmfTimestamp endTime) { fEndTime = endTime; } @@ -509,10 +499,10 @@ public abstract class TmfTrace extends TmfEventProvider // ------------------------------------------------------------------------ @Override - public ITmfContext armRequest(ITmfDataRequest request) { + public ITmfContext armRequest(final ITmfDataRequest request) { if (request instanceof ITmfEventRequest - && !TmfTimestamp.BIG_BANG.equals(((ITmfEventRequest) request).getRange().getStartTime()) && request.getIndex() == 0) { - ITmfContext context = seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); + && !TmfTimestamp.BIG_BANG.equals(((ITmfEventRequest) request).getRange().getStartTime()) && request.getIndex() == 0) { + final ITmfContext context = seekEvent(((ITmfEventRequest) request).getRange().getStartTime()); ((ITmfEventRequest) request).setStartIndex((int) context.getRank()); return context; @@ -529,10 +519,9 @@ public abstract class TmfTrace extends TmfEventProvider */ @SuppressWarnings("unchecked") @Override - public T getNext(ITmfContext context) { - if (context instanceof TmfContext) { - return (T) getNextEvent((TmfContext) context); - } + public T getNext(final ITmfContext context) { + if (context instanceof TmfContext) + return (T) getNextEvent(context); return null; } @@ -548,9 +537,9 @@ public abstract class TmfTrace extends TmfEventProvider * linuxtools.tmf.trace.ITmfTrace.TraceContext) */ @Override - public synchronized ITmfEvent getNextEvent(ITmfContext context) { + public synchronized ITmfEvent getNextEvent(final ITmfContext context) { // parseEvent() does not update the context - ITmfEvent event = parseEvent(context); + final ITmfEvent event = parseEvent(context); if (event != null) { updateIndex(context, context.getRank(), event.getTimestamp()); context.setLocation(getCurrentLocation()); @@ -560,7 +549,7 @@ public abstract class TmfTrace extends TmfEventProvider return event; } - protected synchronized void updateIndex(ITmfContext context, long rank, ITmfTimestamp timestamp) { + protected synchronized void updateIndex(final ITmfContext context, final long rank, final ITmfTimestamp timestamp) { if (fStartTime.compareTo(timestamp, false) > 0) fStartTime = timestamp; if (fEndTime.compareTo(timestamp, false) < 0) @@ -571,10 +560,10 @@ public abstract class TmfTrace extends TmfEventProvider // Build the index as we go along if ((rank % fIndexPageSize) == 0) { // Determine the table position - long position = rank / fIndexPageSize; + final long position = rank / fIndexPageSize; // Add new entry at proper location (if empty) if (fCheckpoints.size() == position) { - ITmfLocation location = context.getLocation().clone(); + final ITmfLocation location = context.getLocation().clone(); fCheckpoints.add(new TmfCheckpoint(timestamp.clone(), location)); // System.out.println(getName() + "[" + (fCheckpoints.size() // - 1) + "] " + timestamp + ", " + location.toString()); @@ -588,7 +577,7 @@ public abstract class TmfTrace extends TmfEventProvider * * @param event */ - protected void processEvent(ITmfEvent event) { + protected void processEvent(final ITmfEvent event) { // Do nothing by default } -- 2.34.1