From 47aafe7493ab62b47e2ddd15e9d3e65c88c68e29 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Thu, 30 Jan 2014 18:36:14 -0500 Subject: [PATCH] tmf: Move TmfTraceType and custom parsers to tmf.core This required splitting the UI-specific functionality in TmfTraceType into a new TmfTraceTypeUiUtils, which remains in the tmf.ui plugin. Change-Id: I717cb1676fec530efa99be1056be4010b6ca8bd7 Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/21360 Tested-by: Hudson CI Reviewed-by: Matthew Khouzam IP-Clean: Matthew Khouzam --- .../views/control/handlers/ImportHandler.java | 7 +- .../META-INF/MANIFEST.MF | 2 + .../tmf/core}/parsers/custom/CustomEvent.java | 5 +- .../parsers/custom/CustomEventContent.java | 3 +- .../core}/parsers/custom/CustomEventType.java | 3 +- .../parsers/custom/CustomTraceDefinition.java | 4 +- .../core}/parsers/custom/CustomTxtEvent.java | 7 +- .../parsers/custom/CustomTxtEventType.java | 3 +- .../core}/parsers/custom/CustomTxtTrace.java | 17 +- .../parsers/custom/CustomTxtTraceContext.java | 5 +- .../custom/CustomTxtTraceDefinition.java | 44 +- .../core}/parsers/custom/CustomXmlEvent.java | 3 +- .../parsers/custom/CustomXmlEventType.java | 3 +- .../core}/parsers/custom/CustomXmlTrace.java | 23 +- .../parsers/custom/CustomXmlTraceContext.java | 3 +- .../custom/CustomXmlTraceDefinition.java | 44 +- .../tmf/core/parsers/custom/Messages.java | 61 +++ .../core/parsers/custom/messages.properties | 42 ++ .../model/TmfTraceImportException.java | 3 +- .../tmf/core}/project/model/TmfTraceType.java | 392 +++--------------- .../core}/project/model/TraceTypeHelper.java | 4 +- .../project/model/TraceValidationHelper.java | 4 +- .../ui/tests/trace/CustomTxtIndexTest.java | 4 +- .../ui/tests/trace/CustomXmlIndexTest.java | 4 +- .../ui/tests/trace/CustomXmlTraceTest.java | 8 +- .../linuxtools/internal/tmf/ui/Messages.java | 29 -- .../ui/dialogs/ManageCustomParsersDialog.java | 6 +- .../internal/tmf/ui/messages.properties | 30 -- .../ui/parsers/custom/CustomEventsTable.java | 4 +- .../tmf/ui/parsers/custom/Messages.java | 26 -- .../tmf/ui/parsers/custom/messages.properties | 13 - .../CustomTxtParserInputWizardPage.java | 10 +- .../CustomTxtParserOutputWizardPage.java | 6 +- .../wizards/CustomTxtParserWizard.java | 2 +- .../CustomXmlParserInputWizardPage.java | 10 +- .../CustomXmlParserOutputWizardPage.java | 8 +- .../wizards/CustomXmlParserWizard.java | 2 +- .../SelectTraceTypeContributionItem.java | 10 +- .../TracePackageImportOperation.java | 11 +- .../tmf/ui/editors/TmfEventsEditor.java | 6 +- .../ui/project/model/TmfOpenTraceHelper.java | 8 +- .../tmf/ui/project/model/TmfTraceElement.java | 14 +- .../ui/project/model/TmfTraceTypeUIUtils.java | 289 +++++++++++++ .../importtrace/BatchImportTraceWizard.java | 12 +- .../ImportTraceContentProvider.java | 2 +- .../ImportTraceWizardScanPage.java | 4 +- .../ImportTraceWizardSelectTraceTypePage.java | 2 +- .../importtrace/TraceTypeContentProvider.java | 4 +- .../tmf/ui/views/filter/FilterViewer.java | 12 +- .../views/statistics/TmfStatisticsView.java | 2 +- 50 files changed, 634 insertions(+), 586 deletions(-) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomEvent.java (98%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomEventContent.java (96%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomEventType.java (95%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomTraceDefinition.java (95%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomTxtEvent.java (95%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomTxtEventType.java (92%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomTxtTrace.java (95%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomTxtTraceContext.java (95%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomTxtTraceDefinition.java (92%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomXmlEvent.java (98%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomXmlEventType.java (92%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomXmlTrace.java (95%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomXmlTraceContext.java (95%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/parsers/custom/CustomXmlTraceDefinition.java (91%) create mode 100644 org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/Messages.java create mode 100644 org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/messages.properties rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/project/model/TmfTraceImportException.java (95%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/project/model/TmfTraceType.java (63%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/project/model/TraceTypeHelper.java (97%) rename {org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui => org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core}/project/model/TraceValidationHelper.java (97%) delete mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/Messages.java delete mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/messages.properties create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceTypeUIUtils.java diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java index 8983992aca..898fa6a3b4 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/handlers/ImportHandler.java @@ -40,11 +40,12 @@ import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.ImportFil import org.eclipse.linuxtools.internal.lttng2.ui.views.control.dialogs.TraceControlDialogFactory; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; +import org.eclipse.linuxtools.tmf.core.project.model.TraceTypeHelper; import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectElement; import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectRegistry; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; -import org.eclipse.linuxtools.tmf.ui.project.model.TraceTypeHelper; +import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceTypeUIUtils; import org.eclipse.linuxtools.tmf.ui.project.wizards.importtrace.BatchImportTraceWizard; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.services.files.IFileService; @@ -155,7 +156,7 @@ public class ImportHandler extends BaseControlViewHandler { } if (helper != null) { - status.add(TmfTraceType.setTraceType(file.getFullPath(), helper)); + status.add(TmfTraceTypeUIUtils.setTraceType(file.getFullPath(), helper)); } } catch (ExecutionException e) { status.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.TraceControl_ImportFailure, e)); diff --git a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF index 1ce0fe7d67..c6fde6dfe1 100644 --- a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF @@ -36,6 +36,8 @@ Export-Package: org.eclipse.linuxtools.internal.tmf.core;x-friends:="org.eclipse org.eclipse.linuxtools.tmf.core.filter.xml, org.eclipse.linuxtools.tmf.core.interval, org.eclipse.linuxtools.tmf.core.io, + org.eclipse.linuxtools.tmf.core.parsers.custom, + org.eclipse.linuxtools.tmf.core.project.model, org.eclipse.linuxtools.tmf.core.request, org.eclipse.linuxtools.tmf.core.signal, org.eclipse.linuxtools.tmf.core.statesystem, diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomEvent.java similarity index 98% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEvent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomEvent.java index fcbc803f17..97f314c918 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomEvent.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -19,12 +19,12 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.ITmfEventType; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition.OutputColumn; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; @@ -33,6 +33,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; * Base event for custom text parsers. * * @author Patrick Tassé + * @since 3.0 */ public class CustomEvent extends TmfEvent { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEventContent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomEventContent.java similarity index 96% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEventContent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomEventContent.java index 1ecde7bddb..038d567573 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEventContent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomEventContent.java @@ -10,7 +10,7 @@ * Patrick Tassé - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; @@ -19,6 +19,7 @@ import org.eclipse.linuxtools.tmf.core.event.TmfEventField; * Event content for custom text parsers * * @author Patrick Tassé + * @since 3.0 */ public class CustomEventContent extends TmfEventField { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomEventType.java similarity index 95% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEventType.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomEventType.java index e94b961d19..1d1730cd96 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomEventType.java @@ -10,7 +10,7 @@ * Patrick Tassé - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; @@ -20,6 +20,7 @@ import org.eclipse.linuxtools.tmf.core.event.TmfEventType; * Event type for custom text parsers. * * @author Patrick Tassé + * @since 3.0 */ public abstract class CustomEventType extends TmfEventType { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTraceDefinition.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTraceDefinition.java similarity index 95% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTraceDefinition.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTraceDefinition.java index 8aad0ca5e7..311d5aea57 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTraceDefinition.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTraceDefinition.java @@ -10,18 +10,18 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import java.text.SimpleDateFormat; import java.util.List; -import org.eclipse.linuxtools.internal.tmf.ui.Messages; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; /** * Base class for custom trace definitions. * * @author Patrick Tassé + * @since 3.0 */ public abstract class CustomTraceDefinition { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtEvent.java similarity index 95% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtEvent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtEvent.java index 582646e0e5..4a0c8af269 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtEvent.java @@ -10,15 +10,15 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import java.util.regex.Matcher; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputData; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputLine; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventType; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition.InputData; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition.InputLine; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; @@ -26,6 +26,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; * Trace event for custom text parsers. * * @author Patrick Tassé + * @since 3.0 */ public class CustomTxtEvent extends CustomEvent { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtEventType.java similarity index 92% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtEventType.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtEventType.java index 75154bc147..8ec65ce058 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtEventType.java @@ -10,12 +10,13 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; /** * Event type for custom text traces. * * @author Patrick Tassé + * @since 3.0 */ public class CustomTxtEventType extends CustomEventType { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtTrace.java similarity index 95% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtTrace.java index b9b569eb8d..840c88d463 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtTrace.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import java.io.File; import java.io.FileNotFoundException; @@ -26,11 +26,11 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.linuxtools.internal.tmf.ui.Activator; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputLine; +import org.eclipse.linuxtools.internal.tmf.core.Activator; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition.InputLine; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfEventParser; @@ -48,6 +48,7 @@ import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation; * Base class for custom plain text traces. * * @author Patrick Tassé + * @since 3.0 */ public class CustomTxtTrace extends TmfTrace implements ITmfEventParser, ITmfPersistentlyIndexable { @@ -150,10 +151,10 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEventParser, ITmfPer } return context; } catch (final FileNotFoundException e) { - Activator.getDefault().logError("Error seeking event. File not found: " + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error seeking event. File not found: " + getPath(), e); //$NON-NLS-1$ return context; } catch (final IOException e) { - Activator.getDefault().logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ return context; } @@ -178,7 +179,7 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEventParser, ITmfPer context.setRank(ITmfContext.UNKNOWN_RANK); return context; } catch (final IOException e) { - Activator.getDefault().logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ return new CustomTxtTraceContext(NULL_LOCATION, ITmfContext.UNKNOWN_RANK); } } @@ -193,7 +194,7 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEventParser, ITmfPer return (double) ((Long) location.getLocationInfo()) / fFile.length(); } } catch (final IOException e) { - Activator.getDefault().logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ } return 0; } @@ -353,7 +354,7 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEventParser, ITmfPer rawPos = fFile.getFilePointer(); } } catch (final IOException e) { - Activator.getDefault().logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ } for (final Entry entry : countMap.entrySet()) { if (entry.getValue() < entry.getKey().getMinCount()) { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtTraceContext.java similarity index 95% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtTraceContext.java index 3b593f8603..4acef7f35b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtTraceContext.java @@ -10,11 +10,11 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import java.util.regex.Matcher; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputLine; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition.InputLine; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; @@ -22,6 +22,7 @@ import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; * Trace context for custom text traces. * * @author Patrick Tassé + * @since 3.0 */ public class CustomTxtTraceContext extends TmfContext { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtTraceDefinition.java similarity index 92% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtTraceDefinition.java index d3400c9d38..3402a47392 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtTraceDefinition.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import java.io.ByteArrayInputStream; import java.io.File; @@ -35,9 +35,8 @@ import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.eclipse.linuxtools.internal.tmf.ui.Activator; -import org.eclipse.linuxtools.internal.tmf.ui.Messages; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; +import org.eclipse.linuxtools.internal.tmf.core.Activator; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -52,6 +51,7 @@ import org.xml.sax.SAXParseException; * Trace definition for custom text traces. * * @author Patrick Tassé + * @since 3.0 */ public class CustomTxtTraceDefinition extends CustomTraceDefinition { @@ -523,17 +523,17 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { TmfTraceType.getInstance().addCustomTraceType(TmfTraceType.CUSTOM_TXT_CATEGORY, definitionName); } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (TransformerConfigurationException e) { - Activator.getDefault().logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (TransformerFactoryConfigurationError e) { - Activator.getDefault().logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (TransformerException e) { - Activator.getDefault().logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (IOException e) { - Activator.getDefault().logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (SAXException e) { - Activator.getDefault().logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ } } @@ -640,11 +640,11 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { } return defList.toArray(new CustomTxtTraceDefinition[0]); } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error loading all in CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error loading all in CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (SAXException e) { - Activator.getDefault().logError("Error loading all in CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error loading all in CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (IOException e) { - Activator.getDefault().logError("Error loading all in CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error loading all in CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$ } return new CustomTxtTraceDefinition[0]; } @@ -704,11 +704,11 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { } } } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error loading CustomTxtTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error loading CustomTxtTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } catch (SAXException e) { - Activator.getDefault().logError("Error loading CustomTxtTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error loading CustomTxtTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } catch (IOException e) { - Activator.getDefault().logError("Error loading CustomTxtTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error loading CustomTxtTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } return null; } @@ -856,17 +856,17 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition { TmfTraceType.getInstance().removeCustomTraceType(TmfTraceType.CUSTOM_TXT_CATEGORY, definitionName); } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error deleting CustomTxtTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleting CustomTxtTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } catch (SAXException e) { - Activator.getDefault().logError("Error deleting CustomTxtTraceDefinition: definitionName= " + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleting CustomTxtTraceDefinition: definitionName= " + definitionName, e); //$NON-NLS-1$ } catch (IOException e) { - Activator.getDefault().logError("Error deleting CustomTxtTraceDefinition: definitionName= " + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleting CustomTxtTraceDefinition: definitionName= " + definitionName, e); //$NON-NLS-1$ } catch (TransformerConfigurationException e) { - Activator.getDefault().logError("Error deleting CustomTxtTraceDefinition: definitionName= " + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleting CustomTxtTraceDefinition: definitionName= " + definitionName, e); //$NON-NLS-1$ } catch (TransformerFactoryConfigurationError e) { - Activator.getDefault().logError("Error deleting CustomTxtTraceDefinition: definitionName= " + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleting CustomTxtTraceDefinition: definitionName= " + definitionName, e); //$NON-NLS-1$ } catch (TransformerException e) { - Activator.getDefault().logError("Error deleting CustomTxtTraceDefinition: definitionName= " + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleting CustomTxtTraceDefinition: definitionName= " + definitionName, e); //$NON-NLS-1$ } } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlEvent.java similarity index 98% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlEvent.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlEvent.java index 0b68807f38..5a9fc071f7 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlEvent.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; @@ -22,6 +22,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; * Trace event for custom XML traces. * * @author Patrick Tassé + * @since 3.0 */ public class CustomXmlEvent extends CustomEvent { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlEventType.java similarity index 92% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlEventType.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlEventType.java index b33411fc4d..be347bcd11 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlEventType.java @@ -10,12 +10,13 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; /** * Event type class for custom XML traces. * * @author Patrick Tassé + * @since 3.0 */ public class CustomXmlEventType extends CustomEventType { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlTrace.java similarity index 95% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlTrace.java index 647212c0e6..2fe4eeb384 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlTrace.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import java.io.ByteArrayInputStream; import java.io.File; @@ -28,12 +28,12 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.linuxtools.internal.tmf.ui.Activator; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputAttribute; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputElement; +import org.eclipse.linuxtools.internal.tmf.core.Activator; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; import org.eclipse.linuxtools.tmf.core.io.BufferedRandomAccessFile; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition.InputAttribute; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition.InputElement; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfEventParser; @@ -60,6 +60,7 @@ import org.xml.sax.SAXParseException; * Trace object for custom XML trace parsers. * * @author Patrick Tassé + * @since 3.0 */ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser, ITmfPersistentlyIndexable { @@ -160,7 +161,7 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser, ITmfPer } return context; } catch (final IOException e) { - Activator.getDefault().logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ return context; } @@ -185,7 +186,7 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser, ITmfPer context.setRank(ITmfContext.UNKNOWN_RANK); return context; } catch (final IOException e) { - Activator.getDefault().logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error seeking event. File: " + getPath(), e); //$NON-NLS-1$ return new CustomXmlTraceContext(NULL_LOCATION, ITmfContext.UNKNOWN_RANK); } } @@ -200,7 +201,7 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser, ITmfPer return (double) ((Long) location.getLocationInfo()) / fFile.length(); } } catch (final IOException e) { - Activator.getDefault().logError("Error getting location ration. File: " + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error getting location ration. File: " + getPath(), e); //$NON-NLS-1$ } return 0; } @@ -267,7 +268,7 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser, ITmfPer rawPos = fFile.getFilePointer(); } } catch (final IOException e) { - Activator.getDefault().logError("Error parsing event. File: " + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error parsing event. File: " + getPath(), e); //$NON-NLS-1$ } context.setLocation(NULL_LOCATION); @@ -307,11 +308,11 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEventParser, ITmfPer final Document doc = db.parse(new ByteArrayInputStream(elementBuffer.toString().getBytes())); return doc.getDocumentElement(); } catch (final ParserConfigurationException e) { - Activator.getDefault().logError("Error parsing element buffer. File:" + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error parsing element buffer. File:" + getPath(), e); //$NON-NLS-1$ } catch (final SAXException e) { - Activator.getDefault().logError("Error parsing element buffer. File:" + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error parsing element buffer. File:" + getPath(), e); //$NON-NLS-1$ } catch (final IOException e) { - Activator.getDefault().logError("Error parsing element buffer. File: " + getPath(), e); //$NON-NLS-1$ + Activator.logError("Error parsing element buffer. File: " + getPath(), e); //$NON-NLS-1$ } return null; } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlTraceContext.java similarity index 95% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlTraceContext.java index 55a92f11e9..6c7386c604 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceContext.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlTraceContext.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import org.eclipse.linuxtools.tmf.core.trace.TmfContext; import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; @@ -19,6 +19,7 @@ import org.eclipse.linuxtools.tmf.core.trace.location.ITmfLocation; * Trace context for custom XML traces. * * @author Patrick Tassé + * @since 3.0 */ public class CustomXmlTraceContext extends TmfContext { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlTraceDefinition.java similarity index 91% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlTraceDefinition.java index 93b1eb0b5c..80cb86cf5f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlTraceDefinition.java @@ -10,7 +10,7 @@ * Patrick Tasse - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; +package org.eclipse.linuxtools.tmf.core.parsers.custom; import java.io.ByteArrayInputStream; import java.io.File; @@ -32,9 +32,8 @@ import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.eclipse.linuxtools.internal.tmf.ui.Activator; -import org.eclipse.linuxtools.internal.tmf.ui.Messages; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; +import org.eclipse.linuxtools.internal.tmf.core.Activator; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -49,6 +48,7 @@ import org.xml.sax.SAXParseException; * Trace definition for custom XML traces. * * @author Patrick Tassé + * @since 3.0 */ public class CustomXmlTraceDefinition extends CustomTraceDefinition { @@ -384,17 +384,17 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { TmfTraceType.getInstance().addCustomTraceType(TmfTraceType.CUSTOM_XML_CATEGORY, definitionName); } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (TransformerConfigurationException e) { - Activator.getDefault().logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (TransformerFactoryConfigurationError e) { - Activator.getDefault().logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (TransformerException e) { - Activator.getDefault().logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (IOException e) { - Activator.getDefault().logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (SAXException e) { - Activator.getDefault().logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ } } @@ -510,11 +510,11 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { } return defList.toArray(new CustomXmlTraceDefinition[0]); } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error loading all in CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error loading all in CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (SAXException e) { - Activator.getDefault().logError("Error loading all in CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error loading all in CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ } catch (IOException e) { - Activator.getDefault().logError("Error loading all in CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ + Activator.logError("Error loading all in CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$ } return new CustomXmlTraceDefinition[0]; } @@ -574,11 +574,11 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { } } } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error loading CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error loading CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } catch (SAXException e) { - Activator.getDefault().logError("Error loading CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error loading CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } catch (IOException e) { - Activator.getDefault().logError("Error loading CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error loading CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } return null; } @@ -734,17 +734,17 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition { TmfTraceType.getInstance().removeCustomTraceType(TmfTraceType.CUSTOM_XML_CATEGORY, definitionName); } catch (ParserConfigurationException e) { - Activator.getDefault().logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } catch (SAXException e) { - Activator.getDefault().logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } catch (IOException e) { - Activator.getDefault().logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } catch (TransformerConfigurationException e) { - Activator.getDefault().logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } catch (TransformerFactoryConfigurationError e) { - Activator.getDefault().logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } catch (TransformerException e) { - Activator.getDefault().logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ + Activator.logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$ } } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/Messages.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/Messages.java new file mode 100644 index 0000000000..7df0b46e1b --- /dev/null +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/Messages.java @@ -0,0 +1,61 @@ +/******************************************************************************* + * Copyright (c) 2013 Ericsson. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Matthew Khouzam - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.linuxtools.tmf.core.parsers.custom; + +import org.eclipse.osgi.util.NLS; + +/** + * @since 3.0 + */ +@SuppressWarnings("javadoc") +public class Messages extends NLS { + + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.core.parsers.custom.messages"; //$NON-NLS-1$ + + public static String CustomTrace_FileNotFound; + + 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 { + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/messages.properties b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/messages.properties new file mode 100644 index 0000000000..1b8fb17ff4 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/messages.properties @@ -0,0 +1,42 @@ +############################################################################### +# Copyright (c) 2013 Ericsson +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Ericsson - Initial API and implementation +############################################################################### + +CustomTrace_FileNotFound=File not found + +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/internal/tmf/ui/project/model/TmfTraceImportException.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TmfTraceImportException.java similarity index 95% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/model/TmfTraceImportException.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TmfTraceImportException.java index c266f3badf..54ef44fa20 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/model/TmfTraceImportException.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TmfTraceImportException.java @@ -10,12 +10,13 @@ * Matthew Khouzam - Initial API and implementation **********************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.project.model; +package org.eclipse.linuxtools.tmf.core.project.model; /** * Tmf trace import exception * * @author Matthew Khouzam + * @since 3.0 */ public class TmfTraceImportException extends Exception { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TmfTraceType.java similarity index 63% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceType.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TmfTraceType.java index f8d1628a6f..189d4c1920 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TmfTraceType.java @@ -11,44 +11,28 @@ * Matthew Khouzam - Added import functionalities *******************************************************************************/ -package org.eclipse.linuxtools.tmf.ui.project.model; +package org.eclipse.linuxtools.tmf.core.project.model; import java.io.File; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Set; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.linuxtools.internal.tmf.ui.Activator; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.project.model.TmfTraceImportException; +import org.eclipse.linuxtools.internal.tmf.core.Activator; import org.eclipse.linuxtools.tmf.core.TmfCommonConstants; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.RowLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.dialogs.FileSystemElement; /** * Utility class for accessing TMF trace type extensions from the platform's @@ -57,81 +41,59 @@ import org.eclipse.ui.dialogs.FileSystemElement; * @version 1.0 * @author Patrick Tasse * @author Matthew Khouzam + * @since 3.0 */ public final class TmfTraceType { - private static final String DEFAULT_TRACE_ICON_PATH = "icons" + File.separator + "elcl16" + File.separator + "trace.gif"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - private static final char SEPARATOR = ':'; - /** - * Extension point ID - */ + /** Extension point ID */ public static final String TMF_TRACE_TYPE_ID = "org.eclipse.linuxtools.tmf.ui.tracetype"; //$NON-NLS-1$ - /** - * Extension point element 'Category' - */ + /** Extension point element 'Category' */ public static final String CATEGORY_ELEM = "category"; //$NON-NLS-1$ - /** - * Extension point element 'Type' - */ + + /** Extension point element 'Type' */ public static final String TYPE_ELEM = "type"; //$NON-NLS-1$ - /** - * Extension point element 'Default editor' - */ + + /** Extension point element 'Default editor' */ public static final String DEFAULT_EDITOR_ELEM = "defaultEditor"; //$NON-NLS-1$ - /** - * Extension point element 'Events table type' - */ + + /** Extension point element 'Events table type' */ public static final String EVENTS_TABLE_TYPE_ELEM = "eventsTableType"; //$NON-NLS-1$ - /** - * Extension point element 'Statistics viewer type' - * - * @since 2.0 - */ + + /** Extension point element 'Statistics viewer type' */ public static final String STATISTICS_VIEWER_ELEM = "statisticsViewerType"; //$NON-NLS-1$ - /** - * Extension point attribute 'ID' - */ + /** Extension point attribute 'ID' */ public static final String ID_ATTR = "id"; //$NON-NLS-1$ - /** - * Extension point attribute 'name' - */ + + /** Extension point attribute 'name' */ public static final String NAME_ATTR = "name"; //$NON-NLS-1$ - /** - * Extension point attribute 'category' - */ + + /** Extension point attribute 'category' */ public static final String CATEGORY_ATTR = "category"; //$NON-NLS-1$ - /** - * Extension point attribute 'trace_type' - */ + + /** Extension point attribute 'trace_type' */ public static final String TRACE_TYPE_ATTR = "trace_type"; //$NON-NLS-1$ - /** - * Extension point attribute 'event_type' - */ + + /** Extension point attribute 'event_type' */ public static final String EVENT_TYPE_ATTR = "event_type"; //$NON-NLS-1$ - /** - * Extension point attribute 'icon' - */ + + /** Extension point attribute 'icon' */ public static final String ICON_ATTR = "icon"; //$NON-NLS-1$ - /** - * Extension point attribute 'class' - */ + + /** Extension point attribute 'class' */ public static final String CLASS_ATTR = "class"; //$NON-NLS-1$ /** * Custom text label used internally and therefore should not be * externalized - * - * @since 2.0 */ public static final String CUSTOM_TXT_CATEGORY = "Custom Text"; //$NON-NLS-1$ + /** * Custom XML label used internally and therefore should not be externalized - * - * @since 2.0 */ public static final String CUSTOM_XML_CATEGORY = "Custom XML"; //$NON-NLS-1$ @@ -176,7 +138,6 @@ public final class TmfTraceType { * definition * @return a new Object based on his definition in plugin.xml, or null if no * definition was found - * @since 2.0 */ public static Object getTraceTypeElement(IResource resource, String element) { try { @@ -197,7 +158,7 @@ public final class TmfTraceType { } } } catch (CoreException e) { - Activator.getDefault().logError("Error creating the element from the resource", e); //$NON-NLS-1$ + Activator.logError("Error creating the element from the resource", e); //$NON-NLS-1$ } return null; } @@ -228,7 +189,6 @@ public final class TmfTraceType { * The import utils instance * * @return the import utils instance - * @since 2.0 */ public static TmfTraceType getInstance() { if (fInstance == null) { @@ -241,11 +201,31 @@ public final class TmfTraceType { // Get trace types // ------------------------------------------------------------------ + /** + * Retrieve the TraceTypeHelper for a given trace type ID + * + * @param id + * The trace type ID + * @return The corresponding TraceTypeHelper, or null if there is none for + * the specified ID + */ + public TraceTypeHelper getTraceTypeHelper(String id) { + return fTraceTypes.get(id); + } + + /** + * Get an iterable view of the existing trace type IDs. + * + * @return The currently registered trace type IDs + */ + public Iterable getTraceTypeIDs() { + return fTraceTypes.keySet(); + } + /** * Returns a list of "category:tracetype , ..." * * @return returns a list of "category:tracetype , ..." - * @since 2.0 */ public String[] getAvailableTraceTypes() { @@ -267,7 +247,6 @@ public final class TmfTraceType { * @param type * the type to get (Text, xml or other...) * @return the list of custom trace types - * @since 2.0 */ public static List getCustomTraceTypes(String type) { List traceTypes = new ArrayList<>(); @@ -290,7 +269,6 @@ public final class TmfTraceType { * Gets all the custom trace types * * @return the list of custom trace types - * @since 2.0 */ public static List getCustomTraceTypes() { @@ -333,7 +311,6 @@ public final class TmfTraceType { * The custom parser category * @param definitionName * The custom parser definition name to add or replace - * @since 3.0 */ public void addCustomTraceType(String category, String definitionName) { String traceTypeId = null; @@ -372,7 +349,6 @@ public final class TmfTraceType { * The custom parser category * @param definitionName * The custom parser definition name to add or replace - * @since 3.0 */ public void removeCustomTraceType(String category, String definitionName) { if (category.equals(CUSTOM_TXT_CATEGORY)) { @@ -396,7 +372,6 @@ public final class TmfTraceType { * @param id * the ID of the trace * @return the return type - * @since 2.0 */ public TraceTypeHelper getTraceType(String id) { return fTraceTypes.get(id); @@ -449,7 +424,6 @@ public final class TmfTraceType { * Returns the list of trace categories * * @return the list of trace categories - * @since 2.0 */ public List getTraceCategories() { List categoryNames = new ArrayList<>(); @@ -468,9 +442,7 @@ public final class TmfTraceType { * @param categoryName * the categoryName to lookup * @return a list of trace type helper classes {@link TraceTypeHelper} - * @since 2.0 */ - public List getTraceTypes(String categoryName) { List traceNames = new ArrayList<>(); for (String key : fTraceTypes.keySet()) { @@ -488,37 +460,6 @@ public final class TmfTraceType { } - private static List isolateTraces(List selectedResources) { - - List traces = new ArrayList<>(); - - // Get the selection - Iterator resources = selectedResources.iterator(); - - // Get the sorted list of unique entries - Map fileSystemObjects = new HashMap<>(); - while (resources.hasNext()) { - File resource = (File) resources.next().getFileSystemObject(); - String key = resource.getAbsolutePath(); - fileSystemObjects.put(key, resource); - } - List files = new ArrayList<>(fileSystemObjects.keySet()); - Collections.sort(files); - - // After sorting, traces correspond to the unique prefixes - String prefix = null; - for (int i = 0; i < files.size(); i++) { - File file = fileSystemObjects.get(files.get(i)); - String name = file.getAbsolutePath(); - if (prefix == null || !name.startsWith(prefix)) { - prefix = name; // new prefix - traces.add(file); - } - } - - return traces; - } - /** * Validate a trace type * @@ -527,7 +468,6 @@ public final class TmfTraceType { * @param fileName * the file name (and path) * @return true if the trace is of a valid type - * @since 2.0 */ public boolean validate(String traceTypeName, String fileName) { if (traceTypeName != null && !traceTypeName.isEmpty()) { @@ -545,27 +485,11 @@ public final class TmfTraceType { * @param traceToValidate * the trace category (canonical name) * @return true if the trace is of a valid type - * @since 2.0 */ public boolean validate(TraceValidationHelper traceToValidate) { return validate(traceToValidate.getTraceType(), traceToValidate.getTraceToScan()); } - /** - * validate list of traces with a tracetype - * - * @param traceTypeName - * the trace category (canonical name) - * @param selectedResources - * List of traces to validate - * @return true if all the traces are valid - * @since 2.0 - */ - public boolean validateTrace(String traceTypeName, List selectedResources) { - List traces = isolateTraces(selectedResources); - return validateTraceFiles(traceTypeName, traces); - } - /** * Validate a list of files with a tracetype * @@ -574,7 +498,6 @@ public final class TmfTraceType { * @param traces * the list of files to check if they are trace * @return true if all the traces are valid - * @since 2.0 */ public boolean validateTraceFiles(String traceTypeName, List traces) { if (traceTypeName != null && !"".equals(traceTypeName) && //$NON-NLS-1$ @@ -594,7 +517,6 @@ public final class TmfTraceType { * @param traceType * the name canonical * @return the configuration element, can be null - * @since 2.0 */ public IConfigurationElement getTraceAttributes(String traceType) { return fTraceTypeAttributes.get(traceType); @@ -608,7 +530,6 @@ public final class TmfTraceType { * @param traceType * like "kernel" * @return an id like "org.eclipse.linuxtools.blabla... - * @since 2.0 */ public String getTraceTypeId(String category, String traceType) { for (String key : fTraceTypes.keySet()) { @@ -619,45 +540,12 @@ public final class TmfTraceType { return null; } - /** - * Is the trace a custom (user-defined) trace type. These are the traces - * like : text and xml defined by the custom trace wizard. - * - * @param traceType - * the trace type in human form (category:name) - * @return true if the trace is a custom type - * @since 2.1 - */ - public static boolean isCustomTrace(String traceType) { - final boolean startsWithTxt = traceType.startsWith(TmfTraceType.CUSTOM_TXT_CATEGORY); - final boolean startsWithXML = traceType.startsWith(TmfTraceType.CUSTOM_XML_CATEGORY); - return (startsWithTxt || startsWithXML); - } - - /** - * Is the trace type id a custom (user-defined) trace type. These are the - * traces like : text and xml defined by the custom trace wizard. - * - * @param traceTypeId - * the trace type id - * @return true if the trace is a custom type - */ - private static boolean isCustomTraceId(String traceTypeId) { - TraceTypeHelper traceType = getInstance().getTraceType(traceTypeId); - if (traceType != null) { - return isCustomTrace(traceType.getCategoryName() + SEPARATOR + traceType.getName()); - } - - return false; - } - /** * Gets the custom trace type ID from the custom trace name * * @param traceType * The trace type in human form (category:name) * @return the trace type ID or null if the trace is not a custom one - * @since 2.1 */ public static String getCustomTraceTypeId(String traceType) { String traceTypeId = null; @@ -676,175 +564,17 @@ public final class TmfTraceType { return traceTypeId; } - TraceTypeHelper selectTraceType(String path, Shell shell) throws TmfTraceImportException { - return selectTraceType(path, shell, null); - } - /** - * This member figures out the trace type of a given file. It will prompt - * the user if it needs more information to properly pick the trace type. - * - * @param path - * The path of file to import - * @param shell - * a shell to display the message to. If it is null, it is - * assumed to be cancelled. - * @param traceTypeHint the ID of a trace (like "o.e.l.specifictrace" ) - * @return null if the request is cancelled or a TraceTypeHelper if it passes. - * @throws TmfTraceImportException - * if the traces don't match or there are errors in the trace - * file - * @since 2.2 - */ - public TraceTypeHelper selectTraceType(String path, Shell shell, String traceTypeHint) throws TmfTraceImportException { - List validCandidates = new ArrayList<>(); - final Set traceTypes = fTraceTypes.keySet(); - for (String traceType : traceTypes) { - if (validate(traceType, path)) { - validCandidates.add(fTraceTypes.get(traceType)); - } - } - - TraceTypeHelper traceTypeToSet = null; - if (validCandidates.isEmpty()) { - final String errorMsg = Messages.TmfOpenTraceHelper_NoTraceTypeMatch + path; - throw new TmfTraceImportException(errorMsg); - } else if (validCandidates.size() != 1) { - List reducedCandidates = reduce(validCandidates); - for (TraceTypeHelper tth : reducedCandidates) { - if (tth.getCanonicalName().equals(traceTypeHint)) { - traceTypeToSet = tth; - } - } - if (traceTypeToSet == null) { - if (reducedCandidates.size() == 0) { - throw new TmfTraceImportException(Messages.TmfOpenTraceHelper_ReduceError); - } else if (reducedCandidates.size() == 1) { - traceTypeToSet = reducedCandidates.get(0); - } else { - if (shell == null) { - return null; - } - traceTypeToSet = getTraceTypeToSet(reducedCandidates, shell); - } - } - } else { - traceTypeToSet = validCandidates.get(0); - } - return traceTypeToSet; - } - - private static List reduce(List candidates) { - List retVal = new ArrayList<>(); - - // get all the tracetypes that are unique in that stage - for (TraceTypeHelper trace : candidates) { - if (isUnique(trace, candidates)) { - retVal.add(trace); - } - } - return retVal; - } - - /* - * Only return the leaves of the trace types. Ignore custom trace types. - */ - private static boolean isUnique(TraceTypeHelper trace, List set) { - if (TmfTraceType.isCustomTraceId(trace.getCanonicalName())) { - return true; - } - // check if the trace type is the leaf. we make an instance of the trace - // type and if it is only an instance of itself, it is a leaf - final ITmfTrace tmfTrace = trace.getTrace(); - int count = -1; - for (TraceTypeHelper child : set) { - final ITmfTrace traceCandidate = child.getTrace(); - if (tmfTrace.getClass().isInstance(traceCandidate)) { - count++; - } - } - return count == 0; - } - - private TraceTypeHelper getTraceTypeToSet(List candidates, Shell shell) { - final Map names = new HashMap<>(); - Shell shellToShow = new Shell(shell); - shellToShow.setText(Messages.TmfTraceType_SelectTraceType); - final String candidatesToSet[] = new String[1]; - for (TraceTypeHelper candidate : candidates) { - Button b = new Button(shellToShow, SWT.RADIO); - final String displayName = candidate.getCategoryName() + ':' + candidate.getName(); - b.setText(displayName); - names.put(displayName, candidate.getCanonicalName()); - - b.addSelectionListener(new SelectionListener() { - - @Override - public void widgetSelected(SelectionEvent e) { - final Button source = (Button) e.getSource(); - candidatesToSet[0] = (names.get(source.getText())); - source.getParent().dispose(); - } - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - - } - }); - } - shellToShow.setLayout(new RowLayout(SWT.VERTICAL)); - shellToShow.pack(); - shellToShow.open(); - - Display display = shellToShow.getDisplay(); - while (!shellToShow.isDisposed()) { - if (!display.readAndDispatch()) { - display.sleep(); - } - } - return fTraceTypes.get(candidatesToSet[0]); - } - - /** - * Set the trace type of a {@Link TraceTypeHelper}. Should only be - * used internally by this project. + * Is the trace a custom (user-defined) trace type. These are the traces + * like : text and xml defined by the custom trace wizard. * - * @param path - * the {@link IPath} path of the resource to set * @param traceType - * the {@link TraceTypeHelper} to set the trace type to. - * @return Status.OK_Status if successful, error is otherwise. - * @throws CoreException - * An exception caused by accessing eclipse project items. - * @since 2.1 + * the trace type in human form (category:name) + * @return true if the trace is a custom type */ - public static IStatus setTraceType(IPath path, TraceTypeHelper traceType) throws CoreException { - IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path); - String traceBundle = null, traceTypeId = traceType.getCanonicalName(), traceIcon = null; - if (TmfTraceType.isCustomTraceId(traceTypeId)) { - traceBundle = Activator.getDefault().getBundle().getSymbolicName(); - traceIcon = DEFAULT_TRACE_ICON_PATH; - } else { - IConfigurationElement ce = TmfTraceType.getInstance().getTraceAttributes(traceTypeId); - traceBundle = ce.getContributor().getName(); - traceIcon = ce.getAttribute(TmfTraceType.ICON_ATTR); - } - - resource.setPersistentProperty(TmfCommonConstants.TRACEBUNDLE, traceBundle); - resource.setPersistentProperty(TmfCommonConstants.TRACETYPE, traceTypeId); - resource.setPersistentProperty(TmfCommonConstants.TRACEICON, traceIcon); - - TmfProjectElement tmfProject = TmfProjectRegistry.getProject(resource.getProject(), true); - final TmfTraceFolder tracesFolder = tmfProject.getTracesFolder(); - List traces = tracesFolder.getTraces(); - for (TmfTraceElement traceElement : traces) { - if (traceElement.getName().equals(resource.getName())) { - traceElement.refreshTraceType(); - break; - } - } - tmfProject.refresh(); - return Status.OK_STATUS; + public static boolean isCustomTrace(String traceType) { + final boolean startsWithTxt = traceType.startsWith(TmfTraceType.CUSTOM_TXT_CATEGORY); + final boolean startsWithXML = traceType.startsWith(TmfTraceType.CUSTOM_XML_CATEGORY); + return (startsWithTxt || startsWithXML); } - } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceTypeHelper.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TraceTypeHelper.java similarity index 97% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceTypeHelper.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TraceTypeHelper.java index b121962376..f27024522a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceTypeHelper.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TraceTypeHelper.java @@ -10,7 +10,7 @@ * Matthew Khouzam - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.ui.project.model; +package org.eclipse.linuxtools.tmf.core.project.model; import org.eclipse.core.runtime.Status; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; @@ -20,7 +20,7 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; * and a trace * * @author Matthew Khouzam - * @since 2.0 + * @since 3.0 */ public class TraceTypeHelper { diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceValidationHelper.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TraceValidationHelper.java similarity index 97% rename from org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceValidationHelper.java rename to org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TraceValidationHelper.java index 5ab1f28032..5d8c9277e6 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TraceValidationHelper.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TraceValidationHelper.java @@ -10,13 +10,13 @@ * Matthew Khouzam - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.ui.project.model; +package org.eclipse.linuxtools.tmf.core.project.model; /** * Trace import helper class * * @author Matthew Khouzam - * @since 2.0 + * @since 3.0 */ public class TraceValidationHelper implements Comparable { diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java index 7a4cd61f7d..7924b2f698 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomTxtIndexTest.java @@ -21,9 +21,9 @@ import java.io.FileWriter; import java.text.SimpleDateFormat; import java.util.Date; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition; import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; /** diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlIndexTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlIndexTest.java index 6798f5352b..755cc3eca7 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlIndexTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlIndexTest.java @@ -21,9 +21,9 @@ import java.io.FileWriter; import java.text.SimpleDateFormat; import java.util.Date; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.linuxtools.tmf.core.trace.indexer.ITmfTraceIndexer; /** diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceTest.java index d974795c96..ab51c25054 100644 --- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceTest.java +++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/trace/CustomXmlTraceTest.java @@ -14,10 +14,10 @@ package org.eclipse.linuxtools.tmf.ui.tests.trace; import java.util.ArrayList; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputElement; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition.OutputColumn; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition.InputElement; import org.junit.Before; /** diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Messages.java index cc35876135..758a6c1c83 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Messages.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Messages.java @@ -34,35 +34,6 @@ public class Messages extends NLS { public static String ManageCustomParsersDialog_TextButtonLabel; public static String ManageCustomParsersDialog_TraceSelection; - 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; - public static String TmfEventsTable_AddBookmarkActionText; public static String TmfEventsTable_AddBookmarkDialogMessage; public static String TmfEventsTable_AddBookmarkDialogTitle; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/ManageCustomParsersDialog.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/ManageCustomParsersDialog.java index 010782f6bb..373794a474 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/ManageCustomParsersDialog.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/dialogs/ManageCustomParsersDialog.java @@ -19,11 +19,11 @@ import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.Messages; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.linuxtools.internal.tmf.ui.parsers.wizards.CustomTxtParserWizard; import org.eclipse.linuxtools.internal.tmf.ui.parsers.wizards.CustomXmlParserWizard; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/messages.properties b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/messages.properties index 179c9f89df..ea71fe2864 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/messages.properties +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/messages.properties @@ -26,36 +26,6 @@ ManageCustomParsersDialog_ParseError=Parse Error ManageCustomParsersDialog_TextButtonLabel=Text ManageCustomParsersDialog_TraceSelection=Select log file to parse using -# org.eclipse.linuxtools.tmf.ui.parsers.custom -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 - # org.eclipse.linuxtools.tmf.ui.viewers.events TmfEventsTable_AddBookmarkActionText=Add Bookmark... TmfEventsTable_AddBookmarkDialogMessage=Enter Bookmark Description: diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEventsTable.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEventsTable.java index c9ecfa1acf..5c1090f8d0 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEventsTable.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomEventsTable.java @@ -15,9 +15,11 @@ package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; import java.util.LinkedList; import java.util.List; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomEvent; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition.OutputColumn; import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable; import org.eclipse.linuxtools.tmf.ui.widgets.virtualtable.ColumnData; import org.eclipse.swt.SWT; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/Messages.java deleted file mode 100644 index c462f42559..0000000000 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/Messages.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2013 Ericsson. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Matthew Khouzam - Initial API and implementation - *******************************************************************************/ -package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom; - -import org.eclipse.osgi.util.NLS; - -@SuppressWarnings("javadoc") -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.messages"; //$NON-NLS-1$ - public static String CustomTrace_FileNotFound; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/messages.properties b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/messages.properties deleted file mode 100644 index 73c9862a83..0000000000 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/messages.properties +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################### -# Copyright (c) 2013 Ericsson -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Ericsson - Initial API and implementation -############################################################################### - -CustomTrace_FileNotFound=File not found diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java index 059906a45f..3cb971eb4b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java @@ -43,11 +43,11 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.Messages; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition.Cardinality; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputData; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition.InputLine; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition.Cardinality; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition.InputData; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition.InputLine; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.browser.TitleEvent; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java index 420741a0ab..f7667ae699 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserOutputWizardPage.java @@ -23,10 +23,10 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.Messages; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomEventsTable; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition.OutputColumn; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserWizard.java index aeceba552b..1ce279288b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserWizard.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.internal.tmf.ui.parsers.wizards; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java index 51ff540e73..b217b034bf 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java @@ -42,11 +42,11 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.Messages; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputAttribute; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition.InputElement; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition.InputAttribute; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition.InputElement; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.browser.TitleEvent; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java index 8239d637a2..2f85829099 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java @@ -23,11 +23,11 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.Messages; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomEventsTable; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition.OutputColumn; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserWizard.java index 3a5db770b3..4d97d73342 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserWizard.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.internal.tmf.ui.parsers.wizards; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java index 9328c96bc4..11dd13763a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeContributionItem.java @@ -27,12 +27,12 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.linuxtools.internal.tmf.ui.Activator; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java index d9d473c05b..df21b86991 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java @@ -33,7 +33,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.operation.ModalContext; import org.eclipse.linuxtools.internal.tmf.ui.Activator; -import org.eclipse.linuxtools.internal.tmf.ui.project.model.TmfTraceImportException; import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.AbstractTracePackageOperation; import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageBookmarkElement; import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageElement; @@ -41,11 +40,13 @@ import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePack import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageSupplFileElement; import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageSupplFilesElement; import org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.TracePackageTraceElement; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceImportException; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; +import org.eclipse.linuxtools.tmf.core.project.model.TraceTypeHelper; import org.eclipse.linuxtools.tmf.ui.editors.TmfEventsEditor; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; -import org.eclipse.linuxtools.tmf.ui.project.model.TraceTypeHelper; +import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceTypeUIUtils; import org.eclipse.ui.dialogs.IOverwriteQuery; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.internal.wizards.datatransfer.TarException; @@ -219,7 +220,7 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i } else { try { progressMonitor.subTask(MessageFormat.format(Messages.TracePackageImportOperation_DetectingTraceType, traceName)); - traceType = TmfTraceType.getInstance().selectTraceType(traceRes.getLocation().toOSString(), null, null); + traceType = TmfTraceTypeUIUtils.selectTraceType(traceRes.getLocation().toOSString(), null, null); } catch (TmfTraceImportException e) { // Could not figure out the type } @@ -227,7 +228,7 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i if (traceType != null) { try { - TmfTraceType.setTraceType(traceRes.getFullPath(), traceType); + TmfTraceTypeUIUtils.setTraceType(traceRes.getFullPath(), traceType); } catch (CoreException e) { setStatus(new Status(IStatus.ERROR, Activator.PLUGIN_ID, MessageFormat.format(Messages.ImportTracePackageWizardPage_ErrorSettingTraceType, traceElement.getTraceType(), traceName), e)); } 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 6957e5bfba..a01f050905 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 @@ -38,9 +38,10 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomEventsTable; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; import org.eclipse.linuxtools.tmf.core.TmfCommonConstants; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTrace; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; import org.eclipse.linuxtools.tmf.core.signal.TmfTimestampFormatUpdateSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfTraceClosedSignal; @@ -57,7 +58,6 @@ import org.eclipse.linuxtools.tmf.ui.project.model.TmfOpenTraceHelper; import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectElement; import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectRegistry; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfOpenTraceHelper.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfOpenTraceHelper.java index cf03865ad6..41a7dca2f5 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfOpenTraceHelper.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfOpenTraceHelper.java @@ -30,9 +30,10 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.project.model.TmfImportHelper; -import org.eclipse.linuxtools.internal.tmf.ui.project.model.TmfTraceImportException; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceImportException; +import org.eclipse.linuxtools.tmf.core.project.model.TraceTypeHelper; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment; import org.eclipse.linuxtools.tmf.ui.editors.TmfEditorInput; @@ -103,10 +104,9 @@ public class TmfOpenTraceHelper { * @since 2.2 */ public IStatus openTraceFromPath(String projectRoot, String path, Shell shell, String tracetypeHint) throws CoreException { - TmfTraceType tt = TmfTraceType.getInstance(); TraceTypeHelper traceTypeToSet = null; try { - traceTypeToSet = tt.selectTraceType(path, shell, tracetypeHint); + traceTypeToSet = TmfTraceTypeUIUtils.selectTraceType(path, shell, tracetypeHint); } catch (TmfTraceImportException e) { MessageBox mb = new MessageBox(shell); mb.setMessage(e.getMessage()); @@ -126,7 +126,7 @@ public class TmfOpenTraceHelper { final IPath pathString = Path.fromOSString(path); IResource linkedTrace = TmfImportHelper.createLink(folder, pathString, traceName); if (linkedTrace != null && linkedTrace.exists()) { - IStatus ret = TmfTraceType.setTraceType(tracePath, traceTypeToSet); + IStatus ret = TmfTraceTypeUIUtils.setTraceType(tracePath, traceTypeToSet); if (ret.isOK()) { ret = openTraceFromProject(projectRoot, traceName); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java index 46f5892bea..c5e3be12ec 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java @@ -37,16 +37,18 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.linuxtools.internal.tmf.ui.Activator; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtEvent; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlEvent; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.linuxtools.tmf.core.TmfCommonConstants; import org.eclipse.linuxtools.tmf.core.analysis.IAnalysisModuleHelper; import org.eclipse.linuxtools.tmf.core.analysis.TmfAnalysisManager; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtEvent; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlEvent; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTrace; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; +import org.eclipse.linuxtools.tmf.core.project.model.TraceTypeHelper; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager; import org.eclipse.linuxtools.tmf.core.signal.TmfTraceOpenedSignal; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceTypeUIUtils.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceTypeUIUtils.java new file mode 100644 index 0000000000..46bff53ce2 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceTypeUIUtils.java @@ -0,0 +1,289 @@ +/******************************************************************************* + * Copyright (c) 2014 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Alexandre Montplaisir - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.linuxtools.tmf.ui.project.model; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.linuxtools.internal.tmf.ui.Activator; +import org.eclipse.linuxtools.tmf.core.TmfCommonConstants; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceImportException; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; +import org.eclipse.linuxtools.tmf.core.project.model.TraceTypeHelper; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.layout.RowLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.dialogs.FileSystemElement; + +/** + * Utils class for the UI-specific parts of @link {@link TmfTraceType}. + * + * @author Alexandre Montplaisir + * @since 3.0 + */ +public final class TmfTraceTypeUIUtils { + + private static final String DEFAULT_TRACE_ICON_PATH = "icons" + File.separator + "elcl16" + File.separator + "trace.gif"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + private static final char SEPARATOR = ':'; + + private TmfTraceTypeUIUtils() {} + + private static List isolateTraces(List selectedResources) { + List traces = new ArrayList<>(); + + // Get the selection + Iterator resources = selectedResources.iterator(); + + // Get the sorted list of unique entries + Map fileSystemObjects = new HashMap<>(); + while (resources.hasNext()) { + File resource = (File) resources.next().getFileSystemObject(); + String key = resource.getAbsolutePath(); + fileSystemObjects.put(key, resource); + } + List files = new ArrayList<>(fileSystemObjects.keySet()); + Collections.sort(files); + + // After sorting, traces correspond to the unique prefixes + String prefix = null; + for (int i = 0; i < files.size(); i++) { + File file = fileSystemObjects.get(files.get(i)); + String name = file.getAbsolutePath(); + if (prefix == null || !name.startsWith(prefix)) { + prefix = name; // new prefix + traces.add(file); + } + } + + return traces; + } + + private static List reduce(List candidates) { + List retVal = new ArrayList<>(); + + // get all the tracetypes that are unique in that stage + for (TraceTypeHelper trace : candidates) { + if (isUnique(trace, candidates)) { + retVal.add(trace); + } + } + return retVal; + } + + /* + * Only return the leaves of the trace types. Ignore custom trace types. + */ + private static boolean isUnique(TraceTypeHelper trace, List set) { + if (isCustomTraceId(trace.getCanonicalName())) { + return true; + } + // check if the trace type is the leaf. we make an instance of the trace + // type and if it is only an instance of itself, it is a leaf + final ITmfTrace tmfTrace = trace.getTrace(); + int count = -1; + for (TraceTypeHelper child : set) { + final ITmfTrace traceCandidate = child.getTrace(); + if (tmfTrace.getClass().isInstance(traceCandidate)) { + count++; + } + } + return count == 0; + } + + /** + * Is the trace type id a custom (user-defined) trace type. These are the + * traces like : text and xml defined by the custom trace wizard. + * + * @param traceTypeId + * the trace type id + * @return true if the trace is a custom type + */ + private static boolean isCustomTraceId(String traceTypeId) { + TraceTypeHelper traceType = TmfTraceType.getInstance().getTraceType(traceTypeId); + if (traceType != null) { + return TmfTraceType.isCustomTrace(traceType.getCategoryName() + SEPARATOR + traceType.getName()); + } + return false; + } + + private static TraceTypeHelper getTraceTypeToSet(TmfTraceType type, List candidates, Shell shell) { + final Map names = new HashMap<>(); + Shell shellToShow = new Shell(shell); + shellToShow.setText(Messages.TmfTraceType_SelectTraceType); + final String candidatesToSet[] = new String[1]; + for (TraceTypeHelper candidate : candidates) { + Button b = new Button(shellToShow, SWT.RADIO); + final String displayName = candidate.getCategoryName() + ':' + candidate.getName(); + b.setText(displayName); + names.put(displayName, candidate.getCanonicalName()); + + b.addSelectionListener(new SelectionListener() { + + @Override + public void widgetSelected(SelectionEvent e) { + final Button source = (Button) e.getSource(); + candidatesToSet[0] = (names.get(source.getText())); + source.getParent().dispose(); + } + + @Override + public void widgetDefaultSelected(SelectionEvent e) { + + } + }); + } + shellToShow.setLayout(new RowLayout(SWT.VERTICAL)); + shellToShow.pack(); + shellToShow.open(); + + Display display = shellToShow.getDisplay(); + while (!shellToShow.isDisposed()) { + if (!display.readAndDispatch()) { + display.sleep(); + } + } + return type.getTraceTypeHelper(candidatesToSet[0]); + } + + /** + * validate list of traces with a tracetype + * + * @param type + * The TmfTraceType instance + * @param traceTypeName + * the trace category (canonical name) + * @param selectedResources + * List of traces to validate + * @return true if all the traces are valid + */ + public static boolean validateTrace(TmfTraceType type, String traceTypeName, List selectedResources) { + List traces = isolateTraces(selectedResources); + return type.validateTraceFiles(traceTypeName, traces); + } + + /** + * This member figures out the trace type of a given file. It will prompt + * the user if it needs more information to properly pick the trace type. + * + * @param path + * The path of file to import + * @param shell + * a shell to display the message to. If it is null, it is + * assumed to be cancelled. + * @param traceTypeHint + * the ID of a trace (like "o.e.l.specifictrace" ) + * @return null if the request is cancelled or a TraceTypeHelper if it + * passes. + * @throws TmfTraceImportException + * if the traces don't match or there are errors in the trace + * file + */ + public static TraceTypeHelper selectTraceType(String path, Shell shell, String traceTypeHint) throws TmfTraceImportException { + TmfTraceType type = TmfTraceType.getInstance(); + List validCandidates = new ArrayList<>(); + final Iterable traceTypes = type.getTraceTypeIDs(); + for (String traceType : traceTypes) { + if (type.validate(traceType, path)) { + validCandidates.add(type.getTraceTypeHelper(traceType)); + } + } + + TraceTypeHelper traceTypeToSet = null; + if (validCandidates.isEmpty()) { + final String errorMsg = Messages.TmfOpenTraceHelper_NoTraceTypeMatch + path; + throw new TmfTraceImportException(errorMsg); + } else if (validCandidates.size() != 1) { + List reducedCandidates = reduce(validCandidates); + for (TraceTypeHelper tth : reducedCandidates) { + if (tth.getCanonicalName().equals(traceTypeHint)) { + traceTypeToSet = tth; + } + } + if (traceTypeToSet == null) { + if (reducedCandidates.size() == 0) { + throw new TmfTraceImportException(Messages.TmfOpenTraceHelper_ReduceError); + } else if (reducedCandidates.size() == 1) { + traceTypeToSet = reducedCandidates.get(0); + } else { + if (shell == null) { + return null; + } + traceTypeToSet = getTraceTypeToSet(type, reducedCandidates, shell); + } + } + } else { + traceTypeToSet = validCandidates.get(0); + } + return traceTypeToSet; + } + + + /** + * Set the trace type of a {@Link TraceTypeHelper}. Should only be + * used internally by this project. + * + * @param path + * the {@link IPath} path of the resource to set + * @param traceType + * the {@link TraceTypeHelper} to set the trace type to. + * @return Status.OK_Status if successful, error is otherwise. + * @throws CoreException + * An exception caused by accessing eclipse project items. + */ + public static IStatus setTraceType(IPath path, TraceTypeHelper traceType) throws CoreException { + IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path); + String traceBundle = null, traceTypeId = traceType.getCanonicalName(), traceIcon = null; + if (isCustomTraceId(traceTypeId)) { + traceBundle = Activator.getDefault().getBundle().getSymbolicName(); + traceIcon = DEFAULT_TRACE_ICON_PATH; + } else { + IConfigurationElement ce = TmfTraceType.getInstance().getTraceAttributes(traceTypeId); + traceBundle = ce.getContributor().getName(); + traceIcon = ce.getAttribute(TmfTraceType.ICON_ATTR); + } + + resource.setPersistentProperty(TmfCommonConstants.TRACEBUNDLE, traceBundle); + resource.setPersistentProperty(TmfCommonConstants.TRACETYPE, traceTypeId); + resource.setPersistentProperty(TmfCommonConstants.TRACEICON, traceIcon); + + TmfProjectElement tmfProject = TmfProjectRegistry.getProject(resource.getProject(), true); + final TmfTraceFolder tracesFolder = tmfProject.getTracesFolder(); + List traces = tracesFolder.getTraces(); + for (TmfTraceElement traceElement : traces) { + if (traceElement.getName().equals(resource.getName())) { + traceElement.refreshTraceType(); + break; + } + } + tmfProject.refresh(); + return Status.OK_STATUS; + } +} diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/BatchImportTraceWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/BatchImportTraceWizard.java index cbb0601851..28005c3c0b 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/BatchImportTraceWizard.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/BatchImportTraceWizard.java @@ -49,14 +49,15 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.project.model.TmfImportHelper; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; +import org.eclipse.linuxtools.tmf.core.project.model.TraceTypeHelper; +import org.eclipse.linuxtools.tmf.core.project.model.TraceValidationHelper; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectElement; import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectRegistry; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceFolder; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; -import org.eclipse.linuxtools.tmf.ui.project.model.TraceTypeHelper; -import org.eclipse.linuxtools.tmf.ui.project.model.TraceValidationHelper; +import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceTypeUIUtils; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.dialogs.IOverwriteQuery; @@ -325,7 +326,7 @@ public class BatchImportTraceWizard extends Wizard implements IImportWizard { String traceTypeId = traceToImport.getTraceTypeId(); TraceTypeHelper traceType = TmfTraceType.getInstance().getTraceType(traceTypeId); if (traceType != null) { - TmfTraceType.setTraceType(path, traceType); + TmfTraceTypeUIUtils.setTraceType(path, traceType); } TmfProjectElement tmfProject = @@ -539,6 +540,7 @@ public class BatchImportTraceWizard extends Wizard implements IImportWizard { * @param traceToScan * The trace to scan * @return if the trace has been scanned yet or not + * @since 3.0 */ public boolean hasScanned(TraceValidationHelper traceToScan) { return fResults.containsKey(traceToScan); @@ -551,6 +553,7 @@ public class BatchImportTraceWizard extends Wizard implements IImportWizard { * The trace that has been scanned * @param validate * if the trace is valid + * @since 3.0 */ public void addResult(TraceValidationHelper traceToScan, boolean validate) { fResults.put(traceToScan, validate); @@ -562,6 +565,7 @@ public class BatchImportTraceWizard extends Wizard implements IImportWizard { * @param traceToScan * the scanned trace * @return whether it passes or not + * @since 3.0 */ public Boolean getResult(TraceValidationHelper traceToScan) { return fResults.get(traceToScan); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceContentProvider.java index c3fb61bf50..2733d2713e 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceContentProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceContentProvider.java @@ -23,7 +23,7 @@ import java.util.TreeSet; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; /** * A helper class to show the trace types and files and names. it contains the diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardScanPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardScanPage.java index 6a90e3ed5b..0f46f223f1 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardScanPage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardScanPage.java @@ -39,8 +39,8 @@ import org.eclipse.jface.viewers.TreeViewerEditor; import org.eclipse.jface.viewers.TreeViewerFocusCellManager; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.internal.tmf.ui.ITmfImageConstants; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; -import org.eclipse.linuxtools.tmf.ui.project.model.TraceValidationHelper; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; +import org.eclipse.linuxtools.tmf.core.project.model.TraceValidationHelper; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java index ec558bbff4..3f11b274ed 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/ImportTraceWizardSelectTraceTypePage.java @@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.linuxtools.tmf.ui.project.model.TraceTypeHelper; +import org.eclipse.linuxtools.tmf.core.project.model.TraceTypeHelper; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/TraceTypeContentProvider.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/TraceTypeContentProvider.java index cb13d59244..a5bd49fd21 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/TraceTypeContentProvider.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/importtrace/TraceTypeContentProvider.java @@ -19,8 +19,8 @@ import java.util.Map; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; -import org.eclipse.linuxtools.tmf.ui.project.model.TraceTypeHelper; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; +import org.eclipse.linuxtools.tmf.core.project.model.TraceTypeHelper; /** * Trace type content provider, a helper for showing trace types diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterViewer.java index c3701cb2ca..eb47838df6 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/filter/FilterViewer.java @@ -31,11 +31,6 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.linuxtools.internal.tmf.ui.Messages; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTraceDefinition.OutputColumn; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtEvent; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTraceDefinition; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlEvent; -import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTraceDefinition; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.ITmfEventType; import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode; @@ -50,7 +45,12 @@ import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterNode; import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterOrNode; import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterRootNode; import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterTreeNode; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtEvent; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTxtTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlEvent; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomXmlTraceDefinition; +import org.eclipse.linuxtools.tmf.core.parsers.custom.CustomTraceDefinition.OutputColumn; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.dnd.DND; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java index c11020b87f..5b34c841d7 100755 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/statistics/TmfStatisticsView.java @@ -17,6 +17,7 @@ package org.eclipse.linuxtools.tmf.ui.views.statistics; import org.eclipse.core.resources.IResource; +import org.eclipse.linuxtools.tmf.core.project.model.TmfTraceType; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; import org.eclipse.linuxtools.tmf.core.signal.TmfTraceClosedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfTraceOpenedSignal; @@ -24,7 +25,6 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfTraceRangeUpdatedSignal; import org.eclipse.linuxtools.tmf.core.signal.TmfTraceSelectedSignal; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfTraceManager; -import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceType; import org.eclipse.linuxtools.tmf.ui.viewers.ITmfViewer; import org.eclipse.linuxtools.tmf.ui.viewers.statistics.TmfStatisticsViewer; import org.eclipse.linuxtools.tmf.ui.views.TmfView; -- 2.34.1