diff -r ca8a1b6995f6 -r 52e343bb8f80 tracefw/tracecompiler/src/com.nokia.tracecompiler/src/com/nokia/tracecompiler/engine/ConfigurationDelegate.java
--- a/tracefw/tracecompiler/src/com.nokia.tracecompiler/src/com/nokia/tracecompiler/engine/ConfigurationDelegate.java	Tue Aug 31 16:45:49 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-/*
-* Copyright (c) 2007 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:
-*
-* Delegate to configuration of the view
-*
-*/
-package com.nokia.tracecompiler.engine;
-
-import java.util.ArrayList;
-
-/**
- * Delegate to configuration of the view
- * 
- */
-final class ConfigurationDelegate implements TraceCompilerEngineConfiguration {
-
-	/**
-	 * Configuration from view
-	 */
-	private TraceCompilerEngineConfiguration configuration;
-
-	/**
-	 * Temporary list of configuration listeners
-	 */
-	private ArrayList<TraceCompilerEngineConfigurationListener> tempListeners;
-
-	/**
-	 * Sets the configuration delegate
-	 * 
-	 * @param configuration
-	 *            the configuration
-	 */
-	void setConfiguration(TraceCompilerEngineConfiguration configuration) {
-		this.configuration = configuration;
-		if (configuration != null && tempListeners != null) {
-			for (int i = 0; i < tempListeners.size(); i++) {
-				TraceCompilerEngineConfigurationListener listener = tempListeners
-						.get(i);
-				configuration.addConfigurationListener(listener);
-				listener.configurationCreated();
-			}
-			tempListeners.clear();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.nokia.tracecompiler.engine.TraceCompilerConfiguration#isAvailable()
-	 */
-	public boolean isAvailable() {
-		boolean retval;
-		if (configuration != null) {
-			retval = configuration.isAvailable();
-		} else {
-			retval = false;
-		}
-		return retval;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.nokia.tracecompiler.engine.TraceCompilerConfiguration#
-	 *      addConfigurationListener(com.nokia.tracecompiler.engine.TraceCompilerConfigurationListener)
-	 */
-	public void addConfigurationListener(
-			TraceCompilerEngineConfigurationListener configurationListener) {
-		if (configuration != null) {
-			configuration.addConfigurationListener(configurationListener);
-		} else {
-			if (tempListeners == null) {
-				tempListeners = new ArrayList<TraceCompilerEngineConfigurationListener>();
-			}
-			tempListeners.add(configurationListener);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.nokia.tracecompiler.engine.TraceCompilerConfiguration#
-	 *      removeConfigurationListener(com.nokia.tracecompiler.engine.TraceCompilerConfigurationListener)
-	 */
-	public void removeConfigurationListener(
-			TraceCompilerEngineConfigurationListener configurationListener) {
-		if (configuration != null) {
-			configuration.removeConfigurationListener(configurationListener);
-		} else {
-			if (tempListeners != null) {
-				tempListeners.remove(configurationListener);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.nokia.tracecompiler.engine.TraceCompilerConfiguration#getFlag(java.lang.String)
-	 */
-	public boolean getFlag(String flagName) {
-		boolean retval;
-		if (configuration != null) {
-			retval = configuration.getFlag(flagName);
-		} else {
-			retval = false;
-		}
-		return retval;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.nokia.tracecompiler.engine.TraceCompilerConfiguration#getText(java.lang.String)
-	 */
-	public String getText(String textName) {
-		String retval;
-		if (configuration != null) {
-			retval = configuration.getText(textName);
-		} else {
-			retval = ""; //$NON-NLS-1$
-		}
-		return retval;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.nokia.tracecompiler.engine.TraceCompilerConfiguration#getValue(java.lang.String)
-	 */
-	public int getValue(String valueName) {
-		int retval;
-		if (configuration != null) {
-			retval = configuration.getValue(valueName);
-		} else {
-			retval = 0;
-		}
-		return retval;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.nokia.tracecompiler.engine.TraceCompilerConfiguration#hasEntry(java.lang.String)
-	 */
-	public boolean hasEntry(String entryName) {
-		boolean retval;
-		if (configuration != null) {
-			retval = configuration.hasEntry(entryName);
-		} else {
-			retval = false;
-		}
-		return retval;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.nokia.tracecompiler.engine.TraceCompilerConfiguration#
-	 *      setFlag(java.lang.String, boolean)
-	 */
-	public void setFlag(String flagName, boolean flag) {
-		if (configuration != null) {
-			configuration.setFlag(flagName, flag);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.nokia.tracecompiler.engine.TraceCompilerConfiguration#
-	 *      setText(java.lang.String, java.lang.String)
-	 */
-	public void setText(String textName, String text) {
-		if (configuration != null) {
-			configuration.setText(textName, text);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.nokia.tracecompiler.engine.TraceCompilerConfiguration#setValue(java.lang.String,
-	 *      int)
-	 */
-	public void setValue(String valueName, int value) {
-		if (configuration != null) {
-			configuration.setValue(valueName, value);
-		}
-	}
-
-}