Merge branch 'master' into lttng-kepler

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / internal / tmf / ui / parsers / custom / CustomTraceDefinition.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTraceDefinition.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTraceDefinition.java
index 539d0e1caa8d26b0a030e57e6c6571360aa084b3..ef947757581b31cfb8bbdd88f8936b952de2e47e 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTraceDefinition.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTraceDefinition.java
@@ -1,58 +1,58 @@
-/*******************************************************************************\r
- * Copyright (c) 2010 Ericsson\r
- *\r
- * All rights reserved. This program and the accompanying materials are\r
- * made available under the terms of the Eclipse Public License v1.0 which\r
- * accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *   Patrick Tasse - Initial API and implementation\r
- *******************************************************************************/\r
-\r
-package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom;\r
-\r
-import java.text.SimpleDateFormat;\r
-import java.util.List;\r
-\r
-import org.eclipse.linuxtools.internal.tmf.ui.Messages;\r
-import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;\r
-\r
-\r
-public abstract class CustomTraceDefinition {\r
-\r
-    public static final int ACTION_SET = 0;\r
-    public static final int ACTION_APPEND = 1;\r
-    public static final int ACTION_APPEND_WITH_SEPARATOR = 2;\r
-\r
-    public static final String TAG_TIMESTAMP = Messages.CustomTraceDefinition_timestampTag;\r
-    public static final String TAG_MESSAGE = Messages.CustomTraceDefinition_messageTag;\r
-    public static final String TAG_OTHER = Messages.CustomTraceDefinition_otherTag;\r
-\r
-    public String definitionName;\r
-    public List<OutputColumn> outputs;\r
-    public String timeStampOutputFormat;\r
-\r
-    public static class OutputColumn {\r
-        public String name;\r
-\r
-        public OutputColumn() {}\r
-\r
-        public OutputColumn(String name) {\r
-            this.name = name;\r
-        }\r
-\r
-        @Override\r
-        public String toString() {\r
-            return name;\r
-        }\r
-    }\r
-\r
-    public String formatTimeStamp(TmfTimestamp timestamp) {\r
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(timeStampOutputFormat);\r
-        return simpleDateFormat.format(timestamp.getValue());\r
-    }\r
-\r
-    public abstract void save();\r
-    public abstract void save(String path);\r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2010 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:
+ *   Patrick Tasse - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.tmf.ui.parsers.custom;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import org.eclipse.linuxtools.internal.tmf.ui.Messages;
+import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+
+
+public abstract class CustomTraceDefinition {
+
+    public static final int ACTION_SET = 0;
+    public static final int ACTION_APPEND = 1;
+    public static final int ACTION_APPEND_WITH_SEPARATOR = 2;
+
+    public static final String TAG_TIMESTAMP = Messages.CustomTraceDefinition_timestampTag;
+    public static final String TAG_MESSAGE = Messages.CustomTraceDefinition_messageTag;
+    public static final String TAG_OTHER = Messages.CustomTraceDefinition_otherTag;
+
+    public String definitionName;
+    public List<OutputColumn> outputs;
+    public String timeStampOutputFormat;
+
+    public static class OutputColumn {
+        public String name;
+
+        public OutputColumn() {}
+
+        public OutputColumn(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
+
+    public String formatTimeStamp(TmfTimestamp timestamp) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(timeStampOutputFormat);
+        return simpleDateFormat.format(timestamp.getValue());
+    }
+
+    public abstract void save();
+    public abstract void save(String path);
+}