# HG changeset patch
# User your_name <your_email_address>
# Date 1267117611 28800
# Node ID e80a4029f09f59b1252a00698880067a7a771ac8
# Parent  505a1a1096d6ae02d18d0068a0866008a15e5d5b# Parent  f02192d5e8f8fa696218283f4ab313824f8c7753
Heads merge

diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools.previewer/preview/css/style.css
--- a/org.symbian.tools.wrttools.previewer/preview/css/style.css	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/preview/css/style.css	Thu Feb 25 09:06:51 2010 -0800
@@ -283,7 +283,7 @@
 div#PreferencesBtn{
 	width: 75px;
 	height: 85px;
-	background-image: url(../images/settings-icon.png);
+    background-image: url(../images/settings-icon.png); 
 	position: absolute;
 	top: 10px;
 	left: 10px;
@@ -459,7 +459,7 @@
 }
 
 div#event-memory{
-	background-image: url(../images/memory-icon.png);
+	background-image: url(../images/memory-icon.png); 
 }
 
 div.ui-panel{
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools.previewer/preview/wrt_preview.html
--- a/org.symbian.tools.wrttools.previewer/preview/wrt_preview.html	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/preview/wrt_preview.html	Thu Feb 25 09:06:51 2010 -0800
@@ -209,10 +209,10 @@
 	<div id="orientationIcon"></div>
 	<div id="loaderDiv"></div>
 	<div id="NotificationDiv" class="hide">
-		<p>NOKIA WRT Simulation may not work properly on this browser, <br/>Firefox is recommended for widget preview and debugging.  <br/><br/><strong>Continue?</strong></p>
+		<p>WRT Simulation may not work properly on this browser, <br/>Chrome is recommended for widget preview and debugging.  <br/><br/><strong>Continue?</strong></p>
 	</div>
 	<div id="BrowserNotificationBar" class="hide">
-		<p><a></a>NOKIA WRT Simulation may not work properly on this browser, Firefox is recommended for widget preview and debugging</p>
+		<p><a></a>WRT Simulation may not work properly on this browser, Chrome is recommended for widget preview and debugging</p>
 	</div>
 </body>
 </html>
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/IWidgetDeployer.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/IWidgetDeployer.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/IWidgetDeployer.java	Thu Feb 25 09:06:51 2010 -0800
@@ -1,13 +1,21 @@
-/* ============================================================================
- * Copyright © 2008 Nokia. All rights reserved.
- * This material, including documentation and any related computer
- * programs, is protected by copyright controlled by Nokia. All
- * rights are reserved. Copying, including reproducing, storing,
- * adapting or translating, any or all of this material requires the
- * prior written consent of Nokia. This material also contains
- * confidential information which may not be disclosed to others
- * without the prior written consent of Nokia.
- * ============================================================================*/
+/**
+ * Copyright (c) 2009 Symbian Foundation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "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:
+ * Symbian Foundation - initial contribution.
+ * Contributors:
+ * Description:
+ * Overview:
+ * Details:
+ * Platforms/Drives/Compatibility:
+ * Assumptions/Requirement/Pre-requisites:
+ * Failures and causes:
+ */
 
 package org.symbian.tools.wrttools.core.deployer;
 
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/WidgetDeployer.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/WidgetDeployer.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/deployer/WidgetDeployer.java	Thu Feb 25 09:06:51 2010 -0800
@@ -1,13 +1,21 @@
-/* ============================================================================
- * Copyright © 2008 Nokia. All rights reserved.
- * This material, including documentation and any related computer
- * programs, is protected by copyright controlled by Nokia. All
- * rights are reserved. Copying, including reproducing, storing,
- * adapting or translating, any or all of this material requires the
- * prior written consent of Nokia. This material also contains
- * confidential information which may not be disclosed to others
- * without the prior written consent of Nokia.
- * ============================================================================*/
+/**
+ * Copyright (c) 2009 Symbian Foundation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "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:
+ * Symbian Foundation - initial contribution.
+ * Contributors:
+ * Description:
+ * Overview:
+ * Details:
+ * Platforms/Drives/Compatibility:
+ * Assumptions/Requirement/Pre-requisites:
+ * Failures and causes:
+ */
 
 package org.symbian.tools.wrttools.core.deployer;
 
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/marker/WRTMarker.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/marker/WRTMarker.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/marker/WRTMarker.java	Thu Feb 25 09:06:51 2010 -0800
@@ -38,7 +38,7 @@
 	 * WRTValidator problem marker type. This can be used to recognize those markers
 	 * in the workspace that flag problems detected by the CodeScanner plugin.
 	 */
-	public static final String WRT_PROBLEM_MARKER = Activator.PLUGIN_ID + ".com.nokia.wrt.core.validator.marker"; //$NON-NLS-1$
+	public static final String WRT_PROBLEM_MARKER = Activator.PLUGIN_ID + ".org.symbian.tools.wrttools.core.validator.marker"; //$NON-NLS-1$
 	
 //	public static final String WRT_PROBLEM_MARKER = Activator.PLUGIN_ID + ".WRTMarker"; //$NON-NLS-1$
 	
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/ExcludeFileAction.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/ExcludeFileAction.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/ExcludeFileAction.java	Thu Feb 25 09:06:51 2010 -0800
@@ -68,7 +68,7 @@
 			}
 		}
 		/*Refresh project tree when property is changed */ 
