# HG changeset patch
# User Eugene Ostroukhov <eugeneo@symbian.org>
# Date 1265743711 28800
# Node ID 94a8b7890e1461c463b82c2d205ab2748ae261b5
# Parent  be293233cdde7d5502901fc320c1cc6f86ef9094# Parent  174ae9d017fe3b7cf280e97a2704b1d6f0372ca9
Heads merge

diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools.debug.core/build.properties
--- a/org.symbian.tools.wrttools.debug.core/build.properties	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/build.properties	Tue Feb 09 11:28:31 2010 -0800
@@ -4,14 +4,12 @@
                .,\
                plugin.xml,\
                icons/main16.gif,\
-               http-content/,\
                LICENSE
 src.includes = src/,\
-               .settings/,\
                .classpath,\
                .project,\
-               LICENSE,\
-               launch/
# javac 
+               LICENSE
+# javac 
 javacSource=1.5
 javacTarget=1.5
 javacVerbose=true
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools.debug.core/plugin.xml
--- a/org.symbian.tools.wrttools.debug.core/plugin.xml	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/plugin.xml	Tue Feb 09 11:28:31 2010 -0800
@@ -196,30 +196,6 @@
         debugModel="org.symbian.debug"
         delegateClass="org.symbian.tools.wrttools.debug.internal.model.JsWatchExpressionDelegate"/>
   </extension>
-    <extension point="org.eclipse.ui.editorActions">
-    <editorContribution
-        targetID="org.chromium.debug.ui.editors.JsEditor"
-        id="org.chromium.debug.ui.editors.JsEditor.editorActions">
-      <action
-          toolbarPath="evaluationGroup"
-          id="org.chromium.debug.ui.SnippetInspect"
-          definitionId="org.chromium.debug.ui.commands.Inspect"
-          class="org.chromium.debug.ui.actions.JsInspectSnippetAction"
-          enablesFor="+"
-          label="Inspect"
-          tooltip="Inspect Result of Evaluating Selected Text">
-        <enablement>
-          <and>
-            <systemProperty
-                name="org.chromium.debug.ui.debuggerActive"
-                value="true"/>
-            <objectClass
-                name="org.eclipse.jface.text.ITextSelection"/>
-          </and>
-        </enablement>
-      </action>
-    </editorContribution>
-  </extension>
     <extension
           point="org.eclipse.wst.sse.ui.breakpoint">
        <breakpointContribution
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WidgetLaunchDelegate.java
--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WidgetLaunchDelegate.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WidgetLaunchDelegate.java	Tue Feb 09 11:28:31 2010 -0800
@@ -18,7 +18,6 @@
  *******************************************************************************/
 package org.symbian.tools.wrttools.debug.internal.launch;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.URI;
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/property/PropertyTester.java
--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/property/PropertyTester.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/property/PropertyTester.java	Tue Feb 09 11:28:31 2010 -0800
@@ -19,7 +19,6 @@
 package org.symbian.tools.wrttools.debug.internal.property;
 
 import org.eclipse.core.resources.IResource;
