From 3b38ea61d32131913435350c5299119885c31b69 Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Tue, 9 Nov 2010 16:07:59 +0000 Subject: [PATCH] 2010-11-09 Francois Chouinard Contribution for Bug315307 - Suppress warning for non-externalized strings - Added some externalized strings --- .../ChangeLog | 6 + .../src/JniTraceTest.java | 1 + .../src/LttngTraceTest.java | 1 + .../src/TmfTraceTest.java | 1 + org.eclipse.linuxtools.lttng.jni/ChangeLog | 19 ++ .../linuxtools/lttng/jni/JniEvent.java | 1 + .../linuxtools/lttng/jni/JniMarker.java | 1 + .../linuxtools/lttng/jni/JniMarkerField.java | 7 +- .../linuxtools/lttng/jni/JniTrace.java | 1 + .../linuxtools/lttng/jni/JniTracefile.java | 1 + .../linuxtools/lttng/jni/Jni_C_Common.java | 2 + .../linuxtools/lttng/jni/common/JniTime.java | 1 + .../lttng/jni/common/Jni_C_Constant.java | 1 + .../lttng/jni/common/Jni_C_Pointer.java | 1 + .../lttng/jni/factory/JniTraceFactory.java | 6 +- .../lttng/jni/factory/JniTraceVersion.java | 1 + .../lttng/jni_v2_3/JniTrace_v2_3.java | 2 +- .../lttng/jni_v2_5/JniTrace_v2_5.java | 2 +- .../lttng/jni_v2_6/JniTrace_v2_6.java | 2 +- org.eclipse.linuxtools.lttng.tests/ChangeLog | 32 +++ .../lttng/LttngTestPreparation.java | 1 + .../LTTngSyntheticEventProviderTest.java | 1 + .../lttng/model/LTTngTreeNodeTest.java | 1 + .../StateExperimentManagerTextTest.java | 1 + .../resource/LTTngStateResourceTest.java | 1 + .../lttng/tests/LTTngCoreTestPlugin.java | 1 + .../lttng/tests/event/AllLttngTests.java | 1 + .../tests/event/LttngEventContentTest.java | 1 + .../tests/event/LttngEventFieldTest.java | 2 +- .../tests/event/LttngEventReferenceTest.java | 1 + .../lttng/tests/event/LttngEventTest.java | 1 + .../lttng/tests/event/LttngEventTypeTest.java | 1 + .../lttng/tests/event/LttngTimestampTest.java | 1 + .../lttng/tests/jni/AllJniTests.java | 1 + .../lttng/tests/jni/Combinations.java | 1 + .../lttng/tests/jni/JniEventTest.java | 1 + .../lttng/tests/jni/JniMarkerFieldTest.java | 1 + .../lttng/tests/jni/JniMarkerTest.java | 1 + .../lttng/tests/jni/JniTraceTest.java | 2 +- .../lttng/tests/jni/JniTracefileTest.java | 1 + .../lttng/tests/state/TestStateManager.java | 1 + .../tests/state/handlers/AbsStateUpdate.java | 1 + .../after/StateAfterUpdateHandlers.java | 1 + .../before/StateBeforeUpdateHandlers.java | 1 + .../state/tests/handlers/AbsStateUpdate.java | 1 + .../tests/trace/LTTngExperimentTest.java | 1 + .../lttng/tests/trace/LTTngTextTraceTest.java | 1 + .../lttng/tests/trace/LTTngTraceTest.java | 1 + .../ChangeLog | 7 + .../lttng/stubs/LTTngTimestampStub.java | 1 + .../lttng/stubs/LTTngTraceStub.java | 1 + org.eclipse.linuxtools.lttng.ui/ChangeLog | 87 ++++++++ .../linuxtools/lttng/ui/LTTngUiPlugin.java | 2 +- .../linuxtools/lttng/ui/TraceDebug.java | 4 +- .../lttng/ui/views/PerspectiveFactory.java | 12 +- .../ui/views/common/AbsTimeUpdateView.java | 43 ++-- .../lttng/ui/views/control/ControlView.java | 2 +- .../ui/views/controlflow/ControlFlowView.java | 75 +++---- .../evProcessor/AbsFlowTRangeUpdate.java | 9 +- .../evProcessor/FlowFinishUpdateHandler.java | 11 +- .../ui/views/controlflow/messages.properties | 13 +- .../model/FlowProcessContainer.java | 3 +- .../lttng/ui/views/events/EventsTable.java | 10 +- .../lttng/ui/views/events/EventsView.java | 3 +- .../lttng/ui/views/events/Messages.java | 19 ++ .../lttng/ui/views/events/messages.properties | 5 + .../HistogramCanvasPaintListener.java | 5 +- .../ui/views/histogram/HistogramConstant.java | 16 +- .../ui/views/histogram/HistogramContent.java | 2 + .../ui/views/histogram/HistogramView.java | 28 +-- .../lttng/ui/views/histogram/Messages.java | 17 ++ .../ParentHistogramCanvasPaintListener.java | 5 +- .../ui/views/histogram/TimeTextGroup.java | 6 +- .../ui/views/histogram/messages.properties | 3 + .../ui/views/project/LTTngProjectNature.java | 2 +- .../lttng/ui/views/project/ProjectView.java | 7 +- .../views/project/dialogs/AddTraceWizard.java | 6 +- .../project/dialogs/AddTraceWizardPage.java | 6 +- .../project/dialogs/ImportTraceWizard.java | 7 +- .../dialogs/ImportTraceWizardPage.java | 8 +- .../ui/views/project/dialogs/Messages.java | 19 ++ .../views/project/dialogs/messages.properties | 5 + .../project/handlers/OpenTraceHandler.java | 4 +- .../handlers/RenameExperimentHandler.java | 4 +- .../handlers/RenameProjectHandler.java | 4 +- .../project/handlers/RenameTraceHandler.java | 4 +- .../model/LTTngProjectLabelProvider.java | 6 +- .../views/project/model/LTTngProjectNode.java | 4 +- .../ui/views/resources/ResourcesView.java | 83 +++---- .../evProcessor/AbsResourcesTRangeUpdate.java | 8 +- .../resources/model/ResourceContainer.java | 5 +- .../ui/views/statistics/StatisticsView.java | 23 +- .../statistics/model/StatisticsData.java | 6 +- .../ui/views/timeframe/TimeFrameView.java | 3 +- org.eclipse.linuxtools.lttng/ChangeLog | 24 ++ .../eclipse/linuxtools/lttng/TraceDebug.java | 1 + .../linuxtools/lttng/event/LttngEvent.java | 1 + .../lttng/event/LttngEventContent.java | 1 + .../lttng/event/LttngEventField.java | 1 + .../lttng/event/LttngEventType.java | 1 + .../lttng/event/LttngTimestamp.java | 1 + .../AbsEventToHandlerResolver.java | 4 +- .../evProcessor/state/AbsStateProcessing.java | 11 +- .../evProcessor/state/AbsStateUpdate.java | 10 +- .../state/model/LttngExecutionState.java | 1 + .../lttng/state/model/LttngProcessState.java | 1 + .../lttng/state/model/LttngTraceState.java | 1 + .../lttng/state/model/LttngTrapState.java | 1 + .../lttng/state/trace/StateTraceManager.java | 1 + .../lttng/trace/LTTngExperiment.java | 1 + .../linuxtools/lttng/trace/LTTngTrace.java | 1 + .../lttng/trace/LTTngTraceVersion.java | 1 + org.eclipse.linuxtools.tmf.tests/ChangeLog | 42 ++++ .../tmf/tests/TmfCorePluginTest.java | 1 + .../tmf/tests/TmfCoreTestPlugin.java | 1 + .../tests/component/TmfEventProviderTest.java | 1 + .../component/TmfProviderManagerTest.java | 1 + .../linuxtools/tmf/tests/event/AllTests.java | 1 + .../tmf/tests/event/TmfEventContentTest.java | 1 + .../tmf/tests/event/TmfEventFieldTest.java | 1 + .../tests/event/TmfEventReferenceTest.java | 1 + .../tmf/tests/event/TmfEventSourceTest.java | 1 + .../tmf/tests/event/TmfEventTest.java | 1 + .../tmf/tests/event/TmfEventTypeTest.java | 1 + .../tmf/tests/event/TmfTimeRangeTest.java | 2 +- .../tmf/tests/event/TmfTimestampTest.java | 1 + .../tmf/tests/event/TmfTraceEventTest.java | 1 + .../tmf/tests/experiment/AllTests.java | 1 + .../tests/experiment/TmfExperimentTest.java | 1 + .../TmfMultiTraceExperimentTest.java | 1 + .../tmf/tests/request/AllTests.java | 1 + .../request/TmfCoalescedDataRequestTest.java | 1 + .../request/TmfCoalescedEventRequestTest.java | 1 + .../tmf/tests/request/TmfDataRequestTest.java | 1 + .../tests/request/TmfEventRequestTest.java | 1 + .../tests/request/TmfRequestExecutorTest.java | 1 + .../linuxtools/tmf/tests/trace/AllTests.java | 1 + .../tmf/tests/trace/TmfCheckpointTest.java | 1 + .../tmf/tests/trace/TmfContextTest.java | 1 + .../tmf/tests/trace/TmfExperimentTest.java | 1 + .../tmf/tests/trace/TmfLocationTest.java | 1 + .../tmf/tests/trace/TmfTraceTest.java | 1 + .../linuxtools/tmf/CreateTestFiles.java | 1 + .../tmf/component/TmfClientStub.java | 1 + .../tmf/component/TmfDataProviderStub.java | 1 + .../tmf/component/TmfEventProviderStub.java | 1 + .../TmfSyntheticEventProviderStub.java | 1 + .../tmf/event/TmfEventContentStub.java | 1 + .../tmf/event/TmfEventTypeStub.java | 1 + .../tmf/trace/TmfEventParserStub.java | 1 + .../linuxtools/tmf/trace/TmfTraceStub.java | 1 + org.eclipse.linuxtools.tmf.ui.tests/ChangeLog | 8 + .../tmf/ui/tests/TmfUITestPlugin.java | 1 + .../test/stub/adaption/TsfImplProvider.java | 2 +- .../test/stub/model/TraceImpl.java | 2 +- .../stub/model/TraceModelImplFactory.java | 1 + .../test/stub/views/TsfTraceAnalysisView.java | 1 + org.eclipse.linuxtools.tmf.ui/ChangeLog | 57 +++++ .../linuxtools/tmf/ui/TmfUiPlugin.java | 2 +- .../tmf/ui/TmfUiPreferenceInitializer.java | 4 +- .../ui/dialogs/ManageCustomParsersDialog.java | 14 +- .../linuxtools/tmf/ui/editors/TmfEditor.java | 2 +- .../tmf/ui/editors/TmfEventsEditor.java | 6 +- .../ui/editors/TmfMultiPageEditorPart.java | 2 +- .../tmf/ui/parsers/ParserProviderManager.java | 6 +- .../tmf/ui/parsers/custom/CustomEvent.java | 4 +- .../ui/parsers/custom/CustomEventsTable.java | 4 +- .../parsers/custom/CustomParserProvider.java | 10 +- .../parsers/custom/CustomTraceDefinition.java | 8 +- .../tmf/ui/parsers/custom/CustomTxtEvent.java | 4 +- .../tmf/ui/parsers/custom/CustomTxtTrace.java | 4 +- .../custom/CustomTxtTraceDefinition.java | 48 ++-- .../tmf/ui/parsers/custom/CustomXmlEvent.java | 4 +- .../tmf/ui/parsers/custom/CustomXmlTrace.java | 24 +- .../custom/CustomXmlTraceDefinition.java | 42 ++-- .../tmf/ui/parsers/custom/Messages.java | 42 ++++ .../tmf/ui/parsers/custom/messages.properties | 28 +++ .../tmf/ui/viewers/events/TmfEventsTable.java | 2 +- .../timeAnalysis/TmfTimeAnalysisProvider.java | 10 +- .../timeAnalysis/TmfTimeAnalysisViewer.java | 8 +- .../dialogs/TmfTimeFilterDialog.java | 4 +- .../timeAnalysis/widgets/TimeScaleCtrl.java | 86 ++++---- .../widgets/TmfTimeStatesCtrl.java | 9 +- .../widgets/TmfTimeTipHandler.java | 19 +- .../viewers/timeAnalysis/widgets/Utils.java | 84 +++---- .../tmf/ui/views/TmfEventsView.java | 9 +- .../tmf/ui/views/project/ProjectView.java | 12 +- .../ui/views/project/TmfProjectNature.java | 2 +- .../views/project/dialogs/AddTraceWizard.java | 8 +- .../project/dialogs/AddTraceWizardPage.java | 6 +- .../project/dialogs/ImportTraceWizard.java | 6 +- .../ui/views/project/dialogs/Messages.java | 19 ++ .../project/dialogs/NewExperimentDialog.java | 2 +- .../project/dialogs/NewProjectWizard.java | 2 +- .../views/project/dialogs/messages.properties | 5 + .../project/handlers/RefreshHandler.java | 2 +- .../handlers/RenameExperimentHandler.java | 4 +- .../handlers/RenameProjectHandler.java | 4 +- .../project/handlers/RenameTraceHandler.java | 4 +- .../SelectParserContributionItem.java | 9 +- .../project/handlers/SelectParserHandler.java | 2 +- .../model/TmfProjectLabelProvider.java | 6 +- .../views/project/model/TmfProjectNode.java | 4 +- .../CustomTxtParserInputWizardPage.java | 190 ++++++++-------- .../CustomTxtParserOutputWizardPage.java | 16 +- .../CustomXmlParserInputWizardPage.java | 206 +++++++++--------- .../CustomXmlParserOutputWizardPage.java | 16 +- .../linuxtools/tmf/ui/wizards/Messages.java | 120 ++++++++++ .../tmf/ui/wizards/messages.properties | 106 +++++++++ org.eclipse.linuxtools.tmf/ChangeLog | 52 +++++ .../eclipse/linuxtools/tmf/TmfCorePlugin.java | 2 +- .../org/eclipse/linuxtools/tmf/Tracer.java | 1 + .../tmf/component/TmfDataProvider.java | 22 +- .../tmf/component/TmfEventProvider.java | 4 +- .../linuxtools/tmf/event/TmfEvent.java | 1 + .../linuxtools/tmf/event/TmfEventContent.java | 1 + .../linuxtools/tmf/event/TmfEventField.java | 1 + .../tmf/event/TmfEventReference.java | 1 + .../linuxtools/tmf/event/TmfEventSource.java | 1 + .../linuxtools/tmf/event/TmfEventType.java | 7 +- .../linuxtools/tmf/event/TmfTimeRange.java | 1 + .../linuxtools/tmf/event/TmfTimestamp.java | 3 +- .../linuxtools/tmf/event/TmfTraceEvent.java | 1 + .../tmf/experiment/TmfExperiment.java | 3 +- .../tmf/experiment/TmfExperimentLocation.java | 1 + .../tmf/request/TmfCoalescedDataRequest.java | 1 + .../tmf/request/TmfCoalescedEventRequest.java | 1 + .../tmf/request/TmfDataRequest.java | 15 +- .../tmf/request/TmfEventRequest.java | 1 + .../tmf/request/TmfRequestExecutor.java | 7 +- .../signal/TmfExperimentSelectedSignal.java | 1 + .../signal/TmfExperimentUpdatedSignal.java | 1 + .../tmf/signal/TmfSignalTracer.java | 2 +- .../tmf/signal/TmfTimeSynchSignal.java | 1 + .../tmf/signal/TmfTraceClosedSignal.java | 1 + .../tmf/signal/TmfTraceOpenedSignal.java | 1 + .../signal/TmfTraceParserUpdatedSignal.java | 1 + .../tmf/signal/TmfTraceSelectedSignal.java | 1 + .../tmf/signal/TmfTraceUpdatedSignal.java | 1 + .../linuxtools/tmf/trace/TmfCheckpoint.java | 1 + .../linuxtools/tmf/trace/TmfContext.java | 3 +- .../linuxtools/tmf/trace/TmfLocation.java | 3 +- .../linuxtools/tmf/trace/TmfTrace.java | 1 + 243 files changed, 1582 insertions(+), 741 deletions(-) create mode 100644 org.eclipse.linuxtools.lttng.headless/ChangeLog create mode 100644 org.eclipse.linuxtools.lttng.ui.tests/ChangeLog create mode 100644 org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java create mode 100644 org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties create mode 100644 org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/Messages.java create mode 100644 org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/messages.properties create mode 100644 org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/Messages.java create mode 100644 org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/messages.properties create mode 100644 org.eclipse.linuxtools.tmf.ui.tests/ChangeLog create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/Messages.java create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/messages.properties create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/Messages.java create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/messages.properties create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/Messages.java create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/messages.properties diff --git a/org.eclipse.linuxtools.lttng.headless/ChangeLog b/org.eclipse.linuxtools.lttng.headless/ChangeLog new file mode 100644 index 0000000000..acf06db7ad --- /dev/null +++ b/org.eclipse.linuxtools.lttng.headless/ChangeLog @@ -0,0 +1,6 @@ +2010-11-09 Francois Chouinard + + Suppress warning for non-externalized strings + * src/JniTraceTest.java: + * src/LttngTraceTest.java: + * src/TmfTraceTest.java: \ No newline at end of file diff --git a/org.eclipse.linuxtools.lttng.headless/src/JniTraceTest.java b/org.eclipse.linuxtools.lttng.headless/src/JniTraceTest.java index 8cd2a2fb23..992d30ab8e 100644 --- a/org.eclipse.linuxtools.lttng.headless/src/JniTraceTest.java +++ b/org.eclipse.linuxtools.lttng.headless/src/JniTraceTest.java @@ -18,6 +18,7 @@ import org.eclipse.linuxtools.lttng.jni.common.JniTime; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; +@SuppressWarnings("nls") public class JniTraceTest { public static void main(String[] args) { diff --git a/org.eclipse.linuxtools.lttng.headless/src/LttngTraceTest.java b/org.eclipse.linuxtools.lttng.headless/src/LttngTraceTest.java index ae273ecd18..e497881919 100644 --- a/org.eclipse.linuxtools.lttng.headless/src/LttngTraceTest.java +++ b/org.eclipse.linuxtools.lttng.headless/src/LttngTraceTest.java @@ -19,6 +19,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfContext; import org.eclipse.linuxtools.tmf.trace.TmfTrace; +@SuppressWarnings("nls") public class LttngTraceTest { /** diff --git a/org.eclipse.linuxtools.lttng.headless/src/TmfTraceTest.java b/org.eclipse.linuxtools.lttng.headless/src/TmfTraceTest.java index 6775ea7514..73a3e61cad 100644 --- a/org.eclipse.linuxtools.lttng.headless/src/TmfTraceTest.java +++ b/org.eclipse.linuxtools.lttng.headless/src/TmfTraceTest.java @@ -19,6 +19,7 @@ import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.request.TmfEventRequest; import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +@SuppressWarnings("nls") public class TmfTraceTest extends TmfEventRequest { @SuppressWarnings("unchecked") diff --git a/org.eclipse.linuxtools.lttng.jni/ChangeLog b/org.eclipse.linuxtools.lttng.jni/ChangeLog index 5e713b7097..243f081aeb 100644 --- a/org.eclipse.linuxtools.lttng.jni/ChangeLog +++ b/org.eclipse.linuxtools.lttng.jni/ChangeLog @@ -1,3 +1,22 @@ +2010-11-09 Francois Chouinard + + Suppress warning for non-externalized strings + * src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java (getReferenceToString): + * src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java (toString): + * src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java (toString): + * src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java (TraceVersion_v2_3): + * src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java (toString): + * src/org/eclipse/linuxtools/lttng/jni/Jni_C_Common.java (printC): + (printlnC): + * src/org/eclipse/linuxtools/lttng/jni/JniEvent.java (toString): + * src/org/eclipse/linuxtools/lttng/jni/JniMarker.java (toString): + * src/org/eclipse/linuxtools/lttng/jni/JniMarkerField.java (toString): + * src/org/eclipse/linuxtools/lttng/jni/JniTrace.java (toString): + * src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java (toString): + * src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java (LIBRARY_NAME): + * src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java (LIBRARY_NAME): + * src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java (LIBRARY_NAME): + 2010-10-29 Francois Chouinard * src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java (equals): Optimization diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java index 7350229bb2..290cb35d8b 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniEvent.java @@ -459,6 +459,7 @@ public abstract class JniEvent extends Jni_C_Common implements Comparable * @return String Attributes of the object concatenated in String */ @Override + @SuppressWarnings("nls") public String toString() { String returnData = ""; diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java index 5cf7a60aaf..dd3609c758 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Constant.java @@ -44,6 +44,7 @@ public abstract class Jni_C_Constant { * * @return The Java hashed UID of the object (i.e. : NAME@HASH) */ + @SuppressWarnings("nls") public String getReferenceToString() { return this.getClass().getName() + "@" + Integer.toHexString(this.hashCode()); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java index 3519dfe048..b04be0f4b1 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/Jni_C_Pointer.java @@ -89,6 +89,7 @@ public class Jni_C_Pointer extends Jni_C_Constant { * @return Attributes of the object concatenated in String */ @Override + @SuppressWarnings("nls") public String toString() { String returnData = "0x"; diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java index ac15628331..2b11b1550d 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceFactory.java @@ -33,9 +33,9 @@ public class JniTraceFactory { // Version string of the supported library version // These will be used in the switch below to find the correct version // *** - static final String TraceVersion_v2_3 = "2.3"; - static final String TraceVersion_v2_5 = "2.5"; - static final String TraceVersion_v2_6 = "2.6"; + static final String TraceVersion_v2_3 = "2.3"; //$NON-NLS-1$ + static final String TraceVersion_v2_5 = "2.5"; //$NON-NLS-1$ + static final String TraceVersion_v2_6 = "2.6"; //$NON-NLS-1$ /* * Default constructor is forbidden diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java index 4b1e6f0e29..62f0ec9f1a 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java @@ -229,6 +229,7 @@ public class JniTraceVersion { @Override + @SuppressWarnings("nls") public String toString() { return "JniTraceVersion [" + majorNumber + "." + minorNumber + "]"; } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java index 5794d57dc5..4e6468f3cb 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_3/JniTrace_v2_3.java @@ -30,7 +30,7 @@ public class JniTrace_v2_3 extends JniTrace { // This is the dynamic library name that is passed to the library loader (liblttvlibraryloader.so) to load. // It needs to be a complete name, like "libXYZ.so", unlike java that would take "XYZ". It could also take a complete path. // The library need to be accessible, i.e. LD_LIBRARY_PATH need to be set correctly. - private static final String LIBRARY_NAME = "liblttvtraceread-2.3.so"; + private static final String LIBRARY_NAME = "liblttvtraceread-2.3.so"; //$NON-NLS-1$ /* * Forbid access to the default constructor diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java index ebea39f877..03a7f4c88b 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_5/JniTrace_v2_5.java @@ -30,7 +30,7 @@ public class JniTrace_v2_5 extends JniTrace { // This is the dynamic library name that is passed to the library loader (liblttvlibraryloader.so) to load. // It needs to be a complete name, like "libXYZ.so", unlike java that would take "XYZ". It could also take a complete path. // The library need to be accessible, i.e. LD_LIBRARY_PATH need to be set correctly. - private static final String LIBRARY_NAME = "liblttvtraceread-2.5.so"; + private static final String LIBRARY_NAME = "liblttvtraceread-2.5.so"; //$NON-NLS-1$ /* * Forbid access to the default constructor diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java index 5339456548..b2961821b5 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni_v2_6/JniTrace_v2_6.java @@ -30,7 +30,7 @@ public class JniTrace_v2_6 extends JniTrace { // This is the dynamic library name that is passed to the library loader (liblttvlibraryloader.so) to load. // It needs to be a complete name, like "libXYZ.so", unlike java that would take "XYZ". It could also take a complete path. // The library need to be accessible, i.e. LD_LIBRARY_PATH need to be set correctly. - private static final String LIBRARY_NAME = "liblttvtraceread-2.6.so"; + private static final String LIBRARY_NAME = "liblttvtraceread-2.6.so"; //$NON-NLS-1$ /* * Forbid access to the default constructor diff --git a/org.eclipse.linuxtools.lttng.tests/ChangeLog b/org.eclipse.linuxtools.lttng.tests/ChangeLog index 1149e0cffa..ea215e1999 100644 --- a/org.eclipse.linuxtools.lttng.tests/ChangeLog +++ b/org.eclipse.linuxtools.lttng.tests/ChangeLog @@ -1,3 +1,35 @@ +2010-11-09 Francois Chouinard + + Suppress warning for non-externalized strings + * src/org/eclipse/linuxtools/lttng/control/LTTngSyntheticEventProviderTest.java: + * src/org/eclipse/linuxtools/lttng/LttngTestPreparation.java: + * src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java: + * src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManagerTextTest.java: + * src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResourceTest.java: + * src/org/eclipse/linuxtools/lttng/tests/event/AllLttngTests.java: + * src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java: + * src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java: + * src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java: + * src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java: + * src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java: + * src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java: + * src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java: + * src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java: + * src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java: + * src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java: + * src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java: + * src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java: + * src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java: + * src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java: + * src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java: + * src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java: + * src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java: + * src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java: + * src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java: + * src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java: + * src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java: + * src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java: + 2010-10-27 Francois Chouinard * src/org/eclipse/linuxtools/lttng/LttngTestPreparation.java (prepareExperimentContext): Event provider adjustment diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/LttngTestPreparation.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/LttngTestPreparation.java index 708339ac20..9157c15c37 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/LttngTestPreparation.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/LttngTestPreparation.java @@ -25,6 +25,7 @@ import org.eclipse.linuxtools.tmf.request.TmfEventRequest; import org.eclipse.linuxtools.tmf.signal.TmfExperimentSelectedSignal; import org.eclipse.linuxtools.tmf.trace.ITmfTrace; +@SuppressWarnings("nls") public abstract class LttngTestPreparation extends TestCase { // ======================================================================== // Data diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/control/LTTngSyntheticEventProviderTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/control/LTTngSyntheticEventProviderTest.java index ae1536ce4f..ddbf5c6f31 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/control/LTTngSyntheticEventProviderTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/control/LTTngSyntheticEventProviderTest.java @@ -16,6 +16,7 @@ import org.eclipse.linuxtools.lttng.event.LttngEvent; import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.request.TmfEventRequest; +@SuppressWarnings("nls") public class LTTngSyntheticEventProviderTest extends LttngTestPreparation { // ======================================================================== // Tests diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java index 68dab475f5..996e43ec9b 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/model/LTTngTreeNodeTest.java @@ -17,6 +17,7 @@ import junit.framework.TestCase; * @author alvaro * */ +@SuppressWarnings("nls") public class LTTngTreeNodeTest extends TestCase { // ======================================================================= // Data diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManagerTextTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManagerTextTest.java index 3e1c23b78d..814c94ffea 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManagerTextTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/experiment/StateExperimentManagerTextTest.java @@ -21,6 +21,7 @@ import org.eclipse.linuxtools.tmf.experiment.TmfExperiment; * @author alvaro * */ +@SuppressWarnings("nls") public class StateExperimentManagerTextTest extends LttngTestPreparation { /** diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResourceTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResourceTest.java index b8840ef9c5..686188c180 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResourceTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/state/resource/LTTngStateResourceTest.java @@ -23,6 +23,7 @@ import org.eclipse.linuxtools.tmf.trace.ITmfTrace; * @author alvaro * */ +@SuppressWarnings("nls") public class LTTngStateResourceTest extends TestCase { // ======================================================================= // Data diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java index c7764fbd68..68cdcd4441 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/LTTngCoreTestPlugin.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.Plugin; *

* The activator class controls the plug-in life cycle */ +@SuppressWarnings("nls") public class LTTngCoreTestPlugin extends Plugin { // ======================================================================== diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLttngTests.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLttngTests.java index a14db9a859..b2c32d6b7b 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLttngTests.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/AllLttngTests.java @@ -4,6 +4,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import org.eclipse.linuxtools.lttng.tests.trace.LTTngTextTraceTest;; +@SuppressWarnings("nls") public final class AllLttngTests extends TestCase { public static TestSuite suite() { TestSuite suite = new TestSuite("Testing LTTng (trace in text format)"); diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java index 546fd68996..e18a3f9321 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java @@ -42,6 +42,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfLocation; public String toString() */ +@SuppressWarnings("nls") public class LttngEventContentTest extends TestCase { private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt"; // private final static boolean skipIndexing=true; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java index 25b4227eac..64b3936878 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java @@ -24,7 +24,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfLocation; public String toString() */ - +@SuppressWarnings("nls") public class LttngEventFieldTest extends TestCase { private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt"; private final static boolean skipIndexing=true; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java index 24897aadab..5c01b3bee8 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventReferenceTest.java @@ -26,6 +26,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfContext; public String toString() */ +@SuppressWarnings("nls") public class LttngEventReferenceTest extends TestCase { private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt"; private final static boolean skipIndexing=true; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java index 66f59cefc9..3ce3e99abe 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java @@ -40,6 +40,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfLocation; public String toString() */ +@SuppressWarnings("nls") public class LttngEventTest extends TestCase { private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt"; private final static boolean skipIndexing=true; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java index a2ff91ed61..c55ce5da56 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTypeTest.java @@ -24,6 +24,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfContext; public String toString() */ +@SuppressWarnings("nls") public class LttngEventTypeTest extends TestCase { private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt"; private final static boolean skipIndexing=true; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java index d8e60136e7..d2c9bdc8f2 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngTimestampTest.java @@ -27,6 +27,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfContext; public String toString() */ +@SuppressWarnings("nls") public class LttngTimestampTest extends TestCase { private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt"; private final static boolean skipIndexing=true; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java index d93756cfa8..3a97ce5060 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/AllJniTests.java @@ -4,6 +4,7 @@ package org.eclipse.linuxtools.lttng.tests.jni; import junit.framework.TestCase; import junit.framework.TestSuite; +@SuppressWarnings("nls") public final class AllJniTests extends TestCase { public static TestSuite suite() { TestSuite suite = new TestSuite("Testing JNI"); diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java index 27dca2fbbf..97a0ebdb9a 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/Combinations.java @@ -21,6 +21,7 @@ import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; * @author alvaro * */ +@SuppressWarnings("nls") public class Combinations extends TestCase { private final static boolean printLttDebug = false; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java index a3bcf2d340..5c99f830ab 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java @@ -39,6 +39,7 @@ import org.eclipse.linuxtools.lttng.jni.common.JniTime; import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; +@SuppressWarnings("nls") public class JniEventTest extends TestCase { private final static boolean printLttDebug = false; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java index 1d4fb5be7b..f476b62998 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java @@ -22,6 +22,7 @@ import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; public void printMarkerFieldInformation() */ +@SuppressWarnings("nls") public class JniMarkerFieldTest extends TestCase { private final static boolean printLttDebug = false; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java index 739b9c085f..5fa2e9c1fd 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java @@ -24,6 +24,7 @@ import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; public void printMarkerInformation() */ +@SuppressWarnings("nls") public class JniMarkerTest extends TestCase { private final static boolean printLttDebug = false; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java index 8f39a935ee..3fb6de8ab1 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java @@ -53,7 +53,7 @@ import junit.framework.TestCase; public String toString() */ - +@SuppressWarnings("nls") public class JniTraceTest extends TestCase { private final static boolean printLttDebug = false; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java index 76fd529519..3fb4b6f54a 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java @@ -52,6 +52,7 @@ import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; public void printTracefileInformation() */ +@SuppressWarnings("nls") public class JniTracefileTest extends TestCase { private final static boolean printLttDebug = false; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java index 8c80e309bd..c26126ab1f 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/TestStateManager.java @@ -20,6 +20,7 @@ import org.eclipse.linuxtools.lttng.trace.LTTngTrace; * @author alvaro * */ +@SuppressWarnings("nls") public class TestStateManager extends TestCase { /** diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java index 1e4f71afee..f7e930fe00 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/AbsStateUpdate.java @@ -9,6 +9,7 @@ import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState; import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; import org.eclipse.linuxtools.tmf.event.TmfEventField; +@SuppressWarnings("nls") public abstract class AbsStateUpdate implements ILttngEventProcessor { // ======================================================================== diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java index 4e9ca93f40..01c6ea67f2 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/after/StateAfterUpdateHandlers.java @@ -28,6 +28,7 @@ import org.eclipse.linuxtools.lttng.tests.state.handlers.AbsStateUpdate; * @author alvaro * */ +@SuppressWarnings("nls") class StateAfterUpdateHandlers { final ILttngEventProcessor getSyscallEntryHandler() { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java index 58a842a337..efa9ed37a9 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/handlers/before/StateBeforeUpdateHandlers.java @@ -28,6 +28,7 @@ import org.eclipse.linuxtools.lttng.tests.state.handlers.AbsStateUpdate; * @author alvaro * */ +@SuppressWarnings("nls") class StateBeforeUpdateHandlers { final ILttngEventProcessor getSyscallEntryHandler() { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java index 7b708d32b3..05e32af183 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/state/tests/handlers/AbsStateUpdate.java @@ -9,6 +9,7 @@ import org.eclipse.linuxtools.lttng.state.model.LttngExecutionState; import org.eclipse.linuxtools.lttng.state.model.LttngTraceState; import org.eclipse.linuxtools.tmf.event.TmfEventField; +@SuppressWarnings("nls") public abstract class AbsStateUpdate implements ILttngEventProcessor { // ======================================================================== diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java index 4704b0d4e9..5e151f210c 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngExperimentTest.java @@ -34,6 +34,7 @@ import org.eclipse.linuxtools.tmf.trace.ITmfTrace; *

* TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class LTTngExperimentTest extends TestCase { private static final String DIRECTORY = "traceset"; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java index d741623172..fc03e8304b 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTextTraceTest.java @@ -31,6 +31,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfLocation; public int getCpuNumber() { */ +@SuppressWarnings("nls") public class LTTngTextTraceTest extends TestCase { private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt"; diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java index 3717266136..2c9ffc22a3 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/trace/LTTngTraceTest.java @@ -31,6 +31,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfContext; public int getCpuNumber() { */ +@SuppressWarnings("nls") public class LTTngTraceTest extends TestCase { private final static String tracepath1="traceset/trace-15316events_nolost_newformat"; diff --git a/org.eclipse.linuxtools.lttng.ui.tests/ChangeLog b/org.eclipse.linuxtools.lttng.ui.tests/ChangeLog new file mode 100644 index 0000000000..8e86580ec0 --- /dev/null +++ b/org.eclipse.linuxtools.lttng.ui.tests/ChangeLog @@ -0,0 +1,7 @@ +2010-11-09 Francois Chouinard + + Suppress warning for non-externalized strings + * stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java: + * stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java: + + \ No newline at end of file diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java index 77cdee6a59..4ea5823488 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTimestampStub.java @@ -9,6 +9,7 @@ import org.eclipse.linuxtools.tmf.event.TmfTimestamp; * @author francois * */ +@SuppressWarnings("nls") public class LTTngTimestampStub extends TmfTimestamp { /** diff --git a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java index 8678522629..bb9916cb69 100644 --- a/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java +++ b/org.eclipse.linuxtools.lttng.ui.tests/stubs/org/eclipse/linuxtools/lttng/stubs/LTTngTraceStub.java @@ -30,6 +30,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfTrace; *

* Dummy test trace. Use in conjunction with LTTngEventParserStub. */ +@SuppressWarnings("nls") public class LTTngTraceStub extends TmfTrace { // ======================================================================== diff --git a/org.eclipse.linuxtools.lttng.ui/ChangeLog b/org.eclipse.linuxtools.lttng.ui/ChangeLog index de18dc32d7..d97103b3d0 100644 --- a/org.eclipse.linuxtools.lttng.ui/ChangeLog +++ b/org.eclipse.linuxtools.lttng.ui/ChangeLog @@ -1,3 +1,90 @@ +2010-11-09 Francois Chouinard + + Externalized Strings + * src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java: New file. + * src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties: New file. + * src/org/eclipse/linuxtools/lttng/ui/views/histogram/Messages.java: New file. + * src/org/eclipse/linuxtools/lttng/ui/views/histogram/messages.properties: New file. + * src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/Messages.java: New file. + * src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/messages.properties: New file. + + Suppress warning for non-externalized strings + * src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java (PLUGIN_ID): + * src/org/eclipse/linuxtools/lttng/ui/TraceDebug.java: + * src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java (processingCompleted): + (synchToTimeRange): + (tsfTmProcessSelEvent): + (processDataRequest): + (.handleData): + (.handleCompleted): + (modelInputChanged): + * src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java: + * src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java (PROCESS_COLUMN): + (ViewContentProvider.inputChanged): + (ViewProcessFilter.select): + (createPartControl): + (makeActions): + (initialExperimentDataRequest): + (checkForSWTBugItemHeightAdjustement): + * src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java (addLocalProcess): + (makeDraw): + * src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java (process): + * src/org/eclipse/linuxtools/lttng/ui/views/controlflow/messages.properties: + * src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java (toString): + * src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java (TIMESTAMP_COLUMN): + * src/org/eclipse/linuxtools/lttng/ui/views/events/EventsView.java (toString): + * src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramCanvasPaintListener.java (DATA_KEY): + (paintControl): + * src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramConstant.java (formatNanoSecondsTime): + (convertStringToNanoseconds): + * src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramContent.java (printContentInfo): + (printTable): + * src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java (ID): + (WINDOW_TIMESPAN_LABEL_TEXT): + (createPartControl): + (resetControlsContent): + * src/org/eclipse/linuxtools/lttng/ui/views/histogram/ParentHistogramCanvasPaintListener.java (DATA_KEY): + (paintControl): + * src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeTextGroup.java (LONGEST_STRING_VALUE): + (TimeTextGroup): + * src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java (ID): + (createInitialLayout): + * src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java (init): + (addPages): + (performFinish): + * src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java (AddTraceWizardPage): + (createControl): + * src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java (IMPORT_WIZARD): + (ImportTraceWizard): + (init): + * src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java (getTraceDirectory): + (getTracepath): + * src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java (execute): + * src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java (execute): + * src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java (execute): + * src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java (execute): + * src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java: + * src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java (fOpenedProjectIcon): + (getText): + * src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java: + * src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java (ProjectView): + (toString): + (createContextMenu): + * src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java (addLocalResource): + (makeDraw): + * src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java (equals): + (toString): + * src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java (ID): + (makeActions): + (initialExperimentDataRequest): + * src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java (ROOT): + (getProcessName): + * src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java (.getText): + (StatisticsView): + (createPartControl): + (requestData): + * src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java (toString): + 2010-11-05 Francois Chouinard * src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java: Made the call to updateScroll() asynchronous diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java index 37e709163b..50f444a5be 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/LTTngUiPlugin.java @@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext; public class LTTngUiPlugin extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.ui"; + public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.ui"; //$NON-NLS-1$ // The shared instance private static LTTngUiPlugin plugin; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/TraceDebug.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/TraceDebug.java index 8dd82a9d8c..4a58f7e6ba 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/TraceDebug.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/TraceDebug.java @@ -12,6 +12,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; +@SuppressWarnings("nls") public class TraceDebug { static boolean DEBUG = false; static boolean INFO = false; @@ -22,8 +23,7 @@ public class TraceDebug { private static Plugin plugin = LTTngUiPlugin.getDefault(); private static String pluginID = LTTngUiPlugin.PLUGIN_ID; - private static SimpleDateFormat stimeformat = new SimpleDateFormat( - "HH:mm:ss:SSS"); + private static SimpleDateFormat stimeformat = new SimpleDateFormat("HH:mm:ss:SSS"); // Note: files are created in $HOME static private PrintWriter fCFVfile = null; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java index 91884830b4..5f71aa2b09 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/PerspectiveFactory.java @@ -32,7 +32,7 @@ import org.eclipse.ui.IPerspectiveFactory; public class PerspectiveFactory implements IPerspectiveFactory { // Perspective ID - public static final String ID = "org.eclipse.linuxtools.lttng.ui.perspective"; + public static final String ID = "org.eclipse.linuxtools.lttng.ui.perspective"; //$NON-NLS-1$ // LTTng views private static final String PROJECT_VIEW_ID = ProjectView.ID; @@ -61,26 +61,26 @@ public class PerspectiveFactory implements IPerspectiveFactory { addPerspectiveShortcuts(layout); // Create the top left folder - IFolderLayout topLeftFolder = layout.createFolder("topLeftFolder", IPageLayout.LEFT, 0.15f, IPageLayout.ID_EDITOR_AREA); + IFolderLayout topLeftFolder = layout.createFolder("topLeftFolder", IPageLayout.LEFT, 0.15f, IPageLayout.ID_EDITOR_AREA); //$NON-NLS-1$ topLeftFolder.addView(PROJECT_VIEW_ID); topLeftFolder.addView(CONTROL_VIEW_ID); // Create the bottom left folder - IFolderLayout bottomLeftFolder = layout.createFolder("bottomLeftFolder", IPageLayout.BOTTOM, 0.50f, "topLeftFolder"); + IFolderLayout bottomLeftFolder = layout.createFolder("bottomLeftFolder", IPageLayout.BOTTOM, 0.50f, "topLeftFolder"); //$NON-NLS-1$ //$NON-NLS-2$ bottomLeftFolder.addView(PROPERTIES_VIEW_ID); // Create the middle right folder - IFolderLayout topRightFolder = layout.createFolder("topRightFolder", IPageLayout.TOP, 0.50f, IPageLayout.ID_EDITOR_AREA); + IFolderLayout topRightFolder = layout.createFolder("topRightFolder", IPageLayout.TOP, 0.50f, IPageLayout.ID_EDITOR_AREA); //$NON-NLS-1$ topRightFolder.addView(CONTROL_FLOW_VIEW_ID); topRightFolder.addView(RESOURCES_VIEW_ID); topRightFolder.addView(STATISTICS_VIEW_ID); // Create the middle right folder - IFolderLayout middleRightFolder = layout.createFolder("middleRightFolder", IPageLayout.BOTTOM, 0.50f, "topRightFolder"); + IFolderLayout middleRightFolder = layout.createFolder("middleRightFolder", IPageLayout.BOTTOM, 0.50f, "topRightFolder"); //$NON-NLS-1$//$NON-NLS-2$ middleRightFolder.addView(EVENTS_VIEW_ID); // Create the bottom right folder - IFolderLayout bottomRightFolder = layout.createFolder("bottomRightFolder", IPageLayout.BOTTOM, 0.65f, "middleRightFolder"); + IFolderLayout bottomRightFolder = layout.createFolder("bottomRightFolder", IPageLayout.BOTTOM, 0.65f, "middleRightFolder"); //$NON-NLS-1$ //$NON-NLS-2$ bottomRightFolder.addView(TIME_FRAME_VIEW_ID); bottomRightFolder.addView(HISTOGRAM_VIEW_ID); bottomRightFolder.addView(PROBLEM_VIEW_ID); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java index b3871a3782..3b52200aa9 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/common/AbsTimeUpdateView.java @@ -158,14 +158,14 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu if (TraceDebug.isDEBUG()) { TmfTimeRange trange = request.getRange(); if (request.isCancelled()) { - TraceDebug.debug("Request cancelled " - + trange.getStartTime() + "-" + trange.getEndTime() - + " Handled Events: " + request.getSynEventCount() - + " " + request.toString(), 15); + TraceDebug.debug("Request cancelled " //$NON-NLS-1$ + + trange.getStartTime() + "-" + trange.getEndTime() //$NON-NLS-1$ + + " Handled Events: " + request.getSynEventCount() //$NON-NLS-1$ + + " " + request.toString(), 15); //$NON-NLS-1$ } else if (request.isFailed()) { - TraceDebug.debug("Request Failed " + trange.getStartTime() - + "-" + trange.getEndTime() + " Handled Events: " - + request.getSynEventCount() + " " + TraceDebug.debug("Request Failed " + trange.getStartTime() //$NON-NLS-1$ + + "-" + trange.getEndTime() + " Handled Events: " //$NON-NLS-1$ //$NON-NLS-2$ + + request.getSynEventCount() + " " //$NON-NLS-1$ + request.toString()); } } @@ -209,7 +209,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu TmfTimeRange trange = signal.getCurrentRange(); TmfExperiment experiment = TmfExperiment.getCurrentExperiment(); if (experiment == null) { - TraceDebug.debug("Current selected experiment is null"); + TraceDebug.debug("Current selected experiment is null"); //$NON-NLS-1$ return; } @@ -262,7 +262,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu paramUpdater.setSelectedTime(selTimens); if (TraceDebug.isDEBUG()) { - TraceDebug.debug("Selected Time: " + new LttngTimestamp(selTimens) + "\n\t\t" + getName()); + TraceDebug.debug("Selected Time: " + new LttngTimestamp(selTimens) + "\n\t\t" + getName()); //$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -372,7 +372,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu TmfTimeRange experimentTRange, boolean clearingData, ExecutionType execType) { // Validate input if (requestTrange == null || experimentTRange == null) { - TraceDebug.debug("Invalid input"); + TraceDebug.debug("Invalid input"); //$NON-NLS-1$ return false; } @@ -427,7 +427,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu if (TraceDebug.isDEBUG()) { frunningTimeStamp = event.getTimestamp(); - TraceDebug.debug("handled: " + fCount + " sequence: " + synEvent.getSynType()); + TraceDebug.debug("handled: " + fCount + " sequence: " + synEvent.getSynType()); //$NON-NLS-1$ //$NON-NLS-2$ } } break; @@ -470,8 +470,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu if (TraceDebug.isDEBUG()) { if (frunningTimeStamp != null) { - TraceDebug.debug("Last event time stamp: " - + frunningTimeStamp.getValue()); + TraceDebug.debug("Last event time stamp: " + frunningTimeStamp.getValue()); //$NON-NLS-1$ } } } @@ -634,7 +633,7 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu if ((paramUpdater != null) && (tsfviewer != null) && (!tsfviewer.getControl().isDisposed())) { final Long selTime = paramUpdater.getSelectedTime(); if (selTime != null) { - TraceDebug.debug("View: " + getName() + "\n\t\tRestoring the selected time to: " + selTime); + TraceDebug.debug("View: " + getName() + "\n\t\tRestoring the selected time to: " + selTime); //$NON-NLS-1$ //$NON-NLS-2$ Display display = tsfviewer.getControl().getDisplay(); display.asyncExec(new Runnable() { @Override @@ -661,14 +660,14 @@ public abstract class AbsTimeUpdateView extends TmfView implements IRequestStatu int dicardedNotVisible = paramUpdater.getEventsDiscardedNotVisible(); TmfTimeRange range = request.getRange(); - StringBuilder sb = new StringBuilder("View: " + getName() + ", Events handled: " + count - + ", Events loaded in view: " + eventCount + ", Number of events discarded: " + discarded - + "\n\tNumber of events discarded with start time earlier than next good time: " - + discardedOutofOrder + "\n\tDiscarded Not visible: " + dicardedNotVisible - + "\n\tDiscarded out of view Range: " + discardedOutofViewRange); - - sb.append("\n\t\tRequested Time Range: " + range.getStartTime() + "-" + range.getEndTime()); - sb.append("\n\t\tExperiment Time Range: " + experimentStartTime + "-" + experimentEndTime); + StringBuilder sb = new StringBuilder("View: " + getName() + ", Events handled: " + count //$NON-NLS-1$ //$NON-NLS-2$ + + ", Events loaded in view: " + eventCount + ", Number of events discarded: " + discarded //$NON-NLS-1$ //$NON-NLS-2$ + + "\n\tNumber of events discarded with start time earlier than next good time: " //$NON-NLS-1$ + + discardedOutofOrder + "\n\tDiscarded Not visible: " + dicardedNotVisible //$NON-NLS-1$ + + "\n\tDiscarded out of view Range: " + discardedOutofViewRange); //$NON-NLS-1$ + + sb.append("\n\t\tRequested Time Range: " + range.getStartTime() + "-" + range.getEndTime()); //$NON-NLS-1$ //$NON-NLS-2$ + sb.append("\n\t\tExperiment Time Range: " + experimentStartTime + "-" + experimentEndTime); //$NON-NLS-1$ //$NON-NLS-2$ TraceDebug.debug(sb.toString()); } } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java index 5571fac589..516de49517 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/ControlView.java @@ -22,7 +22,7 @@ import org.eclipse.ui.part.ViewPart; */ public class ControlView extends ViewPart { - public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.control"; + public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.control"; //$NON-NLS-1$ /** * diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java index abc7b479f5..08fb940b0e 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/ControlFlowView.java @@ -91,20 +91,21 @@ public class ControlFlowView extends AbsTimeUpdateView implements ITmfTimeSelectionListener, ITmfTimeScaleSelectionListener, ITmfTimeFilterSelectionListener { - public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.controlflow"; + public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.controlflow"; //$NON-NLS-1$ // ======================================================================== // Table data // ======================================================================== - private final String PROCESS_COLUMN = "Process"; - private final String BRAND_COLUMN = "Brand"; - private final String PID_COLUMN = "PID"; - private final String TGID_COLUMN = "TGID"; - private final String PPID_COLUMN = "PPID"; - private final String CPU_COLUMN = "CPU"; - private final String BIRTH_SEC_COLUMN = "Birth sec"; - private final String BIRTH_NSEC_COLUMN = "Birth nsec"; - private final String TRACE = "TRACE"; + + private final String PROCESS_COLUMN = Messages.getString("ControlFlowView.processColumn"); //$NON-NLS-1$ + private final String BRAND_COLUMN = Messages.getString("ControlFlowView.brandColumn"); //$NON-NLS-1$ + private final String PID_COLUMN = Messages.getString("ControlFlowView.pidColumn"); //$NON-NLS-1$ + private final String TGID_COLUMN = Messages.getString("ControlFlowView.tgidColumn"); //$NON-NLS-1$ + private final String PPID_COLUMN = Messages.getString("ControlFlowView.ppidColumn"); //$NON-NLS-1$ + private final String CPU_COLUMN = Messages.getString("ControlFlowView.cpuColumn"); //$NON-NLS-1$ + private final String BIRTH_SEC_COLUMN = Messages.getString("ControlFlowView.birthSecColumn"); //$NON-NLS-1$ + private final String BIRTH_NSEC_COLUMN = Messages.getString("ControlFlowView.birthNSecColumn"); //$NON-NLS-1$ + private final String TRACE = Messages.getString("ControlFlowView.TraceNameColumn"); //$NON-NLS-1$ private final String[] columnNames = new String[] { PROCESS_COLUMN, /* */ BRAND_COLUMN,/* */ @@ -167,9 +168,9 @@ public class ControlFlowView extends AbsTimeUpdateView implements public void inputChanged(Viewer v, Object oldInput, Object newInput) { this.elements = (ITmfTimeAnalysisEntry[]) newInput; if (elements != null) { - TraceDebug.debug("Total number of processes provided to Control Flow view: " + elements.length); + TraceDebug.debug("Total number of processes provided to Control Flow view: " + elements.length); //$NON-NLS-1$ } else { - TraceDebug.debug("New input = null"); + TraceDebug.debug("New input = null"); //$NON-NLS-1$ } } @@ -280,7 +281,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements return false; } } else { - TraceDebug.debug("Unexpected type of filter element received: " + TraceDebug.debug("Unexpected type of filter element received: " //$NON-NLS-1$ + element.toString()); } // Compare element versus a list of filtered out @@ -559,7 +560,7 @@ public class ControlFlowView extends AbsTimeUpdateView implements // initialize widget time boundaries and filtering parameters ModelUpdateInit(experimentTRange, adjustedTimeRange, this); } else { - TraceDebug.debug("No selected experiment information available"); + TraceDebug.debug("No selected experiment information available"); //$NON-NLS-1$ } } @@ -647,8 +648,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements .getString("ControlFlowView.Action.Reset.ToolTip")); //$NON-NLS-1$ resetScale.setImageDescriptor(AbstractUIPlugin .imageDescriptorFromPlugin(Messages - .getString("ControlFlowView.tmf.UI"), - "icons/home_nav.gif")); + .getString("ControlFlowView.tmf.UI"), //$NON-NLS-1$ + "icons/home_nav.gif")); //$NON-NLS-1$ // nextEvent nextEvent = new Action() { @@ -665,8 +666,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements .getString("ControlFlowView.Action.NextEvent.Tooltip")); //$NON-NLS-1$ nextEvent.setImageDescriptor(AbstractUIPlugin .imageDescriptorFromPlugin(Messages - .getString("ControlFlowView.tmf.UI"), - "icons/next_event.gif")); + .getString("ControlFlowView.tmf.UI"), //$NON-NLS-1$ + "icons/next_event.gif")); //$NON-NLS-1$ // prevEvent prevEvent = new Action() { @@ -683,8 +684,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements .getString("ControlFlowView.Action.PrevEvent.Tooltip")); //$NON-NLS-1$ prevEvent.setImageDescriptor(AbstractUIPlugin .imageDescriptorFromPlugin(Messages - .getString("ControlFlowView.tmf.UI"), - "icons/prev_event.gif")); + .getString("ControlFlowView.tmf.UI"), //$NON-NLS-1$ + "icons/prev_event.gif")); //$NON-NLS-1$ // nextTrace nextTrace = new Action() { @@ -701,8 +702,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements .getString("ControlFlowView.Action.NextProcess.ToolTip")); //$NON-NLS-1$ nextTrace.setImageDescriptor(AbstractUIPlugin .imageDescriptorFromPlugin(Messages - .getString("ControlFlowView.tmf.UI"), - "icons/next_item.gif")); + .getString("ControlFlowView.tmf.UI"), //$NON-NLS-1$ + "icons/next_item.gif")); //$NON-NLS-1$ // prevTrace prevTrace = new Action() { @@ -719,8 +720,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements .getString("ControlFlowView.Action.PreviousProcess.Tooltip")); //$NON-NLS-1$ prevTrace.setImageDescriptor(AbstractUIPlugin .imageDescriptorFromPlugin(Messages - .getString("ControlFlowView.tmf.UI"), - "icons/prev_item.gif")); + .getString("ControlFlowView.tmf.UI"), //$NON-NLS-1$ + "icons/prev_item.gif")); //$NON-NLS-1$ // showLegend showLegend = new Action() { @@ -750,8 +751,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements .getString("ControlFlowView.Action.Filter.ToolTip")); //$NON-NLS-1$ filterTraces.setImageDescriptor(AbstractUIPlugin .imageDescriptorFromPlugin(Messages - .getString("ControlFlowView.tmf.UI"), - "icons/filter_items.gif")); + .getString("ControlFlowView.tmf.UI"), //$NON-NLS-1$ + "icons/filter_items.gif")); //$NON-NLS-1$ // zoomIn zoomIn = new Action() { @@ -766,8 +767,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements zoomIn.setToolTipText(Messages .getString("ControlFlowView.Action.ZoomIn.Tooltip")); //$NON-NLS-1$ zoomIn.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( - Messages.getString("ControlFlowView.tmf.UI"), - "icons/zoomin_nav.gif")); + Messages.getString("ControlFlowView.tmf.UI"), //$NON-NLS-1$ + "icons/zoomin_nav.gif")); //$NON-NLS-1$ // zoomOut zoomOut = new Action() { @@ -782,8 +783,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements zoomOut.setToolTipText(Messages .getString("ControlFlowView.Action.ZoomOut.tooltip")); //$NON-NLS-1$ zoomOut.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( - Messages.getString("ControlFlowView.tmf.UI"), - "icons/zoomout_nav.gif")); + Messages.getString("ControlFlowView.tmf.UI"), //$NON-NLS-1$ + "icons/zoomout_nav.gif")); //$NON-NLS-1$ // zoomFilter zoomFilter = new Action() { @@ -799,8 +800,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements .getString("ControlFlowView.Action.ZoomFilter.tooltip")); //$NON-NLS-1$ zoomFilter.setImageDescriptor(AbstractUIPlugin .imageDescriptorFromPlugin(Messages - .getString("ControlFlowView.tmf.UI"), - "icons/filter_items.gif")); + .getString("ControlFlowView.tmf.UI"), //$NON-NLS-1$ + "icons/filter_items.gif")); //$NON-NLS-1$ zoomFilter.setChecked(false); // PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_ELCL_SYNCED); @@ -1070,8 +1071,8 @@ public class ControlFlowView extends AbsTimeUpdateView implements dataRequest(initTimeWindow, experimentTRange, true, ExecutionType.FOREGROUND); if (TraceDebug.isDEBUG()) { - TraceDebug.debug("Initialization request time range is: " - + initTimeWindow.getStartTime().toString() + "-" + TraceDebug.debug("Initialization request time range is: " //$NON-NLS-1$ + + initTimeWindow.getStartTime().toString() + "-" //$NON-NLS-1$ + initTimeWindow.getEndTime().toString()); } @@ -1084,14 +1085,14 @@ public class ControlFlowView extends AbsTimeUpdateView implements // public int checkForSWTBugItemHeightAdjustement() { int returnedAjustement = 0; - String desktopSessionName = System.getenv("DESKTOP_SESSION"); + String desktopSessionName = System.getenv("DESKTOP_SESSION"); //$NON-NLS-1$ // Gnome : most common case, no adjustement - if ( desktopSessionName.equals("gnome") ) { + if ( desktopSessionName.equals("gnome") ) { //$NON-NLS-1$ returnedAjustement = 0; } // Kde : ajustement of 2 is needed - else if ( desktopSessionName.equals("kde") ) { + else if ( desktopSessionName.equals("kde") ) { //$NON-NLS-1$ returnedAjustement = 2; } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java index 7ba863f8e3..7e39e75843 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/AbsFlowTRangeUpdate.java @@ -44,7 +44,7 @@ public abstract class AbsFlowTRangeUpdate extends AbsTRangeUpdate implements ILt // TimeRangeEventProcess localProcess = new TimeRangeEventProcess(id, name, startTime, stopTime, groupName, className) TimeRangeEventProcess localProcess = new TimeRangeEventProcess( procContainer.getUniqueId(), stateProcess.getName(), - traceStartTime, traceEndTime, "", stateProcess.getType() + traceStartTime, traceEndTime, "", stateProcess.getType() //$NON-NLS-1$ .getInName(), stateProcess.getCpu(), stateProcess .getInsertion_time()); @@ -60,7 +60,7 @@ public abstract class AbsFlowTRangeUpdate extends AbsTRangeUpdate implements ILt procContainer.addItem(localProcess); if (TraceDebug.isCFV()) { - TraceDebug.traceCFV("addLocalProcess():" + localProcess); + TraceDebug.traceCFV("addLocalProcess():" + localProcess); //$NON-NLS-1$ } return localProcess; @@ -112,7 +112,10 @@ public abstract class AbsFlowTRangeUpdate extends AbsTRangeUpdate implements ILt ParamsUpdater params, String stateMode) { if (TraceDebug.isCFV()) { - TraceDebug.traceCFV("makeDraw():[" + localProcess + ",candidate=[stime=" + startTime + ",etime=" + endTime + ",state=" + stateMode + "]]"); + TraceDebug.traceCFV("makeDraw():[" + localProcess + //$NON-NLS-1$ + ",candidate=[stime=" + startTime + //$NON-NLS-1$ + ",etime=" + endTime + //$NON-NLS-1$ + ",state=" + stateMode + "]]"); //$NON-NLS-1$ //$NON-NLS-2$ } // Determine start and end times to establish duration diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java index bf6b37ae15..e502e868f7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/evProcessor/FlowFinishUpdateHandler.java @@ -49,8 +49,7 @@ public class FlowFinishUpdateHandler extends AbsFlowTRangeUpdate endOfEvent = endOfTrace; } - TraceDebug.debug("Number of localProcesses: " - + procContainer.readItems().length); + TraceDebug.debug("Number of localProcesses: " + procContainer.readItems().length); //$NON-NLS-1$ // to identify the process relevant to the traceState String traceId = traceSt.getTraceId(); int numLocalFound = 0; @@ -90,7 +89,7 @@ public class FlowFinishUpdateHandler extends AbsFlowTRangeUpdate // not contain events related to this process makeDraw(traceSt, nextGoodTime, endOfEvent, localProcess, params, stateMode); } else { - TraceDebug.debug("previous event not instance of TimeRangeEvent?: " + TraceDebug.debug("previous event not instance of TimeRangeEvent?: " //$NON-NLS-1$ + prevEvent.getClass().getSimpleName()); } } else { @@ -106,9 +105,9 @@ public class FlowFinishUpdateHandler extends AbsFlowTRangeUpdate makeDraw(traceSt, endOfEvent, stateProcess, localProcess, params); } - TraceDebug.debug("Print Last Event: NumLocalFound " + numLocalFound - + "; NumLocalNotFound: " + numLocalNotFound - + "; NumWithNoChildren: " + numWithNoChildren); + TraceDebug.debug("Print Last Event: NumLocalFound " + numLocalFound //$NON-NLS-1$ + + "; NumLocalNotFound: " + numLocalNotFound //$NON-NLS-1$ + + "; NumWithNoChildren: " + numWithNoChildren); //$NON-NLS-1$ return false; } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/messages.properties b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/messages.properties index 0260851313..9c42384cc9 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/messages.properties +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/messages.properties @@ -14,13 +14,22 @@ ControlFlowView.Action.PreviousProcess=PreviousProcess ControlFlowView.Action.PreviousProcess.Tooltip=Select Previous Process ControlFlowView.Action.Reset=Reset ControlFlowView.Action.Reset.ToolTip=Reset the Time Scale to Default -ControlFlowView.Action.Synchronize=Synchronise -ControlFlowView.Action.Synchronize.ToolTip=Synchronise by listening to external API selection calls +ControlFlowView.Action.Synchronize=Synchronize +ControlFlowView.Action.Synchronize.ToolTip=Synchronize by listening to external API selection calls ControlFlowView.Action.ZoomIn=Zoom In ControlFlowView.Action.ZoomIn.Tooltip=Zoom In ControlFlowView.Action.ZoomOut=Zoom Out ControlFlowView.Action.ZoomOut.tooltip=Zoom Out ControlFlowView.Action.ZoomFilter=Zoom Filter ControlFlowView.Action.ZoomFilter.tooltip=Display elements with events within the zoomed time window +ControlFlowView.birthNSecColumn=Birth nsec +ControlFlowView.birthSecColumn=Birth sec +ControlFlowView.brandColumn=Brand +ControlFlowView.cpuColumn=CPU ControlFlowView.msgSlogan=Control Flow View +ControlFlowView.pidColumn=PID +ControlFlowView.ppidColumn=PPID +ControlFlowView.processColumn=Process +ControlFlowView.tgidColumn=TGID ControlFlowView.tmf.UI=org.eclipse.linuxtools.tmf.ui +ControlFlowView.TraceNameColumn=TRACE diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java index f70fead441..c90df4abd7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/controlflow/model/FlowProcessContainer.java @@ -250,7 +250,8 @@ class ProcessKey { } - @Override + @Override + @SuppressWarnings("nls") public String toString() { if ( valueRef != null ) { // return (valueRef.getPid().toString() + ":" + diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java index 81dad5e35c..4b4f94ea64 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java @@ -26,11 +26,11 @@ public class EventsTable extends TmfEventsTable { // ------------------------------------------------------------------------ // Table column names - static private final String TIMESTAMP_COLUMN = "Timestamp"; - static private final String SOURCE_COLUMN = "Source"; - static private final String TYPE_COLUMN = "Type"; - static private final String REFERENCE_COLUMN = "Reference"; - static private final String CONTENT_COLUMN = "Content"; + static private final String TIMESTAMP_COLUMN = Messages.EventsTable_timestampColumn; + static private final String SOURCE_COLUMN = Messages.EventsTable_sourceColumn; + static private final String TYPE_COLUMN = Messages.EventsTable_typeColumn; + static private final String REFERENCE_COLUMN = Messages.EventsTable_referenceColumn; + static private final String CONTENT_COLUMN = Messages.EventsTable_contentColumn; static private final String[] COLUMN_NAMES = new String[] { TIMESTAMP_COLUMN, SOURCE_COLUMN, diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsView.java index b96f962e42..381da5a078 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsView.java @@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Composite; */ public class EventsView extends TmfEventsView { - public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.events"; + public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.events"; //$NON-NLS-1$ private static final int BUFFERED_EVENTS = 1000; @@ -44,6 +44,7 @@ public class EventsView extends TmfEventsView { * @see java.lang.Object#toString() */ @Override + @SuppressWarnings("nls") public String toString() { return "[EventsView]"; } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java new file mode 100644 index 0000000000..c3dfaa9695 --- /dev/null +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java @@ -0,0 +1,19 @@ +package org.eclipse.linuxtools.lttng.ui.views.events; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.events.messages"; //$NON-NLS-1$ + public static String EventsTable_contentColumn; + public static String EventsTable_referenceColumn; + public static String EventsTable_sourceColumn; + public static String EventsTable_timestampColumn; + public static String EventsTable_typeColumn; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties new file mode 100644 index 0000000000..f7d177be18 --- /dev/null +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties @@ -0,0 +1,5 @@ +EventsTable_contentColumn=Content +EventsTable_referenceColumn=Reference +EventsTable_sourceColumn=Source +EventsTable_timestampColumn=Timestamp +EventsTable_typeColumn=Type diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramCanvasPaintListener.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramCanvasPaintListener.java index 94d71aeb3e..f94ce74285 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramCanvasPaintListener.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramCanvasPaintListener.java @@ -53,11 +53,12 @@ public class HistogramCanvasPaintListener implements PaintListener * * @param event The generated paint event when redraw is called. */ + private final String DATA_KEY = "double-buffer-image"; //$NON-NLS-1$ @Override public void paintControl(PaintEvent event) { if (childrenCanvas.getSize().x > 0 && childrenCanvas.getSize().y > 0) { - Image image = (Image) childrenCanvas.getData("double-buffer-image"); + Image image = (Image) childrenCanvas.getData(DATA_KEY); // Creates new image only absolutely necessary. if (image == null @@ -70,7 +71,7 @@ public class HistogramCanvasPaintListener implements PaintListener childrenCanvas.getBounds().height ); - childrenCanvas.setData("double-buffer-image", image); + childrenCanvas.setData(DATA_KEY, image); } // Initializes the graphics context of the image. diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramConstant.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramConstant.java index e6ce8bcf06..0d8b866557 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramConstant.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramConstant.java @@ -76,15 +76,15 @@ public abstract class HistogramConstant { // If our number has over 9 digits, just add a dot after the ninth digits if ( returnedTime.length() > 9 ) { - returnedTime = returnedTime.substring(0, returnedTime.length() - 9 ) + "." + returnedTime.substring( returnedTime.length() - 9 ); + returnedTime = returnedTime.substring(0, returnedTime.length() - 9 ) + "." + returnedTime.substring( returnedTime.length() - 9 ); //$NON-NLS-1$ } // Otherwise, patch missing decimal with 0 else { int curSize = returnedTime.length(); for (int l=0; (curSize+l)< 9; l++) { - returnedTime = "0" + returnedTime; + returnedTime = "0" + returnedTime; //$NON-NLS-1$ } - returnedTime = "0." + returnedTime; + returnedTime = "0." + returnedTime; //$NON-NLS-1$ } return returnedTime; @@ -105,14 +105,14 @@ public abstract class HistogramConstant { try { // Avoid simple commat/dot mistake - timeString = timeString.replace(",", "."); + timeString = timeString.replace(",", "."); //$NON-NLS-1$ //$NON-NLS-2$ // If we have a dot, we have a decimal number to convert - int dotPosition = timeString.indexOf("."); + int dotPosition = timeString.indexOf("."); //$NON-NLS-1$ // If the user begun the line with a dot, we add a zero if ( dotPosition == 0 ) { - timeString = "0" + timeString; + timeString = "0" + timeString; //$NON-NLS-1$ dotPosition = 1; } @@ -124,7 +124,7 @@ public abstract class HistogramConstant { if ( decimalNumber <= 9 ) { StringBuffer strBuffer = new StringBuffer(timeString); for ( int nbDec=decimalNumber; nbDec<9; nbDec++) { - strBuffer.append("0"); + strBuffer.append("0"); //$NON-NLS-1$ } timeString = strBuffer.toString(); } @@ -140,7 +140,7 @@ public abstract class HistogramConstant { returnedNumber = (long)(dblMaxTimerange * 1000000000.0); } catch (NumberFormatException e) { - System.out.println("Warning : Could not convert string into nanoseconds (convertStringToLong)"); + System.out.println("Warning : Could not convert string into nanoseconds (convertStringToLong)"); //$NON-NLS-1$ } return returnedNumber; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramContent.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramContent.java index c552b93984..a0fd0bb8a2 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramContent.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramContent.java @@ -180,6 +180,7 @@ public class HistogramContent { /** * Print all HistogramContent attributes, but the elements table. */ + @SuppressWarnings("nls") public void printContentInfo() { System.out.println("startTime : " + startTime); System.out.println("endTime : " + endTime ); @@ -194,6 +195,7 @@ public class HistogramContent { /** * Print the data in the elements table.

*/ + @SuppressWarnings("nls") public void printTable() { for ( int x=0; x " + elementTable[x].intervalNbEvents + ":" + elementTable[x].intervalHeight + " (" + elementTable[x].firstIntervalTimestamp + ")"); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java index f63ee5d39e..63cf7464e7 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java @@ -73,7 +73,7 @@ public class HistogramView extends TmfView implements ControlListener { // at run time. There should be a view of some kind of "menu" to allow the user to change them while executing. // Most of the pertinent values are in HistogramConstant.java or in this file. - public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.histogram"; + public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.histogram"; //$NON-NLS-1$ // "Minimum" screen width size. On smaller screen, we will apply several space saving technique private static final int SCREEN_SMALL_IF_SMALLER_THAN = 1600; @@ -141,13 +141,9 @@ public class HistogramView extends TmfView implements ControlListener { private Text txtWindowMinNbEvents = null; // We move the time label to header from TimeTextGroup.java -// protected static final String NANOSEC_LABEL = "(sec)"; -// private static final String WINDOW_TIMERANGE_LABEL_TEXT = "Window Timerange, " + NANOSEC_LABEL; -// private static final String WINDOW_CURRENT_TIME_LABEL_TEXT = "Cursor Centered on, " + NANOSEC_LABEL; -// private static final String EVENT_CURRENT_TIME_LABEL_TEXT = "Current Event Time, " + NANOSEC_LABEL; - private static final String WINDOW_TIMESPAN_LABEL_TEXT = "Window Span (sec)"; - private static final String WINDOW_CENTER_TIME_LABEL_TEXT = "Window Center (sec)"; - private static final String CURRENT_EVENT_TIME_LABEL_TEXT = "Current Event (sec)"; + private static final String WINDOW_TIMESPAN_LABEL_TEXT = Messages.HistogramView_windowSpanLabel; + private static final String WINDOW_CENTER_TIME_LABEL_TEXT = Messages.HistogramView_windowCenterLabel; + private static final String CURRENT_EVENT_TIME_LABEL_TEXT = Messages.HistogramView_currentEventLabel; private TimeTextGroup ntgWindowTimeSpan = null; private TimeTextGroup ntgWindowCenterTime = null; private TimeTextGroup ntgCurrentEventTime = null; @@ -316,7 +312,7 @@ public class HistogramView extends TmfView implements ControlListener { txtWindowMaxNbEvents.setFont(smallFont); txtWindowMaxNbEvents.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND)); txtWindowMaxNbEvents.setEditable(false); - txtWindowMaxNbEvents.setText("0"); + txtWindowMaxNbEvents.setText("0"); //$NON-NLS-1$ txtWindowMaxNbEvents.setLayoutData(gridDataWindowMaxEvents); GridData gridDataWindowMinEvents = new GridData(); @@ -328,7 +324,7 @@ public class HistogramView extends TmfView implements ControlListener { txtWindowMinNbEvents.setFont(smallFont); txtWindowMinNbEvents.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND)); txtWindowMinNbEvents.setEditable(false); - txtWindowMinNbEvents.setText("0"); + txtWindowMinNbEvents.setText("0"); //$NON-NLS-1$ txtWindowMinNbEvents.setLayoutData(gridDataWindowMinEvents); GridData gridDataWindowStart = new GridData(); @@ -338,7 +334,7 @@ public class HistogramView extends TmfView implements ControlListener { txtWindowStartTime.setFont(smallFont); txtWindowStartTime.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND)); txtWindowStartTime.setEditable(false); - txtWindowStartTime.setText("0.000000000"); + txtWindowStartTime.setText("0.000000000"); //$NON-NLS-1$ txtWindowStartTime.setLayoutData(gridDataWindowStart); GridData gridDataWindowStop = new GridData(); @@ -348,7 +344,7 @@ public class HistogramView extends TmfView implements ControlListener { txtWindowStopTime.setFont(smallFont); txtWindowStopTime.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND)); txtWindowStopTime.setEditable(false); - txtWindowStopTime.setText("0.000000000"); + txtWindowStopTime.setText("0.000000000"); //$NON-NLS-1$ txtWindowStopTime.setLayoutData(gridDataWindowStop); @@ -445,7 +441,7 @@ public class HistogramView extends TmfView implements ControlListener { gridDataExperimentStart.verticalAlignment = SWT.BOTTOM; txtExperimentStartTime = new Text(layoutExperimentHistogram, SWT.READ_ONLY); txtExperimentStartTime.setFont(smallFont); - txtExperimentStartTime.setText("0.000000000"); + txtExperimentStartTime.setText("0.000000000"); //$NON-NLS-1$ txtExperimentStartTime.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND)); txtExperimentStartTime.setEditable(false); txtExperimentStartTime.setLayoutData(gridDataExperimentStart); @@ -455,7 +451,7 @@ public class HistogramView extends TmfView implements ControlListener { gridDataExperimentStop.verticalAlignment = SWT.BOTTOM; txtExperimentStopTime = new Text(layoutExperimentHistogram, SWT.READ_ONLY); txtExperimentStopTime.setFont(smallFont); - txtExperimentStopTime.setText("0.000000000"); + txtExperimentStopTime.setText("0.000000000"); //$NON-NLS-1$ txtExperimentStopTime.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND)); txtExperimentStopTime.setEditable(false); txtExperimentStopTime.setLayoutData(gridDataExperimentStop); @@ -973,8 +969,8 @@ public class HistogramView extends TmfView implements ControlListener { txtExperimentStopTime.setText( stopTime ); txtExperimentStartTime.getParent().layout(); - txtWindowMaxNbEvents.setText("" + 0); - txtWindowMinNbEvents.setText("" + 0); + txtWindowMaxNbEvents.setText("" + 0); //$NON-NLS-1$ + txtWindowMinNbEvents.setText("" + 0); //$NON-NLS-1$ txtWindowStartTime.setText( HistogramConstant.formatNanoSecondsTime( 0L ) ); txtWindowStopTime.setText( HistogramConstant.formatNanoSecondsTime( 0L ) ); txtWindowStartTime.getParent().layout(); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/Messages.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/Messages.java new file mode 100644 index 0000000000..595b21f31c --- /dev/null +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/Messages.java @@ -0,0 +1,17 @@ +package org.eclipse.linuxtools.lttng.ui.views.histogram; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.histogram.messages"; //$NON-NLS-1$ + public static String HistogramView_currentEventLabel; + public static String HistogramView_windowCenterLabel; + public static String HistogramView_windowSpanLabel; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/ParentHistogramCanvasPaintListener.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/ParentHistogramCanvasPaintListener.java index a5c2fedc79..63ca7e392b 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/ParentHistogramCanvasPaintListener.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/ParentHistogramCanvasPaintListener.java @@ -163,11 +163,12 @@ public class ParentHistogramCanvasPaintListener extends HistogramCanvasPaintList * * @param event The generated paint event when redraw is called. */ + private final String DATA_KEY = "double-buffer-image"; //$NON-NLS-1$ @Override public void paintControl(PaintEvent event) { if (parentCanvas.getSize().x > 0 && parentCanvas.getSize().y > 0) { - Image image = (Image) parentCanvas.getData("double-buffer-image"); + Image image = (Image) parentCanvas.getData(DATA_KEY); // Creates new image only absolutely necessary. if (image == null @@ -180,7 +181,7 @@ public class ParentHistogramCanvasPaintListener extends HistogramCanvasPaintList parentCanvas.getClientArea().height ); - parentCanvas.setData("double-buffer-image", image); + parentCanvas.setData(DATA_KEY, image); // isFinished = false; } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeTextGroup.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeTextGroup.java index 96c0a47511..3d760d0b54 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeTextGroup.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/TimeTextGroup.java @@ -40,7 +40,7 @@ public class TimeTextGroup implements FocusListener, KeyListener { // 2010-06-10 Yuriy: Has been moved to header into HistogramView.java protected static final String NANOSEC_LABEL = "sec"; */ - private static final String LONGEST_STRING_VALUE = "." + Long.MAX_VALUE; + private static final String LONGEST_STRING_VALUE = "." + Long.MAX_VALUE; //$NON-NLS-1$ private static final int MAX_CHAR_IN_TEXTBOX = LONGEST_STRING_VALUE.length(); // The "small font" height used to display time will be "default font" minus this constant @@ -68,7 +68,7 @@ public class TimeTextGroup implements FocusListener, KeyListener { * @param groupStyle Style of the group. Anything that suite a Text */ public TimeTextGroup(HistogramView newParentView, Composite parent, int textStyle, int groupStyle) { - this(newParentView, parent, textStyle, groupStyle, "", HistogramConstant.formatNanoSecondsTime(0L), false); + this(newParentView, parent, textStyle, groupStyle, "", HistogramConstant.formatNanoSecondsTime(0L), false); //$NON-NLS-1$ } /** @@ -81,7 +81,7 @@ public class TimeTextGroup implements FocusListener, KeyListener { * @param isSpaceSaverNeeded Value that tell if we try to save some space in the control. */ public TimeTextGroup(HistogramView newParentView, Composite parent, int textStyle, int groupStyle, boolean isSpaceSaverNeeded) { - this(newParentView, parent, textStyle, groupStyle, "", HistogramConstant.formatNanoSecondsTime(0L), isSpaceSaverNeeded); + this(newParentView, parent, textStyle, groupStyle, "", HistogramConstant.formatNanoSecondsTime(0L), isSpaceSaverNeeded); //$NON-NLS-1$ } /** diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/messages.properties b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/messages.properties new file mode 100644 index 0000000000..f6d232292b --- /dev/null +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/messages.properties @@ -0,0 +1,3 @@ +HistogramView_currentEventLabel=Current Event (sec) +HistogramView_windowCenterLabel=Window Center (sec) +HistogramView_windowSpanLabel=Window Span (sec) diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java index ff54238ce4..2e32fccf26 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/LTTngProjectNature.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.CoreException; */ public class LTTngProjectNature implements IProjectNature { - public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.project.LTTngProjectNature"; + public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.project.LTTngProjectNature"; //$NON-NLS-1$ private IProject fProject; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java index b9728ebb5b..109a7a070c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/ProjectView.java @@ -52,7 +52,7 @@ import org.eclipse.swt.widgets.Tree; */ public class ProjectView extends TmfView { - public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.project"; + public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.project"; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Main data structures @@ -91,7 +91,7 @@ public class ProjectView extends TmfView { public ProjectView() { - super("ProjectView"); + super("ProjectView"); //$NON-NLS-1$ fProjectRoot = new LTTngProjectRoot(this); fWorkspace = ResourcesPlugin.getWorkspace(); @@ -142,6 +142,7 @@ public class ProjectView extends TmfView { // ------------------------------------------------------------------------ @Override + @SuppressWarnings("nls") public String toString() { return "[ProjectView]"; } @@ -241,7 +242,7 @@ public class ProjectView extends TmfView { // Populated from the plug-in private void createContextMenu() { - MenuManager menuManager = new MenuManager("#PopupMenu"); + MenuManager menuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuManager.setRemoveAllWhenShown(true); Menu menu = menuManager.createContextMenu(fViewer.getControl()); fViewer.getControl().setMenu(menu); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java index a24cb45f0d..56b4f9064d 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizard.java @@ -50,7 +50,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard { */ @Override public void init(IWorkbench workbench, IStructuredSelection selection) { - setWindowTitle("Adding traces to experiment"); + setWindowTitle(Messages.AddTraceWizard_windowTitle); } /* (non-Javadoc) @@ -59,7 +59,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard { @Override public void addPages() { super.addPages(); - fMainPage = new AddTraceWizardPage(fProject, "Some string"); + fMainPage = new AddTraceWizardPage(fProject, "Some string"); //$NON-NLS-1$ addPage(fMainPage); } @@ -82,7 +82,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard { fExperiment.addTrace(folder); } else { - System.out.println("Problem"); + System.out.println(Messages.AddTraceWizard_invalidTraceLocation); } } catch (CoreException e) { e.printStackTrace(); diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java index 465dcd0289..6032b17e3c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/AddTraceWizardPage.java @@ -38,8 +38,8 @@ public class AddTraceWizardPage extends WizardPage { protected AddTraceWizardPage(LTTngProjectNode project, String pageName) { super(pageName); - setTitle("Select traces"); - setDescription("Select the traces to add to the experiment"); + setTitle(Messages.AddTraceWizardPage_windowTitle); + setDescription(Messages.AddTraceWizardPage_description); fProject = project; } @@ -64,7 +64,7 @@ public class AddTraceWizardPage extends WizardPage { final TableColumn tableColumn = new TableColumn(table, SWT.NONE); tableColumn.setWidth(200); - tableColumn.setText("Trace"); + tableColumn.setText(Messages.AddTraceWizardPage_columnHeader); fCheckboxTableViewer.setInput(fProject.getTracesFolder()); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java index 3e1b0a040d..9afae8ab8c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizard.java @@ -41,11 +41,12 @@ public class ImportTraceWizard extends Wizard implements IImportWizard { /** * */ + private final String IMPORT_WIZARD = "LTTngTraceImportWizard"; //$NON-NLS-1$ public ImportTraceWizard() { IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings(); - IDialogSettings section = workbenchSettings.getSection("LTTngTraceImportWizard"); + IDialogSettings section = workbenchSettings.getSection(IMPORT_WIZARD); if (section == null) { - section = workbenchSettings.addNewSection("LTTngTraceImportWizard"); + section = workbenchSettings.addNewSection(IMPORT_WIZARD); } setDialogSettings(section); @@ -76,7 +77,7 @@ public class ImportTraceWizard extends Wizard implements IImportWizard { } setWindowTitle(DataTransferMessages.DataTransfer_importTitle); - setDefaultPageImageDescriptor(IDEWorkbenchPlugin.getIDEImageDescriptor("wizban/importdir_wiz.png")); + setDefaultPageImageDescriptor(IDEWorkbenchPlugin.getIDEImageDescriptor("wizban/importdir_wiz.png")); //$NON-NLS-1$ setNeedsProgressMonitor(true); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java index 5c8e041633..6a75c7df35 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/ImportTraceWizardPage.java @@ -29,8 +29,8 @@ import org.eclipse.ui.internal.wizards.datatransfer.WizardFileSystemResourceImpo public class ImportTraceWizardPage extends WizardFileSystemResourceImportPage1 { private boolean isContainerSet = false; - private String initialContainerString = ""; - private String selectedSourceDirectory = ""; + private String initialContainerString = ""; //$NON-NLS-1$ + private String selectedSourceDirectory = ""; //$NON-NLS-1$ public ImportTraceWizardPage(IWorkbench workbench, IStructuredSelection selection) { super(workbench, selection); @@ -44,7 +44,7 @@ public class ImportTraceWizardPage extends WizardFileSystemResourceImportPage1 { public String getTraceDirectory() { - String tmpPath = ""; + String tmpPath = ""; //$NON-NLS-1$ if ( (getSourceDirectory() != null) && (getSourceDirectory().getName() != null) ) { tmpPath = this.getSourceDirectory().getName().toString(); } @@ -57,7 +57,7 @@ public class ImportTraceWizardPage extends WizardFileSystemResourceImportPage1 { } public String getTracepath() { - String tmpPath = ""; + String tmpPath = ""; //$NON-NLS-1$ if ( (getSourceDirectory() != null) && (getSourceDirectory().getPath() != null) ) { tmpPath = this.getSourceDirectory().getPath().toString(); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/Messages.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/Messages.java new file mode 100644 index 0000000000..718cdb6c6e --- /dev/null +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/Messages.java @@ -0,0 +1,19 @@ +package org.eclipse.linuxtools.lttng.ui.views.project.dialogs; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.project.dialogs.messages"; //$NON-NLS-1$ + public static String AddTraceWizard_invalidTraceLocation; + public static String AddTraceWizard_windowTitle; + public static String AddTraceWizardPage_columnHeader; + public static String AddTraceWizardPage_description; + public static String AddTraceWizardPage_windowTitle; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/messages.properties b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/messages.properties new file mode 100644 index 0000000000..93f37e27bf --- /dev/null +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/dialogs/messages.properties @@ -0,0 +1,5 @@ +AddTraceWizard_invalidTraceLocation=Problem +AddTraceWizard_windowTitle=Adding traces to experiment +AddTraceWizardPage_columnHeader=Trace +AddTraceWizardPage_description=Select the traces to add to the experiment +AddTraceWizardPage_windowTitle=Select traces diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java index f408ae17a4..69318753b9 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/OpenTraceHandler.java @@ -52,8 +52,8 @@ public class OpenTraceHandler implements IHandler { public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); - mb.setText("Open Trace"); - mb.setMessage("Not implemented yet"); + mb.setText("Open Trace"); //$NON-NLS-1$ + mb.setMessage("Not implemented yet"); //$NON-NLS-1$ mb.open(); return null; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java index 38b0d92137..1f74ec67a2 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameExperimentHandler.java @@ -52,8 +52,8 @@ public class RenameExperimentHandler implements IHandler { public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); - mb.setText("Rename Experiment"); - mb.setMessage("Not implemented yet"); + mb.setText("Rename Experiment"); //$NON-NLS-1$ + mb.setMessage("Not implemented yet"); //$NON-NLS-1$ mb.open(); return null; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java index 3e4957531d..8ef9c06400 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameProjectHandler.java @@ -70,8 +70,8 @@ public class RenameProjectHandler implements IHandler { public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); - mb.setText("Rename Project"); - mb.setMessage("Not implemented yet"); + mb.setText("Rename Project"); //$NON-NLS-1$ + mb.setMessage("Not implemented yet"); //$NON-NLS-1$ mb.open(); return null; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java index 708f68ea2e..4cc81f1b09 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/handlers/RenameTraceHandler.java @@ -52,8 +52,8 @@ public class RenameTraceHandler implements IHandler { public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); - mb.setText("Rename Trace"); - mb.setMessage("Not implemented yet"); + mb.setText("Rename Trace"); //$NON-NLS-1$ + mb.setMessage("Not implemented yet"); //$NON-NLS-1$ mb.open(); return null; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java index 643310d6e6..fd434a0e05 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectLabelProvider.java @@ -30,8 +30,8 @@ import org.eclipse.ui.PlatformUI; */ public class LTTngProjectLabelProvider implements ILabelProvider { - private final String fTraceIconFile = "icons/garland16.png"; -// private final String fExperimentIconFile = "icons/garland16.png"; + private final String fTraceIconFile = "icons/garland16.png"; //$NON-NLS-1$ +// private final String fExperimentIconFile = "icons/garland16.png"; //$NON-NLS-1$ private final Image fOpenedProjectIcon; private final Image fClosedProjectIcon; @@ -105,7 +105,7 @@ public class LTTngProjectLabelProvider implements ILabelProvider { node instanceof LTTngExperimentFolderNode || node instanceof LTTngExperimentNode) { - label += " [" + node.getChildren().size() + "]"; + label += " [" + node.getChildren().size() + "]"; //$NON-NLS-1$//$NON-NLS-2$ } return label; } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java index 6e79c35c64..525fa5f78c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/project/model/LTTngProjectNode.java @@ -28,8 +28,8 @@ import org.eclipse.linuxtools.lttng.ui.views.project.LTTngProjectNature; */ public class LTTngProjectNode extends LTTngProjectTreeNode { - public static final String TRACE_FOLDER_NAME = "Traces"; - public static final String EXPER_FOLDER_NAME = "Experiments"; + public static final String TRACE_FOLDER_NAME = "Traces"; //$NON-NLS-1$ + public static final String EXPER_FOLDER_NAME = "Experiments"; //$NON-NLS-1$ private final IProject fProject; private boolean fIsLTTngProject; diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java index 11346f94fa..2513a1bbff 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/ResourcesView.java @@ -60,7 +60,7 @@ public class ResourcesView extends AbsTimeUpdateView implements // ======================================================================== // Data // ======================================================================== - public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.resources"; + public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.resources"; //$NON-NLS-1$ // private int totalNumItems = 0; // Actions @@ -236,12 +236,9 @@ public class ResourcesView extends AbsTimeUpdateView implements } }; resetScale.setText(Messages.getString("ResourcesView.Action.Reset")); //$NON-NLS-1$ - resetScale.setToolTipText(Messages - .getString("ResourcesView.Action.Reset.ToolTip")); //$NON-NLS-1$ - resetScale.setImageDescriptor(AbstractUIPlugin - .imageDescriptorFromPlugin(Messages - .getString("ResourcesView.tmf.UI"), - "icons/home_nav.gif")); + resetScale.setToolTipText(Messages.getString("ResourcesView.Action.Reset.ToolTip")); //$NON-NLS-1$ + resetScale.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( + Messages.getString("ResourcesView.tmf.UI"), "icons/home_nav.gif")); //$NON-NLS-1$ //$NON-NLS-2$ // action5 nextEvent = new Action() { @@ -253,12 +250,9 @@ public class ResourcesView extends AbsTimeUpdateView implements } }; nextEvent.setText(Messages.getString("ResourcesView.Action.NextEvent")); //$NON-NLS-1$ - nextEvent.setToolTipText(Messages - .getString("ResourcesView.Action.NextEvent.Tooltip")); //$NON-NLS-1$ - nextEvent.setImageDescriptor(AbstractUIPlugin - .imageDescriptorFromPlugin(Messages - .getString("ResourcesView.tmf.UI"), - "icons/next_event.gif")); + nextEvent.setToolTipText(Messages.getString("ResourcesView.Action.NextEvent.Tooltip")); //$NON-NLS-1$ + nextEvent.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( + Messages.getString("ResourcesView.tmf.UI"), "icons/next_event.gif")); //$NON-NLS-1$//$NON-NLS-2$ // action6 prevEvent = new Action() { @@ -270,12 +264,9 @@ public class ResourcesView extends AbsTimeUpdateView implements } }; prevEvent.setText(Messages.getString("ResourcesView.Action.PrevEvent")); //$NON-NLS-1$ - prevEvent.setToolTipText(Messages - .getString("ResourcesView.Action.PrevEvent.Tooltip")); //$NON-NLS-1$ - prevEvent.setImageDescriptor(AbstractUIPlugin - .imageDescriptorFromPlugin(Messages - .getString("ResourcesView.tmf.UI"), - "icons/prev_event.gif")); + prevEvent.setToolTipText(Messages.getString("ResourcesView.Action.PrevEvent.Tooltip")); //$NON-NLS-1$ + prevEvent.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( + Messages.getString("ResourcesView.tmf.UI"), "icons/prev_event.gif")); //$NON-NLS-1$//$NON-NLS-2$ // action7 nextTrace = new Action() { @@ -286,14 +277,10 @@ public class ResourcesView extends AbsTimeUpdateView implements } } }; - nextTrace.setText(Messages - .getString("ResourcesView.Action.NextResource")); //$NON-NLS-1$ - nextTrace.setToolTipText(Messages - .getString("ResourcesView.Action.NextResource.ToolTip")); //$NON-NLS-1$ - nextTrace.setImageDescriptor(AbstractUIPlugin - .imageDescriptorFromPlugin(Messages - .getString("ResourcesView.tmf.UI"), - "icons/next_item.gif")); + nextTrace.setText(Messages.getString("ResourcesView.Action.NextResource")); //$NON-NLS-1$ + nextTrace.setToolTipText(Messages.getString("ResourcesView.Action.NextResource.ToolTip")); //$NON-NLS-1$ + nextTrace.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( + Messages.getString("ResourcesView.tmf.UI"), "icons/next_item.gif")); //$NON-NLS-1$//$NON-NLS-2$ // action8 prevTrace = new Action() { @@ -304,14 +291,10 @@ public class ResourcesView extends AbsTimeUpdateView implements } } }; - prevTrace.setText(Messages - .getString("ResourcesView.Action.PreviousResource")); //$NON-NLS-1$ - prevTrace.setToolTipText(Messages - .getString("ResourcesView.Action.PreviousResource.Tooltip")); //$NON-NLS-1$ - prevTrace.setImageDescriptor(AbstractUIPlugin - .imageDescriptorFromPlugin(Messages - .getString("ResourcesView.tmf.UI"), - "icons/prev_item.gif")); + prevTrace.setText(Messages.getString("ResourcesView.Action.PreviousResource")); //$NON-NLS-1$ + prevTrace.setToolTipText(Messages.getString("ResourcesView.Action.PreviousResource.Tooltip")); //$NON-NLS-1$ + prevTrace.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( + Messages.getString("ResourcesView.tmf.UI"), "icons/prev_item.gif")); //$NON-NLS-1$//$NON-NLS-2$ // action9 showLegend = new Action() { @@ -323,8 +306,7 @@ public class ResourcesView extends AbsTimeUpdateView implements } }; showLegend.setText(Messages.getString("ResourcesView.Action.Legend")); //$NON-NLS-1$ - showLegend.setToolTipText(Messages - .getString("ResourcesView.Action.Legend.ToolTip")); //$NON-NLS-1$ + showLegend.setToolTipText(Messages.getString("ResourcesView.Action.Legend.ToolTip")); //$NON-NLS-1$ // action10 filterTraces = new Action() { @@ -336,12 +318,9 @@ public class ResourcesView extends AbsTimeUpdateView implements } }; filterTraces.setText(Messages.getString("ResourcesView.Action.Filter")); //$NON-NLS-1$ - filterTraces.setToolTipText(Messages - .getString("ResourcesView.Action.Filter.ToolTip")); //$NON-NLS-1$ - filterTraces.setImageDescriptor(AbstractUIPlugin - .imageDescriptorFromPlugin(Messages - .getString("ResourcesView.tmf.UI"), - "icons/filter_items.gif")); + filterTraces.setToolTipText(Messages.getString("ResourcesView.Action.Filter.ToolTip")); //$NON-NLS-1$ + filterTraces.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( + Messages.getString("ResourcesView.tmf.UI"), "icons/filter_items.gif")); //$NON-NLS-1$//$NON-NLS-2$ // action10 zoomIn = new Action() { @@ -353,11 +332,9 @@ public class ResourcesView extends AbsTimeUpdateView implements } }; zoomIn.setText(Messages.getString("ResourcesView.Action.ZoomIn")); //$NON-NLS-1$ - zoomIn.setToolTipText(Messages - .getString("ResourcesView.Action.ZoomIn.Tooltip")); //$NON-NLS-1$ + zoomIn.setToolTipText(Messages.getString("ResourcesView.Action.ZoomIn.Tooltip")); //$NON-NLS-1$ zoomIn.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( - Messages.getString("ResourcesView.tmf.UI"), - "icons/zoomin_nav.gif")); + Messages.getString("ResourcesView.tmf.UI"), "icons/zoomin_nav.gif")); //$NON-NLS-1$//$NON-NLS-2$ // action10 zoomOut = new Action() { @@ -369,11 +346,9 @@ public class ResourcesView extends AbsTimeUpdateView implements } }; zoomOut.setText(Messages.getString("ResourcesView.Action.ZoomOut")); //$NON-NLS-1$ - zoomOut.setToolTipText(Messages - .getString("ResourcesView.Action.ZoomOut.tooltip")); //$NON-NLS-1$ + zoomOut.setToolTipText(Messages.getString("ResourcesView.Action.ZoomOut.tooltip")); //$NON-NLS-1$ zoomOut.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( - Messages.getString("ResourcesView.tmf.UI"), - "icons/zoomout_nav.gif")); + Messages.getString("ResourcesView.tmf.UI"), "icons/zoomout_nav.gif")); //$NON-NLS-1$//$NON-NLS-2$ // zoomFilter zoomFilter = new Action() { @@ -386,8 +361,8 @@ public class ResourcesView extends AbsTimeUpdateView implements zoomFilter.setText(Messages.getString("ResourcesView.Action.ZoomFilter")); //$NON-NLS-1$ zoomFilter.setToolTipText(Messages.getString("ResourcesView.Action.ZoomFilter.tooltip")); //$NON-NLS-1$ - zoomFilter.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(Messages - .getString("ResourcesView.tmf.UI"), "icons/filter_items.gif")); + zoomFilter.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin( + Messages.getString("ResourcesView.tmf.UI"), "icons/filter_items.gif")); //$NON-NLS-1$//$NON-NLS-2$ zoomFilter.setChecked(false); // PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_ELCL_SYNCED); @@ -541,7 +516,7 @@ public class ResourcesView extends AbsTimeUpdateView implements dataRequest(initTimeWindow, experimentTRange, true, ExecutionType.FOREGROUND); if (TraceDebug.isDEBUG()) { - TraceDebug.debug("Initialization request time range is: " + initTimeWindow.getStartTime().toString() + "-" + TraceDebug.debug("Initialization request time range is: " + initTimeWindow.getStartTime().toString() + "-" //$NON-NLS-1$ //$NON-NLS-2$ + initTimeWindow.getEndTime().toString()); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java index c01d981a55..ee13fe616a 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/evProcessor/AbsResourcesTRangeUpdate.java @@ -47,17 +47,17 @@ public abstract class AbsResourcesTRangeUpdate extends AbsTRangeUpdate long traceEndTime, String traceId, ResourceTypes type, Long resId, long insertionTime) { - String resourceName = type.toString() + " " + resId.toString(); + String resourceName = type.toString() + " " + resId.toString(); //$NON-NLS-1$ // Note : the "traceid" here is assigned to the "groupname" as we group // by trace in the UI TimeRangeEventResource localRessource = TimeRangeResourceFactory .getInstance().createResource(resContainer.getUniqueId(), traceStartTime, traceEndTime, resourceName, traceId, - "", type, resId, insertionTime); + "", type, resId, insertionTime); //$NON-NLS-1$ resContainer.addItem(localRessource); if (TraceDebug.isRV()) { - TraceDebug.traceRV("addLocalResource():" + localRessource); + TraceDebug.traceRV("addLocalResource():" + localRessource); //$NON-NLS-1$ } return localRessource; @@ -196,7 +196,7 @@ public abstract class AbsResourcesTRangeUpdate extends AbsTRangeUpdate String stateMode) { if (TraceDebug.isRV()) { - TraceDebug.traceRV("makeDraw():[" + localResource + ",candidate=[stime=" + stime + ",etime=" + etime + ",state=" + stateMode + "]]"); + TraceDebug.traceRV("makeDraw():[" + localResource + ",candidate=[stime=" + stime + ",etime=" + etime + ",state=" + stateMode + "]]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } // Check if the event is out of range diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java index b7203be227..77bedcaf58 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/resources/model/ResourceContainer.java @@ -185,7 +185,7 @@ class ResourceKey { } } else { - TraceDebug.debug("ERROR : The given key is not of the type ProcessKey!" + obj.getClass().toString()); + TraceDebug.debug("ERROR : The given key is not of the type ProcessKey!" + obj.getClass().toString()); //$NON-NLS-1$ } return isSame; @@ -227,7 +227,8 @@ class ResourceKey { @Override - public String toString() { + @SuppressWarnings("nls") + public String toString() { if ( valueRef != null ) { return (valueRef.getResourceId().toString() + ":" + valueRef.getTraceId().toString() + ":" + valueRef.getType().toString()); } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java index 55308aab12..6f17dea3ae 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/StatisticsView.java @@ -67,7 +67,7 @@ import org.eclipse.ui.PlatformUI; * observer of the model. */ public class StatisticsView extends AbsTimeUpdateView { - public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.statistics"; + public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.statistics"; //$NON-NLS-1$ private TreeViewer treeViewer; // Table column names @@ -175,7 +175,7 @@ public class StatisticsView extends AbsTimeUpdateView { if (!folderLevels.contains(node.getKey())) { return Long.toString(node.getValue().nbEvents); } else { - return ""; + return ""; //$NON-NLS-1$ } } }, new ViewerComparator() { @@ -211,11 +211,11 @@ public class StatisticsView extends AbsTimeUpdateView { StatisticsTreeNode node = (StatisticsTreeNode) element; if (folderLevels.contains(node.getKey())) { - return ""; + return ""; //$NON-NLS-1$ } else if (node.getParent() != null && levelsWithEmptyTime.contains(node .getParent().getKey())) { - return ""; + return ""; //$NON-NLS-1$ } else { return decimalFormat .format(node.getValue().cpuTime @@ -229,11 +229,11 @@ public class StatisticsView extends AbsTimeUpdateView { public String getText(Object element) { StatisticsTreeNode node = (StatisticsTreeNode) element; if (folderLevels.contains(node.getKey())) { - return ""; + return ""; //$NON-NLS-1$ } else if (node.getParent() != null && levelsWithEmptyTime.contains(node .getParent().getKey())) { - return ""; + return ""; //$NON-NLS-1$ } else { return decimalFormat .format(node.getValue().cumulativeCpuTime @@ -247,11 +247,11 @@ public class StatisticsView extends AbsTimeUpdateView { public String getText(Object element) { StatisticsTreeNode node = (StatisticsTreeNode) element; if (folderLevels.contains(node.getKey())) { - return ""; + return ""; //$NON-NLS-1$ } else if (node.getParent() != null && levelsWithEmptyTime.contains(node .getParent().getKey())) { - return ""; + return ""; //$NON-NLS-1$ } else { return decimalFormat .format(node.getValue().elapsedTime @@ -340,8 +340,9 @@ public class StatisticsView extends AbsTimeUpdateView { super(viewName); } + private static final String STATISTICS_VIEW = "StatisticsView"; //$NON-NLS-1$ public StatisticsView() { - this("StatisticsView"); + this(STATISTICS_VIEW); } /* @@ -461,7 +462,7 @@ public class StatisticsView extends AbsTimeUpdateView { if (experiment != null) { requestData(experiment); } else { - TraceDebug.debug("No selected experiment information available"); + TraceDebug.debug("No selected experiment information available"); //$NON-NLS-1$ } } @@ -649,7 +650,7 @@ public class StatisticsView extends AbsTimeUpdateView { // send the initial request, to start filling up model dataRequest(experimentTRange, experimentTRange, true, ExecutionType.BACKGROUND); } else { - TraceDebug.debug("No selected experiment information available"); + TraceDebug.debug("No selected experiment information available"); //$NON-NLS-1$ } } diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java index 5bac44c5c3..0e61b3c80c 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/statistics/model/StatisticsData.java @@ -74,7 +74,7 @@ public abstract class StatisticsData { /** *

Identification of the root.

*/ - public static final FixedArray ROOT = new FixedArray("root"); + public static final FixedArray ROOT = new FixedArray("root"); //$NON-NLS-1$ /** *

Function to merge many string with more efficacy.

* @param strings Strings to merge. @@ -171,10 +171,10 @@ public abstract class StatisticsData { return "Unknown process"; if(process.getName() == null) return mergeString("Unknown process - ", String.valueOf(process.getPid())); - if(process.getName().equals("")) + if(process.getName().equals("")) //$NON-NLS-1$ return process.getPid().toString(); else - return mergeString(process.getName(), " - ",String.valueOf(process.getPid())); + return mergeString(process.getName(), " - ",String.valueOf(process.getPid())); //$NON-NLS-1$ } /** *

Increase some values.

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java index ce06019329..373b99e3ff 100644 --- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java +++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/timeframe/TimeFrameView.java @@ -56,7 +56,7 @@ import org.eclipse.swt.widgets.Slider; */ public class TimeFrameView extends TmfView { - public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.timeframe"; + public static final String ID = "org.eclipse.linuxtools.lttng.ui.views.timeframe"; //$NON-NLS-1$ // ======================================================================== // TimeFrameView @@ -267,6 +267,7 @@ public class TimeFrameView extends TmfView { * @see java.lang.Object#toString() */ @Override + @SuppressWarnings("nls") public String toString() { return "[TimeFrameView]"; } diff --git a/org.eclipse.linuxtools.lttng/ChangeLog b/org.eclipse.linuxtools.lttng/ChangeLog index 972b6686cc..073b3b0459 100644 --- a/org.eclipse.linuxtools.lttng/ChangeLog +++ b/org.eclipse.linuxtools.lttng/ChangeLog @@ -1,3 +1,27 @@ +2010-11-09 Francois Chouinard + + Suppress warning for non-externalized strings + * src/org/eclipse/linuxtools/lttng/event/LttngEvent.java (toString): + * src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java (toString): + * src/org/eclipse/linuxtools/lttng/event/LttngEventField.java (toString): + * src/org/eclipse/linuxtools/lttng/event/LttngEventType.java (toString): + * src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java (toString): + * src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java (process): + * src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java (getAFieldLong): + (getAFieldString): + (sendNoFieldFoundMsg): + * src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java (pop_state): + (pop_function): + * src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java (toString): + * src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java (toString): + * src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java (toString): + * src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java (toString): + * src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java (toString): + * src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java (toString): + * src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java (toString): + * src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java (toString): + * src/org/eclipse/linuxtools/lttng/TraceDebug.java: + 2010-10-29 Francois Chouinard * src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java (getFields): Cosmetic change diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java index a4eea698d2..8e23ab89f8 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java @@ -9,6 +9,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; +@SuppressWarnings("nls") public class TraceDebug { static boolean DEBUG = false; static boolean INFO = false; diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java index dbb15b9880..ad54fef95e 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEvent.java @@ -169,6 +169,7 @@ public class LttngEvent extends TmfEvent { } @Override + @SuppressWarnings("nls") public String toString() { StringBuffer result= new StringBuffer("[LttngEvent("); result.append("Timestamp:" + getTimestamp().getValue()); diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java index 84083e256a..2134cf4c8c 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventContent.java @@ -251,6 +251,7 @@ public class LttngEventContent extends TmfEventContent { * Note : this function parse all fields and so is very heavy to use. */ @Override + @SuppressWarnings("nls") public String toString() { LttngEventField[] allFields = getFields(); diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java index ac67c760de..4c1170035d 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventField.java @@ -56,6 +56,7 @@ public class LttngEventField extends TmfEventField { } @Override + @SuppressWarnings("nls") public String toString() { Object value = getValue(); return getId() + ":" + ((value != null) ? value.toString() : "null"); diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java index 82505e532e..b11597dfc3 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngEventType.java @@ -78,6 +78,7 @@ public class LttngEventType extends TmfEventType { * @return TypeId (channel/marker) of the object */ @Override + @SuppressWarnings("nls") public String toString() { // *** TODO *** // This is used as-it in the events view, so we won't change its format. diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java index c282a554f0..700067e9f6 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/event/LttngTimestamp.java @@ -138,6 +138,7 @@ public class LttngTimestamp extends TmfTimestamp { * @return timestamp, as string */ @Override + @SuppressWarnings("nls") public String toString() { // If we are dealing with units of seconds (or higher), diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java index 16b3476af5..0d596a2d85 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/AbsEventToHandlerResolver.java @@ -97,7 +97,7 @@ public abstract class AbsEventToHandlerResolver implements case ENDREQ: { processor = getfinishProcessor(); - TraceDebug.debug("EndRequest satus received:"); + TraceDebug.debug("EndRequest satus received:"); //$NON-NLS-1$ break; } @@ -146,7 +146,7 @@ public abstract class AbsEventToHandlerResolver implements if (!(tmfEvent instanceof LttngSyntheticEvent)) { TraceDebug - .debug("The event received is not an instance of LttngSyntheticEvent and can not be processed"); + .debug("The event received is not an instance of LttngSyntheticEvent and can not be processed"); //$NON-NLS-1$ return; } diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java index 6126b9b24c..fa28540d43 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateProcessing.java @@ -37,7 +37,7 @@ public abstract class AbsStateProcessing { LttngEventField field = ((LttngEventContent) trcEvent.getContent()).getField(fieldname); if ( field == null ) { - TraceDebug.debug("***************** CONTENT : " + ((LttngEventContent) trcEvent.getContent()).toString()); + TraceDebug.debug("***************** CONTENT : " + ((LttngEventContent) trcEvent.getContent()).toString()); //$NON-NLS-1$ } else { Object fieldObj = field.getValue(); @@ -47,7 +47,7 @@ public abstract class AbsStateProcessing { } else { if (TraceDebug.isDEBUG()) { - TraceDebug.debug("Unexpected field Type. Expected: Long, Received: "+ fieldObj.getClass().getSimpleName()); + TraceDebug.debug("Unexpected field Type. Expected: Long, Received: "+ fieldObj.getClass().getSimpleName()); //$NON-NLS-1$ } } } @@ -110,13 +110,13 @@ public abstract class AbsStateProcessing { */ protected String getAFieldString(LttngEvent trcEvent, LttngTraceState traceSt, Fields expectedField) { - String fieldVal = ""; + String fieldVal = ""; //$NON-NLS-1$ String fieldname = expectedField.getInName(); LttngEventField field = ((LttngEventContent) trcEvent.getContent()).getField(fieldname); if ( field == null ) { - TraceDebug.debug("***************** CONTENT : " + ((LttngEventContent) trcEvent.getContent()).toString()); + TraceDebug.debug("***************** CONTENT : " + ((LttngEventContent) trcEvent.getContent()).toString()); //$NON-NLS-1$ } else { Object fieldObj = field.getValue(); @@ -126,7 +126,7 @@ public abstract class AbsStateProcessing { } else { if (TraceDebug.isDEBUG()) { - TraceDebug.debug("Unexpected field Type. Expected: String, Received: "+ fieldObj.getClass().getSimpleName()); + TraceDebug.debug("Unexpected field Type. Expected: String, Received: "+ fieldObj.getClass().getSimpleName()); //$NON-NLS-1$ } } } @@ -192,6 +192,7 @@ public abstract class AbsStateProcessing { return traceState.findProcessState(pid, cpu, traceState.getTraceId()); } + @SuppressWarnings("nls") protected void sendNoFieldFoundMsg(TmfEventField[] fields, String expectedFieldName) { LttngEventField field; diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java index 5838443e7c..aa5caec3c8 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/evProcessor/state/AbsStateUpdate.java @@ -60,10 +60,10 @@ public abstract class AbsStateUpdate extends AbsStateProcessing implements if (!process.getState().getExec_mode().equals(execMode)) { // Different execution mode - TraceDebug.debug("Different Execution Mode type \n\tTime:" - + eventTime.toString() + "\n\tprocess state has: \n\t" + TraceDebug.debug("Different Execution Mode type \n\tTime:" //$NON-NLS-1$ + + eventTime.toString() + "\n\tprocess state has: \n\t" //$NON-NLS-1$ + process.getState().getExec_mode().toString() - + "\n\twhen pop_int is:\n\t" + execMode.toString()); + + "\n\twhen pop_int is:\n\t" + execMode.toString()); //$NON-NLS-1$ return; } @@ -130,8 +130,8 @@ public abstract class AbsStateUpdate extends AbsStateProcessing implements Long curr_function = process.getCurrent_function(); if (curr_function != null && !curr_function.equals(funcptr)) { - TraceDebug.debug("Different functions: " + funcptr + " current: " - + curr_function + " time stamp: " + TraceDebug.debug("Different functions: " + funcptr + " current: " //$NON-NLS-1$ //$NON-NLS-2$ + + curr_function + " time stamp: " //$NON-NLS-1$ + trcEvent.getTimestamp().toString()); // g_info("Different functions (%lu.%09lu): ignore it\n", diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java index f1a065250f..96c1beaee8 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngExecutionState.java @@ -151,6 +151,7 @@ public class LttngExecutionState implements Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { return "[LttngExecutionState: " + "entry=" + entry_LttTime + ",change=" + change_LttTime + ",cum_cpu=" + cum_cpu_time_Timens + ",pstatus=" + proc_status + ",emode=" + exec_mode + ",esubmode=" + exec_submode +"]"; diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java index 90e0c551c9..232af231ae 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngProcessState.java @@ -489,6 +489,7 @@ public class LttngProcessState implements Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { String stateSt = state.toString(); String eStackSt = execution_stack.toString(); diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java index d1dd4a11be..a5068cb11b 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTraceState.java @@ -568,6 +568,7 @@ class ProcessStateKey { @Override + @SuppressWarnings("nls") public String toString() { if ( valueRef != null ) { // return (valueRef.getPid().toString() + ":" + diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java index 94dba7db07..3bf174d637 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/model/LttngTrapState.java @@ -79,6 +79,7 @@ public class LttngTrapState implements Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { return "running : " + running; } diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java index a1f2e34e04..1b6be05a96 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/trace/StateTraceManager.java @@ -519,6 +519,7 @@ public class StateTraceManager extends LTTngTreeNode implements IStateTraceManag * @see java.lang.Object#toString() */ @Override + @SuppressWarnings("nls") public String toString() { StringBuilder sb = new StringBuilder(super.toString()); sb.append("\n\tTotal number of processes in the Shared State model: " + fStateModel.getProcesses().length diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java index 82f9b56172..612b89b7e5 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngExperiment.java @@ -173,6 +173,7 @@ public class LTTngExperiment extends TmfExperiment implem * @see java.lang.Object#toString() */ @Override + @SuppressWarnings("nls") public String toString() { return "[LTTngExperiment (" + getName() + ")]"; } diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java index 193c40c9ec..d3c9d670ec 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTrace.java @@ -1138,6 +1138,7 @@ public class LTTngTrace extends TmfTrace { * @return String that identify this trace */ @Override + @SuppressWarnings("nls") public String toString() { String returnedData = ""; diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java index 6c67e98d70..9faf3294cd 100644 --- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java +++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/trace/LTTngTraceVersion.java @@ -149,6 +149,7 @@ public class LTTngTraceVersion { } @Override + @SuppressWarnings("nls") public String toString() { return "LTTngTraceVersion : [" + getTraceFloatVersion() + "]"; } diff --git a/org.eclipse.linuxtools.tmf.tests/ChangeLog b/org.eclipse.linuxtools.tmf.tests/ChangeLog index 131ab80eba..abccc44d31 100644 --- a/org.eclipse.linuxtools.tmf.tests/ChangeLog +++ b/org.eclipse.linuxtools.tmf.tests/ChangeLog @@ -1,3 +1,45 @@ +2010-11-09 Francois Chouinard + + Suppress warning for non-externalized strings + * src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java: + * src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java: + * src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java: + * src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java: + * src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java: + * src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java: + * src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java: + * src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java: + * src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java: + * src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java (TmfTimeRangeTest): + * src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java: + * src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java: + * src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java: + * src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java: + * src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java: + * src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java: + * src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java: + * src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java: + * src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java: + * src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java: + * src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java: + * src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java: + * src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java: + * src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java: + * src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java: + * src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java: + * src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java: + * src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java: + * src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java: + * stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java: + * stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java: + * stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java: + * stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java: + * stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java: + * stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java: + * stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java: + * stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java: + * stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java: + 2010-10-27 Francois Chouinard * src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java: Augmented coalescing and cancelling tests diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java index a07565545a..068ae1ed3c 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCorePluginTest.java @@ -21,6 +21,7 @@ import junit.framework.TestCase; *

* Test the TMF core plug-in activator */ +@SuppressWarnings("nls") public class TmfCorePluginTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java index ff7be5ff96..316e7fc567 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/TmfCoreTestPlugin.java @@ -21,6 +21,7 @@ import org.osgi.framework.BundleContext; *

* The activator class controls the plug-in life cycle */ +@SuppressWarnings("nls") public class TmfCoreTestPlugin extends Plugin { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java index fa4899cbb4..dc59bbbfb1 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfEventProviderTest.java @@ -35,6 +35,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; *

* Test suite for the TmfEventProvider class. */ +@SuppressWarnings("nls") public class TmfEventProviderTest extends TestCase { TmfEventProviderStub fEventProvider; diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java index 1b9e7e2c0c..366816f775 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/component/TmfProviderManagerTest.java @@ -25,6 +25,7 @@ import org.eclipse.linuxtools.tmf.trace.ITmfContext; *

* Test suite for the TmfProviderManager class. */ +@SuppressWarnings("nls") public class TmfProviderManagerTest extends TestCase { public TmfProviderManagerTest(String name) { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java index c298219812..f046694f87 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/AllTests.java @@ -5,6 +5,7 @@ import junit.framework.TestSuite; import org.eclipse.linuxtools.tmf.TmfCorePlugin; +@SuppressWarnings("nls") public class AllTests { public static Test suite() { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java index 70cf546c54..fbfbf6121c 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventContentTest.java @@ -29,6 +29,7 @@ import org.eclipse.linuxtools.tmf.event.TmfTimestamp; *

* Test suite for the TmfEventContent class. */ +@SuppressWarnings("nls") public class TmfEventContentTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java index e63ba86dcb..8db604588e 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventFieldTest.java @@ -28,6 +28,7 @@ import org.eclipse.linuxtools.tmf.event.TmfTimestamp; *

* Test suite for the TmfEventField class. */ +@SuppressWarnings("nls") public class TmfEventFieldTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java index 42e599898c..1f350b6d04 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventReferenceTest.java @@ -21,6 +21,7 @@ import org.eclipse.linuxtools.tmf.event.TmfEventReference; *

* Test suite for the TmfEventReference class. */ +@SuppressWarnings("nls") public class TmfEventReferenceTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java index dbac78e55f..e2b7a6ec1b 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventSourceTest.java @@ -21,6 +21,7 @@ import org.eclipse.linuxtools.tmf.event.TmfEventSource; *

* Test suite for the TmfEventSource class. */ +@SuppressWarnings("nls") public class TmfEventSourceTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java index 647724eaf4..7691ba0806 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTest.java @@ -26,6 +26,7 @@ import org.eclipse.linuxtools.tmf.event.TmfTimestamp; *

* Test suite for the TmfEvent class. */ +@SuppressWarnings("nls") public class TmfEventTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java index df0eecfbb7..355e1ca764 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfEventTypeTest.java @@ -22,6 +22,7 @@ import org.eclipse.linuxtools.tmf.event.TmfNoSuchFieldException; *

* JUnit test suite for the TmfEventType class. */ +@SuppressWarnings("nls") public class TmfEventTypeTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java index ea99827e05..1bf85eb819 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimeRangeTest.java @@ -22,9 +22,9 @@ import junit.framework.TestCase; *

* Test suite for the TmfTimeRange class. */ +@SuppressWarnings("nls") public class TmfTimeRangeTest extends TestCase { - // ------------------------------------------------------------------------ // Housekeeping // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java index e6083b6022..d4a3e65e45 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTimestampTest.java @@ -21,6 +21,7 @@ import org.eclipse.linuxtools.tmf.event.TmfTimestamp; *

* Test suite for the TmfTimestamp class. */ +@SuppressWarnings("nls") public class TmfTimestampTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java index 989f7bf518..6b3fd2177b 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/event/TmfTraceEventTest.java @@ -26,6 +26,7 @@ import junit.framework.TestCase; *

* Test suite for the TmfTraceEvent class. */ +@SuppressWarnings("nls") public class TmfTraceEventTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java index a285a36ade..8f706c2de1 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/AllTests.java @@ -5,6 +5,7 @@ import junit.framework.TestSuite; import org.eclipse.linuxtools.tmf.TmfCorePlugin; +@SuppressWarnings("nls") public class AllTests { public static Test suite() { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java index 589eac0a6c..0ece3d3aa2 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java @@ -40,6 +40,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; *

* TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class TmfExperimentTest extends TestCase { private static final String DIRECTORY = "testfiles"; diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java index a573bf19cc..98d8fb9788 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfMultiTraceExperimentTest.java @@ -40,6 +40,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; *

* TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class TmfMultiTraceExperimentTest extends TestCase { private static final String DIRECTORY = "testfiles"; diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java index e578e04eb9..8fe1686ecb 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/AllTests.java @@ -5,6 +5,7 @@ import junit.framework.TestSuite; import org.eclipse.linuxtools.tmf.TmfCorePlugin; +@SuppressWarnings("nls") public class AllTests { public static Test suite() { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java index eae1e9399c..b2f19f7711 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedDataRequestTest.java @@ -25,6 +25,7 @@ import org.eclipse.linuxtools.tmf.request.TmfDataRequestStub; *

* Test suite for the TmfCoalescedDataRequest class. */ +@SuppressWarnings("nls") public class TmfCoalescedDataRequestTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java index b044ccb823..aba098f500 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfCoalescedEventRequestTest.java @@ -42,6 +42,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; *

* Test suite for the TmfCoalescedEventRequest class. */ +@SuppressWarnings("nls") public class TmfCoalescedEventRequestTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java index eb662dc83b..e6b9686584 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java @@ -23,6 +23,7 @@ import org.eclipse.linuxtools.tmf.request.TmfDataRequestStub; *

* Test suite for the TmfDataRequest class. */ +@SuppressWarnings("nls") public class TmfDataRequestTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java index 0761a6fbf1..06d5b02f50 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfEventRequestTest.java @@ -26,6 +26,7 @@ import org.eclipse.linuxtools.tmf.request.TmfEventRequestStub; *

* Test suite for the TmfEventRequest class. */ +@SuppressWarnings("nls") public class TmfEventRequestTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java index 003db950c5..d490435d41 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfRequestExecutorTest.java @@ -23,6 +23,7 @@ import org.eclipse.linuxtools.tmf.request.TmfRequestExecutor; * * Test suite for the TmfRequestExecutor class. */ +@SuppressWarnings("nls") public class TmfRequestExecutorTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java index f228496b0b..570f4cecc5 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/AllTests.java @@ -5,6 +5,7 @@ import junit.framework.TestSuite; import org.eclipse.linuxtools.tmf.TmfCorePlugin; +@SuppressWarnings("nls") public class AllTests { public static Test suite() { diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java index 7ab0dcabbb..5865a257b9 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfCheckpointTest.java @@ -23,6 +23,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfLocation; *

* Test suite for the TmfCheckpoint class. */ +@SuppressWarnings("nls") public class TmfCheckpointTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java index f5e0d9a131..50bdc47d4c 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfContextTest.java @@ -23,6 +23,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfLocation; *

* Test suite for the TmfContext class. */ +@SuppressWarnings("nls") public class TmfContextTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java index b6ae97ae2d..6ec86ce343 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfExperimentTest.java @@ -39,6 +39,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; *

* TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class TmfExperimentTest extends TestCase { private static final String DIRECTORY = "testfiles"; diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java index e95cd25953..460c4b82f2 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfLocationTest.java @@ -22,6 +22,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfLocation; *

* Test suite for the TmfLocation class. */ +@SuppressWarnings("nls") public class TmfLocationTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java index f3cb23e8ae..2bc01e5235 100644 --- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java +++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/trace/TmfTraceTest.java @@ -40,6 +40,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; *

* Test suite for the TmfTrace class. */ +@SuppressWarnings("nls") public class TmfTraceTest extends TestCase { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java index d2d66abccb..c4c438db75 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/CreateTestFiles.java @@ -32,6 +32,7 @@ import java.util.Random; *

  • The number of fields (0 .. NB_TYPES-1) depends on the event type. * */ +@SuppressWarnings("nls") public class CreateTestFiles { // ======================================================================== diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java index 58e4ae4f18..8ce79737ea 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfClientStub.java @@ -19,6 +19,7 @@ import org.eclipse.linuxtools.tmf.event.TmfSyntheticEventStub; *

    * TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class TmfClientStub extends TmfComponent { private TmfDataProvider[] fProviders; diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java index a93e01ed3f..2df7db7d6d 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfDataProviderStub.java @@ -31,6 +31,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; *

    * TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class TmfDataProviderStub extends TmfDataProvider { private static final String DIRECTORY = "testfiles"; diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java index 0c7c937742..10dbe9fb1c 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfEventProviderStub.java @@ -31,6 +31,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfTraceStub; *

    * TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class TmfEventProviderStub extends TmfEventProvider { private static final String DIRECTORY = "testfiles"; diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java index c5d6eb1a8a..b1e062584c 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/component/TmfSyntheticEventProviderStub.java @@ -28,6 +28,7 @@ import org.eclipse.linuxtools.tmf.trace.TmfContext; *

    * TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class TmfSyntheticEventProviderStub extends TmfEventProvider { public static final int BLOCK_SIZE = 100; diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java index 91dc38af1c..97f87cc3af 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java @@ -17,6 +17,7 @@ package org.eclipse.linuxtools.tmf.event; *

    * TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class TmfEventContentStub extends TmfEventContent { public TmfEventContentStub(TmfEvent parent, Object content) { diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java index e36cb348f6..cdb05eec32 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/event/TmfEventTypeStub.java @@ -17,6 +17,7 @@ package org.eclipse.linuxtools.tmf.event; *

    * TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class TmfEventTypeStub extends TmfEventType { public TmfEventTypeStub() { diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java index f4ab4d15bd..ddc53dd5a0 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java @@ -30,6 +30,7 @@ import org.eclipse.linuxtools.tmf.parser.ITmfEventParser; *

    * TODO: Implement me. Please. */ +@SuppressWarnings("nls") public class TmfEventParserStub implements ITmfEventParser { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java index 4f84e6ae58..32b0e0595e 100644 --- a/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java +++ b/org.eclipse.linuxtools.tmf.tests/stubs/org/eclipse/linuxtools/tmf/trace/TmfTraceStub.java @@ -26,6 +26,7 @@ import org.eclipse.linuxtools.tmf.parser.ITmfEventParser; *

    * Dummy test trace. Use in conjunction with TmfEventParserStub. */ +@SuppressWarnings("nls") public class TmfTraceStub extends TmfTrace { // ------------------------------------------------------------------------ diff --git a/org.eclipse.linuxtools.tmf.ui.tests/ChangeLog b/org.eclipse.linuxtools.tmf.ui.tests/ChangeLog new file mode 100644 index 0000000000..e29a81f0e9 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui.tests/ChangeLog @@ -0,0 +1,8 @@ +2010-11-09 Francois Chouinard + + Suppress warning for non-externalized strings + * src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java: + * widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/adaption/TsfImplProvider.java: + * widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceImpl.java: + * widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceModelImplFactory.java: + * widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/views/TsfTraceAnalysisView.java: \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java index 746a525819..c2596c613a 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/TmfUITestPlugin.java @@ -18,6 +18,7 @@ import org.osgi.framework.BundleContext; /** * The activator class controls the plug-in life cycle */ +@SuppressWarnings("nls") public class TmfUITestPlugin extends AbstractUIPlugin { // The plug-in ID diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/adaption/TsfImplProvider.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/adaption/TsfImplProvider.java index 8fdf0c5041..581b6f2291 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/adaption/TsfImplProvider.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/adaption/TsfImplProvider.java @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysis import org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.test.stub.model.EventImpl; import org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.test.stub.model.TraceImpl; - +@SuppressWarnings("nls") public class TsfImplProvider extends TmfTimeAnalysisProvider { // ======================================================================== diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceImpl.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceImpl.java index 83527dfd8e..11dbb043ac 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceImpl.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceImpl.java @@ -16,7 +16,7 @@ import java.util.Vector; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.ITmfTimeAnalysisEntry; import org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis.model.TimeEvent; - +@SuppressWarnings("nls") public class TraceImpl implements ITmfTimeAnalysisEntry { // ======================================================================== // Data diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceModelImplFactory.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceModelImplFactory.java index e364fce461..72fca7846f 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceModelImplFactory.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/model/TraceModelImplFactory.java @@ -13,6 +13,7 @@ package org.eclipse.linuxtools.tmf.ui.widgets.timeAnalysis.test.stub.model; import java.util.Date; +@SuppressWarnings("nls") public class TraceModelImplFactory { // ======================================================================== diff --git a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/views/TsfTraceAnalysisView.java b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/views/TsfTraceAnalysisView.java index 8e3c9cacd0..7dcb510b88 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/views/TsfTraceAnalysisView.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/widgets/timeAnalysis/test/stub/views/TsfTraceAnalysisView.java @@ -56,6 +56,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.DrillDownAdapter; import org.eclipse.ui.part.ViewPart; +@SuppressWarnings("nls") public class TsfTraceAnalysisView extends ViewPart implements ITmfTimeSelectionListener, ITmfTimeScaleSelectionListener { diff --git a/org.eclipse.linuxtools.tmf.ui/ChangeLog b/org.eclipse.linuxtools.tmf.ui/ChangeLog index 8eef7adccb..e47c7d31bf 100644 --- a/org.eclipse.linuxtools.tmf.ui/ChangeLog +++ b/org.eclipse.linuxtools.tmf.ui/ChangeLog @@ -1,3 +1,60 @@ +2010-11-09 Francois Chouinard + + Externalized strings + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/Messages.java: New file. + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/messages.properties: New file. + * src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/Messages.java: New file. + * src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/messages.properties: New file. + * src/org/eclipse/linuxtools/tmf/ui/wizards/Messages.java: New file. + * src/org/eclipse/linuxtools/tmf/ui/wizards/messages.properties: New file. + + Suppress warning for non-externalized strings + * src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java (createDialogArea): + * src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java (TmfEditor): + * src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java (init): + * src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java (TmfMultiPageEditorPart): + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java: + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventsTable.java (static initializer): + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomParserProvider.java (getCategory): + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTraceDefinition.java (formatTimeStamp): + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java (processGroups): + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java (seekLocation): + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java (CustomTxtTraceDefinition): + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java (parseInput): + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java (seekLocation): + * src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java (CustomXmlTraceDefinition): + * src/org/eclipse/linuxtools/tmf/ui/parsers/ParserProviderManager.java (init): + * src/org/eclipse/linuxtools/tmf/ui/TmfUiPlugin.java (PLUGIN_ID): + * src/org/eclipse/linuxtools/tmf/ui/TmfUiPreferenceInitializer.java: + * src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java (TmfEventsTable): + * src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java (createColumns): + * src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisProvider.java (StateColor.StateColor): + * src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java (getViewTypeStr): + * src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java (paint): + * src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java (drawName): + * src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeTipHandler.java (.fillValues): + * src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/Utils.java (static initializer): + * src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java (init): + * src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java (AddTraceWizardPage): + * src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/ImportTraceWizard.java (ImportTraceWizard): + * src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java (validateFolderName): + * src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewProjectWizard.java (NewProjectWizard): + * src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RefreshHandler.java (execute): + * src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameExperimentHandler.java (execute): + * src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameProjectHandler.java (execute): + * src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameTraceHandler.java (execute): + * src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserContributionItem.java (getContributionItems): + * src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserHandler.java (execute): + * src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectLabelProvider.java (fOpenedProjectIcon): + * src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectNode.java: + * src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java (createLink): + * src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java: + * src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java (TmfEventsView): + * src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java (CustomTxtParserInputWizardPage): + * src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserOutputWizardPage.java (CustomTxtParserOutputWizardPage): + * src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java (CustomXmlParserInputWizardPage): + * src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserOutputWizardPage.java (CustomXmlParserOutputWizardPage): + 2010-10-27 Francois Chouinard * src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java: Performance optimization diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPlugin.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPlugin.java index 88cfd05c9c..0c94663289 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPlugin.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPlugin.java @@ -29,7 +29,7 @@ public class TmfUiPlugin extends AbstractUIPlugin { // ======================================================================== // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf.ui"; + public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf.ui"; //$NON-NLS-1$ // The shared instance private static TmfUiPlugin plugin; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPreferenceInitializer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPreferenceInitializer.java index f3818e31d2..9b012c1167 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPreferenceInitializer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/TmfUiPreferenceInitializer.java @@ -18,8 +18,8 @@ import org.eclipse.core.runtime.preferences.InstanceScope; public class TmfUiPreferenceInitializer extends AbstractPreferenceInitializer { - public static final String ACTIVE_PROJECT_PREFERENCE = "ACTIVE_PROJECT"; - public static final String ACTIVE_PROJECT_DEFAULT = ""; + public static final String ACTIVE_PROJECT_PREFERENCE = "ACTIVE_PROJECT"; //$NON-NLS-1$ + public static final String ACTIVE_PROJECT_DEFAULT = ""; //$NON-NLS-1$ public TmfUiPreferenceInitializer() { super(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java index 389b3cc428..87a4ca8b5e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/dialogs/ManageCustomParsersDialog.java @@ -59,7 +59,7 @@ import org.eclipse.ui.part.FileEditorInput; public class ManageCustomParsersDialog extends Dialog { - private static final Image image = TmfUiPlugin.getDefault().getImageFromPath("/icons/customparser_wizard.gif"); + private static final Image image = TmfUiPlugin.getDefault().getImageFromPath("/icons/customparser_wizard.gif"); //$NON-NLS-1$ Button txtButton; Button xmlButton; @@ -112,7 +112,7 @@ public class ManageCustomParsersDialog extends Dialog { }}); xmlButton = new Button(radioContainer, SWT.RADIO); - xmlButton.setText("XML"); + xmlButton.setText("XML"); //$NON-NLS-1$ xmlButton.addSelectionListener(new SelectionListener(){ @Override public void widgetDefaultSelected(SelectionEvent e) {} @@ -223,7 +223,7 @@ public class ManageCustomParsersDialog extends Dialog { public void widgetSelected(SelectionEvent e) { FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.OPEN); dialog.setText("Select custom parser file to import"); - dialog.setFilterExtensions(new String[] {"*.xml", "*"}); + dialog.setFilterExtensions(new String[] {"*.xml", "*"}); //$NON-NLS-1$ //$NON-NLS-2$ String path = dialog.open(); if (path != null) { CustomTraceDefinition[] defs = null; @@ -252,7 +252,7 @@ public class ManageCustomParsersDialog extends Dialog { public void widgetSelected(SelectionEvent e) { FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.SAVE); dialog.setText("Select file to export the " + parserList.getSelection()[0] + " custom parser"); - dialog.setFilterExtensions(new String[] {"*.xml", "*"}); + dialog.setFilterExtensions(new String[] {"*.xml", "*"}); //$NON-NLS-1$ //$NON-NLS-2$ String path = dialog.open(); if (path != null) { CustomTraceDefinition def = null; @@ -279,7 +279,7 @@ public class ManageCustomParsersDialog extends Dialog { FileDialog dialog = new FileDialog(Display.getCurrent().getActiveShell(), SWT.OPEN); dialog.setText("Select log file to parse using the " + parserList.getSelection()[0] + " custom parser"); if (xmlButton.getSelection()) { - dialog.setFilterExtensions(new String[] {"*.xml", "*"}); + dialog.setFilterExtensions(new String[] {"*.xml", "*"}); //$NON-NLS-1$ //$NON-NLS-2$ } String path = dialog.open(); String parser = null; @@ -287,10 +287,10 @@ public class ManageCustomParsersDialog extends Dialog { CustomTraceDefinition def = null; if (txtButton.getSelection()) { def = CustomTxtTraceDefinition.load(parserList.getSelection()[0]); - parser = CustomTxtTrace.class.getCanonicalName() + "." + def.definitionName; + parser = CustomTxtTrace.class.getCanonicalName() + "." + def.definitionName; //$NON-NLS-1$ } else if (xmlButton.getSelection()) { def = CustomXmlTraceDefinition.load(parserList.getSelection()[0]); - parser = CustomXmlTrace.class.getCanonicalName() + "." + def.definitionName; + parser = CustomXmlTrace.class.getCanonicalName() + "." + def.definitionName; //$NON-NLS-1$ } if (def != null) { try { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java index 91708c7592..958f19a2bf 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEditor.java @@ -27,7 +27,7 @@ public abstract class TmfEditor extends EditorPart implements ITmfComponent { public TmfEditor() { super(); - fName = "TmfEditor"; + fName = "TmfEditor"; //$NON-NLS-1$ TmfSignalManager.register(this); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java index 3b88050eea..4999d72836 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java @@ -39,7 +39,7 @@ import org.eclipse.ui.ide.FileStoreEditorInput; */ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReusableEditor, IPropertyListener { - public static final String ID = "org.eclipse.linuxtools.tmf.ui.editors.events"; + public static final String ID = "org.eclipse.linuxtools.tmf.ui.editors.events"; //$NON-NLS-1$ private TmfEventsTable fEventsTable; private IResource fResource; @@ -73,10 +73,10 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus throw new PartInitException(e.getMessage()); } } else { - throw new PartInitException("Invalid IEditorInput: " + input.getClass()); + throw new PartInitException("Invalid IEditorInput: " + input.getClass()); //$NON-NLS-1$ } if (fTrace == null) { - throw new PartInitException("Invalid IEditorInput: " + fResource.getName()); + throw new PartInitException("Invalid IEditorInput: " + fResource.getName()); //$NON-NLS-1$ } super.setSite(site); super.setInput(input); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java index 7dc7be0090..ca4b90b28c 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfMultiPageEditorPart.java @@ -27,7 +27,7 @@ public abstract class TmfMultiPageEditorPart extends MultiPageEditorPart impleme public TmfMultiPageEditorPart() { super(); - fName = "TmfMultiPageEditorPart"; + fName = "TmfMultiPageEditorPart"; //$NON-NLS-1$ TmfSignalManager.register(this); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/ParserProviderManager.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/ParserProviderManager.java index c344b339cf..ada2a704e7 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/ParserProviderManager.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/ParserProviderManager.java @@ -32,17 +32,17 @@ import org.eclipse.swt.widgets.Composite; public class ParserProviderManager { - public static final QualifiedName PARSER_PROPERTY = new QualifiedName(TmfUiPlugin.PLUGIN_ID, "PARSER"); + public static final QualifiedName PARSER_PROPERTY = new QualifiedName(TmfUiPlugin.PLUGIN_ID, "PARSER"); //$NON-NLS-1$ private static List fParserProviders = new ArrayList(); public static void init() { IExtensionRegistry reg = Platform.getExtensionRegistry(); - IConfigurationElement[] extensions = reg.getConfigurationElementsFor("org.eclipse.linuxtools.tmf.ui.parserProviders"); + IConfigurationElement[] extensions = reg.getConfigurationElementsFor("org.eclipse.linuxtools.tmf.ui.parserProviders"); //$NON-NLS-1$ for (int i = 0; i < extensions.length; i++) { IConfigurationElement element = extensions[i]; try { - IParserProvider parserProvider = (IParserProvider) element.createExecutableExtension("class"); + IParserProvider parserProvider = (IParserProvider) element.createExecutableExtension("class"); //$NON-NLS-1$ addParserProvider(parserProvider); } catch (CoreException e) { e.printStackTrace(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java index c910f3a0f1..06b059a6f6 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java @@ -28,8 +28,8 @@ import org.eclipse.linuxtools.tmf.ui.parsers.custom.CustomTraceDefinition.Output public class CustomEvent extends TmfEvent { - protected static final String TIMESTAMP_INPUT_FORMAT_KEY = "CE_TS_I_F"; - protected static final String NO_MESSAGE = ""; + protected static final String TIMESTAMP_INPUT_FORMAT_KEY = "CE_TS_I_F"; //$NON-NLS-1$ + protected static final String NO_MESSAGE = ""; //$NON-NLS-1$ public static final byte TIMESTAMP_SCALE = -3; protected CustomTraceDefinition fDefinition; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventsTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventsTable.java index 83c369442f..87192142ec 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventsTable.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEventsTable.java @@ -34,10 +34,10 @@ public class CustomEventsTable extends TmfEventsTable { createColumnHeaders(); } - public static final String TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; + public static final String TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; //$NON-NLS-1$ private static final SimpleDateFormat TIMESTAMP_SIMPLE_DATE_FORMAT = new SimpleDateFormat(TIMESTAMP_FORMAT); static { - TIMESTAMP_SIMPLE_DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT")); + TIMESTAMP_SIMPLE_DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ } protected void createColumnHeaders() { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomParserProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomParserProvider.java index 4e64770ca2..d70f135e3a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomParserProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomParserProvider.java @@ -26,7 +26,7 @@ public class CustomParserProvider implements IParserProvider { @Override public String getCategory() { - return "Custom"; + return "Custom"; //$NON-NLS-1$ } @Override @@ -35,12 +35,12 @@ public class CustomParserProvider implements IParserProvider { String name = resource.getName(); String path = resource.getLocation().toOSString(); for (CustomTxtTraceDefinition def : CustomTxtTraceDefinition.loadAll()) { - if (parser.equals(CustomTxtTrace.class.getCanonicalName() + "." + def.definitionName)) { + if (parser.equals(CustomTxtTrace.class.getCanonicalName() + "." + def.definitionName)) { //$NON-NLS-1$ return new CustomTxtTrace(name, def, path, 100); } } for (CustomXmlTraceDefinition def : CustomXmlTraceDefinition.loadAll()) { - if (parser.equals(CustomXmlTrace.class.getCanonicalName() + "." + def.definitionName)) { + if (parser.equals(CustomXmlTrace.class.getCanonicalName() + "." + def.definitionName)) { //$NON-NLS-1$ return new CustomXmlTrace(name, def, path, 100); } } @@ -64,10 +64,10 @@ public class CustomParserProvider implements IParserProvider { public Map getParserMap() { Map parserMap = new LinkedHashMap(); for (CustomTxtTraceDefinition def : CustomTxtTraceDefinition.loadAll()) { - parserMap.put(def.definitionName, CustomTxtTrace.class.getCanonicalName() + "." + def.definitionName); + parserMap.put(def.definitionName, CustomTxtTrace.class.getCanonicalName() + "." + def.definitionName); //$NON-NLS-1$ } for (CustomXmlTraceDefinition def : CustomXmlTraceDefinition.loadAll()) { - parserMap.put(def.definitionName, CustomXmlTrace.class.getCanonicalName() + "." + def.definitionName); + parserMap.put(def.definitionName, CustomXmlTrace.class.getCanonicalName() + "." + def.definitionName); //$NON-NLS-1$ } return parserMap; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTraceDefinition.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTraceDefinition.java index 70c456e919..17cef9a7a2 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTraceDefinition.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTraceDefinition.java @@ -25,9 +25,9 @@ public abstract class CustomTraceDefinition { public static final int ACTION_APPEND = 1; public static final int ACTION_APPEND_WITH_SEPARATOR = 2; - public static final String TAG_TIMESTAMP = "Time Stamp"; - public static final String TAG_MESSAGE = "Message"; - public static final String TAG_OTHER = "Other"; + public static final String TAG_TIMESTAMP = Messages.CustomTraceDefinition_timestampTag; + public static final String TAG_MESSAGE = Messages.CustomTraceDefinition_messageTag; + public static final String TAG_OTHER = Messages.CustomTraceDefinition_otherTag; public String definitionName; public List outputs; @@ -50,7 +50,7 @@ public abstract class CustomTraceDefinition { public String formatTimeStamp(TmfTimestamp timestamp) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat(timeStampOutputFormat); - simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ return simpleDateFormat.format(timestamp.getValue()); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java index 0c7582f498..7008ee5827 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java @@ -68,14 +68,14 @@ public class CustomTxtEvent extends CustomEvent { } else if (column.action == CustomTxtTraceDefinition.ACTION_APPEND_WITH_SEPARATOR) { String s = fData.get(name); if (s != null) { - fData.put(name, s + " | " + value); + fData.put(name, s + " | " + value); //$NON-NLS-1$ } else { fData.put(name, value); } if (name.equals(CustomTxtTraceDefinition.TAG_TIMESTAMP)) { String timeStampInputFormat = fData.get(TIMESTAMP_INPUT_FORMAT_KEY); if (timeStampInputFormat != null) { - fData.put(TIMESTAMP_INPUT_FORMAT_KEY, timeStampInputFormat + " | " + column.format); + fData.put(TIMESTAMP_INPUT_FORMAT_KEY, timeStampInputFormat + " | " + column.format); //$NON-NLS-1$ } else { fData.put(TIMESTAMP_INPUT_FORMAT_KEY, column.format); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java index 7901d556f7..4bb339b458 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTrace.java @@ -60,7 +60,7 @@ public class CustomTxtTrace extends TmfTrace { return context; } try { - RandomAccessFile raFile = new RandomAccessFile(getPath(), "r"); + RandomAccessFile raFile = new RandomAccessFile(getPath(), "r"); //$NON-NLS-1$ if (location != null && location.getLocation() instanceof Long) { raFile.seek((Long)location.getLocation()); } @@ -258,7 +258,7 @@ public class CustomTxtTrace extends TmfTrace { } public CustomTxtEvent parseFirstLine(CustomTxtTraceContext context) { - CustomTxtEvent event = new CustomTxtEvent(fDefinition, TmfTimestamp.Zero, new TmfEventSource(""), new TmfEventType(fDefinition.definitionName, new String[0]), new TmfEventReference("")); + CustomTxtEvent event = new CustomTxtEvent(fDefinition, TmfTimestamp.Zero, new TmfEventSource(""), new TmfEventType(fDefinition.definitionName, new String[0]), new TmfEventReference("")); //$NON-NLS-1$ //$NON-NLS-2$ event.processGroups(context.inputLine, context.firstLineMatcher); return event; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java index ab1803f78e..2e0031ece1 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java @@ -48,28 +48,28 @@ import org.xml.sax.SAXParseException; public class CustomTxtTraceDefinition extends CustomTraceDefinition { - protected static final String CUSTOM_TXT_TRACE_DEFINITIONS_FILE_NAME = "custom_txt_parsers.xml"; + protected static final String CUSTOM_TXT_TRACE_DEFINITIONS_FILE_NAME = "custom_txt_parsers.xml"; //$NON-NLS-1$ protected static final String CUSTOM_TXT_TRACE_DEFINITIONS_PATH_NAME = TmfUiPlugin.getDefault().getStateLocation().addTrailingSeparator().append(CUSTOM_TXT_TRACE_DEFINITIONS_FILE_NAME).toString(); - private static final String CUSTOM_TXT_TRACE_DEFINITION_ROOT_ELEMENT = "CustomTxtTraceDefinitionList"; - private static final String DEFINITION_ELEMENT = "Definition"; - private static final String NAME_ATTRIBUTE = "name"; - private static final String TIME_STAMP_OUTPUT_FORMAT_ELEMENT = "TimeStampOutputFormat"; - private static final String INPUT_LINE_ELEMENT = "InputLine"; - private static final String CARDINALITY_ELEMENT = "Cardinality"; - private static final String MIN_ATTRIBUTE = "min"; - private static final String MAX_ATTRIBUTE = "max"; - private static final String REGEX_ELEMENT = "RegEx"; - private static final String INPUT_DATA_ELEMENT = "InputData"; - private static final String ACTION_ATTRIBUTE = "action"; - private static final String FORMAT_ATTRIBUTE = "format"; - private static final String OUTPUT_COLUMN_ELEMENT = "OutputColumn"; + private static final String CUSTOM_TXT_TRACE_DEFINITION_ROOT_ELEMENT = Messages.CustomTxtTraceDefinition_definitionRootElement; + private static final String DEFINITION_ELEMENT = Messages.CustomTxtTraceDefinition_definition; + private static final String NAME_ATTRIBUTE = Messages.CustomTxtTraceDefinition_name; + private static final String TIME_STAMP_OUTPUT_FORMAT_ELEMENT = Messages.CustomTxtTraceDefinition_timestampOutputFormat; + private static final String INPUT_LINE_ELEMENT = Messages.CustomTxtTraceDefinition_inputLine; + private static final String CARDINALITY_ELEMENT = Messages.CustomTxtTraceDefinition_cardinality; + private static final String MIN_ATTRIBUTE = Messages.CustomTxtTraceDefinition_min; + private static final String MAX_ATTRIBUTE = Messages.CustomTxtTraceDefinition_max; + private static final String REGEX_ELEMENT = Messages.CustomTxtTraceDefinition_regEx; + private static final String INPUT_DATA_ELEMENT = Messages.CustomTxtTraceDefinition_inputData; + private static final String ACTION_ATTRIBUTE = Messages.CustomTxtTraceDefinition_action; + private static final String FORMAT_ATTRIBUTE = Messages.CustomTxtTraceDefinition_format; + private static final String OUTPUT_COLUMN_ELEMENT = Messages.CustomTxtTraceDefinition_outputColumn; public List inputs; public CustomTxtTraceDefinition() { - this("", new ArrayList(0), new ArrayList(0), ""); + this("", new ArrayList(0), new ArrayList(0), ""); //$NON-NLS-1$ //$NON-NLS-2$ }; public CustomTxtTraceDefinition(String logtype, List inputs, List outputs, String timeStampOutputFormat) { @@ -199,7 +199,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { @Override public String toString() { - return regex + " " + cardinality; + return regex + " " + cardinality; //$NON-NLS-1$ } } @@ -238,9 +238,9 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { this.max = max; } - @Override + @Override public String toString() { - return "(" + (min >= 0 ? min : "?") + "," + (max == INF ? "\u221E" : (max >= 0 ? max : "?")) + ")"; + return "(" + (min >= 0 ? min : "?") + "," + (max == INF ? "\u221E" : (max >= 0 ? max : "?")) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ } @Override @@ -266,7 +266,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { EntityResolver resolver = new EntityResolver () { @Override public InputSource resolveEntity (String publicId, String systemId) { - String empty = ""; + String empty = ""; //$NON-NLS-1$ ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); } @@ -331,7 +331,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { } Transformer transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT, "yes"); + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$ //initialize StreamResult with File object to save to file StreamResult result = new StreamResult(new StringWriter()); @@ -403,7 +403,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { EntityResolver resolver = new EntityResolver () { @Override public InputSource resolveEntity (String publicId, String systemId) { - String empty = ""; + String empty = ""; //$NON-NLS-1$ ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); } @@ -463,7 +463,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { EntityResolver resolver = new EntityResolver () { @Override public InputSource resolveEntity (String publicId, String systemId) { - String empty = ""; + String empty = ""; //$NON-NLS-1$ ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); } @@ -581,7 +581,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { EntityResolver resolver = new EntityResolver () { @Override public InputSource resolveEntity (String publicId, String systemId) { - String empty = ""; + String empty = ""; //$NON-NLS-1$ ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); } @@ -618,7 +618,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { } Transformer transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT, "yes"); + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$ //initialize StreamResult with File object to save to file StreamResult result = new StreamResult(new StringWriter()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java index bf2950a265..e4d10e8e3d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java @@ -59,14 +59,14 @@ public class CustomXmlEvent extends CustomEvent { } else if (inputAction == CustomTraceDefinition.ACTION_APPEND_WITH_SEPARATOR) { String s = fData.get(name); if (s != null) { - fData.put(name, s + " | " + value); + fData.put(name, s + " | " + value); //$NON-NLS-1$ } else { fData.put(name, value); } if (name.equals(CustomTraceDefinition.TAG_TIMESTAMP)) { String timeStampInputFormat = fData.get(TIMESTAMP_INPUT_FORMAT_KEY); if (timeStampInputFormat != null) { - fData.put(TIMESTAMP_INPUT_FORMAT_KEY, timeStampInputFormat + " | " + inputFormat); + fData.put(TIMESTAMP_INPUT_FORMAT_KEY, timeStampInputFormat + " | " + inputFormat); //$NON-NLS-1$ } else { fData.put(TIMESTAMP_INPUT_FORMAT_KEY, inputFormat); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java index f028c7ffd6..772d38cfed 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTrace.java @@ -65,13 +65,13 @@ public class CustomXmlTrace extends TmfTrace { return context; } try { - context.raFile = new RandomAccessFile(getPath(), "r"); + context.raFile = new RandomAccessFile(getPath(), "r"); //$NON-NLS-1$ if (location != null && location.getLocation() instanceof Long) { context.raFile.seek((Long)location.getLocation()); } String line; - String recordElementStart = "<" + fRecordInputElement.elementName; + String recordElementStart = "<" + fRecordInputElement.elementName; //$NON-NLS-1$ long rawPos = context.raFile.getFilePointer(); while ((line = context.raFile.readLine()) != null) { @@ -133,14 +133,14 @@ public class CustomXmlTrace extends TmfTrace { if (context.raFile.getFilePointer() != (Long)context.getLocation().getLocation() + 1) { context.raFile.seek((Long)context.getLocation().getLocation() + 1); // +1 is for the < } - StringBuffer elementBuffer = new StringBuffer("<"); + StringBuffer elementBuffer = new StringBuffer("<"); //$NON-NLS-1$ readElement(elementBuffer, context.raFile); Element element = parseElementBuffer(elementBuffer); event = extractEvent(element, fRecordInputElement); String line; - String recordElementStart = "<" + fRecordInputElement.elementName; + String recordElementStart = "<" + fRecordInputElement.elementName; //$NON-NLS-1$ long rawPos = context.raFile.getFilePointer(); while ((line = context.raFile.readLine()) != null) { @@ -168,7 +168,7 @@ public class CustomXmlTrace extends TmfTrace { EntityResolver resolver = new EntityResolver () { @Override public InputSource resolveEntity (String publicId, String systemId) { - String empty = ""; + String empty = ""; //$NON-NLS-1$ ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); } @@ -215,7 +215,7 @@ public class CustomXmlTrace extends TmfTrace { readElement(buffer, raFile); } else if (c == '/' && numRead == 1) { break; // found "') { if (buffer.charAt(buffer.length() - 2) == '/') { @@ -257,7 +257,7 @@ public class CustomXmlTrace extends TmfTrace { numRead++; char c = (char)i; buffer.append(c); - if (c == '>' && numRead >= 2 && buffer.substring(buffer.length() - 3, buffer.length() - 1).equals("--")) { + if (c == '>' && numRead >= 2 && buffer.substring(buffer.length() - 3, buffer.length() - 1).equals("--")) { //$NON-NLS-1$ break; // found "-->" } } @@ -274,7 +274,7 @@ public class CustomXmlTrace extends TmfTrace { Node node = nodeList.item(i); if (node.getNodeType() == Node.ELEMENT_NODE) { if (separator == null) { - separator = " | "; + separator = " | "; //$NON-NLS-1$ } else { buffer.append(separator); } @@ -282,12 +282,12 @@ public class CustomXmlTrace extends TmfTrace { if (element.hasChildNodes() == false) { buffer.append(element.getNodeName()); } else if (element.getChildNodes().getLength() == 1 && element.getFirstChild().getNodeType() == Node.TEXT_NODE) { - buffer.append(element.getNodeName() + ":" + element.getFirstChild().getNodeValue().trim()); + buffer.append(element.getNodeName() + ":" + element.getFirstChild().getNodeValue().trim()); //$NON-NLS-1$ } else { buffer.append(element.getNodeName()); - buffer.append(" [ "); + buffer.append(" [ "); //$NON-NLS-1$ parseElement(element, buffer); - buffer.append(" ]"); + buffer.append(" ]"); //$NON-NLS-1$ } } else if (node.getNodeType() == Node.TEXT_NODE) { if (node.getNodeValue().trim().length() != 0) { @@ -313,7 +313,7 @@ public class CustomXmlTrace extends TmfTrace { } public CustomXmlEvent extractEvent(Element element, InputElement inputElement) { - CustomXmlEvent event = new CustomXmlEvent(fDefinition, TmfTimestamp.Zero, new TmfEventSource(""), new TmfEventType(fDefinition.definitionName, new String[0]), new TmfEventReference("")); + CustomXmlEvent event = new CustomXmlEvent(fDefinition, TmfTimestamp.Zero, new TmfEventSource(""), new TmfEventType(fDefinition.definitionName, new String[0]), new TmfEventReference("")); //$NON-NLS-1$ //$NON-NLS-2$ parseElement(element, event, inputElement); return event; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java index a1efbcfe31..bf67fdcbb9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java @@ -45,28 +45,28 @@ import org.xml.sax.SAXParseException; public class CustomXmlTraceDefinition extends CustomTraceDefinition { - protected static final String CUSTOM_XML_TRACE_DEFINITIONS_FILE_NAME = "custom_xml_parsers.xml"; + protected static final String CUSTOM_XML_TRACE_DEFINITIONS_FILE_NAME = "custom_xml_parsers.xml"; //$NON-NLS-1$ protected static final String CUSTOM_XML_TRACE_DEFINITIONS_PATH_NAME = TmfUiPlugin.getDefault().getStateLocation().addTrailingSeparator().append(CUSTOM_XML_TRACE_DEFINITIONS_FILE_NAME).toString(); - public static final String TAG_IGNORE = "Ignore"; - - private static final String CUSTOM_XML_TRACE_DEFINITION_ROOT_ELEMENT = "CustomXMLTraceDefinitionList"; - private static final String DEFINITION_ELEMENT = "Definition"; - private static final String NAME_ATTRIBUTE = "name"; - private static final String LOG_ENTRY_ATTRIBUTE = "logentry"; - private static final String TIME_STAMP_OUTPUT_FORMAT_ELEMENT = "TimeStampOutputFormat"; - private static final String INPUT_ELEMENT_ELEMENT = "InputElement"; - private static final String ATTRIBUTE_ELEMENT = "Attribute"; - private static final String INPUT_DATA_ELEMENT = "InputData"; - private static final String ACTION_ATTRIBUTE = "action"; - private static final String FORMAT_ATTRIBUTE = "format"; - private static final String OUTPUT_COLUMN_ELEMENT = "OutputColumn"; + public static final String TAG_IGNORE = Messages.CustomXmlTraceDefinition_ignoreTag; + + private static final String CUSTOM_XML_TRACE_DEFINITION_ROOT_ELEMENT = Messages.CustomXmlTraceDefinition_definitionRootElement; + private static final String DEFINITION_ELEMENT = Messages.CustomXmlTraceDefinition_definition; + private static final String NAME_ATTRIBUTE = Messages.CustomXmlTraceDefinition_name; + private static final String LOG_ENTRY_ATTRIBUTE = Messages.CustomXmlTraceDefinition_logEntry; + private static final String TIME_STAMP_OUTPUT_FORMAT_ELEMENT = Messages.CustomXmlTraceDefinition_timestampOutputFormat; + private static final String INPUT_ELEMENT_ELEMENT = Messages.CustomXmlTraceDefinition_inputElement; + private static final String ATTRIBUTE_ELEMENT = Messages.CustomXmlTraceDefinition_attribute; + private static final String INPUT_DATA_ELEMENT = Messages.CustomXmlTraceDefinition_inputData; + private static final String ACTION_ATTRIBUTE = Messages.CustomXmlTraceDefinition_action; + private static final String FORMAT_ATTRIBUTE = Messages.CustomXmlTraceDefinition_format; + private static final String OUTPUT_COLUMN_ELEMENT = Messages.CustomXmlTraceDefinition_outputColumn; public InputElement rootInputElement; public CustomXmlTraceDefinition() { - this("", null, new ArrayList(), ""); + this("", null, new ArrayList(), ""); //$NON-NLS-1$ //$NON-NLS-2$ }; public CustomXmlTraceDefinition(String logtype, InputElement rootElement, List outputs, String timeStampOutputFormat) { @@ -182,7 +182,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { EntityResolver resolver = new EntityResolver () { @Override public InputSource resolveEntity (String publicId, String systemId) { - String empty = ""; + String empty = ""; //$NON-NLS-1$ ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); } @@ -245,7 +245,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { } Transformer transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT, "yes"); + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$ //initialize StreamResult with File object to save to file StreamResult result = new StreamResult(new StringWriter()); @@ -326,7 +326,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { EntityResolver resolver = new EntityResolver () { @Override public InputSource resolveEntity (String publicId, String systemId) { - String empty = ""; + String empty = ""; //$NON-NLS-1$ ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); } @@ -386,7 +386,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { EntityResolver resolver = new EntityResolver () { @Override public InputSource resolveEntity (String publicId, String systemId) { - String empty = ""; + String empty = ""; //$NON-NLS-1$ ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); } @@ -512,7 +512,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { EntityResolver resolver = new EntityResolver () { @Override public InputSource resolveEntity (String publicId, String systemId) { - String empty = ""; + String empty = ""; //$NON-NLS-1$ ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); } @@ -549,7 +549,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { } Transformer transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT, "yes"); + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$ //initialize StreamResult with File object to save to file StreamResult result = new StreamResult(new StringWriter()); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/Messages.java new file mode 100644 index 0000000000..e6252872be --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/Messages.java @@ -0,0 +1,42 @@ +package org.eclipse.linuxtools.tmf.ui.parsers.custom; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.parsers.custom.messages"; //$NON-NLS-1$ + public static String CustomTraceDefinition_messageTag; + public static String CustomTraceDefinition_otherTag; + public static String CustomTraceDefinition_timestampTag; + public static String CustomTxtTraceDefinition_action; + public static String CustomTxtTraceDefinition_cardinality; + public static String CustomTxtTraceDefinition_definition; + public static String CustomTxtTraceDefinition_definitionRootElement; + public static String CustomTxtTraceDefinition_format; + public static String CustomTxtTraceDefinition_inputData; + public static String CustomTxtTraceDefinition_inputLine; + public static String CustomTxtTraceDefinition_max; + public static String CustomTxtTraceDefinition_min; + public static String CustomTxtTraceDefinition_name; + public static String CustomTxtTraceDefinition_outputColumn; + public static String CustomTxtTraceDefinition_regEx; + public static String CustomTxtTraceDefinition_timestampOutputFormat; + public static String CustomXmlTraceDefinition_action; + public static String CustomXmlTraceDefinition_attribute; + public static String CustomXmlTraceDefinition_definition; + public static String CustomXmlTraceDefinition_definitionRootElement; + public static String CustomXmlTraceDefinition_format; + public static String CustomXmlTraceDefinition_ignoreTag; + public static String CustomXmlTraceDefinition_inputData; + public static String CustomXmlTraceDefinition_inputElement; + public static String CustomXmlTraceDefinition_logEntry; + public static String CustomXmlTraceDefinition_name; + public static String CustomXmlTraceDefinition_outputColumn; + public static String CustomXmlTraceDefinition_timestampOutputFormat; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/messages.properties b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/messages.properties new file mode 100644 index 0000000000..51aa911b37 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/messages.properties @@ -0,0 +1,28 @@ +CustomTraceDefinition_messageTag=Message +CustomTraceDefinition_otherTag=Other +CustomTraceDefinition_timestampTag=Time Stamp +CustomTxtTraceDefinition_action=action +CustomTxtTraceDefinition_cardinality=Cardinality +CustomTxtTraceDefinition_definition=Definition +CustomTxtTraceDefinition_definitionRootElement=CustomTxtTraceDefinitionList +CustomTxtTraceDefinition_format=format +CustomTxtTraceDefinition_inputData=InputData +CustomTxtTraceDefinition_inputLine=InputLine +CustomTxtTraceDefinition_max=max +CustomTxtTraceDefinition_min=min +CustomTxtTraceDefinition_name=name +CustomTxtTraceDefinition_outputColumn=OutputColumn +CustomTxtTraceDefinition_regEx=RegEx +CustomTxtTraceDefinition_timestampOutputFormat=TimeStampOutputFormat +CustomXmlTraceDefinition_action=action +CustomXmlTraceDefinition_attribute=Attribute +CustomXmlTraceDefinition_definition=Definition +CustomXmlTraceDefinition_definitionRootElement=CustomXMLTraceDefinitionList +CustomXmlTraceDefinition_format=format +CustomXmlTraceDefinition_ignoreTag=Ignore +CustomXmlTraceDefinition_inputData=InputData +CustomXmlTraceDefinition_inputElement=InputElement +CustomXmlTraceDefinition_logEntry=logentry +CustomXmlTraceDefinition_name=name +CustomXmlTraceDefinition_outputColumn=OutputColumn +CustomXmlTraceDefinition_timestampOutputFormat=TimeStampOutputFormat diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java index 8034e8cc5f..c1f101d921 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java @@ -94,7 +94,7 @@ public class TmfEventsTable extends TmfComponent { } public TmfEventsTable(Composite parent, int cacheSize, ColumnData[] columnData) { - super("TmfEventsTable"); + super("TmfEventsTable"); //$NON-NLS-1$ fCacheSize = cacheSize; fCache = new TmfEvent[fCacheSize]; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisProvider.java index ce95945b14..7ea4e4f1e4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisProvider.java @@ -39,7 +39,7 @@ public abstract class TmfTimeAnalysisProvider { private String stateName; StateColor() { - String undef = new String("Undefined"); + String undef = new String("Undefined"); //$NON-NLS-1$ this.stateName = undef; } @@ -272,13 +272,13 @@ public abstract class TmfTimeAnalysisProvider { String name = trace.getName(); String threadClass = getTraceClassName(trace); if (threadClass != null && threadClass.length() > 0) { - name += " [" + threadClass + "]"; + name += " [" + threadClass + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } if (inclState) { List list = trace.getTraceEvents(); if (null != list && list.size() > 0) { ITimeEvent event = (ITimeEvent) list.get(list.size() - 1); - name += " (" + getEventName(event, false, true) + ")"; + name += " (" + getEventName(event, false, true) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ } } return name; @@ -288,9 +288,9 @@ public abstract class TmfTimeAnalysisProvider { String name = event.getEntry().getName(); String threadClass = getTraceClassName(event.getEntry()); if (threadClass != null && threadClass.length() > 0) { - name += " [" + threadClass + "]"; + name += " [" + threadClass + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } - name += " (" + getEventName(event, false, true) + ")"; + name += " (" + getEventName(event, false, true) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ return name; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java index d8fb2bb344..5f9c4ee1fd 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/TmfTimeAnalysisViewer.java @@ -147,7 +147,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv } protected String getViewTypeStr() { - return "viewoption.threads"; + return "viewoption.threads"; //$NON-NLS-1$ } int getMarginWidth(int idx) { @@ -161,12 +161,12 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv void loadOptions() { _minTimeInterval = 1; _selectedTime = -1; - _nameWidth = Utils.loadIntOption(getPreferenceString("namewidth"), + _nameWidth = Utils.loadIntOption(getPreferenceString("namewidth"), //$NON-NLS-1$ _nameWidthPref, _minNameWidth, 1000); } void saveOptions() { - Utils.saveIntOption(getPreferenceString("namewidth"), _nameWidth); + Utils.saveIntOption(getPreferenceString("namewidth"), _nameWidth); //$NON-NLS-1$ } protected Control createDataViewer(Composite parent, @@ -616,7 +616,7 @@ public class TmfTimeAnalysisViewer implements ITimeAnalysisViewer, ITimeDataProv } private String getPreferenceString(String string) { - return getViewTypeStr() + "." + string; + return getViewTypeStr() + "." + string; //$NON-NLS-1$ } @Override diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java index 9e287cf643..85b09042af 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/dialogs/TmfTimeFilterDialog.java @@ -120,7 +120,7 @@ public class TmfTimeFilterDialog extends TitleAreaDialog { private void createColumns(Table table) { table.setHeaderVisible(true); - String headers[] = { "", Messages._TRACE_ID, Messages._TRACE_NAME }; + String headers[] = { "", Messages._TRACE_ID, Messages._TRACE_NAME }; //$NON-NLS-1$ int width[] = { 20, 80, 400 }; for (int i = 0; i < headers.length; i++) { @@ -199,7 +199,7 @@ public class TmfTimeFilterDialog extends TitleAreaDialog { else if (columnIndex == 2) return t.getName(); else - return ""; + return ""; //$NON-NLS-1$ } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java index ae7e67261a..8d1a2b8d1e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TimeScaleCtrl.java @@ -55,7 +55,7 @@ public class TimeScaleCtrl extends TraceCtrl implements MouseListener, private static final double LOG10_3 = Math.log10(3); private static final double LOG10_5 = Math.log10(5); - private static final Calendar GREGORIAN_CALENDAR = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT")); + private static final Calendar GREGORIAN_CALENDAR = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ private ITimeDataProvider _timeProvider; private int _dragState = 0; @@ -198,9 +198,9 @@ public class TimeScaleCtrl extends TraceCtrl implements MouseListener, _rect0.x += 4; _rect0.width -= 4; if (_rect0.width > 0) { - Utils.drawText(gc, Messages._Timescale + ":", _rect0, true); + Utils.drawText(gc, Messages._Timescale + ":", _rect0, true); //$NON-NLS-1$ } - int messageWidth = gc.stringExtent(Messages._Timescale + ":").x + 4; + int messageWidth = gc.stringExtent(Messages._Timescale + ":").x + 4; //$NON-NLS-1$ Rectangle absHeaderRect = new Rectangle(_rect0.x + messageWidth, _rect0.y, _rect0.width - messageWidth, _rect0.height); _rect0.x -= 4; _rect0.width += 4; @@ -464,30 +464,30 @@ public class TimeScaleCtrl extends TraceCtrl implements MouseListener, } abstract class TimeDraw { - static String S = ":"; - static String S0 = ":0"; - static String S00 = ":00"; - protected static final SimpleDateFormat stimeformat = new SimpleDateFormat("HH:mm:ss"); - protected static final SimpleDateFormat stimeformatheader = new SimpleDateFormat("yyyy MMM dd"); - protected static final SimpleDateFormat sminformat = new SimpleDateFormat("HH:mm"); - protected static final SimpleDateFormat sminformatheader = new SimpleDateFormat("yyyy MMM dd"); - protected static final SimpleDateFormat shrsformat = new SimpleDateFormat("MMM dd HH:mm"); - protected static final SimpleDateFormat shrsformatheader = new SimpleDateFormat("yyyy"); - protected static final SimpleDateFormat sdayformat = new SimpleDateFormat("MMM dd"); - protected static final SimpleDateFormat sdayformatheader = new SimpleDateFormat("yyyy"); - protected static final SimpleDateFormat smonthformat = new SimpleDateFormat("yyyy MMM"); - protected static final SimpleDateFormat syearformat = new SimpleDateFormat("yyyy"); + static String S = ":" ; //$NON-NLS-1$ + static String S0 = ":0" ; //$NON-NLS-1$ + static String S00 = ":00"; //$NON-NLS-1$ + protected static final SimpleDateFormat stimeformat = new SimpleDateFormat("HH:mm:ss"); //$NON-NLS-1$ + protected static final SimpleDateFormat stimeformatheader = new SimpleDateFormat("yyyy MMM dd"); //$NON-NLS-1$ + protected static final SimpleDateFormat sminformat = new SimpleDateFormat("HH:mm"); //$NON-NLS-1$ + protected static final SimpleDateFormat sminformatheader = new SimpleDateFormat("yyyy MMM dd"); //$NON-NLS-1$ + protected static final SimpleDateFormat shrsformat = new SimpleDateFormat("MMM dd HH:mm"); //$NON-NLS-1$ + protected static final SimpleDateFormat shrsformatheader = new SimpleDateFormat("yyyy"); //$NON-NLS-1$ + protected static final SimpleDateFormat sdayformat = new SimpleDateFormat("MMM dd"); //$NON-NLS-1$ + protected static final SimpleDateFormat sdayformatheader = new SimpleDateFormat("yyyy"); //$NON-NLS-1$ + protected static final SimpleDateFormat smonthformat = new SimpleDateFormat("yyyy MMM"); //$NON-NLS-1$ + protected static final SimpleDateFormat syearformat = new SimpleDateFormat("yyyy"); //$NON-NLS-1$ static { - stimeformat.setTimeZone(TimeZone.getTimeZone("GMT")); - stimeformatheader.setTimeZone(TimeZone.getTimeZone("GMT")); - sminformat.setTimeZone(TimeZone.getTimeZone("GMT")); - sminformatheader.setTimeZone(TimeZone.getTimeZone("GMT")); - shrsformat.setTimeZone(TimeZone.getTimeZone("GMT")); - shrsformatheader.setTimeZone(TimeZone.getTimeZone("GMT")); - sdayformat.setTimeZone(TimeZone.getTimeZone("GMT")); - sdayformatheader.setTimeZone(TimeZone.getTimeZone("GMT")); - smonthformat.setTimeZone(TimeZone.getTimeZone("GMT")); - syearformat.setTimeZone(TimeZone.getTimeZone("GMT")); + stimeformat.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + stimeformatheader.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + sminformat.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + sminformatheader.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + shrsformat.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + shrsformatheader.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + sdayformat.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + sdayformatheader.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + smonthformat.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + syearformat.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ } static String pad(long n) { @@ -510,12 +510,12 @@ abstract class TimeDraw { } class TimeDrawSec extends TimeDraw { - static String _hint = "sec"; + static String _hint = "sec"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { time /= 1000000000; - Utils.drawText(gc, time + "", rect, true); + Utils.drawText(gc, time + "", rect, true); //$NON-NLS-1$ } @Override @@ -525,7 +525,7 @@ class TimeDrawSec extends TimeDraw { } class TimeDrawMillisec extends TimeDraw { - static String _hint = "s:ms"; + static String _hint = "s:ms"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { @@ -542,7 +542,7 @@ class TimeDrawMillisec extends TimeDraw { } class TimeDrawMicrosec extends TimeDraw { - static String _hint = "s:ms:mcs"; + static String _hint = "s:ms:mcs"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { @@ -561,7 +561,7 @@ class TimeDrawMicrosec extends TimeDraw { } class TimeDrawNanosec extends TimeDraw { - static String _hint = "s:ms:mcs:ns"; + static String _hint = "s:ms:mcs:ns"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { @@ -581,7 +581,7 @@ class TimeDrawNanosec extends TimeDraw { } class TimeDrawAbsYear extends TimeDraw { - static String _hint = "YYYY"; + static String _hint = "YYYY"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { @@ -596,7 +596,7 @@ class TimeDrawAbsYear extends TimeDraw { } class TimeDrawAbsMonth extends TimeDraw { - static String _hint = "YYYY Mmm"; + static String _hint = "YYYY Mmm"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { @@ -611,7 +611,7 @@ class TimeDrawAbsMonth extends TimeDraw { } class TimeDrawAbsDay extends TimeDraw { - static String _hint = "Mmm dd"; + static String _hint = "Mmm dd"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { @@ -636,7 +636,7 @@ class TimeDrawAbsDay extends TimeDraw { } class TimeDrawAbsHrs extends TimeDraw { - static String _hint = "Mmm dd HH:mm"; + static String _hint = "Mmm dd HH:mm"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { @@ -661,7 +661,7 @@ class TimeDrawAbsHrs extends TimeDraw { } class TimeDrawAbsMin extends TimeDraw { - static String _hint = "HH:mm"; + static String _hint = "HH:mm"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { @@ -687,7 +687,7 @@ class TimeDrawAbsMin extends TimeDraw { } class TimeDrawAbsSec extends TimeDraw { - static String _hint = "HH:mm:ss"; + static String _hint = "HH:mm:ss"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { @@ -712,14 +712,14 @@ class TimeDrawAbsSec extends TimeDraw { } class TimeDrawAbsMillisec extends TimeDraw { - static String _hint = "HH:ss:ms"; + static String _hint = "HH:ss:ms"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { String stime = stimeformat.format(new Date((long) (time / 1000000))); String ns = Utils.formatNs(time, Resolution.MILLISEC); - Utils.drawText(gc, stime + " " + ns, rect, true); + Utils.drawText(gc, stime + " " + ns, rect, true); //$NON-NLS-1$ } @Override @@ -739,13 +739,13 @@ class TimeDrawAbsMillisec extends TimeDraw { } class TimeDrawAbsMicroSec extends TimeDraw { - static String _hint = "HH:ss:ms:mcs"; + static String _hint = "HH:ss:ms:mcs"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { String stime = stimeformat.format(new Date((long) (time / 1000000))); String micr = Utils.formatNs(time, Resolution.MICROSEC); - Utils.drawText(gc, stime + " " + micr, rect, true); + Utils.drawText(gc, stime + " " + micr, rect, true); //$NON-NLS-1$ } @Override @@ -765,13 +765,13 @@ class TimeDrawAbsMicroSec extends TimeDraw { } class TimeDrawAbsNanoSec extends TimeDraw { - static String _hint = "HH:ss:ms:mcs:ns"; + static String _hint = "HH:ss:ms:mcs:ns"; //$NON-NLS-1$ @Override public void draw(GC gc, long time, Rectangle rect) { String stime = stimeformat.format(new Date((long) (time / 1000000))); String ns = Utils.formatNs(time, Resolution.NANOSEC); - Utils.drawText(gc, stime + " " + ns, rect, true); + Utils.drawText(gc, stime + " " + ns, rect, true); //$NON-NLS-1$ } @Override diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java index e21bd00deb..7c8957cbb8 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeStatesCtrl.java @@ -1039,10 +1039,10 @@ public class TmfTimeStatesCtrl extends TraceCtrl implements FocusListener, while (size.x > width && name.length() > 1) { cuts++; name = name.substring(0, name.length() - 1); - size = gc.stringExtent(name + "..."); + size = gc.stringExtent(name + "..."); //$NON-NLS-1$ } if (cuts > 0) - name += "..."; + name += "..."; //$NON-NLS-1$ elemWidth += MARGIN; } Utils.init(_rect1, rect); @@ -2097,7 +2097,7 @@ class ItemData { public void updateItems() { List itemList = new ArrayList(); - String name = ""; + String name = ""; //$NON-NLS-1$ Iterator it = _groupTable.values().iterator(); while (it.hasNext()) { @@ -2224,8 +2224,7 @@ class ItemData { if (null == group) { group = new GroupItem(NLS.bind(Messages._TRACE_GROUP_LABEL, groupName)); - group._expanded = !groupName.equalsIgnoreCase("system") - && !groupName.equalsIgnoreCase(undef); + group._expanded = !groupName.equalsIgnoreCase("system") && !groupName.equalsIgnoreCase(undef); _groupTable.put(groupName, group); groupList.add(group); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeTipHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeTipHandler.java index eda2d7992b..042e830389 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeTipHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/TmfTimeTipHandler.java @@ -155,33 +155,33 @@ public class TmfTimeTipHandler { // Add Date addItem(Messages._TRACE_DATE, eventStartTime > -1 ? Utils.formatDate(eventStartTime) - : "?"); + : "?"); //$NON-NLS-1$ if (eventDuration > 0) { addItem(Messages._TRACE_START_TIME, eventStartTime > -1 ? Utils.formatTime(eventStartTime, TimeFormat.ABSOLUTE, res) - : "?"); + : "?"); //$NON-NLS-1$ addItem(Messages._TRACE_STOP_TIME, eventEndTime > -1 ? Utils.formatTime(eventEndTime, TimeFormat.ABSOLUTE, res) - : "?"); + : "?"); //$NON-NLS-1$ } else { addItem(Messages._TRACE_EVENT_TIME, eventStartTime > -1 ? Utils.formatTime(eventStartTime, TimeFormat.ABSOLUTE, res) - : "?"); + : "?"); //$NON-NLS-1$ } } else { if (eventDuration > 0) { addItem(Messages._TRACE_START_TIME, eventStartTime > -1 ? Utils.formatTime(eventStartTime, TimeFormat.RELATIVE, res) - : "?"); + : "?"); //$NON-NLS-1$ addItem(Messages._TRACE_STOP_TIME, eventEndTime > -1 ? Utils.formatTime(eventEndTime, TimeFormat.RELATIVE, res) - : "?"); + : "?"); //$NON-NLS-1$ } else { addItem(Messages._TRACE_EVENT_TIME, eventStartTime > -1 ? Utils.formatTime(eventStartTime, TimeFormat.RELATIVE, res) - : "?"); + : "?"); //$NON-NLS-1$ } } @@ -189,13 +189,12 @@ public class TmfTimeTipHandler { // Duration in relative format in any case addItem(Messages._DURATION, eventDuration > -1 ? Utils.formatTime(eventDuration, TimeFormat.RELATIVE, res) - : "?"); + : "?"); //$NON-NLS-1$ } } else if (item instanceof GroupItem) { addItem(Messages._TRACE_GROUP_NAME, item.toString()); - addItem(Messages._NUMBER_OF_TRACES, "" - + ((GroupItem) item)._traces.size()); + addItem(Messages._NUMBER_OF_TRACES, "" + ((GroupItem) item)._traces.size()); //$NON-NLS-1$ } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/Utils.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/Utils.java index 80680e32fd..b04b4be50b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/Utils.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/timeAnalysis/widgets/Utils.java @@ -48,11 +48,11 @@ public class Utils { SECONDS, MILLISEC, MICROSEC, NANOSEC }; - static private final SimpleDateFormat stimeformat = new SimpleDateFormat("HH:mm:ss"); - static private final SimpleDateFormat sdateformat = new SimpleDateFormat("yyyy-MM-dd"); + static private final SimpleDateFormat stimeformat = new SimpleDateFormat("HH:mm:ss"); //$NON-NLS-1$ + static private final SimpleDateFormat sdateformat = new SimpleDateFormat("yyyy-MM-dd"); //$NON-NLS-1$ static { - stimeformat.setTimeZone(TimeZone.getTimeZone("GMT")); - sdateformat.setTimeZone(TimeZone.getTimeZone("GMT")); + stimeformat.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + sdateformat.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ } // static private String _externalPlugin[] = { "org.eclipse.debug.ui", @@ -184,7 +184,7 @@ public class Utils { // str.append('0'); str.append(sec); String ns = formatNs(v, res); - if (!ns.equals("")) { + if (!ns.equals("")) { //$NON-NLS-1$ str.append(':'); str.append(ns); } @@ -214,7 +214,7 @@ public class Utils { // format time from nanoseconds to calendar time HH:MM:SS String stime = stimeformat.format(new Date((long) (time * 1E-6))); - str.append(stime + " "); + str.append(stime + " "); //$NON-NLS-1$ // append the Milliseconds, MicroSeconds and NanoSeconds as specified in // the Resolution str.append(formatNs(time, res)); @@ -262,21 +262,21 @@ public class Utils { long ns = time; ns %= 1000000000; if (ns < 10) { - temp.append("00000000"); + temp.append("00000000"); //$NON-NLS-1$ } else if (ns < 100) { - temp.append("0000000"); + temp.append("0000000"); //$NON-NLS-1$ } else if (ns < 1000) { - temp.append("000000"); + temp.append("000000"); //$NON-NLS-1$ } else if (ns < 10000) { - temp.append("00000"); + temp.append("00000"); //$NON-NLS-1$ } else if (ns < 100000) { - temp.append("0000"); + temp.append("0000"); //$NON-NLS-1$ } else if (ns < 1000000) { - temp.append("000"); + temp.append("000"); //$NON-NLS-1$ } else if (ns < 10000000) { - temp.append("00"); + temp.append("00"); //$NON-NLS-1$ } else if (ns < 100000000) { - temp.append("0"); + temp.append("0"); //$NON-NLS-1$ } temp.append(ns); @@ -287,12 +287,12 @@ public class Utils { } if (segments > 1) { // append Micro secs - str.append("."); + str.append("."); //$NON-NLS-1$ str.append(temp.substring(3, 6)); } if (segments > 2) { // append Nano seconds - str.append("."); + str.append("."); //$NON-NLS-1$ str.append(temp.substring(6)); } @@ -410,13 +410,13 @@ public class Utils { if (pos >= 0) { String ret = sig.substring(0, pos); sig = sig.substring(pos); - sig = sig + " " + ret; + sig = sig + " " + ret; //$NON-NLS-1$ } return sig; } static public String restoreMethodSignature(String sig) { - String ret = ""; + String ret = ""; //$NON-NLS-1$ int pos = sig.indexOf('('); if (pos >= 0) { ret = sig.substring(0, pos); @@ -426,15 +426,15 @@ public class Utils { if (pos >= 0) { sig = sig.substring(0, pos); } - String args[] = sig.split(","); - sig = "("; + String args[] = sig.split(","); //$NON-NLS-1$ + sig = "("; //$NON-NLS-1$ for (int i = 0; i < args.length; i++) { String arg = args[i].trim(); if (arg.length() == 0 && args.length == 1) break; sig += getTypeSignature(arg); } - sig += ")" + getTypeSignature(ret); + sig += ")" + getTypeSignature(ret); //$NON-NLS-1$ return sig; } @@ -447,29 +447,29 @@ public class Utils { int pos = type.indexOf('['); if (pos >= 0) type = type.substring(0, pos); - String sig = ""; + String sig = ""; //$NON-NLS-1$ for (int j = 0; j < dim; j++) - sig += "["; - if (type.equals("boolean")) - sig += "Z"; - else if (type.equals("byte")) - sig += "B"; - else if (type.equals("char")) - sig += "C"; - else if (type.equals("short")) - sig += "S"; - else if (type.equals("int")) - sig += "I"; - else if (type.equals("long")) - sig += "J"; - else if (type.equals("float")) - sig += "F"; - else if (type.equals("double")) - sig += "D"; - else if (type.equals("void")) - sig += "V"; + sig += "["; //$NON-NLS-1$ + if (type.equals("boolean")) //$NON-NLS-1$ + sig += "Z"; //$NON-NLS-1$ + else if (type.equals("byte")) //$NON-NLS-1$ + sig += "B"; //$NON-NLS-1$ + else if (type.equals("char")) //$NON-NLS-1$ + sig += "C"; //$NON-NLS-1$ + else if (type.equals("short")) //$NON-NLS-1$ + sig += "S"; //$NON-NLS-1$ + else if (type.equals("int")) //$NON-NLS-1$ + sig += "I"; //$NON-NLS-1$ + else if (type.equals("long")) //$NON-NLS-1$ + sig += "J"; //$NON-NLS-1$ + else if (type.equals("float")) //$NON-NLS-1$ + sig += "F"; //$NON-NLS-1$ + else if (type.equals("double")) //$NON-NLS-1$ + sig += "D"; //$NON-NLS-1$ + else if (type.equals("void")) //$NON-NLS-1$ + sig += "V"; //$NON-NLS-1$ else - sig += "L" + type.replace('.', '/') + ";"; + sig += "L" + type.replace('.', '/') + ";"; //$NON-NLS-1$ //$NON-NLS-2$ return sig; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java index f44c1a9bd2..6ca4e7ab0a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Composite; */ public class TmfEventsView extends TmfView { - public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.events"; + public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.events"; //$NON-NLS-1$ private TmfExperiment fExperiment; private TmfEventsTable fEventsTable; @@ -43,7 +43,7 @@ public class TmfEventsView extends TmfView { // ------------------------------------------------------------------------ public TmfEventsView(int cacheSize) { - super("TmfEventsView"); + super("TmfEventsView"); //$NON-NLS-1$ fCacheSize = cacheSize; } @@ -55,8 +55,8 @@ public class TmfEventsView extends TmfView { // ViewPart // ------------------------------------------------------------------------ - @SuppressWarnings("unchecked") @Override + @SuppressWarnings("unchecked") public void createPartControl(Composite parent) { fEventsTable = createEventsTable(parent, fCacheSize); @@ -93,6 +93,7 @@ public class TmfEventsView extends TmfView { * @see java.lang.Object#toString() */ @Override + @SuppressWarnings("nls") public String toString() { return "[TmfEventsView]"; } @@ -106,7 +107,7 @@ public class TmfEventsView extends TmfView { public void experimentSelected(TmfExperimentSelectedSignal signal) { // Update the trace reference fExperiment = (TmfExperiment) signal.getExperiment(); - setPartName(fTitlePrefix + " - " + fExperiment.getName()); + setPartName(fTitlePrefix + " - " + fExperiment.getName()); //$NON-NLS-1$ if (fEventsTable != null) { fEventsTable.setTrace(fExperiment, false); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java index e6578c93bc..c0709ccf2b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/ProjectView.java @@ -91,7 +91,7 @@ import org.osgi.service.prefs.BackingStoreException; */ public class ProjectView extends TmfView { - public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.project"; + public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.project"; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Main data structures @@ -128,8 +128,7 @@ public class ProjectView extends TmfView { static public IFile createLink(URI uri) throws CoreException { IFolder folder = getActiveProjectTracesFolder(); if (folder == null || !folder.exists()) { - throw new CoreException(new Status(Status.ERROR, TmfUiPlugin.PLUGIN_ID, - "No active project set")); + throw new CoreException(new Status(Status.ERROR, TmfUiPlugin.PLUGIN_ID, "No active project set")); } String path = uri.getPath(); // TODO: support duplicate file names @@ -166,7 +165,7 @@ public class ProjectView extends TmfView { // ------------------------------------------------------------------------ public ProjectView() { - super("Projects"); + super("Projects"); //$NON-NLS-1$ fWorkspace = ResourcesPlugin.getWorkspace(); try { @@ -296,6 +295,7 @@ public class ProjectView extends TmfView { // ------------------------------------------------------------------------ @Override + @SuppressWarnings("nls") public String toString() { return "[ProjectView]"; } @@ -330,7 +330,7 @@ public class ProjectView extends TmfView { IWorkbenchWindow win = wb.getActiveWorkbenchWindow(); IHandlerService handlerService = (IHandlerService) win.getService(IHandlerService.class); try { - handlerService.executeCommand("org.eclipse.linuxtools.tmf.ui.command.project.trace.open", null); + handlerService.executeCommand("org.eclipse.linuxtools.tmf.ui.command.project.trace.open", null); //$NON-NLS-1$ } catch (ExecutionException e) { e.printStackTrace(); } catch (NotDefinedException e) { @@ -394,7 +394,7 @@ public class ProjectView extends TmfView { // Populated from the plug-in private void createContextMenu() { - MenuManager menuManager = new MenuManager("#PopupMenu"); + MenuManager menuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuManager.setRemoveAllWhenShown(true); Menu menu = menuManager.createContextMenu(fViewer.getControl()); fViewer.getControl().setMenu(menu); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java index 57de13a97f..90272d6e5b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/TmfProjectNature.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.CoreException; */ public class TmfProjectNature implements IProjectNature { - public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.project.TmfProjectNature"; + public static final String ID = "org.eclipse.linuxtools.tmf.ui.views.project.TmfProjectNature"; //$NON-NLS-1$ private IProject fProject; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java index d17585b52a..447ed34d19 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizard.java @@ -51,7 +51,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard { */ @Override public void init(IWorkbench workbench, IStructuredSelection selection) { - setWindowTitle("Adding traces to experiment"); + setWindowTitle(Messages.AddTraceWizard_windowTitle); } /* (non-Javadoc) @@ -60,7 +60,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard { @Override public void addPages() { super.addPages(); - fMainPage = new AddTraceWizardPage(fProject, "Some string"); + fMainPage = new AddTraceWizardPage(fProject, "Some string"); //$NON-NLS-1$ addPage(fMainPage); } @@ -84,7 +84,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard { folder.createLink(location, IResource.REPLACE, null); } else { - System.out.println("Problem"); + System.out.println(Messages.AddTraceWizard_invalidTraceLocation); } } else { IFile file = experimentFolder.getFile(trace.getName()); @@ -92,7 +92,7 @@ public class AddTraceWizard extends Wizard implements IImportWizard { file.createLink(location, IResource.REPLACE, null); } else { - System.out.println("Problem"); + System.out.println(Messages.AddTraceWizard_invalidTraceLocation); } } } catch (CoreException e) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java index c729b419b2..8ac1514ed9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/AddTraceWizardPage.java @@ -38,8 +38,8 @@ public class AddTraceWizardPage extends WizardPage { protected AddTraceWizardPage(TmfProjectNode project, String pageName) { super(pageName); - setTitle("Select traces"); - setDescription("Select the traces to add to the experiment"); + setTitle(Messages.AddTraceWizardPage_windowTitle); + setDescription(Messages.AddTraceWizardPage_description); fProject = project; } @@ -64,7 +64,7 @@ public class AddTraceWizardPage extends WizardPage { final TableColumn tableColumn = new TableColumn(table, SWT.NONE); tableColumn.setWidth(200); - tableColumn.setText("Trace"); + tableColumn.setText(Messages.AddTraceWizardPage_columnHeader); fCheckboxTableViewer.setInput(fProject.getTracesFolder()); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/ImportTraceWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/ImportTraceWizard.java index 5a080b07cb..ac5bab2bb4 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/ImportTraceWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/ImportTraceWizard.java @@ -43,9 +43,9 @@ public class ImportTraceWizard extends Wizard implements IImportWizard { */ public ImportTraceWizard() { IDialogSettings workbenchSettings = WorkbenchPlugin.getDefault().getDialogSettings(); - IDialogSettings section = workbenchSettings.getSection("TmfTraceImportWizard"); + IDialogSettings section = workbenchSettings.getSection("TmfTraceImportWizard"); //$NON-NLS-1$ if (section == null) { - section = workbenchSettings.addNewSection("TmfTraceImportWizard"); + section = workbenchSettings.addNewSection("TmfTraceImportWizard"); //$NON-NLS-1$ } setDialogSettings(section); } @@ -75,7 +75,7 @@ public class ImportTraceWizard extends Wizard implements IImportWizard { } setWindowTitle(DataTransferMessages.DataTransfer_importTitle); - setDefaultPageImageDescriptor(IDEWorkbenchPlugin.getIDEImageDescriptor("wizban/importdir_wiz.png")); + setDefaultPageImageDescriptor(IDEWorkbenchPlugin.getIDEImageDescriptor("wizban/importdir_wiz.png")); //$NON-NLS-1$ setNeedsProgressMonitor(true); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/Messages.java new file mode 100644 index 0000000000..c626b51e63 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/Messages.java @@ -0,0 +1,19 @@ +package org.eclipse.linuxtools.tmf.ui.views.project.dialogs; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.views.project.dialogs.messages"; //$NON-NLS-1$ + public static String AddTraceWizard_invalidTraceLocation; + public static String AddTraceWizard_windowTitle; + public static String AddTraceWizardPage_columnHeader; + public static String AddTraceWizardPage_description; + public static String AddTraceWizardPage_windowTitle; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java index eb96806bc8..c71cb7b43e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewExperimentDialog.java @@ -318,7 +318,7 @@ public class NewExperimentDialog extends SelectionStatusDialog { updateStatus(IStatus.ERROR, NLS.bind("Experiment already exists", name)); return false; } - updateStatus(IStatus.OK, ""); + updateStatus(IStatus.OK, ""); //$NON-NLS-1$ return true; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewProjectWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewProjectWizard.java index f928f4d02e..099d821e74 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewProjectWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/NewProjectWizard.java @@ -50,7 +50,7 @@ public class NewProjectWizard extends BasicNewResourceWizard { * */ public NewProjectWizard() { - this("Tmf Project", "Create an Tmf Project"); + this("Tmf Project", "Create a Tmf Project"); } /** diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/messages.properties b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/messages.properties new file mode 100644 index 0000000000..93f37e27bf --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/dialogs/messages.properties @@ -0,0 +1,5 @@ +AddTraceWizard_invalidTraceLocation=Problem +AddTraceWizard_windowTitle=Adding traces to experiment +AddTraceWizardPage_columnHeader=Trace +AddTraceWizardPage_description=Select the traces to add to the experiment +AddTraceWizardPage_windowTitle=Select traces diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RefreshHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RefreshHandler.java index daf7b338ff..3fc51ced6e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RefreshHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RefreshHandler.java @@ -75,7 +75,7 @@ public class RefreshHandler extends AbstractHandler { root.refreshLocal(IResource.DEPTH_INFINITE, null); fProjectRoot.refreshChildren(); } catch (CoreException e) { - throw new ExecutionException("CoreException", e); + throw new ExecutionException("CoreException", e); //$NON-NLS-1$ } return null; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameExperimentHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameExperimentHandler.java index 62a423c2ae..5d2f79a1d9 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameExperimentHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameExperimentHandler.java @@ -45,8 +45,8 @@ public class RenameExperimentHandler extends AbstractHandler { public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); - mb.setText("Rename Experiment"); - mb.setMessage("Not implemented yet"); + mb.setText("Rename Experiment"); //$NON-NLS-1$ + mb.setMessage("Not implemented yet"); //$NON-NLS-1$ mb.open(); return null; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameProjectHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameProjectHandler.java index 3d964f9818..17ee1f375e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameProjectHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameProjectHandler.java @@ -63,8 +63,8 @@ public class RenameProjectHandler extends AbstractHandler { public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); - mb.setText("Rename Project"); - mb.setMessage("Not implemented yet"); + mb.setText("Rename Project"); //$NON-NLS-1$ + mb.setMessage("Not implemented yet"); //$NON-NLS-1$ mb.open(); return null; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameTraceHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameTraceHandler.java index 799f5e97fe..79ee3b1219 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameTraceHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/RenameTraceHandler.java @@ -45,8 +45,8 @@ public class RenameTraceHandler extends AbstractHandler { public Object execute(ExecutionEvent event) throws ExecutionException { MessageBox mb = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); - mb.setText("Rename Trace"); - mb.setMessage("Not implemented yet"); + mb.setText("Rename Trace"); //$NON-NLS-1$ + mb.setMessage("Not implemented yet"); //$NON-NLS-1$ mb.open(); return null; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserContributionItem.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserContributionItem.java index 64978a5ef1..b2dc522b51 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserContributionItem.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserContributionItem.java @@ -39,15 +39,16 @@ public class SelectParserContributionItem extends CompoundContributionItem { MenuManager subMenu = new MenuManager(providerEntry.getKey()); for(Entry entry : providerEntry.getValue().entrySet()) { params = new HashMap(); - params.put("org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.selectparser.parser", entry.getValue()); + params.put("org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.selectparser.parser", entry.getValue()); //$NON-NLS-1$ - CommandContributionItemParameter param = new CommandContributionItemParameter(PlatformUI.getWorkbench().getActiveWorkbenchWindow(), "my.parameterid", - "org.eclipse.linuxtools.tmf.ui.command.project.trace.selectparser", + CommandContributionItemParameter param = new CommandContributionItemParameter(PlatformUI.getWorkbench().getActiveWorkbenchWindow(), + "my.parameterid", //$NON-NLS-1$ + "org.eclipse.linuxtools.tmf.ui.command.project.trace.selectparser", //$NON-NLS-1$ params, null, // icon null, // disabled icon null, // hover icon - entry.getKey().replaceAll("&", "&&"), // label + entry.getKey().replaceAll("&", "&&"), // label //$NON-NLS-1$//$NON-NLS-2$ null, // mnemonic null, // tooltip CommandContributionItem.STYLE_PUSH, diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserHandler.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserHandler.java index 87c8ec685c..0f9be21242 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserHandler.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/handlers/SelectParserHandler.java @@ -80,7 +80,7 @@ public class SelectParserHandler extends AbstractHandler { if (fTrace.getParent() instanceof TmfExperimentNode) { resource = fTrace.getProject().getTracesFolder().getTraceForLocation(resource.getLocation()).getResource(); } - String parser = event.getParameter("org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.selectparser.parser"); + String parser = event.getParameter("org.eclipse.linuxtools.tmf.ui.commandparameter.project.trace.selectparser.parser"); //$NON-NLS-1$ try { resource.setPersistentProperty(ParserProviderManager.PARSER_PROPERTY, parser); fProjectView.broadcast(new TmfTraceParserUpdatedSignal(fProjectView, resource)); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectLabelProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectLabelProvider.java index ffd736aac9..1ccbc7370d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectLabelProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectLabelProvider.java @@ -36,8 +36,8 @@ import org.eclipse.ui.PlatformUI; */ public class TmfProjectLabelProvider implements ILabelProvider { - private final String fTraceIconFile = "icons/events_view.gif"; -// private final String fExperimentIconFile = "icons/garland16.png"; + private final String fTraceIconFile = "icons/events_view.gif"; //$NON-NLS-1$ +// private final String fExperimentIconFile = "icons/garland16.png"; //$NON-NLS-1$ private final Image fOpenedProjectIcon; private final Image fClosedProjectIcon; @@ -138,7 +138,7 @@ public class TmfProjectLabelProvider implements ILabelProvider { node instanceof TmfExperimentFolderNode || node instanceof TmfExperimentNode) { - label += " [" + node.getChildren().size() + "]"; + label += " [" + node.getChildren().size() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ } return label; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectNode.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectNode.java index 140bb6208e..6192523087 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectNode.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/project/model/TmfProjectNode.java @@ -28,8 +28,8 @@ import org.eclipse.linuxtools.tmf.ui.views.project.TmfProjectNature; */ public class TmfProjectNode extends TmfProjectTreeNode { - public static final String TRACE_FOLDER_NAME = "Traces"; - public static final String EXPER_FOLDER_NAME = "Experiments"; + public static final String TRACE_FOLDER_NAME = "Traces"; //$NON-NLS-1$ + public static final String EXPER_FOLDER_NAME = "Experiments"; //$NON-NLS-1$ private final IProject fProject; private boolean fIsTmfProject; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java index 2498bd661f..6175be993d 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserInputWizardPage.java @@ -67,18 +67,18 @@ import org.eclipse.swt.widgets.Text; public class CustomTxtParserInputWizardPage extends WizardPage { - private static final String DEFAULT_REGEX = "\\s*(.*\\S)"; - private static final String DEFAULT_TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; - private static final String SIMPLE_DATE_FORMAT_URL = "http://java.sun.com/javase/6/docs/api/java/text/SimpleDateFormat.html#skip-navbar_top"; - private static final String PATTERN_URL = "http://java.sun.com/javase/6/docs/api/java/util/regex/Pattern.html#sum"; - private static final Image lineImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/line_icon.gif"); - private static final Image addImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/add_button.gif"); - private static final Image addNextImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/addnext_button.gif"); - private static final Image addChildImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/addchild_button.gif"); - private static final Image deleteImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/delete_button.gif"); - private static final Image moveUpImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/moveup_button.gif"); - private static final Image moveDownImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/movedown_button.gif"); - private static final Image helpImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/help_button.gif"); + private static final String DEFAULT_REGEX = "\\s*(.*\\S)"; //$NON-NLS-1$ + private static final String DEFAULT_TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; //$NON-NLS-1$ + private static final String SIMPLE_DATE_FORMAT_URL = "http://java.sun.com/javase/6/docs/api/java/text/SimpleDateFormat.html#skip-navbar_top"; //$NON-NLS-1$ + private static final String PATTERN_URL = "http://java.sun.com/javase/6/docs/api/java/util/regex/Pattern.html#sum"; //$NON-NLS-1$ + private static final Image lineImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/line_icon.gif"); //$NON-NLS-1$ + private static final Image addImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/add_button.gif"); //$NON-NLS-1$ + private static final Image addNextImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/addnext_button.gif"); //$NON-NLS-1$ + private static final Image addChildImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/addchild_button.gif"); //$NON-NLS-1$ + private static final Image deleteImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/delete_button.gif"); //$NON-NLS-1$ + private static final Image moveUpImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/moveup_button.gif"); //$NON-NLS-1$ + private static final Image moveDownImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/movedown_button.gif"); //$NON-NLS-1$ + private static final Image helpImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/help_button.gif"); //$NON-NLS-1$ private static final Color COLOR_BLACK = Display.getCurrent().getSystemColor(SWT.COLOR_BLACK); private static final Color COLOR_LIGHT_GREEN = new Color(Display.getDefault(), 192, 255, 192); private static final Color COLOR_GREEN = Display.getCurrent().getSystemColor(SWT.COLOR_GREEN); @@ -118,13 +118,13 @@ public class CustomTxtParserInputWizardPage extends WizardPage { private boolean timestampFound; protected CustomTxtParserInputWizardPage(ISelection selection, CustomTxtTraceDefinition definition) { - super("CustomParserWizardPage"); + super("CustomParserWizardPage"); //$NON-NLS-1$ if (definition == null) { - setTitle("New Custom Text Parser"); - defaultDescription = "Create a new custom parser for text log files"; + setTitle(Messages.CustomTxtParserInputWizardPage_windowTitleNew); + defaultDescription = Messages.CustomTxtParserInputWizardPage_descriptionNew; } else { - setTitle("Edit Custom Text Parser"); - defaultDescription = "Edit an existing custom parser for text log files"; + setTitle(Messages.CustomTxtParserInputWizardPage_windowTitleEdit); + defaultDescription = Messages.CustomTxtParserInputWizardPage_desccriptionEdit; } setDescription(defaultDescription); this.selection = selection; @@ -149,14 +149,14 @@ public class CustomTxtParserInputWizardPage extends WizardPage { headerComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); Label logtypeLabel = new Label(headerComposite, SWT.NULL); - logtypeLabel.setText("Log type:"); + logtypeLabel.setText(Messages.CustomTxtParserInputWizardPage_logType); logtypeText = new Text(headerComposite, SWT.BORDER | SWT.SINGLE); logtypeText.setLayoutData(new GridData(120, SWT.DEFAULT)); logtypeText.addModifyListener(updateListener); Label timestampFormatLabel = new Label(headerComposite, SWT.NULL); - timestampFormatLabel.setText("Time Stamp format:"); + timestampFormatLabel.setText(Messages.CustomTxtParserInputWizardPage_timestampFormat); timestampOutputFormatText = new Text(headerComposite, SWT.BORDER | SWT.SINGLE); timestampOutputFormatText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); @@ -165,7 +165,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { Button dateFormatHelpButton = new Button(headerComposite, SWT.PUSH); dateFormatHelpButton.setImage(helpImage); - dateFormatHelpButton.setToolTipText("Date Format Help"); + dateFormatHelpButton.setToolTipText(Messages.CustomTxtParserInputWizardPage_dateFormatHelp); dateFormatHelpButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -175,11 +175,11 @@ public class CustomTxtParserInputWizardPage extends WizardPage { Label timestampPreviewLabel = new Label(headerComposite, SWT.NULL); timestampPreviewLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 3, 1)); - timestampPreviewLabel.setText("Preview:"); + timestampPreviewLabel.setText(Messages.CustomTxtParserInputWizardPage_preview); timestampPreviewText = new Text(headerComposite, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY); timestampPreviewText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); - timestampPreviewText.setText("*no matching timestamp*"); + timestampPreviewText.setText(Messages.CustomTxtParserInputWizardPage_noMatchingTimestamp); Composite buttonBar = new Composite(container, SWT.NONE); GridLayout buttonBarLayout = new GridLayout(5, false); @@ -189,7 +189,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { Button removeButton = new Button(buttonBar, SWT.PUSH); removeButton.setImage(deleteImage); - removeButton.setToolTipText("Remove line"); + removeButton.setToolTipText(Messages.CustomTxtParserInputWizardPage_removeLine); removeButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -208,11 +208,11 @@ public class CustomTxtParserInputWizardPage extends WizardPage { }); Button addNextButton = new Button(buttonBar, SWT.PUSH); addNextButton.setImage(addNextImage); - addNextButton.setToolTipText("Add next line"); + addNextButton.setToolTipText(Messages.CustomTxtParserInputWizardPage_addNextLine); addNextButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - InputLine inputLine = new InputLine(Cardinality.ZERO_OR_MORE, "", null); + InputLine inputLine = new InputLine(Cardinality.ZERO_OR_MORE, "", null); //$NON-NLS-1$ if (((List) treeViewer.getInput()).size() == 0) { definition.inputs.add(inputLine); } else if (treeViewer.getSelection().isEmpty()) { @@ -235,11 +235,11 @@ public class CustomTxtParserInputWizardPage extends WizardPage { }); Button addChildButton = new Button(buttonBar, SWT.PUSH); addChildButton.setImage(addChildImage); - addChildButton.setToolTipText("Add child line"); + addChildButton.setToolTipText(Messages.CustomTxtParserInputWizardPage_addChildLine); addChildButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - InputLine inputLine = new InputLine(Cardinality.ZERO_OR_MORE, "", null); + InputLine inputLine = new InputLine(Cardinality.ZERO_OR_MORE, "", null); //$NON-NLS-1$ if (((List) treeViewer.getInput()).size() == 0) { definition.inputs.add(inputLine); } else if (treeViewer.getSelection().isEmpty()) { @@ -254,7 +254,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { }); Button moveUpButton = new Button(buttonBar, SWT.PUSH); moveUpButton.setImage(moveUpImage); - moveUpButton.setToolTipText("Move up"); + moveUpButton.setToolTipText(Messages.CustomTxtParserInputWizardPage_moveUp); moveUpButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -277,7 +277,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { }); Button moveDownButton = new Button(buttonBar, SWT.PUSH); moveDownButton.setImage(moveDownImage); - moveDownButton.setToolTipText("Move down"); + moveDownButton.setToolTipText(Messages.CustomTxtParserInputWizardPage_moveDown); moveDownButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -356,12 +356,12 @@ public class CustomTxtParserInputWizardPage extends WizardPage { sashBottom.setLayout(sashBottomLayout); Label previewLabel = new Label(sashBottom, SWT.NULL); - previewLabel.setText("Preview input"); + previewLabel.setText(Messages.CustomTxtParserInputWizardPage_previewInput); previewLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); Button highlightAllButton = new Button(sashBottom, SWT.PUSH); highlightAllButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); - highlightAllButton.setText("Highlight All"); + highlightAllButton.setText(Messages.CustomTxtParserInputWizardPage_highlightAll); highlightAllButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -371,7 +371,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { Button legendButton = new Button(sashBottom, SWT.PUSH); legendButton.setImage(helpImage); - legendButton.setToolTipText("Preview Legend"); + legendButton.setToolTipText(Messages.CustomTxtParserInputWizardPage_previewLegend); legendButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); legendButton.addSelectionListener(new SelectionAdapter() { @Override @@ -382,10 +382,10 @@ public class CustomTxtParserInputWizardPage extends WizardPage { inputText = new StyledText(sashBottom, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL); if (fixedFont == null) { - if (System.getProperty("os.name").contains("Windows")) { - fixedFont = new Font(Display.getCurrent(), new FontData("Courier New", 10, SWT.NORMAL)); + if (System.getProperty("os.name").contains("Windows")) { //$NON-NLS-1$ //$NON-NLS-2$ + fixedFont = new Font(Display.getCurrent(), new FontData("Courier New", 10, SWT.NORMAL)); //$NON-NLS-1$ } else { - fixedFont = new Font(Display.getCurrent(), new FontData("Monospace", 10, SWT.NORMAL)); + fixedFont = new Font(Display.getCurrent(), new FontData("Monospace", 10, SWT.NORMAL)); //$NON-NLS-1$ } } inputText.setFont(fixedFont); @@ -450,9 +450,9 @@ public class CustomTxtParserInputWizardPage extends WizardPage { public String getText(Object element) { InputLine inputLine = (InputLine) element; if (inputLine.parentInput == null) { - return "Root Line " + getName(inputLine) + " " + inputLine.cardinality.toString() + " : " + inputLine.getRegex(); + return "Root Line " + getName(inputLine) + " " + inputLine.cardinality.toString() + " : " + inputLine.getRegex(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { - return "Line " + getName(inputLine) + " " + inputLine.cardinality.toString() + " : " + inputLine.getRegex(); + return "Line " + getName(inputLine) + " " + inputLine.cardinality.toString() + " : " + inputLine.getRegex(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } } @@ -502,7 +502,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { if (inputLine.parentInput == null) { return Integer.toString(definition.inputs.indexOf(inputLine)+1); } - return getName(inputLine.parentInput) + "." + Integer.toString(inputLine.parentInput.childrenInputs.indexOf(inputLine)+1); + return getName(inputLine.parentInput) + "." + Integer.toString(inputLine.parentInput.childrenInputs.indexOf(inputLine)+1); //$NON-NLS-1$ } public List getInputNames() { @@ -561,17 +561,17 @@ public class CustomTxtParserInputWizardPage extends WizardPage { StringBuilder sb = new StringBuilder(); String line = null; while ((line = reader.readLine()) != null) { - sb.append(line + "\n"); + sb.append(line + "\n"); //$NON-NLS-1$ } return sb.toString(); } catch (CoreException e) { - return ""; + return ""; //$NON-NLS-1$ } catch (IOException e) { - return ""; + return ""; //$NON-NLS-1$ } } } - return ""; + return ""; //$NON-NLS-1$ } private void updatePreviews() { @@ -586,17 +586,17 @@ public class CustomTxtParserInputWizardPage extends WizardPage { inputText.setStyleRanges(new StyleRange[] {}); Scanner scanner = new Scanner(inputText.getText()); - scanner.useDelimiter("\n"); + scanner.useDelimiter("\n"); //$NON-NLS-1$ int rawPos = 0; String skip; // skip starting delimiters - if ((skip = scanner.findWithinHorizon("\\A\n+", 0)) != null) { + if ((skip = scanner.findWithinHorizon("\\A\n+", 0)) != null) { //$NON-NLS-1$ rawPos += skip.length(); } timeStampFormat = null; if (selectedLine != null) { for (InputGroup input : selectedLine.inputs) { - input.previewText.setText("*no matching line*"); + input.previewText.setText(Messages.CustomTxtParserInputWizardPage_noMathcingLine); } } @@ -755,11 +755,11 @@ public class CustomTxtParserInputWizardPage extends WizardPage { firstEntryTimeStampInputFormat = timeStampFormat; } if (firstEntryTimeStamp == null) { - timestampPreviewText.setText("*no timestamp group*"); + timestampPreviewText.setText(Messages.CustomTxtParserInputWizardPage_noTimestampGroup); if (selectedLine != null) { for (InputGroup group : selectedLine.inputs) { if (group.tagCombo.getText().equals(CustomTxtTraceDefinition.TAG_TIMESTAMP)) { - timestampPreviewText.setText("*no matching timestamp*"); + timestampPreviewText.setText(Messages.CustomTxtParserInputWizardPage_noMatchingTimestamp); break; } } @@ -771,9 +771,9 @@ public class CustomTxtParserInputWizardPage extends WizardPage { dateFormat = new SimpleDateFormat(timestampOutputFormatText.getText().trim()); timestampPreviewText.setText(dateFormat.format(date)); } catch (ParseException e) { - timestampPreviewText.setText("*parse exception* [" + firstEntryTimeStamp + "] <> [" + firstEntryTimeStampInputFormat + "]"); + timestampPreviewText.setText(Messages.CustomTxtParserInputWizardPage_20 + firstEntryTimeStamp + Messages.CustomTxtParserInputWizardPage_21 + firstEntryTimeStampInputFormat + Messages.CustomTxtParserInputWizardPage_22); } catch (IllegalArgumentException e) { - timestampPreviewText.setText("*parse exception* [Illegal Argument]"); + timestampPreviewText.setText(Messages.CustomTxtParserInputWizardPage_23); } } @@ -792,7 +792,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } String value = matcher.group(i+1).trim(); if (selectedLine != null && selectedLine.inputLine.equals(line) && rootLineMatches == 1) { - if (selectedLine.inputs.get(i).previewText.getText().equals("*no matching line*")) { + if (selectedLine.inputs.get(i).previewText.getText().equals(Messages.CustomTxtParserInputWizardPage_noMatchingLine)) { selectedLine.inputs.get(i).previewText.setText(value); } } @@ -821,13 +821,13 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } else if (input.action == CustomTxtTraceDefinition.ACTION_APPEND_WITH_SEPARATOR) { String s = data.get(input.name); if (s != null) { - data.put(input.name, s + " | " + value); + data.put(input.name, s + " | " + value); //$NON-NLS-1$ } else { data.put(input.name, value); } if (input.name.equals(CustomTxtTraceDefinition.TAG_TIMESTAMP)) { if (timeStampFormat != null) { - timeStampFormat += " | " + input.format; + timeStampFormat += " | " + input.format; //$NON-NLS-1$ } else { timeStampFormat = input.format; } @@ -835,8 +835,8 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } } else { if (selectedLine != null && selectedLine.inputLine.equals(line) && rootLineMatches == 1) { - if (selectedLine.inputs.get(i).previewText.getText().equals("*no matching line*")) { - selectedLine.inputs.get(i).previewText.setText("*no matching group*"); + if (selectedLine.inputs.get(i).previewText.getText().equals(Messages.CustomTxtParserInputWizardPage_noMatchingLine)) { + selectedLine.inputs.get(i).previewText.setText(Messages.CustomTxtParserInputWizardPage_noMatchingGroup); } } } @@ -879,21 +879,21 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } private void openLegend() { - final String CG = "Captured group"; - final String UCG = "Unidentified captured group"; - final String UT = "Uncaptured text"; + final String CG = Messages.CustomTxtParserInputWizardPage_capturedGroup; + final String UCG = Messages.CustomTxtParserInputWizardPage_unidentifiedCaptureGroup; + final String UT = Messages.CustomTxtParserInputWizardPage_uncapturedText; int line1start = 0; - String line1 = "Non-matching line\n"; + String line1 = Messages.CustomTxtParserInputWizardPage_nonMatchingLine; int line2start = line1start + line1.length(); - String line2 = "Matching root line : "+CG+" "+UCG+" "+UT+" \n"; + String line2 = Messages.CustomTxtParserInputWizardPage_matchingLineRoot+CG+" "+UCG+" "+UT+" \n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ int line3start = line2start + line2.length(); - String line3 = "Matching other line: "+CG+" "+UCG+" "+UT+" \n"; + String line3 = Messages.CustomTxtParserInputWizardPage_matchingOtherLine+CG+" "+UCG+" "+UT+" \n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ int line4start = line3start + line3.length(); - String line4 = "Matching other line: "+CG+" "+UCG+" "+UT+" \n"; + String line4 = Messages.CustomTxtParserInputWizardPage_matchingOtherLine+CG+" "+UCG+" "+UT+" \n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ int line5start = line4start + line4.length(); - String line5 = "Non-matching line\n"; + String line5 = Messages.CustomTxtParserInputWizardPage_nonMatchingLine; int line6start = line5start + line5.length(); - String line6 = "Matching root line : "+CG+" "+UCG+" "+UT+" \n"; + String line6 = Messages.CustomTxtParserInputWizardPage_44+CG+" "+UCG+" "+UT+" \n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ final Shell legendShell = new Shell(getShell(), SWT.DIALOG_TRIM); legendShell.setLayout(new FillLayout()); @@ -912,7 +912,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { legendText.setStyleRange(new StyleRange(line4start + line4.indexOf(UCG), UCG.length(), COLOR_BLACK, COLOR_LIGHT_MAGENTA)); legendText.setStyleRange(new StyleRange(line6start + line6.indexOf(CG), CG.length(), COLOR_BLACK, COLOR_GREEN, SWT.BOLD)); legendText.setStyleRange(new StyleRange(line6start + line6.indexOf(UCG), UCG.length(), COLOR_BLACK, COLOR_MAGENTA)); - legendShell.setText("Preview Legend"); + legendShell.setText(Messages.CustomTxtParserInputWizardPage_previewLegend); legendShell.pack(); legendShell.open(); } @@ -940,7 +940,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } private class Line { - private static final String INFINITY_STRING = "\u221E"; + private static final String INFINITY_STRING = "\u221E"; //$NON-NLS-1$ @SuppressWarnings("unused") String name; InputLine inputLine; @@ -975,7 +975,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { labelComposite.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); Label label = new Label(labelComposite, SWT.NULL); - label.setText("Regular expression:"); + label.setText(Messages.CustomTxtParserInputWizardPage_regularExpression); Composite regexContainer = new Composite(group, SWT.NONE); GridLayout regexLayout = new GridLayout(2, false); @@ -993,7 +993,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { Button regexHelpButton = new Button(regexContainer, SWT.PUSH); regexHelpButton.setImage(helpImage); - regexHelpButton.setToolTipText("Regular Expression Help"); + regexHelpButton.setToolTipText(Messages.CustomTxtParserInputWizardPage_regularExpressionHelp); regexHelpButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -1002,7 +1002,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { }); label = new Label(group, SWT.NONE); - label.setText("Cardinality:"); + label.setText(Messages.CustomTxtParserInputWizardPage_cardinality); label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); cardinalityContainer = new Composite(group, SWT.NONE); @@ -1018,7 +1018,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { Cardinality.ONE_OR_MORE.toString(), Cardinality.ZERO_OR_ONE.toString(), Cardinality.ONE.toString(), - "(?,?)"}); + "(?,?)"}); //$NON-NLS-1$ cardinalityCombo.addSelectionListener(new SelectionListener(){ @Override public void widgetDefaultSelected(SelectionEvent e) {} @@ -1047,7 +1047,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { cardinalityMinLabel = new Label(cardinalityContainer, SWT.NONE); cardinalityMinLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); - cardinalityMinLabel.setText("min:"); + cardinalityMinLabel.setText(Messages.CustomTxtParserInputWizardPage_min); cardinalityMinLabel.setVisible(false); cardinalityMinText = new Text(cardinalityContainer, SWT.BORDER | SWT.SINGLE); @@ -1058,7 +1058,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { cardinalityMaxLabel = new Label(cardinalityContainer, SWT.NONE); cardinalityMaxLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); - cardinalityMaxLabel.setText("max:"); + cardinalityMaxLabel.setText(Messages.CustomTxtParserInputWizardPage_max); cardinalityMaxLabel.setVisible(false); cardinalityMaxText = new Text(cardinalityContainer, SWT.BORDER | SWT.SINGLE); @@ -1130,7 +1130,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { if (inputData.name.equals(CustomTxtTraceDefinition.TAG_TIMESTAMP)) { inputGroup.tagCombo.select(0); inputGroup.tagText.setText(inputData.format); - inputGroup.tagLabel.setText("format:"); + inputGroup.tagLabel.setText(Messages.CustomTxtParserInputWizardPage_format); inputGroup.tagLabel.setVisible(true); inputGroup.tagText.setVisible(true); inputGroup.tagText.addModifyListener(updateListener); @@ -1139,7 +1139,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } else { inputGroup.tagCombo.select(2); inputGroup.tagText.setText(inputData.name); - inputGroup.tagLabel.setText("name:"); + inputGroup.tagLabel.setText(Messages.CustomTxtParserInputWizardPage_name); inputGroup.tagLabel.setVisible(true); inputGroup.tagText.setVisible(true); inputGroup.tagText.addModifyListener(updateListener); @@ -1156,7 +1156,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { addGroupButton = new Button(group, SWT.PUSH); addGroupButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); addGroupButton.setImage(addImage); - addGroupButton.setToolTipText("Add group"); + addGroupButton.setToolTipText(Messages.CustomTxtParserInputWizardPage_addGroup); addGroupButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -1172,7 +1172,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { }); addGroupLabel = new Label(group, SWT.NULL); - addGroupLabel.setText("New group"); + addGroupLabel.setText(Messages.CustomTxtParserInputWizardPage_newGroup); } private void removeAddGroupButton() { @@ -1289,7 +1289,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { Button deleteButton = new Button(labelComposite, SWT.PUSH); deleteButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); deleteButton.setImage(deleteImage); - deleteButton.setToolTipText("Remove group"); + deleteButton.setToolTipText(Messages.CustomTxtParserInputWizardPage_removeGroup); deleteButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -1301,7 +1301,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { inputLabel = new Label(labelComposite, SWT.NULL); inputLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); - inputLabel.setText("Group " + inputNumber + ":"); + inputLabel.setText(Messages.CustomTxtParserInputWizardPage_group + inputNumber + ":"); //$NON-NLS-1$ tagComposite = new Composite(parent, SWT.FILL); GridLayout tagLayout = new GridLayout(4, false); @@ -1323,7 +1323,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { tagText.removeModifyListener(updateListener); switch (tagCombo.getSelectionIndex()) { case 0: //Time Stamp - tagLabel.setText("format:"); + tagLabel.setText(Messages.CustomTxtParserInputWizardPage_format); tagLabel.setVisible(true); tagText.setVisible(true); tagText.addModifyListener(updateListener); @@ -1333,7 +1333,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { tagText.setVisible(false); break; case 2: //Other - tagLabel.setText("name:"); + tagLabel.setText(Messages.CustomTxtParserInputWizardPage_name); tagLabel.setVisible(true); tagText.setVisible(true); tagText.addModifyListener(updateListener); @@ -1359,19 +1359,19 @@ public class CustomTxtParserInputWizardPage extends WizardPage { tagText.setVisible(false); actionCombo = new Combo(tagComposite, SWT.DROP_DOWN | SWT.READ_ONLY); - actionCombo.setItems(new String[] {"Set", "Append", "Append with |"}); + actionCombo.setItems(new String[] {Messages.CustomTxtParserInputWizardPage_set, Messages.CustomTxtParserInputWizardPage_append, Messages.CustomTxtParserInputWizardPage_appendWith}); actionCombo.select(0); actionCombo.addSelectionListener(updateListener); previewLabel = new Label(parent, SWT.NULL); previewLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); - previewLabel.setText("Preview:"); + previewLabel.setText(Messages.CustomTxtParserInputWizardPage_preview); previewText = new Text(parent, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY); gd = new GridData(SWT.FILL, SWT.CENTER, true, false); gd.widthHint = 0; previewText.setLayoutData(gd); - previewText.setText("*no match*"); + previewText.setText(Messages.CustomTxtParserInputWizardPage_noMatch); previewText.setBackground(COLOR_WIDGET_BACKGROUND); } @@ -1384,7 +1384,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { private void setInputNumber(int inputNumber) { this.inputNumber = inputNumber; - inputLabel.setText("Group " + inputNumber + ":"); + inputLabel.setText(Messages.CustomTxtParserInputWizardPage_group + inputNumber + ":"); //$NON-NLS-1$ labelComposite.layout(); } } @@ -1402,14 +1402,14 @@ public class CustomTxtParserInputWizardPage extends WizardPage { StringBuffer errors = new StringBuffer(); if (definition.definitionName.length() == 0) { - errors.append("Enter a name for the new log type. "); + errors.append("Enter a name for the new log type. "); //$NON-NLS-1$ logtypeText.setBackground(COLOR_LIGHT_RED); } else { logtypeText.setBackground(COLOR_TEXT_BACKGROUND); for (CustomTxtTraceDefinition def : CustomTxtTraceDefinition.loadAll()) { if (definition.definitionName.equals(def.definitionName)) { if (editDefinitionName == null || ! editDefinitionName.equals(definition.definitionName)) { - errors.append("The log type name already exists. "); + errors.append("The log type name already exists. "); //$NON-NLS-1$ logtypeText.setBackground(COLOR_LIGHT_RED); break; } @@ -1426,14 +1426,14 @@ public class CustomTxtParserInputWizardPage extends WizardPage { } if (timestampFound) { if (definition.timeStampOutputFormat.length() == 0) { - errors.append("Enter the output format for the Time Stamp field. "); + errors.append("Enter the output format for the Time Stamp field. "); //$NON-NLS-1$ timestampOutputFormatText.setBackground(COLOR_LIGHT_RED); } else { try { new SimpleDateFormat(definition.timeStampOutputFormat); timestampOutputFormatText.setBackground(COLOR_TEXT_BACKGROUND); } catch (IllegalArgumentException e) { - errors.append("Enter a valid output format for the Time Stamp field. "); + errors.append("Enter a valid output format for the Time Stamp field. "); //$NON-NLS-1$ timestampOutputFormatText.setBackground(COLOR_LIGHT_RED); } } @@ -1463,20 +1463,20 @@ public class CustomTxtParserInputWizardPage extends WizardPage { Pattern.compile(inputLine.getRegex()); if (line != null) line.regexText.setBackground(COLOR_TEXT_BACKGROUND); } catch (PatternSyntaxException e) { - errors.append("Enter a valid regular expression (Line "+name+"). "); + errors.append("Enter a valid regular expression (Line "+name+"). "); //$NON-NLS-1$ //$NON-NLS-2$ if (line != null) line.regexText.setBackground(COLOR_LIGHT_RED); } if (inputLine.getMinCount() == -1) { - errors.append("Enter a minimum value for cardinality (Line "+name+"). "); + errors.append("Enter a minimum value for cardinality (Line "+name+"). "); //$NON-NLS-1$ //$NON-NLS-2$ if (line != null) line.cardinalityMinText.setBackground(COLOR_LIGHT_RED); } else { if (line != null) line.cardinalityMinText.setBackground(COLOR_TEXT_BACKGROUND); } if (inputLine.getMaxCount() == -1) { - errors.append("Enter a maximum value for cardinality (Line "+name+"). "); + errors.append("Enter a maximum value for cardinality (Line "+name+"). "); //$NON-NLS-1$ //$NON-NLS-2$ if (line != null) line.cardinalityMaxText.setBackground(COLOR_LIGHT_RED); } else if (inputLine.getMinCount() > inputLine.getMaxCount()) { - errors.append("Enter correct (min <= max) values for cardinality (Line "+name+"). "); + errors.append("Enter correct (min <= max) values for cardinality (Line "+name+"). "); //$NON-NLS-1$ //$NON-NLS-2$ if (line != null) line.cardinalityMinText.setBackground(COLOR_LIGHT_RED); if (line != null) line.cardinalityMaxText.setBackground(COLOR_LIGHT_RED); } else { @@ -1489,26 +1489,26 @@ public class CustomTxtParserInputWizardPage extends WizardPage { if (inputData.name.equals(CustomTxtTraceDefinition.TAG_TIMESTAMP)) { timestampFound = true; if (inputData.format.length() == 0) { - errors.append("Enter the input format for the Time Stamp (Line "+name+" Group "+(i+1)+"). "); + errors.append("Enter the input format for the Time Stamp (Line "+name+" Group "+(i+1)+"). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (group != null) group.tagText.setBackground(COLOR_LIGHT_RED); } else { try { new SimpleDateFormat(inputData.format); if (group != null) group.tagText.setBackground(COLOR_TEXT_BACKGROUND); } catch (IllegalArgumentException e) { - errors.append("Enter a valid input format for the Time Stamp (Line "+name+" Group "+(i+1)+"). "); + errors.append("Enter a valid input format for the Time Stamp (Line "+name+" Group "+(i+1)+"). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (group != null) group.tagText.setBackground(COLOR_LIGHT_RED); } } } else if (inputData.name.length() == 0) { - errors.append("Enter a name for the data group (Line "+name+" Group "+(i+1)+"). "); + errors.append("Enter a name for the data group (Line "+name+" Group "+(i+1)+"). "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (group != null) group.tagText.setBackground(COLOR_LIGHT_RED); } else { if (group != null) group.tagText.setBackground(COLOR_TEXT_BACKGROUND); } } for (int i = 0; inputLine.childrenInputs != null && i < inputLine.childrenInputs.size(); i++) { - errors.append(validateLine(inputLine.childrenInputs.get(i), name+"."+(i+1))); + errors.append(validateLine(inputLine.childrenInputs.get(i), name+"."+(i+1))); //$NON-NLS-1$ } return errors; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserOutputWizardPage.java index e640405cad..0204c66535 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomTxtParserOutputWizardPage.java @@ -29,8 +29,8 @@ import org.eclipse.swt.widgets.Text; public class CustomTxtParserOutputWizardPage extends WizardPage { - private static final Image upImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/up_button.gif"); - private static final Image downImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/down_button.gif"); + private static final Image upImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/up_button.gif"); //$NON-NLS-1$ + private static final Image downImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/down_button.gif"); //$NON-NLS-1$ private CustomTxtParserWizard wizard; private CustomTxtTraceDefinition definition; ArrayList outputs = new ArrayList(); @@ -47,9 +47,9 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { File tmpFile; protected CustomTxtParserOutputWizardPage(CustomTxtParserWizard wizard) { - super("CustomParserOutputWizardPage"); + super("CustomParserOutputWizardPage"); //$NON-NLS-1$ setTitle(wizard.inputPage.getTitle()); - setDescription("Customize the output of the parser"); + setDescription(Messages.CustomTxtParserOutputWizardPage_description); this.wizard = wizard; setPageComplete(false); } @@ -197,7 +197,7 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { definition.outputs = extractOutputs(); try { - tmpFile = TmfUiPlugin.getDefault().getStateLocation().addTrailingSeparator().append("customwizard.tmp").toFile(); + tmpFile = TmfUiPlugin.getDefault().getStateLocation().addTrailingSeparator().append("customwizard.tmp").toFile(); //$NON-NLS-1$ FileWriter writer = new FileWriter(tmpFile); writer.write(wizard.inputPage.getInputText()); writer.close(); @@ -248,7 +248,7 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { this.name = name; enabledButton = new Button(parent, SWT.CHECK); - enabledButton.setToolTipText("Visible"); + enabledButton.setToolTipText(Messages.CustomTxtParserOutputWizardPage_visible); enabledButton.setSelection(true); enabledButton.addSelectionListener(new SelectionAdapter() { @Override @@ -267,7 +267,7 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { upButton = new Button(parent, SWT.PUSH); upButton.setImage(upImage); - upButton.setToolTipText("Move Before"); + upButton.setToolTipText(Messages.CustomTxtParserOutputWizardPage_moveBefore); upButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -278,7 +278,7 @@ public class CustomTxtParserOutputWizardPage extends WizardPage { downButton = new Button(parent, SWT.PUSH); downButton.setImage(downImage); - downButton.setToolTipText("Move After"); + downButton.setToolTipText(Messages.CustomTxtParserOutputWizardPage_moveAfter); downButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java index 9ab6fb752f..8e84ec3396 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserInputWizardPage.java @@ -73,17 +73,17 @@ import org.xml.sax.SAXParseException; public class CustomXmlParserInputWizardPage extends WizardPage { - private static final String DEFAULT_TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; - private static final String SIMPLE_DATE_FORMAT_URL = "http://java.sun.com/javase/6/docs/api/java/text/SimpleDateFormat.html#skip-navbar_top"; - private static final Image elementImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/element_icon.gif"); - private static final Image addImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/add_button.gif"); - private static final Image addNextImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/addnext_button.gif"); - private static final Image addChildImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/addchild_button.gif"); - private static final Image addManyImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/addmany_button.gif"); - private static final Image deleteImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/delete_button.gif"); - private static final Image moveUpImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/moveup_button.gif"); - private static final Image moveDownImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/movedown_button.gif"); - private static final Image helpImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/help_button.gif"); + private static final String DEFAULT_TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; //$NON-NLS-1$ + private static final String SIMPLE_DATE_FORMAT_URL = "http://java.sun.com/javase/6/docs/api/java/text/SimpleDateFormat.html#skip-navbar_top"; //$NON-NLS-1$ + private static final Image elementImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/element_icon.gif"); //$NON-NLS-1$ + private static final Image addImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/add_button.gif"); //$NON-NLS-1$ + private static final Image addNextImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/addnext_button.gif"); //$NON-NLS-1$ + private static final Image addChildImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/addchild_button.gif"); //$NON-NLS-1$ + private static final Image addManyImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/addmany_button.gif"); //$NON-NLS-1$ + private static final Image deleteImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/delete_button.gif"); //$NON-NLS-1$ + private static final Image moveUpImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/moveup_button.gif"); //$NON-NLS-1$ + private static final Image moveDownImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/movedown_button.gif"); //$NON-NLS-1$ + private static final Image helpImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/help_button.gif"); //$NON-NLS-1$ private static final Color COLOR_LIGHT_RED = new Color(Display.getDefault(), 255, 192, 192); private static final Color COLOR_TEXT_BACKGROUND = Display.getCurrent().getSystemColor(SWT.COLOR_WHITE); private static final Color COLOR_WIDGET_BACKGROUND = Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND); @@ -124,13 +124,13 @@ public class CustomXmlParserInputWizardPage extends WizardPage { private int logEntryNestedCount; protected CustomXmlParserInputWizardPage(ISelection selection, CustomXmlTraceDefinition definition) { - super("CustomXmlParserWizardPage"); + super("CustomXmlParserWizardPage"); //$NON-NLS-1$ if (definition == null) { - setTitle("New Custom XML Parser"); - defaultDescription = "Create a new custom parser for XML log files"; + setTitle(Messages.CustomXmlParserInputWizardPage_titleNew); + defaultDescription = Messages.CustomXmlParserInputWizardPage_descriptionNew; } else { - setTitle("Edit Custom XML Parser"); - defaultDescription = "Edit an existing custom parser for XML log files"; + setTitle(Messages.CustomXmlParserInputWizardPage_titleEdit); + defaultDescription = Messages.CustomXmlParserInputWizardPage_descriptionEdit; } setDescription(defaultDescription); this.selection = selection; @@ -155,14 +155,14 @@ public class CustomXmlParserInputWizardPage extends WizardPage { headerComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); Label logtypeLabel = new Label(headerComposite, SWT.NULL); - logtypeLabel.setText("Log type:"); + logtypeLabel.setText(Messages.CustomXmlParserInputWizardPage_logType); logtypeText = new Text(headerComposite, SWT.BORDER | SWT.SINGLE); logtypeText.setLayoutData(new GridData(120, SWT.DEFAULT)); logtypeText.addModifyListener(updateListener); Label timeStampFormatLabel = new Label(headerComposite, SWT.NULL); - timeStampFormatLabel.setText("Time Stamp format:"); + timeStampFormatLabel.setText(Messages.CustomXmlParserInputWizardPage_timestampFormat); timeStampOutputFormatText = new Text(headerComposite, SWT.BORDER | SWT.SINGLE); timeStampOutputFormatText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); @@ -171,7 +171,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { Button dateFormatHelpButton = new Button(headerComposite, SWT.PUSH); dateFormatHelpButton.setImage(helpImage); - dateFormatHelpButton.setToolTipText("Date Format Help"); + dateFormatHelpButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_dateFormatHelp); dateFormatHelpButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -181,11 +181,11 @@ public class CustomXmlParserInputWizardPage extends WizardPage { Label timeStampPreviewLabel = new Label(headerComposite, SWT.NULL); timeStampPreviewLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 3, 1)); - timeStampPreviewLabel.setText("Preview:"); + timeStampPreviewLabel.setText(Messages.CustomXmlParserInputWizardPage_preview); timeStampPreviewText = new Text(headerComposite, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY); timeStampPreviewText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); - timeStampPreviewText.setText("*no time stamp element or attribute*"); + timeStampPreviewText.setText("*no time stamp element or attribute*"); //$NON-NLS-1$ createButtonBar(); @@ -236,7 +236,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { if (definition.rootInputElement == null) { removeButton.setEnabled(false); - addChildButton.setToolTipText("Add document element"); + addChildButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_addDocumentElement); addNextButton.setEnabled(false); moveUpButton.setEnabled(false); moveDownButton.setEnabled(false); @@ -251,7 +251,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { sashBottom.setLayout(sashBottomLayout); Label previewLabel = new Label(sashBottom, SWT.NULL); - previewLabel.setText("Preview input"); + previewLabel.setText(Messages.CustomXmlParserInputWizardPage_previewInput); errorText = new Text(sashBottom, SWT.SINGLE | SWT.READ_ONLY); errorText.setBackground(COLOR_WIDGET_BACKGROUND); @@ -260,10 +260,10 @@ public class CustomXmlParserInputWizardPage extends WizardPage { inputText = new StyledText(sashBottom, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL); if (fixedFont == null) { - if (System.getProperty("os.name").contains("Windows")) { - fixedFont = new Font(Display.getCurrent(), new FontData("Courier New", 10, SWT.NORMAL)); + if (System.getProperty("os.name").contains("Windows")) { //$NON-NLS-1$ //$NON-NLS-2$ + fixedFont = new Font(Display.getCurrent(), new FontData("Courier New", 10, SWT.NORMAL)); //$NON-NLS-1$ } else { - fixedFont = new Font(Display.getCurrent(), new FontData("Monospace", 10, SWT.NORMAL)); + fixedFont = new Font(Display.getCurrent(), new FontData("Monospace", 10, SWT.NORMAL)); //$NON-NLS-1$ } } inputText.setFont(fixedFont); @@ -293,7 +293,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { removeButton = new Button(buttonBar, SWT.PUSH); removeButton.setImage(deleteImage); - removeButton.setToolTipText("Remove element"); + removeButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_removeElement); removeButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -311,7 +311,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { removeButton.setEnabled(false); if (definition.rootInputElement == null) { addChildButton.setEnabled(true); - addChildButton.setToolTipText("Add document element"); + addChildButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_addDocumentEleemnt); } else { addChildButton.setEnabled(false); } @@ -323,11 +323,11 @@ public class CustomXmlParserInputWizardPage extends WizardPage { addChildButton = new Button(buttonBar, SWT.PUSH); addChildButton.setImage(addChildImage); - addChildButton.setToolTipText("Add child element"); + addChildButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_addChildElement); addChildButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - InputElement inputElement = new InputElement("", false, CustomXmlTraceDefinition.TAG_IGNORE, 0, "", null); + InputElement inputElement = new InputElement("", false, CustomXmlTraceDefinition.TAG_IGNORE, 0, "", null); //$NON-NLS-1$ //$NON-NLS-2$ if (definition.rootInputElement == null) { definition.rootInputElement = inputElement; inputElement.elementName = getChildNameSuggestion(null); @@ -345,11 +345,11 @@ public class CustomXmlParserInputWizardPage extends WizardPage { addNextButton = new Button(buttonBar, SWT.PUSH); addNextButton.setImage(addNextImage); - addNextButton.setToolTipText("Add next element"); + addNextButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_addNextElement); addNextButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - InputElement inputElement = new InputElement("", false, CustomXmlTraceDefinition.TAG_IGNORE, 0, "", null); + InputElement inputElement = new InputElement("", false, CustomXmlTraceDefinition.TAG_IGNORE, 0, "", null); //$NON-NLS-1$ //$NON-NLS-2$ if (definition.rootInputElement == null) { definition.rootInputElement = inputElement; inputElement.elementName = getChildNameSuggestion(null); @@ -371,14 +371,14 @@ public class CustomXmlParserInputWizardPage extends WizardPage { feelingLuckyButton = new Button(buttonBar, SWT.PUSH); feelingLuckyButton.setImage(addManyImage); - feelingLuckyButton.setToolTipText("Feeling lucky"); + feelingLuckyButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_feelingLucky); feelingLuckyButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { InputElement inputElement = null; if (definition.rootInputElement == null) { if (getChildNameSuggestion(null).length() != 0) { - inputElement = new InputElement(getChildNameSuggestion(null), false, CustomXmlTraceDefinition.TAG_IGNORE, 0, "", null); + inputElement = new InputElement(getChildNameSuggestion(null), false, CustomXmlTraceDefinition.TAG_IGNORE, 0, "", null); //$NON-NLS-1$ definition.rootInputElement = inputElement; feelingLucky(inputElement); } @@ -396,7 +396,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { moveUpButton = new Button(buttonBar, SWT.PUSH); moveUpButton.setImage(moveUpImage); - moveUpButton.setToolTipText("Move up"); + moveUpButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_moveUp); moveUpButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -415,7 +415,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { moveDownButton = new Button(buttonBar, SWT.PUSH); moveDownButton.setImage(moveDownImage); - moveDownButton.setToolTipText("Move down"); + moveDownButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_moveDown); moveDownButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -439,7 +439,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { if (attributeName.length() == 0) { break; } else { - InputAttribute attribute = new InputAttribute(attributeName, attributeName, 0, ""); + InputAttribute attribute = new InputAttribute(attributeName, attributeName, 0, ""); //$NON-NLS-1$ inputElement.addAttribute(attribute); } } @@ -448,7 +448,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { if (childName.length() == 0) { break; } else { - InputElement childElement = new InputElement(childName, false, CustomXmlTraceDefinition.TAG_IGNORE, 0, "", null); + InputElement childElement = new InputElement(childName, false, CustomXmlTraceDefinition.TAG_IGNORE, 0, "", null); //$NON-NLS-1$ inputElement.addChild(childElement); feelingLucky(childElement); } @@ -505,7 +505,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { @Override public String getText(Object element) { InputElement inputElement = (InputElement) element; - return (inputElement.elementName.trim().length() == 0) ? "?" : inputElement.elementName; + return (inputElement.elementName.trim().length() == 0) ? "?" : inputElement.elementName; //$NON-NLS-1$ } } @@ -526,7 +526,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { updatePreviews(); removeButton.setEnabled(true); addChildButton.setEnabled(true); - addChildButton.setToolTipText("Add child element"); + addChildButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_addChildElement); if (definition.rootInputElement == inputElement) { addNextButton.setEnabled(false); } else { @@ -538,7 +538,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { removeButton.setEnabled(false); if (definition.rootInputElement == null) { addChildButton.setEnabled(true); - addChildButton.setToolTipText("Add document element"); + addChildButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_addDocumentElement); } else { addChildButton.setEnabled(false); } @@ -572,16 +572,16 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } private String getName(InputElement inputElement) { - String name = (inputElement.elementName.trim().length() == 0) ? "?" : inputElement.elementName.trim(); + String name = (inputElement.elementName.trim().length() == 0) ? "?" : inputElement.elementName.trim(); //$NON-NLS-1$ if (inputElement.parentElement == null) { return name; } - return getName(inputElement.parentElement) + " : " + name; + return getName(inputElement.parentElement) + " : " + name; //$NON-NLS-1$ } private String getName(InputAttribute inputAttribute, InputElement inputElement) { - String name = (inputAttribute.attributeName.trim().length() == 0) ? "?" : inputAttribute.attributeName.trim(); - return getName(inputElement) + " : " + name; + String name = (inputAttribute.attributeName.trim().length() == 0) ? "?" : inputAttribute.attributeName.trim(); //$NON-NLS-1$ + return getName(inputElement) + " : " + name; //$NON-NLS-1$ } /* (non-Javadoc) @@ -645,7 +645,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { try { inputStream = file.getContents(); } catch (CoreException e) { - return ""; + return ""; //$NON-NLS-1$ } } } @@ -655,15 +655,15 @@ public class CustomXmlParserInputWizardPage extends WizardPage { StringBuilder sb = new StringBuilder(); String line = null; while ((line = reader.readLine()) != null) { - sb.append(line + "\n"); + sb.append(line + "\n"); //$NON-NLS-1$ } parseXmlInput(sb.toString()); return sb.toString(); } catch (IOException e) { - return ""; + return ""; //$NON-NLS-1$ } } - return ""; + return ""; //$NON-NLS-1$ } private void parseXmlInput(final String string) { @@ -675,7 +675,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { EntityResolver resolver = new EntityResolver () { @Override public InputSource resolveEntity (String publicId, String systemId) { - String empty = ""; + String empty = ""; //$NON-NLS-1$ ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes()); return new InputSource(bais); } @@ -741,12 +741,12 @@ public class CustomXmlParserInputWizardPage extends WizardPage { dateFormat = new SimpleDateFormat(timeStampOutputFormatText.getText().trim()); timeStampPreviewText.setText(dateFormat.format(date)); } catch (ParseException e) { - timeStampPreviewText.setText("*parse exception* [" + timeStampValue + "] <> [" + timeStampFormat + "]"); + timeStampPreviewText.setText("*parse exception* [" + timeStampValue + "] <> [" + timeStampFormat + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } catch (IllegalArgumentException e) { - timeStampPreviewText.setText("*parse exception* [Illegal Argument]"); + timeStampPreviewText.setText("*parse exception* [Illegal Argument]"); //$NON-NLS-1$ } } else { - timeStampPreviewText.setText("*no matching time stamp*"); + timeStampPreviewText.setText("*no matching time stamp*"); //$NON-NLS-1$ } } @@ -825,7 +825,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { group.setText(getName(inputElement)); Label label = new Label(group, SWT.NULL); - label.setText("Element name:"); + label.setText(Messages.CustomXmlParserInputWizardPage_elementName); label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); elementNameText = new Text(group, SWT.BORDER | SWT.SINGLE); @@ -844,17 +844,17 @@ public class CustomXmlParserInputWizardPage extends WizardPage { if (inputElement.parentElement != null) { previewLabel = new Label(group, SWT.NULL); previewLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); - previewLabel.setText("Preview:"); + previewLabel.setText(Messages.CustomXmlParserInputWizardPage_preview); previewText = new Text(group, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY); gd = new GridData(SWT.FILL, SWT.CENTER, true, false); gd.widthHint = 0; previewText.setLayoutData(gd); - previewText.setText("*no matching element*"); + previewText.setText(Messages.CustomXmlParserInputWizardPage_noMatchingElement); previewText.setBackground(COLOR_WIDGET_BACKGROUND); logEntryButton = new Button(group, SWT.CHECK); - logEntryButton.setText("Log Entry"); + logEntryButton.setText(Messages.CustomXmlParserInputWizardPage_logEntry); logEntryButton.setSelection(inputElement.logEntry); logEntryButton.addSelectionListener(new SelectionListener(){ @Override @@ -895,7 +895,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { actionCombo.setVisible(false); break; case 1: //Time Stamp - tagLabel.setText("format:"); + tagLabel.setText(Messages.CustomXmlParserInputWizardPage_format); tagLabel.setVisible(true); tagText.setVisible(true); tagText.addModifyListener(updateListener); @@ -907,7 +907,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { actionCombo.setVisible(true); break; case 3: //Other - tagLabel.setText("tag name:"); + tagLabel.setText(Messages.CustomXmlParserInputWizardPage_tagName); tagLabel.setVisible(true); if (tagText.getText().trim().length() == 0) { tagText.setText(elementNameText.getText().trim()); @@ -931,7 +931,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { tagText.setLayoutData(gd); actionCombo = new Combo(tagComposite, SWT.DROP_DOWN | SWT.READ_ONLY); - actionCombo.setItems(new String[] {"Set", "Append", "Append with |"}); + actionCombo.setItems(new String[] {Messages.CustomXmlParserInputWizardPage_set, Messages.CustomXmlParserInputWizardPage_append, Messages.CustomXmlParserInputWizardPage_appendWith}); actionCombo.select(inputElement.inputAction); actionCombo.addSelectionListener(updateListener); @@ -942,7 +942,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { actionCombo.setVisible(false); } else if (inputElement.inputName.equals(CustomXmlTraceDefinition.TAG_TIMESTAMP)) { tagCombo.select(1); - tagLabel.setText("format:"); + tagLabel.setText(Messages.CustomXmlParserInputWizardPage_format); tagText.setText(inputElement.inputFormat); tagText.addModifyListener(updateListener); } else if (inputElement.inputName.equals(CustomXmlTraceDefinition.TAG_MESSAGE)) { @@ -951,7 +951,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { tagText.setVisible(false); } else { tagCombo.select(3); - tagLabel.setText("tag name:"); + tagLabel.setText(Messages.CustomXmlParserInputWizardPage_tagName); tagText.setText(inputElement.inputName); tagText.addModifyListener(updateListener); } @@ -970,7 +970,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { private void updatePreview() { Element element = getPreviewElement(inputElement); if (inputElement.parentElement != null) { // no preview text for document element - previewText.setText("*no matching element*"); + previewText.setText(Messages.CustomXmlParserInputWizardPage_noMatchingElement); if (element != null) { previewText.setText(CustomXmlTrace.parseElement(element, new StringBuffer()).toString()); if (logEntryButton.getSelection()) { @@ -997,8 +997,8 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } } else if (actionCombo.getSelectionIndex() == CustomXmlTraceDefinition.ACTION_APPEND_WITH_SEPARATOR) { if (timeStampValue != null) { - timeStampValue += " | " + value; - timeStampFormat += " | " + tagText.getText().trim(); + timeStampValue += " | " + value; //$NON-NLS-1$ + timeStampFormat += " | " + tagText.getText().trim(); //$NON-NLS-1$ } else { timeStampValue = value; timeStampFormat = tagText.getText().trim(); @@ -1027,8 +1027,8 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } } else if (attribute.actionCombo.getSelectionIndex() == CustomXmlTraceDefinition.ACTION_APPEND_WITH_SEPARATOR) { if (timeStampValue != null) { - timeStampValue += " | " + value; - timeStampFormat += " | " + attribute.tagText.getText().trim(); + timeStampValue += " | " + value; //$NON-NLS-1$ + timeStampFormat += " | " + attribute.tagText.getText().trim(); //$NON-NLS-1$ } else { timeStampValue = value; timeStampFormat = attribute.tagText.getText().trim(); @@ -1036,10 +1036,10 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } } } else { - attribute.previewText.setText("*no matching attribute*"); + attribute.previewText.setText(Messages.CustomXmlParserInputWizardPage_noMatchingAttribute); } } else { - attribute.previewText.setText("*no matching element*"); + attribute.previewText.setText(Messages.CustomXmlParserInputWizardPage_noMatchingElement); } } for (ElementNode child : childElements) { @@ -1062,13 +1062,13 @@ public class CustomXmlParserInputWizardPage extends WizardPage { addAttributeButton = new Button(addAttributeComposite, SWT.PUSH); addAttributeButton.setImage(addImage); - addAttributeButton.setToolTipText("Add attribute"); + addAttributeButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_addAttribute); addAttributeButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { removeAddButton(); String attributeName = getAttributeNameSuggestion(inputElement); - InputAttribute inputAttribute = new InputAttribute(attributeName, attributeName, 0, ""); + InputAttribute inputAttribute = new InputAttribute(attributeName, attributeName, 0, ""); //$NON-NLS-1$ attributes.add(new Attribute(group, ElementNode.this, inputAttribute, attributes.size()+1)); createAddButton(); elementContainer.layout(); @@ -1081,7 +1081,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { addAttributeLabel = new Label(addAttributeComposite, SWT.NULL); addAttributeLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - addAttributeLabel.setText("New attribute"); + addAttributeLabel.setText(Messages.CustomXmlParserInputWizardPage_newAttibute); } private void removeAddButton() { @@ -1175,7 +1175,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { Button deleteButton = new Button(labelComposite, SWT.PUSH); deleteButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); deleteButton.setImage(deleteImage); - deleteButton.setToolTipText("Remove attribute"); + deleteButton.setToolTipText(Messages.CustomXmlParserInputWizardPage_removeAttribute); deleteButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -1187,7 +1187,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { attributeLabel = new Label(labelComposite, SWT.NULL); attributeLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false)); - attributeLabel.setText("Attribute"); + attributeLabel.setText(Messages.CustomXmlParserInputWizardPage_attibute); attributeComposite = new Composite(parent, SWT.FILL); GridLayout attributeLayout = new GridLayout(4, false); @@ -1197,7 +1197,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { attributeComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); Label nameLabel = new Label(attributeComposite, SWT.NONE); - nameLabel.setText("name:"); + nameLabel.setText(Messages.CustomXmlParserInputWizardPage_name); attributeNameText = new Text(attributeComposite, SWT.BORDER | SWT.SINGLE); attributeNameText.setLayoutData(new GridData(120, SWT.DEFAULT)); @@ -1205,13 +1205,13 @@ public class CustomXmlParserInputWizardPage extends WizardPage { attributeNameText.addModifyListener(updateListener); Label previewLabel = new Label(attributeComposite, SWT.NONE); - previewLabel.setText("Preview:"); + previewLabel.setText(Messages.CustomXmlParserInputWizardPage_preview); previewText = new Text(attributeComposite, SWT.BORDER | SWT.SINGLE | SWT.READ_ONLY); GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false); gd.widthHint = 0; previewText.setLayoutData(gd); - previewText.setText("*no match*"); + previewText.setText(Messages.CustomXmlParserInputWizardPage_noMatch); previewText.setBackground(COLOR_WIDGET_BACKGROUND); filler = new Label(parent, SWT.NULL); @@ -1236,7 +1236,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { tagText.removeModifyListener(updateListener); switch (tagCombo.getSelectionIndex()) { case 0: //Time Stamp - tagLabel.setText("format:"); + tagLabel.setText(Messages.CustomXmlParserInputWizardPage_format); tagLabel.setVisible(true); tagText.setVisible(true); tagText.addModifyListener(updateListener); @@ -1246,7 +1246,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { tagText.setVisible(false); break; case 2: //Other - tagLabel.setText("tag name:"); + tagLabel.setText(Messages.CustomXmlParserInputWizardPage_tagName); tagLabel.setVisible(true); if (tagText.getText().trim().length() == 0) { tagText.setText(attributeNameText.getText().trim()); @@ -1270,13 +1270,13 @@ public class CustomXmlParserInputWizardPage extends WizardPage { tagText.setText(attributeNameText.getText()); actionCombo = new Combo(tagComposite, SWT.DROP_DOWN | SWT.READ_ONLY); - actionCombo.setItems(new String[] {"Set", "Append", "Append with |"}); + actionCombo.setItems(new String[] {Messages.CustomXmlParserInputWizardPage_set, Messages.CustomXmlParserInputWizardPage_append, Messages.CustomXmlParserInputWizardPage_appendWith}); actionCombo.select(inputAttribute.inputAction); actionCombo.addSelectionListener(updateListener); if (inputAttribute.inputName.equals(CustomXmlTraceDefinition.TAG_TIMESTAMP)) { tagCombo.select(0); - tagLabel.setText("format:"); + tagLabel.setText(Messages.CustomXmlParserInputWizardPage_format); tagText.setText(inputAttribute.inputFormat); tagText.addModifyListener(updateListener); } else if (inputAttribute.inputName.equals(CustomXmlTraceDefinition.TAG_MESSAGE)) { @@ -1285,7 +1285,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { tagText.setVisible(false); } else { tagCombo.select(2); - tagLabel.setText("tag name:"); + tagLabel.setText(Messages.CustomXmlParserInputWizardPage_tagName); tagText.setText(inputAttribute.inputName); tagText.addModifyListener(updateListener); } @@ -1364,7 +1364,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } } } - return (""); + return ""; //$NON-NLS-1$ } private String getAttributeNameSuggestion(InputElement inputElement) { @@ -1387,7 +1387,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } } } - return (""); + return ""; //$NON-NLS-1$ } private void validate() { @@ -1402,14 +1402,14 @@ public class CustomXmlParserInputWizardPage extends WizardPage { StringBuffer errors = new StringBuffer(); if (definition.definitionName.length() == 0) { - errors.append("Enter a name for the new log type. "); + errors.append(Messages.CustomXmlParserInputWizardPage_62); logtypeText.setBackground(COLOR_LIGHT_RED); } else { logtypeText.setBackground(COLOR_TEXT_BACKGROUND); for (CustomXmlTraceDefinition def : CustomXmlTraceDefinition.loadAll()) { if (definition.definitionName.equals(def.definitionName)) { if (editDefinitionName == null || ! editDefinitionName.equals(definition.definitionName)) { - errors.append("The log type name already exists. "); + errors.append(Messages.CustomXmlParserInputWizardPage_63); logtypeText.setBackground(COLOR_LIGHT_RED); break; } @@ -1418,7 +1418,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } if (definition.rootInputElement == null) { - errors.append("Add a document element. "); + errors.append(Messages.CustomXmlParserInputWizardPage_64); } if (definition.rootInputElement != null) { @@ -1431,28 +1431,28 @@ public class CustomXmlParserInputWizardPage extends WizardPage { if ((definition.rootInputElement.attributes != null && definition.rootInputElement.attributes.size() != 0) || (definition.rootInputElement.childElements != null && definition.rootInputElement.childElements.size() != 0) || errors.length() == 0) { if (!logEntryFound) { - errors.append("Identify a Log Entry element. "); + errors.append(Messages.CustomXmlParserInputWizardPage_65); } if (timeStampFound) { if (timeStampOutputFormatText.getText().trim().length() == 0) { - errors.append("Enter the output format for the Time Stamp field. "); + errors.append(Messages.CustomXmlParserInputWizardPage_66); timeStampOutputFormatText.setBackground(COLOR_LIGHT_RED); } else { try { new SimpleDateFormat(timeStampOutputFormatText.getText().trim()); timeStampOutputFormatText.setBackground(COLOR_TEXT_BACKGROUND); } catch (IllegalArgumentException e) { - errors.append("Enter a valid output format for the Time Stamp field. "); + errors.append(Messages.CustomXmlParserInputWizardPage_67); timeStampOutputFormatText.setBackground(COLOR_LIGHT_RED); } } } else { - timeStampPreviewText.setText("*no time stamp element or attribute*"); + timeStampPreviewText.setText(Messages.CustomXmlParserInputWizardPage_68); } } } else { - timeStampPreviewText.setText("*no time stamp element or attribute*"); + timeStampPreviewText.setText(Messages.CustomXmlParserInputWizardPage_69); } if (errors.length() == 0) { @@ -1470,7 +1470,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { if (selectedElement != null && selectedElement.inputElement.equals(inputElement)) elementNode = selectedElement; if (inputElement == definition.rootInputElement) { if (inputElement.elementName.length() == 0) { - errors.append("Enter a name for the document element. "); + errors.append(Messages.CustomXmlParserInputWizardPage_70); if (elementNode != null) elementNode.elementNameText.setBackground(COLOR_LIGHT_RED); } else { if (elementNode != null) elementNode.elementNameText.setBackground(COLOR_TEXT_BACKGROUND); @@ -1484,19 +1484,19 @@ public class CustomXmlParserInputWizardPage extends WizardPage { if (inputElement.inputName.equals(CustomXmlTraceDefinition.TAG_TIMESTAMP)) { timeStampFound = true; if (inputElement.inputFormat.length() == 0) { - errors.append("Enter the input format for the Time Stamp (Element " + getName(inputElement) + "). "); + errors.append(Messages.CustomXmlParserInputWizardPage_71 + getName(inputElement) + "). "); //$NON-NLS-1$ if (elementNode != null) elementNode.tagText.setBackground(COLOR_LIGHT_RED); } else { try { new SimpleDateFormat(inputElement.inputFormat); if (elementNode != null) elementNode.tagText.setBackground(COLOR_TEXT_BACKGROUND); } catch (IllegalArgumentException e) { - errors.append("Enter a valid input format for the Time Stamp (Element " + getName(inputElement) + "). "); + errors.append(Messages.CustomXmlParserInputWizardPage_73 + getName(inputElement) + "). "); //$NON-NLS-1$ if (elementNode != null) elementNode.tagText.setBackground(COLOR_LIGHT_RED); } } } else if (inputElement.inputName.length() == 0) { - errors.append("Enter a name for the input . "); + errors.append(Messages.CustomXmlParserInputWizardPage_75); if (elementNode != null) elementNode.tagText.setBackground(COLOR_LIGHT_RED); } else { if (elementNode != null) elementNode.tagText.setBackground(COLOR_TEXT_BACKGROUND); @@ -1521,28 +1521,28 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } } if (attribute.attributeName.length() == 0) { - errors.append("Enter a name for the attribute (Attribute " + getName(inputElement) + ": ?). "); + errors.append(Messages.CustomXmlParserInputWizardPage_76 + getName(inputElement) + ": ?). "); //$NON-NLS-1$ if (elementNode != null) elementNode.attributes.get(i).attributeNameText.setBackground(COLOR_LIGHT_RED); } else if (duplicate) { - errors.append("Duplicate attribute names (Attribute " + getName(attribute, inputElement) +"). "); + errors.append(Messages.CustomXmlParserInputWizardPage_78 + getName(attribute, inputElement) +"). "); //$NON-NLS-1$ if (elementNode != null) elementNode.attributes.get(i).attributeNameText.setBackground(COLOR_LIGHT_RED); } if (attribute.inputName.equals(CustomXmlTraceDefinition.TAG_TIMESTAMP)) { timeStampFound = true; if (attribute.inputFormat.length() == 0) { - errors.append("Enter the input format for the Time Stamp (Attribute " + getName(attribute, inputElement) +"). "); + errors.append(Messages.CustomXmlParserInputWizardPage_80 + getName(attribute, inputElement) +"). "); //$NON-NLS-1$ if (elementNode != null) elementNode.attributes.get(i).tagText.setBackground(COLOR_LIGHT_RED); } else { try { new SimpleDateFormat(attribute.inputFormat); if (elementNode != null) elementNode.attributes.get(i).tagText.setBackground(COLOR_TEXT_BACKGROUND); } catch (IllegalArgumentException e) { - errors.append("Enter a valid input format for the Time Stamp (Attribute " + getName(attribute, inputElement) +"). "); + errors.append(Messages.CustomXmlParserInputWizardPage_82 + getName(attribute, inputElement) +"). "); //$NON-NLS-1$ if (elementNode != null) elementNode.attributes.get(i).tagText.setBackground(COLOR_LIGHT_RED); } } } else if (attribute.inputName.length() == 0) { - errors.append("Enter a name for the data group (Attribute " + getName(attribute, inputElement) +"). "); + errors.append(Messages.CustomXmlParserInputWizardPage_84 + getName(attribute, inputElement) +"). "); //$NON-NLS-1$ if (elementNode != null) elementNode.attributes.get(i).tagText.setBackground(COLOR_LIGHT_RED); } else { if (elementNode != null) elementNode.attributes.get(i).tagText.setBackground(COLOR_TEXT_BACKGROUND); @@ -1560,7 +1560,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { ElementNode childElementNode = null; if (selectedElement != null && selectedElement.inputElement.equals(child)) childElementNode = selectedElement; if (child.elementName.length() == 0) { - errors.append("Enter a name for the element (Element " + getName(child) + "). "); + errors.append(Messages.CustomXmlParserInputWizardPage_86 + getName(child) + "). "); //$NON-NLS-1$ if (childElementNode != null) childElementNode.elementNameText.setBackground(COLOR_LIGHT_RED); } else { boolean duplicate = false; @@ -1574,7 +1574,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage { } } if (duplicate) { - errors.append("Duplicate element names (Element " + getName(child) + "). "); + errors.append(Messages.CustomXmlParserInputWizardPage_88 + getName(child) + "). "); //$NON-NLS-1$ if (childElementNode != null) childElementNode.elementNameText.setBackground(COLOR_LIGHT_RED); } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserOutputWizardPage.java index d9fab22325..d032b8894f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/CustomXmlParserOutputWizardPage.java @@ -30,8 +30,8 @@ import org.eclipse.swt.widgets.Text; public class CustomXmlParserOutputWizardPage extends WizardPage { - private static final Image upImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/up_button.gif"); - private static final Image downImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/down_button.gif"); + private static final Image upImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/up_button.gif"); //$NON-NLS-1$ + private static final Image downImage = TmfUiPlugin.getDefault().getImageFromPath("/icons/down_button.gif"); //$NON-NLS-1$ private CustomXmlParserWizard wizard; private CustomXmlTraceDefinition definition; ArrayList outputs = new ArrayList(); @@ -48,9 +48,9 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { File tmpFile; protected CustomXmlParserOutputWizardPage(CustomXmlParserWizard wizard) { - super("CustomParserOutputWizardPage"); + super("CustomParserOutputWizardPage"); //$NON-NLS-1$ setTitle(wizard.inputPage.getTitle()); - setDescription("Customize the output of the parser"); + setDescription(Messages.CustomXmlParserOutputWizardPage_description); this.wizard = wizard; setPageComplete(false); } @@ -198,7 +198,7 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { definition.outputs = extractOutputs(); try { - tmpFile = TmfUiPlugin.getDefault().getStateLocation().addTrailingSeparator().append("customwizard.tmp").toFile(); + tmpFile = TmfUiPlugin.getDefault().getStateLocation().addTrailingSeparator().append("customwizard.tmp").toFile(); //$NON-NLS-1$ FileWriter writer = new FileWriter(tmpFile); writer.write(wizard.inputPage.getInputText()); writer.close(); @@ -249,7 +249,7 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { this.name = name; enabledButton = new Button(parent, SWT.CHECK); - enabledButton.setToolTipText("Visible"); + enabledButton.setToolTipText(Messages.CustomXmlParserOutputWizardPage_visible); enabledButton.setSelection(true); enabledButton.addSelectionListener(new SelectionAdapter() { @Override @@ -268,7 +268,7 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { upButton = new Button(parent, SWT.PUSH); upButton.setImage(upImage); - upButton.setToolTipText("Move Before"); + upButton.setToolTipText(Messages.CustomXmlParserOutputWizardPage_moveBefore); upButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -279,7 +279,7 @@ public class CustomXmlParserOutputWizardPage extends WizardPage { downButton = new Button(parent, SWT.PUSH); downButton.setImage(downImage); - downButton.setToolTipText("Move After"); + downButton.setToolTipText(Messages.CustomXmlParserOutputWizardPage_moveAfter); downButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/Messages.java new file mode 100644 index 0000000000..1a67bf5dc5 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/Messages.java @@ -0,0 +1,120 @@ +package org.eclipse.linuxtools.tmf.ui.wizards; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.wizards.messages"; //$NON-NLS-1$ + public static String CustomTxtParserInputWizardPage_20; + public static String CustomTxtParserInputWizardPage_21; + public static String CustomTxtParserInputWizardPage_22; + public static String CustomTxtParserInputWizardPage_23; + public static String CustomTxtParserInputWizardPage_44; + public static String CustomTxtParserInputWizardPage_addChildLine; + public static String CustomTxtParserInputWizardPage_addGroup; + public static String CustomTxtParserInputWizardPage_addNextLine; + public static String CustomTxtParserInputWizardPage_append; + public static String CustomTxtParserInputWizardPage_appendWith; + public static String CustomTxtParserInputWizardPage_capturedGroup; + public static String CustomTxtParserInputWizardPage_cardinality; + public static String CustomTxtParserInputWizardPage_dateFormatHelp; + public static String CustomTxtParserInputWizardPage_desccriptionEdit; + public static String CustomTxtParserInputWizardPage_descriptionNew; + public static String CustomTxtParserInputWizardPage_format; + public static String CustomTxtParserInputWizardPage_group; + public static String CustomTxtParserInputWizardPage_highlightAll; + public static String CustomTxtParserInputWizardPage_logType; + public static String CustomTxtParserInputWizardPage_matchingLineRoot; + public static String CustomTxtParserInputWizardPage_matchingOtherLine; + public static String CustomTxtParserInputWizardPage_max; + public static String CustomTxtParserInputWizardPage_min; + public static String CustomTxtParserInputWizardPage_moveDown; + public static String CustomTxtParserInputWizardPage_moveUp; + public static String CustomTxtParserInputWizardPage_name; + public static String CustomTxtParserInputWizardPage_newGroup; + public static String CustomTxtParserInputWizardPage_noMatch; + public static String CustomTxtParserInputWizardPage_noMatchingGroup; + public static String CustomTxtParserInputWizardPage_noMatchingLine; + public static String CustomTxtParserInputWizardPage_noMatchingTimestamp; + public static String CustomTxtParserInputWizardPage_noMathcingLine; + public static String CustomTxtParserInputWizardPage_nonMatchingLine; + public static String CustomTxtParserInputWizardPage_noTimestampGroup; + public static String CustomTxtParserInputWizardPage_preview; + public static String CustomTxtParserInputWizardPage_previewInput; + public static String CustomTxtParserInputWizardPage_previewLegend; + public static String CustomTxtParserInputWizardPage_regularExpression; + public static String CustomTxtParserInputWizardPage_regularExpressionHelp; + public static String CustomTxtParserInputWizardPage_removeGroup; + public static String CustomTxtParserInputWizardPage_removeLine; + public static String CustomTxtParserInputWizardPage_set; + public static String CustomTxtParserInputWizardPage_timestampFormat; + public static String CustomTxtParserInputWizardPage_uncapturedText; + public static String CustomTxtParserInputWizardPage_unidentifiedCaptureGroup; + public static String CustomTxtParserInputWizardPage_windowTitleEdit; + public static String CustomTxtParserInputWizardPage_windowTitleNew; + public static String CustomTxtParserOutputWizardPage_description; + public static String CustomTxtParserOutputWizardPage_moveAfter; + public static String CustomTxtParserOutputWizardPage_moveBefore; + public static String CustomTxtParserOutputWizardPage_visible; + public static String CustomXmlParserInputWizardPage_62; + public static String CustomXmlParserInputWizardPage_63; + public static String CustomXmlParserInputWizardPage_64; + public static String CustomXmlParserInputWizardPage_65; + public static String CustomXmlParserInputWizardPage_66; + public static String CustomXmlParserInputWizardPage_67; + public static String CustomXmlParserInputWizardPage_68; + public static String CustomXmlParserInputWizardPage_69; + public static String CustomXmlParserInputWizardPage_70; + public static String CustomXmlParserInputWizardPage_71; + public static String CustomXmlParserInputWizardPage_73; + public static String CustomXmlParserInputWizardPage_75; + public static String CustomXmlParserInputWizardPage_76; + public static String CustomXmlParserInputWizardPage_78; + public static String CustomXmlParserInputWizardPage_80; + public static String CustomXmlParserInputWizardPage_82; + public static String CustomXmlParserInputWizardPage_84; + public static String CustomXmlParserInputWizardPage_86; + public static String CustomXmlParserInputWizardPage_88; + public static String CustomXmlParserInputWizardPage_addAttribute; + public static String CustomXmlParserInputWizardPage_addChildElement; + public static String CustomXmlParserInputWizardPage_addDocumentEleemnt; + public static String CustomXmlParserInputWizardPage_addDocumentElement; + public static String CustomXmlParserInputWizardPage_addNextElement; + public static String CustomXmlParserInputWizardPage_append; + public static String CustomXmlParserInputWizardPage_appendWith; + public static String CustomXmlParserInputWizardPage_attibute; + public static String CustomXmlParserInputWizardPage_dateFormatHelp; + public static String CustomXmlParserInputWizardPage_descriptionEdit; + public static String CustomXmlParserInputWizardPage_descriptionNew; + public static String CustomXmlParserInputWizardPage_elementName; + public static String CustomXmlParserInputWizardPage_feelingLucky; + public static String CustomXmlParserInputWizardPage_format; + public static String CustomXmlParserInputWizardPage_logEntry; + public static String CustomXmlParserInputWizardPage_logType; + public static String CustomXmlParserInputWizardPage_moveDown; + public static String CustomXmlParserInputWizardPage_moveUp; + public static String CustomXmlParserInputWizardPage_name; + public static String CustomXmlParserInputWizardPage_newAttibute; + public static String CustomXmlParserInputWizardPage_noMatchingAttribute; + public static String CustomXmlParserInputWizardPage_noMatch; + public static String CustomXmlParserInputWizardPage_noMatchingElement; + public static String CustomXmlParserInputWizardPage_preview; + public static String CustomXmlParserInputWizardPage_previewInput; + public static String CustomXmlParserInputWizardPage_removeAttribute; + public static String CustomXmlParserInputWizardPage_removeElement; + public static String CustomXmlParserInputWizardPage_set; + public static String CustomXmlParserInputWizardPage_tagName; + public static String CustomXmlParserInputWizardPage_timestampFormat; + public static String CustomXmlParserInputWizardPage_titleEdit; + public static String CustomXmlParserInputWizardPage_titleNew; + public static String CustomXmlParserOutputWizardPage_description; + public static String CustomXmlParserOutputWizardPage_moveAfter; + public static String CustomXmlParserOutputWizardPage_moveBefore; + public static String CustomXmlParserOutputWizardPage_visible; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/messages.properties b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/messages.properties new file mode 100644 index 0000000000..ee1b65ccc3 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/wizards/messages.properties @@ -0,0 +1,106 @@ +CustomTxtParserInputWizardPage_20=*parse exception* [ +CustomTxtParserInputWizardPage_21=] <> [ +CustomTxtParserInputWizardPage_22=] +CustomTxtParserInputWizardPage_23=*parse exception* [Illegal Argument] +CustomTxtParserInputWizardPage_44=matchingRootLine +CustomTxtParserInputWizardPage_addChildLine=Add child line +CustomTxtParserInputWizardPage_addGroup=Add group +CustomTxtParserInputWizardPage_addNextLine=Add next line +CustomTxtParserInputWizardPage_append=Append +CustomTxtParserInputWizardPage_appendWith=Append with | +CustomTxtParserInputWizardPage_capturedGroup=Captured group +CustomTxtParserInputWizardPage_cardinality=Cardinality: +CustomTxtParserInputWizardPage_dateFormatHelp=Date Format Help +CustomTxtParserInputWizardPage_desccriptionEdit=Edit an existing custom parser for text log files +CustomTxtParserInputWizardPage_descriptionNew=Create a new custom parser for text log files +CustomTxtParserInputWizardPage_format=format: +CustomTxtParserInputWizardPage_group=Group +CustomTxtParserInputWizardPage_highlightAll=Highlight All +CustomTxtParserInputWizardPage_logType=Log type: +CustomTxtParserInputWizardPage_matchingLineRoot=Matching root line : +CustomTxtParserInputWizardPage_matchingOtherLine=Matching other line: +CustomTxtParserInputWizardPage_max=max: +CustomTxtParserInputWizardPage_min=min: +CustomTxtParserInputWizardPage_moveDown=Move down +CustomTxtParserInputWizardPage_moveUp=Move up +CustomTxtParserInputWizardPage_name=name: +CustomTxtParserInputWizardPage_newGroup=New group +CustomTxtParserInputWizardPage_noMatch=*no match* +CustomTxtParserInputWizardPage_noMatchingGroup=*no matching group* +CustomTxtParserInputWizardPage_noMatchingLine=*no matching line* +CustomTxtParserInputWizardPage_noMatchingTimestamp=*no matching timestamp* +CustomTxtParserInputWizardPage_noMathcingLine=*no matching line* +CustomTxtParserInputWizardPage_nonMatchingLine=Non-matching line\n +CustomTxtParserInputWizardPage_noTimestampGroup=*no timestamp group* +CustomTxtParserInputWizardPage_preview=Preview: +CustomTxtParserInputWizardPage_previewInput=Preview input +CustomTxtParserInputWizardPage_previewLegend=Preview Legend +CustomTxtParserInputWizardPage_regularExpression=Regular expression: +CustomTxtParserInputWizardPage_regularExpressionHelp=Regular Expression Help +CustomTxtParserInputWizardPage_removeGroup=Remove group +CustomTxtParserInputWizardPage_removeLine=Remove line +CustomTxtParserInputWizardPage_set=Set +CustomTxtParserInputWizardPage_timestampFormat=Time Stamp format: +CustomTxtParserInputWizardPage_uncapturedText=Uncaptured text +CustomTxtParserInputWizardPage_unidentifiedCaptureGroup=Unidentified captured group +CustomTxtParserInputWizardPage_windowTitleEdit=Edit Custom Text Parser +CustomTxtParserInputWizardPage_windowTitleNew=New Custom Text Parser +CustomTxtParserOutputWizardPage_description=Customize the output of the parser +CustomTxtParserOutputWizardPage_moveAfter=Move After +CustomTxtParserOutputWizardPage_moveBefore=Move Before +CustomTxtParserOutputWizardPage_visible=Visible +CustomXmlParserInputWizardPage_62=Enter a name for the new log type. +CustomXmlParserInputWizardPage_63=The log type name already exists. +CustomXmlParserInputWizardPage_64=Add a document element. +CustomXmlParserInputWizardPage_65=Identify a Log Entry element. +CustomXmlParserInputWizardPage_66=Enter the output format for the Time Stamp field. +CustomXmlParserInputWizardPage_67=Enter a valid output format for the Time Stamp field. +CustomXmlParserInputWizardPage_68=*no time stamp element or attribute* +CustomXmlParserInputWizardPage_69=*no time stamp element or attribute* +CustomXmlParserInputWizardPage_70=Enter a name for the document element. +CustomXmlParserInputWizardPage_71=Enter the input format for the Time Stamp (Element +CustomXmlParserInputWizardPage_73=Enter a valid input format for the Time Stamp (Element +CustomXmlParserInputWizardPage_75=Enter a name for the input . +CustomXmlParserInputWizardPage_76=Enter a name for the attribute (Attribute +CustomXmlParserInputWizardPage_78=Duplicate attribute names (Attribute +CustomXmlParserInputWizardPage_80=Enter the input format for the Time Stamp (Attribute +CustomXmlParserInputWizardPage_82=Enter a valid input format for the Time Stamp (Attribute +CustomXmlParserInputWizardPage_84=Enter a name for the data group (Attribute +CustomXmlParserInputWizardPage_86=Enter a name for the element (Element +CustomXmlParserInputWizardPage_88=Duplicate element names (Element +CustomXmlParserInputWizardPage_addAttribute=Add attribute +CustomXmlParserInputWizardPage_addChildElement=Add child element +CustomXmlParserInputWizardPage_addDocumentEleemnt=Add document element +CustomXmlParserInputWizardPage_addDocumentElement=Add document element +CustomXmlParserInputWizardPage_addNextElement=Add next element +CustomXmlParserInputWizardPage_append=Append +CustomXmlParserInputWizardPage_appendWith=Append with | +CustomXmlParserInputWizardPage_attibute=Attribute +CustomXmlParserInputWizardPage_dateFormatHelp=Date Format Help +CustomXmlParserInputWizardPage_descriptionEdit=Edit an existing custom parser for XML log files +CustomXmlParserInputWizardPage_descriptionNew=Create a new custom parser for XML log files +CustomXmlParserInputWizardPage_elementName=Element name: +CustomXmlParserInputWizardPage_feelingLucky=Feeling lucky +CustomXmlParserInputWizardPage_format=format: +CustomXmlParserInputWizardPage_logEntry=Log Entry +CustomXmlParserInputWizardPage_logType=Log type: +CustomXmlParserInputWizardPage_moveDown=Move down +CustomXmlParserInputWizardPage_moveUp=Move up +CustomXmlParserInputWizardPage_name=name: +CustomXmlParserInputWizardPage_newAttibute=New attribute +CustomXmlParserInputWizardPage_noMatch=*no match* +CustomXmlParserInputWizardPage_noMatchingAttribute=*no matching attribute* +CustomXmlParserInputWizardPage_noMatchingElement=*no matching element* +CustomXmlParserInputWizardPage_preview=Preview: +CustomXmlParserInputWizardPage_previewInput=Preview input +CustomXmlParserInputWizardPage_removeAttribute=Remove attribute +CustomXmlParserInputWizardPage_removeElement=Remove element +CustomXmlParserInputWizardPage_set=Set +CustomXmlParserInputWizardPage_tagName=tag name: +CustomXmlParserInputWizardPage_timestampFormat=Time Stamp format: +CustomXmlParserInputWizardPage_titleEdit=Edit Custom XML Parser +CustomXmlParserInputWizardPage_titleNew=New Custom XML Parser +CustomXmlParserOutputWizardPage_description=Customize the output of the parser +CustomXmlParserOutputWizardPage_moveAfter=Move After +CustomXmlParserOutputWizardPage_moveBefore=Move Before +CustomXmlParserOutputWizardPage_visible=Visible diff --git a/org.eclipse.linuxtools.tmf/ChangeLog b/org.eclipse.linuxtools.tmf/ChangeLog index 615b7d014d..2095112ba9 100644 --- a/org.eclipse.linuxtools.tmf/ChangeLog +++ b/org.eclipse.linuxtools.tmf/ChangeLog @@ -1,3 +1,55 @@ +2010-11-09 Francois Chouinard + + Suppress warning for non-externalized strings + * src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java (newCoalescedDataRequest): + (coalesceDataRequest): + (.run): + (queueRequest): + * src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java (newCoalescedDataRequest): + * src/org/eclipse/linuxtools/tmf/event/TmfEvent.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfEventField.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfEventType.java (DEFAULT_TYPE_ID): + (getLabel): + (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java (synchronize): + (toString): + * src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java (toString): + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java (TmfExperiment): + (toString): + * src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java (toString): + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java (toString): + * src/org/eclipse/linuxtools/tmf/request/TmfCoalescedEventRequest.java (toString): + * src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java (TmfDataRequest): + (handleCompleted): + (start): + (done): + (toString): + * src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java (toString): + * src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java (TmfRequestExecutor): + (stop): + (.run): + (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java (traceSignal): + * src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java (toString): + * src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java (PLUGIN_ID): + * src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java (toString): + * src/org/eclipse/linuxtools/tmf/trace/TmfContext.java (toString): + * src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java (toString): + (clone): + * src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java (toString): + * src/org/eclipse/linuxtools/tmf/Tracer.java: + 2010-11-04 Francois Chouinard * src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java: Use the correct index page size diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java index 7fd06bf75a..3f2eb12d28 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java @@ -28,7 +28,7 @@ public class TmfCorePlugin extends Plugin { // ------------------------------------------------------------------------ // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf"; + public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf"; //$NON-NLS-1$ // The shared instance private static TmfCorePlugin fPlugin; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java index 42613d2de0..27d25c3e53 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java @@ -10,6 +10,7 @@ import org.eclipse.linuxtools.tmf.component.ITmfDataProvider; import org.eclipse.linuxtools.tmf.event.TmfData; import org.eclipse.linuxtools.tmf.request.ITmfDataRequest; +@SuppressWarnings("nls") public class Tracer { private static String pluginID = TmfCorePlugin.PLUGIN_ID; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java index 841fa9aa1a..fbe81839fa 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfDataProvider.java @@ -198,8 +198,8 @@ public abstract class TmfDataProvider extends TmfComponent im fType, request.getIndex(), request.getNbRequested(),request.getExecType()); coalescedRequest.addRequest(request); if (Tracer.isRequestTraced()) { - Tracer.traceRequest(request, "coalesced with " + coalescedRequest.getRequestId()); - Tracer.traceRequest(coalescedRequest, "added " + request.getRequestId()); + Tracer.traceRequest(request, "coalesced with " + coalescedRequest.getRequestId()); //$NON-NLS-1$ + Tracer.traceRequest(coalescedRequest, "added " + request.getRequestId()); //$NON-NLS-1$ } fPendingCoalescedRequests.add(coalescedRequest); } @@ -211,8 +211,8 @@ public abstract class TmfDataProvider extends TmfComponent im if (req.isCompatible(request)) { req.addRequest(request); if (Tracer.isRequestTraced()) { - Tracer.traceRequest(request, "coalesced with " + req.getRequestId()); - Tracer.traceRequest(req, "added " + request.getRequestId()); + Tracer.traceRequest(request, "coalesced with " + req.getRequestId()); //$NON-NLS-1$ + Tracer.traceRequest(req, "added " + request.getRequestId()); //$NON-NLS-1$ } return; } @@ -247,7 +247,7 @@ public abstract class TmfDataProvider extends TmfComponent im @Override public void run() { - if (Tracer.isRequestTraced()) Tracer.traceRequest(request, "started"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(request, "started"); //$NON-NLS-1$ // Extract the generic information request.start(); @@ -263,9 +263,9 @@ public abstract class TmfDataProvider extends TmfComponent im try { // Get the ordered events - if (Tracer.isRequestTraced()) Tracer.trace("Request #" + request.getRequestId() + " is being serviced by " + provider.getName()); + if (Tracer.isRequestTraced()) Tracer.trace("Request #" + request.getRequestId() + " is being serviced by " + provider.getName()); //$NON-NLS-1$//$NON-NLS-2$ T data = getNext(context); - if (Tracer.isRequestTraced()) Tracer.trace("Request #" + request.getRequestId() + " read first event"); + if (Tracer.isRequestTraced()) Tracer.trace("Request #" + request.getRequestId() + " read first event"); //$NON-NLS-1$ //$NON-NLS-2$ while (data != null && !isCompleted(request, data, nbRead)) { if (fLogData) Tracer.traceEvent(provider, request, data); @@ -275,7 +275,7 @@ public abstract class TmfDataProvider extends TmfComponent im if (++nbRead < nbRequested) { data = getNext(context); if (Tracer.isRequestTraced() && (data == null || data.isNullRef())) { - Tracer.trace("Request #" + request.getRequestId() + " end of data"); + Tracer.trace("Request #" + request.getRequestId() + " end of data"); //$NON-NLS-1$//$NON-NLS-2$ } } } @@ -287,10 +287,10 @@ public abstract class TmfDataProvider extends TmfComponent im request.done(); } - if (Tracer.isRequestTraced()) Tracer.traceRequest(request, "completed"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(request, "completed"); //$NON-NLS-1$ } catch (Exception e) { - if (Tracer.isRequestTraced()) Tracer.traceRequest(request, "exception (failed)"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(request, "exception (failed)"); //$NON-NLS-1$ request.fail(); } } @@ -298,7 +298,7 @@ public abstract class TmfDataProvider extends TmfComponent im fExecutor.execute(thread); - if (Tracer.isRequestTraced()) Tracer.traceRequest(request, "queued"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(request, "queued"); //$NON-NLS-1$ } // By default, same behavior as a foreground request diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java index 420e7a803e..1cbbf7e7d1 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/component/TmfEventProvider.java @@ -56,8 +56,8 @@ public abstract class TmfEventProvider extends TmfDataProvid new TmfCoalescedEventRequest(fType, eventRequest.getRange(), eventRequest.getNbRequested(), eventRequest.getExecType()); coalescedRequest.addRequest(eventRequest); if (Tracer.isRequestTraced()) { - Tracer.traceRequest(request, "coalesced with " + coalescedRequest.getRequestId()); - Tracer.traceRequest(coalescedRequest, "added " + request.getRequestId()); + Tracer.traceRequest(request, "coalesced with " + coalescedRequest.getRequestId()); //$NON-NLS-1$ + Tracer.traceRequest(coalescedRequest, "added " + request.getRequestId()); //$NON-NLS-1$ } fPendingCoalescedRequests.add(coalescedRequest); } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java index d5b8be044a..7f041f820e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEvent.java @@ -186,6 +186,7 @@ public class TmfEvent extends TmfData implements Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfEvent(" + fEffectiveTimestamp + "," + fSource + "," + fType + "," + fContent + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java index 19174a1a93..3bccfc6381 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java @@ -161,6 +161,7 @@ public class TmfEventContent implements Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { Object[] fields = getFields(); StringBuilder result = new StringBuilder("[TmfEventContent("); diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java index 972491c738..6729b776ec 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventField.java @@ -116,6 +116,7 @@ public class TmfEventField implements Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfEventField(" + fFieldId + ":" + fValue.toString() + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java index 2b1fc97696..a7a12bc530 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java @@ -75,6 +75,7 @@ public class TmfEventReference implements Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfEventReference(" + ((fReference != null) ? fReference.toString() : "null") + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java index c97805ae28..244ecd53fe 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java @@ -83,6 +83,7 @@ public class TmfEventSource implements Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfEventSource(" + ((fSourceId != null) ? fSourceId.toString() : "null") + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java index 357dc9e2d9..03f8030795 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfEventType.java @@ -25,8 +25,8 @@ public class TmfEventType implements Cloneable { // Constants // ------------------------------------------------------------------------ - public static final String DEFAULT_TYPE_ID = "TMF Default Type"; - public static final String[] DEFAULT_LABELS = new String[] { "Content" }; + public static final String DEFAULT_TYPE_ID = "TMF Default Type"; //$NON-NLS-1$ + public static final String[] DEFAULT_LABELS = new String[] { "Content" }; //$NON-NLS-1$ // ------------------------------------------------------------------------ // Attributes @@ -118,7 +118,7 @@ public class TmfEventType implements Cloneable { public String getLabel(int i) throws TmfNoSuchFieldException { if (i >= 0 && i < fNbFields) return fFieldLabels[i]; - throw new TmfNoSuchFieldException("Bad index (" + i + ")"); + throw new TmfNoSuchFieldException("Bad index (" + i + ")"); //$NON-NLS-1$//$NON-NLS-2$ } // ------------------------------------------------------------------------ @@ -139,6 +139,7 @@ public class TmfEventType implements Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfEventType:" + fTypeId + "]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java index 9f76b22e3a..2e7b0b871a 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimeRange.java @@ -149,6 +149,7 @@ public class TmfTimeRange { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfTimeRange(" + fStartTime + ":" + fEndTime + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java index 786e643465..b786e3dd30 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTimestamp.java @@ -170,7 +170,7 @@ public class TmfTimestamp implements Cloneable { int scaleDiff = Math.abs(fScale - newScale); // Let's try to be realistic... if (scaleDiff >= scalingFactors.length) { - throw new ArithmeticException("Scaling exception"); + throw new ArithmeticException("Scaling exception"); //$NON-NLS-1$ } // Adjust the timestamp long scalingFactor = scalingFactors[scaleDiff]; @@ -354,6 +354,7 @@ public class TmfTimestamp implements Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfTimestamp(" + fValue + "," + fScale + "," + fPrecision + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java index 26759e2459..25c05d1bd1 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/event/TmfTraceEvent.java @@ -140,6 +140,7 @@ public class TmfTraceEvent extends TmfEvent { // TODO: Proper format @Override + @SuppressWarnings("nls") public String toString() { return "[TmfTraceEvent(" + fSourcePath + "," + fFileName + "," + fLineNumber + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java index e18b994abe..63c096c2d2 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java @@ -124,7 +124,7 @@ public class TmfExperiment extends TmfEventProvider imple * @param other */ public TmfExperiment(TmfExperiment other) { - super(other.getName() + "(clone)", other.fType); + super(other.getName() + "(clone)", other.fType); //$NON-NLS-1$ fEpoch = other.fEpoch; fIndexPageSize = other.fIndexPageSize; @@ -609,6 +609,7 @@ public class TmfExperiment extends TmfEventProvider imple * @see java.lang.Object#toString() */ @Override + @SuppressWarnings("nls") public String toString() { return "[TmfExperiment (" + getName() + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java index 887e9d0c42..51ce4d6f45 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperimentLocation.java @@ -41,6 +41,7 @@ public class TmfExperimentLocation extends TmfLocation[]> { } @Override + @SuppressWarnings("nls") public String toString() { StringBuilder result = new StringBuilder("[TmfExperimentLocation"); ITmfLocation[] locations = (ITmfLocation[]) getLocation(); diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java index 33b4fd5650..262eabe26a 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfCoalescedDataRequest.java @@ -225,6 +225,7 @@ public class TmfCoalescedDataRequest extends TmfDataRequest extends TmfCoalescedDa } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfCoalescedEventRequest(" + getRequestId() + "," + getDataType().getSimpleName() + "," + getRange() + "," + getNbRequested() + ")]"; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java index 868c62f2ee..030d814ada 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java @@ -167,7 +167,7 @@ public abstract class TmfDataRequest implements ITmfDataReque fNbRequested = nbRequested; fExecType = execType; fNbRead = 0; - if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "created"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "created"); //$NON-NLS-1$ } /** @@ -311,15 +311,15 @@ public abstract class TmfDataRequest implements ITmfDataReque @Override public void handleCompleted() { if (fRequestFailed) { - if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "failed"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "failed"); //$NON-NLS-1$ handleFailure(); } else if (fRequestCanceled) { - if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "cancelled"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "cancelled"); //$NON-NLS-1$ handleCancel(); } else { - if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "succeeded"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "succeeded"); //$NON-NLS-1$ handleSuccess(); } } @@ -366,13 +366,13 @@ public abstract class TmfDataRequest implements ITmfDataReque */ @Override public void start() { - if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "starting"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "starting"); //$NON-NLS-1$ synchronized(this) { fRequestRunning = true; } handleStarted(); startedLatch.countDown(); - if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "started"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "started"); //$NON-NLS-1$ } /** @@ -380,7 +380,7 @@ public abstract class TmfDataRequest implements ITmfDataReque */ @Override public void done() { - if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "completing"); + if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "completing"); //$NON-NLS-1$ synchronized(this) { if (!fRequestCompleted) { fRequestRunning = false; @@ -435,6 +435,7 @@ public abstract class TmfDataRequest implements ITmfDataReque } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfDataRequest(" + fRequestId + "," + fDataType.getSimpleName() + "," + fIndex + "," + fNbRequested + ")]"; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java index 43dfc53f42..2c510d74b4 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfEventRequest.java @@ -113,6 +113,7 @@ public abstract class TmfEventRequest extends TmfDataRequest } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfEventRequest(" + getRequestId() + "," + getDataType().getSimpleName() + "," + getRange() + "," + getNbRequested() + ")]"; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java index 12cfcb1315..6f1aff448d 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfRequestExecutor.java @@ -55,7 +55,7 @@ public class TmfRequestExecutor implements Executor { fExecutor = executor; String canonicalName = fExecutor.getClass().getCanonicalName(); fExecutorName = canonicalName.substring(canonicalName.lastIndexOf('.') + 1); - if (Tracer.isComponentTraced()) Tracer.trace(fExecutor + " created"); + if (Tracer.isComponentTraced()) Tracer.trace(fExecutor + " created"); //$NON-NLS-1$ } /** @@ -84,7 +84,7 @@ public class TmfRequestExecutor implements Executor { */ public void stop() { fExecutor.shutdown(); - if (Tracer.isComponentTraced()) Tracer.trace(fExecutor + " terminated"); + if (Tracer.isComponentTraced()) Tracer.trace(fExecutor + " terminated"); //$NON-NLS-1$ } // ------------------------------------------------------------------------ @@ -101,7 +101,7 @@ public class TmfRequestExecutor implements Executor { public void run() { try { requestThread.run(); - if (Tracer.isRequestTraced()) Tracer.trace("[REQ] Request finished"); + if (Tracer.isRequestTraced()) Tracer.trace("[REQ] Request finished"); //$NON-NLS-1$ } finally { scheduleNext(); } @@ -127,6 +127,7 @@ public class TmfRequestExecutor implements Executor { // ------------------------------------------------------------------------ @Override + @SuppressWarnings("nls") public String toString() { return "[TmfRequestExecutor(" + fExecutorName + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java index 0bd452eff5..9aa264fd68 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentSelectedSignal.java @@ -34,6 +34,7 @@ public class TmfExperimentSelectedSignal extends TmfSignal { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfExperimentSelectedSignal (" + fExperiment.getName() + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java index 49556b5c99..f217f4c57f 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfExperimentUpdatedSignal.java @@ -43,6 +43,7 @@ public class TmfExperimentUpdatedSignal extends TmfSignal { * @see java.lang.Object#toString() */ @Override + @SuppressWarnings("nls") public String toString() { return "[TmfExperimentUpdatedSignal (" + fExperiment.toString() /*+ ", " + fTrace.toString()*/ + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java index 73ae15fa03..5b0b0d5e9b 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfSignalTracer.java @@ -33,6 +33,6 @@ public class TmfSignalTracer { @TmfSignalHandler public void traceSignal(TmfSignal signal) { - System.out.println(signal.getSource().toString() + ": " + signal.toString()); + System.out.println(signal.getSource().toString() + ": " + signal.toString()); //$NON-NLS-1$ } } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java index 861c0f3195..77fada3934 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTimeSynchSignal.java @@ -36,6 +36,7 @@ public class TmfTimeSynchSignal extends TmfSignal { * @see java.lang.Object#toString() */ @Override + @SuppressWarnings("nls") public String toString() { return "[TmfTimeSynchSignal (" + fCurrentTime.toString() + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java index 9d72d09d36..a41ac49d31 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceClosedSignal.java @@ -31,6 +31,7 @@ public class TmfTraceClosedSignal extends TmfSignal { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfTraceClosedSignal (" + fTrace.getName() + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java index d1c5d44ff6..4f6ace3ecc 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceOpenedSignal.java @@ -31,6 +31,7 @@ public class TmfTraceOpenedSignal extends TmfSignal { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfTraceOpenedSignal (" + fTrace.getName() + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java index 1c6d5c0688..9cdb759784 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceParserUpdatedSignal.java @@ -31,6 +31,7 @@ public class TmfTraceParserUpdatedSignal extends TmfSignal { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfTraceParserUpdatedSignal (" + fTraceResource.getName() + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java index 6612e497e7..f98ec44325 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceSelectedSignal.java @@ -31,6 +31,7 @@ public class TmfTraceSelectedSignal extends TmfSignal { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfTraceSelectedSignal (" + fTrace.getName() + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java index ce48dc09b1..866dc3d68e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/signal/TmfTraceUpdatedSignal.java @@ -43,6 +43,7 @@ public class TmfTraceUpdatedSignal extends TmfSignal { * @see java.lang.Object#toString() */ @Override + @SuppressWarnings("nls") public String toString() { return "[TmfTraceUpdatedSignal (" + fTrace.toString() + ", " + fTimeRange.toString() + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java index 3d23329787..82244292f5 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfCheckpoint.java @@ -109,6 +109,7 @@ public class TmfCheckpoint implements Comparable, Cloneable { } @Override + @SuppressWarnings("nls") public String toString() { return "[TmfCheckpoint(" + fTimestamp + "," + fLocation + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java index e03e85ea24..bce668369e 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfContext.java @@ -105,7 +105,8 @@ public class TmfContext implements ITmfContext, Cloneable { return fLocation.equals(o.fLocation) && (fRank == o.fRank); } - @Override + @Override + @SuppressWarnings("nls") public String toString() { return "[TmfContext(" + fLocation.toString() + "," + fRank + ")]"; } diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java index 5e00215631..27277a1850 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfLocation.java @@ -69,14 +69,15 @@ public class TmfLocation implements ITmfLocation { } @Override + @SuppressWarnings("nls") public String toString() { if (fLocation == null) return "null"; return fLocation.toString(); } - @SuppressWarnings("unchecked") @Override + @SuppressWarnings({ "nls", "unchecked" }) public TmfLocation clone() { TmfLocation clone = null; try { diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java index 41d1d04d20..c91dfda144 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/trace/TmfTrace.java @@ -383,6 +383,7 @@ public abstract class TmfTrace extends TmfEventProvider i * @see java.lang.Object#toString() */ @Override + @SuppressWarnings("nls") public String toString() { return "[TmfTrace (" + getName() + ")]"; } -- 2.34.1