-		PlatformUI.getWorkbench().getDecoratorManager().update("com.nokia.wrt.decorator"); 
+		PlatformUI.getWorkbench().getDecoratorManager().update("org.symbian.tools.wrttools.decorator"); 
 	}
 	
 	public void selectionChanged(IAction action, ISelection selection) {
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/IncludeFileAction.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/IncludeFileAction.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/IncludeFileAction.java	Thu Feb 25 09:06:51 2010 -0800
@@ -71,7 +71,7 @@
 			}
 		}
 		/*Refresh project tree when property is changed */ 
-		PlatformUI.getWorkbench().getDecoratorManager().update("com.nokia.wrt.decorator"); 
+		PlatformUI.getWorkbench().getDecoratorManager().update("org.symbian.tools.wrttools.decorator"); 
 	}
 	
 	/**
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/PackagerZipFolder.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/PackagerZipFolder.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/PackagerZipFolder.java	Thu Feb 25 09:06:51 2010 -0800
@@ -40,8 +40,6 @@
 
 //import org.apache.commons.io.IOUtils;
 
-//import com.nokia.wrt.core.report.IMessageListener;
-//import com.nokia.wrt.core.report.Message;
 import org.symbian.tools.wrttools.core.status.IWRTConstants;
 import org.symbian.tools.wrttools.core.status.IWRTStatusListener;
 import org.symbian.tools.wrttools.core.status.WRTStatus;
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/WRTPackagerConstants.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/WRTPackagerConstants.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/packager/WRTPackagerConstants.java	Thu Feb 25 09:06:51 2010 -0800
@@ -23,7 +23,7 @@
 
 public class WRTPackagerConstants {
 	
-	public static QualifiedName EXCLUDE_PROPERTY = new QualifiedName("com.nokia.wrt.packager", "exclude");
+	public static QualifiedName EXCLUDE_PROPERTY = new QualifiedName("org.symbian.tools.wrttools.core.packager", "exclude");
 	
 
 	public static String STA_PKG_PASSED = PackagerMessages.getString("WRTPackagerConstants.success"); //$NON-NLS-1$
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/IMessageListener.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/IMessageListener.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/IMessageListener.java	Thu Feb 25 09:06:51 2010 -0800
@@ -1,13 +1,21 @@
-/* ============================================================================
- * Copyright © 2008 Nokia. All rights reserved.
- * This material, including documentation and any related computer
- * programs, is protected by copyright controlled by Nokia. All
- * rights are reserved. Copying, including reproducing, storing,
- * adapting or translating, any or all of this material requires the
- * prior written consent of Nokia. This material also contains
- * confidential information which may not be disclosed to others
- * without the prior written consent of Nokia.
- * ============================================================================*/
+/**
+ * Copyright (c) 2009 Symbian Foundation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "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:
+ * Symbian Foundation - initial contribution.
+ * Contributors:
+ * Description:
+ * Overview:
+ * Details:
+ * Platforms/Drives/Compatibility:
+ * Assumptions/Requirement/Pre-requisites:
+ * Failures and causes:
+ */
 
 package org.symbian.tools.wrttools.core.report;
 
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/messages.properties
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/messages.properties	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/report/messages.properties	Thu Feb 25 09:06:51 2010 -0800
@@ -1,7 +1,7 @@
 HtmlReportHandler.convert.title=Dashboard widget conversion report
-HtmlReportHandler.convert.description=Automatic conversions performed by the converter to match Nokia Web Runtime.
+HtmlReportHandler.convert.description=Automatic conversions performed by the converter to match Web Runtime.
 HtmlReportHandler.analysis.report.title=Dashboard widget analysis report
-HtmlReportHandler.analysis.report.description=This analysis report lists the mandatory or optional conversions needed to port the widget to Nokia Web Runtime.
+HtmlReportHandler.analysis.report.description=This analysis report lists the mandatory or optional conversions needed to port the widget to Web Runtime.
 HtmlReportHandler.file.name=File name
 HtmlReportHandler.line.number=Line number
 HtmlReportHandler.convert.action.needed=Action needed
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/status/IWRTConstants.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/status/IWRTConstants.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/status/IWRTConstants.java	Thu Feb 25 09:06:51 2010 -0800
@@ -74,11 +74,11 @@
 	/**
 	 * Locally stored Nokia DTD
 	 */