-import org.symbian.tools.wrttools.debug.internal.ChromeDebugUtils;
 import org.symbian.tools.wrttools.util.ProjectUtils;
 
 public class PropertyTester extends org.eclipse.core.expressions.PropertyTester {
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewCSSFileAction.java
--- a/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewCSSFileAction.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewCSSFileAction.java	Tue Feb 09 11:28:31 2010 -0800
@@ -9,10 +9,10 @@
 import org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard;
 import org.eclipse.wst.jsdt.ui.actions.AbstractOpenWizardAction;
 
+@SuppressWarnings("restriction")
 public class NewCSSFileAction extends AbstractOpenWizardAction implements
 		IWorkbenchWindowActionDelegate {
 
-	@SuppressWarnings("restriction")
 	@Override
 	protected INewWizard createWizard() throws CoreException {
 		return new NewCSSWizard();
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewHTMLFileAction.java
--- a/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewHTMLFileAction.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewHTMLFileAction.java	Tue Feb 09 11:28:31 2010 -0800
@@ -9,10 +9,10 @@
 import org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard;
 import org.eclipse.wst.jsdt.ui.actions.AbstractOpenWizardAction;
 
+@SuppressWarnings("restriction")
 public class NewHTMLFileAction extends AbstractOpenWizardAction implements
 		IWorkbenchWindowActionDelegate {
 
-	@SuppressWarnings("restriction")
 	@Override
 	protected INewWizard createWizard() throws CoreException {
 		return new NewHTMLWizard();
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewJSFileAction.java
--- a/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewJSFileAction.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewJSFileAction.java	Tue Feb 09 11:28:31 2010 -0800
@@ -9,10 +9,10 @@
 import org.eclipse.wst.jsdt.internal.ui.wizards.NewJSWizard;
 import org.eclipse.wst.jsdt.ui.actions.AbstractOpenWizardAction;
 
+@SuppressWarnings("restriction")
 public class NewJSFileAction extends AbstractOpenWizardAction implements
 		IWorkbenchWindowActionDelegate {
 
-	@SuppressWarnings("restriction")
 	@Override
 	protected INewWizard createWizard() throws CoreException {
 		return new NewJSWizard();
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/internal/validation/CssBuildValidator.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/internal/validation/CssBuildValidator.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/internal/validation/CssBuildValidator.java	Tue Feb 09 11:28:31 2010 -0800
@@ -28,7 +28,6 @@
 import org.eclipse.wst.validation.ValidationState;
 import org.eclipse.wst.validation.ValidatorMessage;
 import org.symbian.tools.wrttools.Activator;
-import org.w3c.*;
 import org.w3c.css.css.DocumentParser;
 import org.w3c.css.css.StyleSheet;
 import org.w3c.css.parser.CssError;
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/libraries/WrtKitLibInitializer.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/libraries/WrtKitLibInitializer.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/core/libraries/WrtKitLibInitializer.java	Tue Feb 09 11:28:31 2010 -0800
@@ -18,7 +18,6 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.wst.jsdt.core.IJavaScriptProject;
 import org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer;
 import org.eclipse.wst.jsdt.core.compiler.libraries.LibraryLocation;
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/WRTNavigatorContentProvider.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/WRTNavigatorContentProvider.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/WRTNavigatorContentProvider.java	Tue Feb 09 11:28:31 2010 -0800
@@ -27,6 +27,7 @@
 import org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorContentProvider;
 import org.symbian.tools.wrttools.Activator;
 
+@SuppressWarnings({"restriction", "unchecked"})
 public class WRTNavigatorContentProvider extends JavaNavigatorContentProvider
 		implements ITreeContentProvider {
 	private static final class RootResourceFinder implements
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/ProjectUtils.java	Tue Feb 09 11:28:31 2010 -0800
@@ -49,6 +49,7 @@
 import org.symbian.tools.wrttools.Activator;
 import org.symbian.tools.wrttools.WidgetProjectNature;
 
+@SuppressWarnings("restriction")
 public class ProjectUtils {
 	private static final String DEFAULT_APTANA_WORKSPACE = "Aptana Studio Workspace";
 	public static final String PREVIEW_FOLDER = "preview";
@@ -66,7 +67,6 @@
 		return workspace.isPrefixOf(project);
 	}
 	
-	@SuppressWarnings("restriction")
 	public static IProject createWrtProject(String name, URI uri,
 			IProgressMonitor monitor) throws CoreException {
 		uri = isDefaultProjectLocation(uri) ? null
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/AptanaProjectLocationWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/AptanaProjectLocationWizardPage.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/AptanaProjectLocationWizardPage.java	Tue Feb 09 11:28:31 2010 -0800
@@ -103,6 +103,7 @@
 import org.symbian.tools.wrttools.Activator;
 import org.symbian.tools.wrttools.util.ProjectUtils;
 
+@SuppressWarnings({"restriction", "unchecked"})
 public class AptanaProjectLocationWizardPage extends WizardPage implements
 		IOverwriteQuery {
 
@@ -297,9 +298,6 @@
 
 	private final static String STORE_ARCHIVE_SELECTED = "WizardProjectsImportPage.STORE_ARCHIVE_SELECTED"; //$NON-NLS-1$
 
-	// dialog store id constants
-	private final static String STORE_COPY_PROJECT_ID = "WizardProjectsImportPage.STORE_COPY_PROJECT_ID"; //$NON-NLS-1$
-
 	private Text archivePathField;
 
 	private Button browseArchivesButton;
@@ -577,7 +575,6 @@
 		return true;
 	}
 
-	@SuppressWarnings("unchecked")
 	private List filterEntries(List fileSystemObjects) {
 		List result = new LinkedList();
 		for (Object object : fileSystemObjects) {
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WgzImportWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WgzImportWizardPage.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WgzImportWizardPage.java	Tue Feb 09 11:28:31 2010 -0800
@@ -39,6 +39,7 @@
 import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea;
 import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMessageReporter;
 
+@SuppressWarnings("restriction")
 public class WgzImportWizardPage extends WizardPage {
 	private final IFile file;
 
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WrtKitLibraryWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WrtKitLibraryWizardPage.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WrtKitLibraryWizardPage.java	Tue Feb 09 11:28:31 2010 -0800
@@ -14,6 +14,7 @@
 import org.eclipse.wst.jsdt.ui.wizards.IJsGlobalScopeContainerPageExtension2;
 import org.eclipse.wst.jsdt.ui.wizards.NewElementWizardPage;
 
+@SuppressWarnings("restriction")
 public class WrtKitLibraryWizardPage extends NewElementWizardPage implements IJsGlobalScopeContainerPage, IJsGlobalScopeContainerPageExtension, IJsGlobalScopeContainerPageExtension2  {
 
 	private static final String CONTAINER_ID="org.symbian.wrtkit";
diff -r 174ae9d017fe -r 94a8b7890e14 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WrtWidgetWizard.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WrtWidgetWizard.java	Tue Feb 09 10:54:46 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WrtWidgetWizard.java	Tue Feb 09 11:28:31 2010 -0800
@@ -45,7 +45,6 @@
 import org.eclipse.core.runtime.IExecutableExtension;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -56,8 +55,6 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
 import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.wst.jsdt.core.IIncludePathEntry;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
 import org.eclipse.wst.jsdt.core.JavaScriptCore;
 import org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer;
 import org.symbian.tools.wrttools.Activator;