--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.carbide.extensions.traceviewer/build.properties	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               license.htm

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.carbide.extensions.traceviewer/feature.xml	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.nokia.carbide.extensions.traceviewer"
+      label="Carbide.c++ Extensions - TraceViewer"
+      version="2.6.0"
+      provider-name="Nokia"
+      plugin="com.nokia.traceviewer">
+
+   <description>
+      TraceViewer is used for receiving and manipulating traces.
+   </description>
+
+   <copyright>
+      Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html.
+   </copyright>
+
+   <license url="license.htm">
+      Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).All rights reserved.
+  This component and the accompanying materials are made available under the 
+  terms of &quot;Eclipse Public License v1.0&quot; which accompanies this 
+  distribution, and is available at the URL &quot;http://www.eclipse.org/legal/epl-v10.html&quot;.
+  
+  Part of the graphics of the program are from Eclipse 3.1 platform 
+  and CDT project in Eclipse community, which are made available under 
+  the terms of the Eclipse Public License v1.0.
+  A copy of the EPL is provided at 
+  http://www.eclipse.org/legal/epl-v10.html
+   </license>
+
+   <url>
+      <update label="Carbide.c++ Extensions Nokia Update Server" url="http://trwwwaps.nmp.nokia.com/programs/carbide"/>
+      <discovery label="Carbide.c++ Extensions Nokia Update Server" url="http://trwwwaps.nmp.nokia.com/programs/carbide"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.console"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="com.nokia.tcf"/>
+      <import plugin="com.nokia.carbide.remoteConnections"/>
+      <import plugin="com.nokia.carbide.trk.support"/>
+   </requires>
+
+   <plugin
+         id="com.nokia.traceviewer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.nokia.traceviewer.dictionary"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.nokia.traceviewer.eventhandler"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.nokia.traceviewer.help"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+
+   <plugin
+         id="com.nokia.traceviewer.ost"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="com.nokia.trace.eventrouter"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.nokia.trace.eventview"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.nokia.trace.dictionary"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.nokia.trace.help"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>         
+
+</feature>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.carbide.extensions.traceviewer/license.htm	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,14 @@
+<h2>Carbide.c++ Extensions - TraceViewer plug-in</h2>
+
+<h3>License Information</h3>
+COPYRIGHTS<br/>
+Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).All rights reserved.<br/>
+This component and the accompanying materials are made available under the <br/>
+terms of "Eclipse Public License v1.0" which accompanies this <br/>
+distribution, and is available at the URL "http://www.eclipse.org/legal/epl-v10.html".<br/>
+
+Part of the graphics of the program are from Eclipse 3.1 platform 
+and CDT project in Eclipse community, which are made available under 
+the terms of the Eclipse Public License v1.0.
+A copy of the EPL is provided at 
+http://www.eclipse.org/legal/epl-v10.html
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/.classpath	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/.settings/org.eclipse.jdt.core.prefs	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,2 @@
+#Wed Mar 14 17:24:05 EET 2007
+org.eclipse.jdt.core.compiler.source=1.5

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/META-INF/MANIFEST.MF	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Carbide.c++ Extensions - Trace Common
+Bundle-SymbolicName: com.nokia.trace.dictionary;singleton:=true
+Bundle-Version: 2.6.0
+Bundle-Activator: com.nokia.trace.dictionary.TraceDictionaryPlugin
+Bundle-Vendor: Nokia
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ com.nokia.trace.eventrouter
+Bundle-ActivationPolicy: lazy
+Export-Package: com.nokia.trace.dictionary,
+ com.nokia.trace.dictionary.decoder,
+ com.nokia.trace.dictionary.model,
+ com.nokia.trace.dictionary.model.decodeparameters,
+ com.nokia.trace.dictionary.model.handlers
+Bundle-RequiredExecutionEnvironment: J2SE-1.5

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/about.html	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+<body>
+
+<h2>About This Content</h2>
+ 
+<p>June 4, 2010</p>	
+
+<h3>Copyright</h3>
+<p>Copyright &copy; 2007-2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.<br>
+This component and the accompanying materials are made available under the <br/>
+terms of "Eclipse Public License v1.0" which accompanies this <br/>
+distribution, and is available at the URL: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.<p>
+
+</body>
+</html>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/build.properties	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/src/com/nokia/trace/dictionary/TraceDictionaryEngine.java	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ * Trace Dictionary Engine
+ *
+ */
+package com.nokia.trace.dictionary;
+
+import com.nokia.trace.dictionary.decoder.TraceDictionaryDecoder;
+import com.nokia.trace.dictionary.model.DictionaryDecodeModel;
+import com.nokia.trace.dictionary.model.DictionaryModelBuilder;
+import com.nokia.trace.eventrouter.TraceEvent;
+import com.nokia.trace.eventrouter.TraceEventRouter;
+
+/**
+ * Trace Dictionary Engine
+ */
+public class TraceDictionaryEngine {
+
+	/**
+	 * Decoder
+	 */
+	private TraceDictionaryDecoder decoder;
+
+	/**
+	 * Model Builder
+	 */
+	private DictionaryModelBuilder modelBuilder;
+
+	/**
+	 * Decode Model
+	 */
+	private DictionaryDecodeModel decodeModel;
+
+	/**
+	 * Constructor
+	 */
+	public TraceDictionaryEngine() {
+		decodeModel = new DictionaryDecodeModel();
+	}
+
+	/**
+	 * Gets decoder
+	 * 
+	 * @return the decoder
+	 */
+	public TraceDictionaryDecoder getDecoder() {
+		if (decoder == null) {
+			decoder = new TraceDictionaryDecoder(decodeModel);
+		}
+		return decoder;
+	}
+
+	/**
+	 * Gets model builder
+	 * 
+	 * @return the model builder
+	 */
+	public DictionaryModelBuilder getModelBuilder() {
+		if (modelBuilder == null) {
+			modelBuilder = new DictionaryModelBuilder(decodeModel);
+		}
+		return modelBuilder;
+	}
+
+	/**
+	 * Gets model
+	 * 
+	 * @return the decode model
+	 */
+	public DictionaryDecodeModel getModel() {
+		return decodeModel;
+	}
+
+	/**
+	 * Posts event to event view
+	 * 
+	 * @param event
+	 *            event
+	 */
+	public static void postEvent(final TraceEvent event) {
+		// If source has line number, add also file name
+		if (event.getSource() != null && event.getSource() instanceof Integer) {
+			event.setSource(DictionaryModelBuilder.getCurrentFile()
+					+ " line " + event.getSource()); //$NON-NLS-1$
+		}
+		TraceEventRouter.getInstance().postEvent(event);
+	}
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/src/com/nokia/trace/dictionary/TraceDictionaryPlugin.java	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ * The activator class controls the plug-in life cycle
+ *
+ */
+package com.nokia.trace.dictionary;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ * 
+ */
+public class TraceDictionaryPlugin extends AbstractUIPlugin {
+
+	/**
+	 * The plug-in ID
+	 */
+	public static final String PLUGIN_ID = "com.nokia.trace.dictionary"; //$NON-NLS-1$
+
+	/**
+	 * The shared instance
+	 */
+	private static TraceDictionaryPlugin plugin;
+
+	/**
+	 * The constructor
+	 */
+	public TraceDictionaryPlugin() {
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
+	 * )
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
+	 * )
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 * 
+	 * @return the shared instance
+	 */
+	public static TraceDictionaryPlugin getDefault() {
+		return plugin;
+	}
+
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/src/com/nokia/trace/dictionary/decoder/TraceDictionaryDecoder.java	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,385 @@
+/*
+ * Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ * Trace Dictionary Decoder
+ *
+ */
+package com.nokia.trace.dictionary.decoder;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import com.nokia.trace.dictionary.model.DictionaryDecodeModel;
+import com.nokia.trace.dictionary.model.Location;
+import com.nokia.trace.dictionary.model.Trace;
+import com.nokia.trace.dictionary.model.TraceComponent;
+import com.nokia.trace.dictionary.model.TraceData;
+import com.nokia.trace.dictionary.model.TraceGroup;
+import com.nokia.trace.dictionary.model.decodeparameters.DecodeParameter;
+
+/**
+ * Trace Dictionary Decoder
+ * 
+ */
+public final class TraceDictionaryDecoder {
+
+	/**
+	 * Estimated trace size
+	 */
+	private static final int ESTIMATED_TRACE_SIZE = 70;
+
+	/**
+	 * Separator between class and function
+	 */
+	private static final String CLASS_FUNCTION_SEPARATOR = "::"; //$NON-NLS-1$
+
+	/**
+	 * Separator after function name
+	 */
+	private static final String AFTER_FUNCTION_SEPARATOR = ": "; //$NON-NLS-1$
+
+	/**
+	 * Model to use for decoding
+	 */
+	private DictionaryDecodeModel model;
+
+	/**
+	 * Previous trace used when getting metadata so that trace is only need to
+	 * be get once
+	 */
+	private Trace previousMetaTrace;
+
+	/**
+	 * Constructor
+	 * 
+	 * @param model
+	 *            dictionary model
+	 */
+	public TraceDictionaryDecoder(DictionaryDecodeModel model) {
+		this.model = model;
+	}
+
+	/**
+	 * Decodes the contents of a trace
+	 * 
+	 * @param dataBuffer
+	 *            buffer containing data
+	 * @param dataStart
+	 *            data start offset
+	 * @param dataLength
+	 *            data length
+	 * @param componentId
+	 *            component ID of the trace
+	 * @param groupId
+	 *            group ID of the trace
+	 * @param traceId
+	 *            trace ID
+	 * @param showClassPrefixes
+	 *            if true, add class and function name to the trace text if they
+	 *            exist
+	 * @param showComponentGroupPrefixes
+	 *            if true, add component and group name to the trace text if
+	 *            they exist
+	 * @param parameterList
+	 *            parameter list where to add each parameters separately when
+	 *            decoding
+	 * @return decoded trace string buffer
+	 */
+	public StringBuffer decode(ByteBuffer dataBuffer, int dataStart,
+			int dataLength, int componentId, int groupId, int traceId,
+			boolean showClassPrefixes, boolean showComponentGroupPrefixes,
+			ArrayList<String> parameterList) {
+
+		// Get trace
+		Trace trace = getTrace(componentId, groupId, traceId);
+
+		// Create variables
+		StringBuffer buf = null;
+		ArrayList<DecodeParameter> parameters = null;
+		TraceData traceData = null;
+
+		// Get trace data
+		if (trace != null) {
+			traceData = trace.getTraceData();
+
+			// Get trace parameters
+			if (traceData != null) {
+				parameters = traceData.getDecodeParameters();
+
+				// Check if the trace only contains one variable and tell it to
+				// the decoders
+				if (traceData.containsOnlyOneVariable()) {
+					DecodeParameter.isOnlyVariableInTrace = true;
+				} else {
+					DecodeParameter.isOnlyVariableInTrace = false;
+				}
+			}
+		}
+
+		// Decode the trace to the StringBuffer
+		if (parameters != null && trace != null) {
+			buf = new StringBuffer(ESTIMATED_TRACE_SIZE);
+
+			// Create parameter list if it doesn't exist so the decode
+			// parameters doesn't have to make a null check
+			if (parameterList == null) {
+				parameterList = new ArrayList<String>();
+			}
+
+			// Insert prefixes
+			TraceGroup group = trace.getGroup();
+			insertPrefixes(buf, trace, group, showClassPrefixes,
+					showComponentGroupPrefixes);
+
+			// Decode all parameters
+			Iterator<DecodeParameter> it = parameters.iterator();
+			int offset = dataStart;
+
+			while (it.hasNext()) {
+				DecodeParameter par = it.next();
+				offset = par.decode(dataBuffer, offset, buf, dataStart,
+						dataLength, parameterList);
+			}
+
+			// Insert suffixes
+			insertSuffixes(buf, group);
+		}
+
+		return buf;
+	}
+
+	/**
+	 * Inserts prefixes
+	 * 
+	 * @param buf
+	 *            trace buffer
+	 * @param trace
+	 *            trace
+	 * @param group
+	 *            trace group
+	 * @param showClassPrefixes
+	 *            if true, add class and function name to the trace text if they
+	 *            exist
+	 * @param showComponentGroupPrefixes
+	 *            if true, add component and group name to the trace text if
+	 *            they exist
+	 */
+	private void insertPrefixes(StringBuffer buf, Trace trace,
+			TraceGroup group, boolean showClassPrefixes,
+			boolean showComponentGroupPrefixes) {
+		if (showComponentGroupPrefixes) {
+			if (group.getComponent().getPrefix() != null) {
+				buf.append(group.getComponent().getPrefix());
+			}
+			if (group.getPrefix() != null) {
+				buf.append(group.getPrefix());
+			}
+		}
+		if (showClassPrefixes && trace.getClassName() != null
+				&& trace.getMethodName() != null) {
+			buf.append(trace.getClassName());
+			buf.append(CLASS_FUNCTION_SEPARATOR);
+			buf.append(trace.getMethodName());
+			buf.append(AFTER_FUNCTION_SEPARATOR);
+		}
+	}
+
+	/**
+	 * Insert suffixes
+	 * 
+	 * @param buf
+	 *            trace buffer
+	 * @param group
+	 *            trace group
+	 */
+	private void insertSuffixes(StringBuffer buf, TraceGroup group) {
+		if (group.getSuffix() != null) {
+			buf.append(group.getSuffix());
+		}
+		if (group.getComponent().getSuffix() != null) {
+			buf.append(group.getComponent().getSuffix());
+		}
+	}
+
+	/**
+	 * Gets trace with component, group and trace IDs
+	 * 
+	 * @param componentId
+	 *            component Id
+	 * @param groupId
+	 *            group Id
+	 * @param traceId
+	 *            trace Id
+	 * @return Trace
+	 */
+	private Trace getTrace(int componentId, int groupId, int traceId) {
+		TraceGroup group = null;
+		Trace trace = null;
+
+		// Get component
+		TraceComponent comp = model.getComponent(componentId);
+
+		// Get group
+		if (comp != null) {
+			group = comp.getGroup(groupId);
+			// Get trace
+			if (group != null) {
+				trace = group.getTrace(traceId);
+			}
+		}
+		return trace;
+	}
+
+	/**
+	 * Sets previous trace where to get data from. Must be set before calling
+	 * decode or getMetaData functions
+	 * 
+	 * @param componentId
+	 *            component Id
+	 * @param groupId
+	 *            group Id
+	 * @param traceId
+	 *            trace Id
+	 */
+	public void setTraceWhereToGetMetaData(int componentId, int groupId,
+			int traceId) {
+		previousMetaTrace = getTrace(componentId, groupId, traceId);
+	}
+
+	/**
+	 * Gets location
+	 * 
+	 * @return location
+	 */
+	public Location getLocation() {
+		Location location = null;
+		if (previousMetaTrace != null) {
+			location = previousMetaTrace.getLocation();
+		}
+		return location;
+	}
+
+	/**
+	 * Gets line number
+	 * 
+	 * @return line number
+	 */
+	public int getLineNumber() {
+		int lineNum = 0;
+		if (previousMetaTrace != null) {
+			lineNum = previousMetaTrace.getLineNumber();
+		}
+		return lineNum;
+	}
+
+	/**
+	 * Gets class name
+	 * 
+	 * @return class name
+	 */
+	public String getClassName() {
+		String className = null;
+		if (previousMetaTrace != null) {
+			className = previousMetaTrace.getClassName();
+		}
+		return className;
+	}
+
+	/**
+	 * Gets method name
+	 * 
+	 * @return method name
+	 */
+	public String getMethodName() {
+		String methodName = null;
+		if (previousMetaTrace != null) {
+			methodName = previousMetaTrace.getMethodName();
+		}
+		return methodName;
+	}
+
+	/**
+	 * Gets metadata map
+	 * 
+	 * @return metadata map
+	 */
+	public HashMap<String, HashMap<String, Object>> getMetadata() {
+		HashMap<String, HashMap<String, Object>> metadata = null;
+
+		// Create a new metadata map if trace has some metadata
+		if (previousMetaTrace != null
+				&& (previousMetaTrace.getMetadata() != null
+						|| previousMetaTrace.getGroup().getMetadata() != null || previousMetaTrace
+						.getGroup().getComponent().getMetadata() != null)) {
+			TraceGroup group = previousMetaTrace.getGroup();
+			metadata = new HashMap<String, HashMap<String, Object>>();
+
+			// Add trace metadata
+			if (previousMetaTrace.getMetadata() != null) {
+				addMissingMetadataToList(previousMetaTrace.getMetadata(),
+						metadata);
+			}
+
+			// Add group metadata
+			if (group.getMetadata() != null) {
+				addMissingMetadataToList(group.getMetadata(), metadata);
+			}
+
+			// Add component metadata
+			if (group.getComponent().getMetadata() != null) {
+				addMissingMetadataToList(group.getComponent().getMetadata(),
+						metadata);
+			}
+		}
+		return metadata;
+	}
+
+	/**
+	 * Adds missing metadata to list
+	 * 
+	 * @param oldList
+	 *            old list to append from
+	 * @param newList
+	 *            new list to append to
+	 */
+	private void addMissingMetadataToList(
+			HashMap<String, HashMap<String, Object>> oldList,
+			HashMap<String, HashMap<String, Object>> newList) {
+		Iterator<String> it = oldList.keySet().iterator();
+		while (it.hasNext()) {
+			String key = it.next();
+
+			// Doesn't contain this key, add it
+			if (!newList.containsKey(key)) {
+				newList.put(key, oldList.get(key));
+
+				// Contains the key, check values inside
+			} else {
+				Iterator<String> valueIt = oldList.get(key).keySet().iterator();
+				while (valueIt.hasNext()) {
+					String valueKey = valueIt.next();
+
+					// Doesn't contain value key, add it
+					if (!newList.get(key).containsKey(valueKey)) {
+						newList.get(key).put(valueKey,
+								newList.get(key).get(valueKey));
+					}
+				}
+			}
+		}
+	}
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/src/com/nokia/trace/dictionary/decoder/package.html	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,5 @@
+<html><body>
+Dictionary decoder uses the 
+{@link com.nokia.tracedictionary.model.DictionaryDecodeModel DictionaryDecodeModel} 
+to convert binary traces to text
+</body></html>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/src/com/nokia/trace/dictionary/model/DecodeObject.java	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ * Decode object
+ *
+ */
+package com.nokia.trace.dictionary.model;
+
+import java.util.HashMap;
+
+/**
+ * Decode object
+ * 
+ */
+public class DecodeObject {
+
+	/**
+	 * ID number
+	 */
+	private int id;
+
+	/**
+	 * Name
+	 */
+	private String name;
+
+	/**
+	 * Hashmap containing metadata for this object
+	 */
+	protected HashMap<String, HashMap<String, Object>> metadataMap;
+
+	/**
+	 * Constructor
+	 * 
+	 * @param id
+	 *            id of this component
+	 * @param name
+	 *            name of this component
+	 */
+	public DecodeObject(int id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+
+	/**
+	 * Gets ID
+	 * 
+	 * @return the id
+	 */
+	public int getId() {
+		return id;
+	}
+
+	/**
+	 * Gets name
+	 * 
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Attaches metadata to this trace
+	 * 
+	 * @param id
+	 *            id of the metadata
+	 * @param tagName
+	 *            tag name of the metadata
+	 * @param metadata
+	 *            the metadata object
+	 */
+	public void addMetadata(String id, String tagName, Object metadata) {
+		if (metadataMap == null) {
+			metadataMap = new HashMap<String, HashMap<String, Object>>();
+		}
+		HashMap<String, Object> tagMap = metadataMap.get(id);
+		if (tagMap == null) {
+			tagMap = new HashMap<String, Object>();
+			metadataMap.put(id, tagMap);
+		}
+		tagMap.put(tagName, metadata);
+	}
+
+	/**
+	 * Gets metadata map
+	 * 
+	 * @return the metadata
+	 */
+	public HashMap<String, HashMap<String, Object>> getMetadata() {
+		return metadataMap;
+	}
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trace/traceviewer/com.nokia.trace.dictionary/src/com/nokia/trace/dictionary/model/DecodeObjectFactory.java	Wed Jun 23 14:49:59 2010 +0300
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ * Decode Object Factory
+ *
+ */
+package com.nokia.trace.dictionary.model;
+
+/**
+ * Decode Object Factory creates components, groups and traces
+ * 
+ */
+public class DecodeObjectFactory {
+
+	/**
+	 * Constructor
+	 */
+	public DecodeObjectFactory() {
+
+	}
+
+	/**
+	 * Creates and returns new TraceComponent
+	 * 
+	 * @param id
+	 *            id
+	 * @param name
+	 *            name
+	 * @param prefix
+	 *            prefix
+	 * @param suffix
+	 *            suffix
+	 * @param model
+	 *            model
+	 * @return component
+	 */
+	public TraceComponent createTraceComponent(int id, String name,
+			String prefix, String suffix, DictionaryDecodeModel model) {
+		TraceComponent newComponent = new TraceComponent(id, name, prefix,
+				suffix, DictionaryModelBuilder.getCurrentFile(), model);
+		return newComponent;
+	}
+
+	/**
+	 * Creates and returns new TraceGroup
+	 * 
+	 * @param id
+	 *            id
+	 * @param name
+	 *            name
+	 * @param prefix
+	 *            prefix
+	 * @param suffix
+	 *            suffix
+	 * @param component
+	 *            component
+	 * @return group
+	 */
+	public TraceGroup createTraceGroup(int id, String name, String prefix,
+			String suffix, TraceComponent component) {
+		TraceGroup newGroup = new TraceGroup(id, name, prefix, suffix,
+				component);
+		return newGroup;
+	}
+
+	/**
+	 * Creates and return new Trace
+	 * 
+	 * @param id
+	 *            id
+	 * @param name
+	 *            name
+	 * @param traceData
+	 *            reference to traceData
+	 * @param location
+	 *            reference to location
+	 * @param lineNum
+	 *            line number
+	 * @param methodName
+	 *            method name
+	 * @param className
+	 *            class name
+	 * @param group
+	 *            parent group
+	 * @return new trace
+	 */
+	public Trace createTrace(int id, String name, TraceData traceData,
+			Location location, int lineNum, String methodName,
+			String className, TraceGroup group) {
+		Trace newTrace = new Trace(id, name, traceData, location, lineNum,
+				methodName, className, group);
+		return newTrace;
+	}
+
+}