-	public static String NOKIA_PLIST_DTD = "/com/nokia/wrt/core/widgetmodel/plist-1.0.dtd";
+	public static String NOKIA_PLIST_DTD = "/org/symbian/tools/wrttools/core/widgetmodel/plist-1.0.dtd";
 	/**
 	 * Locally stored Apple DTD
 	 */
-	public static String APPLE_PLIST_DTD = "/com/nokia/wrt/core/converter/PropertyList-1.0.dtd";
+//	public static String APPLE_PLIST_DTD = "/com/nokia/wrt/core/converter/PropertyList-1.0.dtd";
 	/**
 	 * Nokia DTD in nfo.plist file 
 	 */
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/validator/WidgetValidator.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/validator/WidgetValidator.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/validator/WidgetValidator.java	Thu Feb 25 09:06:51 2010 -0800
@@ -54,7 +54,7 @@
  * .plist -  This file will be parsed to verify for the Nokia specific DTD 
  *        
  *            1. <key >DisplayName</key> - display name should exist
- *            2. <key>Identifier</key>  - value should be of com.nokia. **
+ *            2. <key>Identifier</key>  - value should be of org.symbian.tools.wrttools. **
  *            3. <key>MainHTML</key>    - value should be same as the .html file name
  * 
  *  
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/widgetmodel/WidgetModel.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/widgetmodel/WidgetModel.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/widgetmodel/WidgetModel.java	Thu Feb 25 09:06:51 2010 -0800
@@ -1272,20 +1272,7 @@
 		  try {
 				showData(" ############################################################################################################################# ");
 				model.getWidgetModel( "C:/ModelTest/Flickr");	
-//			model.getWidgetModel( "C:/ModelTest/HelloWorld");
-//			  model.getWidgetModel( "C:/ModelTest/mFootyAmazonPedia.wdgt");
-			  
-//			  model.getWidgetModel( "C:/ModelTest/mFooty");
-//			  model.getWidgetModel( "C:/ModelTest/NokiaRSS");
-//			  model.getWidgetModel( "C:/ModelTest/Widgets/bmi");
-//			  model.getWidgetModel( "C:/ModelTest/blink");
-//			  model.getWidgetModel( "C:/ModelTest/Gmail");			  
-//			  model.getWidgetModel( "C:/ModelTest/MOSH");
-//			  model.getWidgetModel( "C:/ModelTest/AmazonPedia.wdgt");
-//			  model.getWidgetModel( "C:/ModelTest/UniversalDecider");
-//			  model.getWidgetModel( "d:/ModelTest/Beep");
-//				  model.getWidgetModel( "C:/ModelTest/blankPlist");
-//				 model.getWidgetModel( "C:/ModelTest/AmazonPedia.wdgt");
+
 			  /**
 				List<String> fileNames=null;	
 				FileUtil filehelper = new FileUtil();
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/DefaultMessageListener.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/DefaultMessageListener.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/DefaultMessageListener.java	Thu Feb 25 09:06:51 2010 -0800
@@ -32,7 +32,7 @@
 	
 	
 	/* (non-Javadoc)
-	 * @see com.nokia.sdt.utils.IMessageListener#isHandlingMessage(com.nokia.sdt.utils.IMessage)
+	 * @see org.symbian.tools.wrttools.sdt.utils.IMessageListener#isHandlingMessage(org.symbian.tools.wrttools.sdt.utils.IMessage)
 	 */
 	public boolean isHandlingMessage(IMessage msg) {
 		// in case this gets added as a MessageReporting listener
@@ -40,7 +40,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see com.nokia.sdt.utils.IMessageListener#emitMessage(com.nokia.sdt.utils.IMessage)
+	 * @see org.symbian.tools.wrttools.sdt.utils.IMessageListener#emitMessage(org.symbian.tools.wrttools.sdt.utils.IMessage)
 	 */
 	public void emitMessage(IMessage msg) {
 		MessageReporting.emitMessage(msg);
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Logging.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Logging.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Logging.java	Thu Feb 25 09:06:51 2010 -0800
@@ -269,7 +269,7 @@
      * @param option
      *            The debug option to test. The plugin's symbolic name is
      *            prepended to the option name, e.g.
-     *            "com.nokia.myplugin"+"/"+option
+     *            "org.symbian.tools.wrttools.myplugin"+"/"+option
      * @return true if debugging enabled and option enabled (e.g. defined and
      *         set to "true")
      */
@@ -325,7 +325,7 @@
      *            the calling plugin, or null
      * @param option
      *            the debug option to test. The plugin name is prepended to the
-     *            option name, e.g. "com.nokia.myplugin"+"/"+option
+     *            option name, e.g. "org.symbian.tools.wrttools.myplugin"+"/"+option
      * @param status
      *            the status object
      * @see Logging#isDebugOptionEnabled(Plugin, String)
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Message.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Message.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/Message.java	Thu Feb 25 09:06:51 2010 -0800
@@ -146,56 +146,56 @@
     }
 
     /* (non-Javadoc)
-     * @see com.nokia.sdt.component.sourcegen.ISourceGenProblem#getSeverity()
+     * @see org.symbian.tools.wrttools.sdt.component.sourcegen.ISourceGenProblem#getSeverity()
      */
     public int getSeverity() {
         return severity;
     }
 
     /* (non-Javadoc)
-     * @see com.nokia.sdt.utils.IMessage#getMessageLocation()
+     * @see org.symbian.tools.wrttools.sdt.utils.IMessage#getMessageLocation()
      */
     public MessageLocation getMessageLocation() {
         return ref;
     }
     
     /* (non-Javadoc)
-     * @see com.nokia.sdt.utils.IMessage#getLocation()
+     * @see org.symbian.tools.wrttools.sdt.utils.IMessage#getLocation()
      */
     public IPath getLocation() {
         return ref != null ? ref.getLocation() : null;
     }
     
     /* (non-Javadoc)
-     * @see com.nokia.sdt.utils.IMessage#getPath()
+     * @see org.symbian.tools.wrttools.sdt.utils.IMessage#getPath()
      */
     public IPath getPath() {
         return ref != null ? ref.getPath() : null;
     }
     
     /* (non-Javadoc)
-     * @see com.nokia.sdt.component.sourcegen.ISourceGenProblem#getLineNumber()
+     * @see org.symbian.tools.wrttools.sdt.component.sourcegen.ISourceGenProblem#getLineNumber()
      */
     public int getLineNumber() {
         return ref != null ? ref.lineNumber : -1;
     }
 
     /* (non-Javadoc)
-     * @see com.nokia.sdt.sourcegen.ISourceGenMessage#getColumnNumber()
+     * @see org.symbian.tools.wrttools.sdt.sourcegen.ISourceGenMessage#getColumnNumber()
      */
     public int getColumnNumber() {
         return ref != null ? ref.columnNumber : -1;
     }
     
     /* (non-Javadoc)
-     * @see com.nokia.sdt.component.sourcegen.ISourceGenProblem#getMessage()
+     * @see org.symbian.tools.wrttools.sdt.component.sourcegen.ISourceGenProblem#getMessage()
      */
     public String getMessage() {
         return text;
     }
 
     /* (non-Javadoc)
-     * @see com.nokia.sdt.component.sourcegen.ISourceGenProblem#getMessageKey()
+     * @see org.symbian.tools.wrttools.sdt.component.sourcegen.ISourceGenProblem#getMessageKey()
      */
     public String getMessageKey() {
         return key;
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/UtilsPlugin.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/UtilsPlugin.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/UtilsPlugin.java	Thu Feb 25 09:06:51 2010 -0800
@@ -84,7 +84,7 @@
 	public ResourceBundle getResourceBundle() {
 		try {
 			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("com.nokia.sdt.utils.UtilsPluginResources"); //$NON-NLS-1$
+				resourceBundle = ResourceBundle.getBundle("org.symbian.tools.wrttools.sdt.utils.UtilsPluginResources"); //$NON-NLS-1$
 		} catch (MissingResourceException x) {
 			resourceBundle = null;
 		}
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/noexport/Messages.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/noexport/Messages.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/sdt/utils/noexport/Messages.java	Thu Feb 25 09:06:51 2010 -0800
@@ -27,7 +27,7 @@
  *
  */
 public class Messages {
-    private static final String BUNDLE_NAME = "com.nokia.sdt.utils.noexport.messages";//$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.symbian.tools.wrttools.sdt.utils.noexport.messages";//$NON-NLS-1$
 
     private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
             .getBundle(BUNDLE_NAME);
diff -r f02192d5e8f8 -r e80a4029f09f org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/Messages.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/Messages.java	Wed Feb 24 16:12:51 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/Messages.java	Thu Feb 25 09:06:51 2010 -0800
@@ -23,7 +23,7 @@
 import java.util.ResourceBundle;
 
 public class Messages {
-	private static final String BUNDLE_NAME = "com.nokia.wrt.util.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.symbian.tools.wrttools.util.messages"; //$NON-NLS-1$
 
 	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
 			.getBundle(BUNDLE_NAME);