# HG changeset patch
# User Eugene Ostroukhov <eostroukhov@gmail.com>
# Date 1264706834 28800
# Node ID 22f918ed49f782f4ddd87df53d75e7beb06cd210
# Parent  bb6160d0b6f2c8269bae74ff671fc6f90ee935d6
Java5 is now supported

diff -r bb6160d0b6f2 -r 22f918ed49f7 Chrome-Java6-Patch.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Chrome-Java6-Patch.txt	Thu Jan 28 11:27:14 2010 -0800
@@ -0,0 +1,142 @@
+diff -r bb6160d0b6f2 org.chromium.debug.core/META-INF/MANIFEST.MF
+--- a/org.chromium.debug.core/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
++++ b/org.chromium.debug.core/META-INF/MANIFEST.MF	Thu Jan 28 11:23:45 2010 -0800
+@@ -20,4 +20,5 @@
+  org.chromium.debug.core.model,
+  org.chromium.debug.core.util
+ Eclipse-LazyStart: true
+-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
++Bundle-RequiredExecutionEnvironment: J2SE-1.5,
++ JavaSE-1.6
+diff -r bb6160d0b6f2 org.chromium.debug.ui/META-INF/MANIFEST.MF
+--- a/org.chromium.debug.ui/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
++++ b/org.chromium.debug.ui/META-INF/MANIFEST.MF	Thu Jan 28 11:23:45 2010 -0800
+@@ -16,4 +16,5 @@
+  org.chromium.debug.core;bundle-version="0.1.5",
+  org.chromium.sdk;bundle-version="0.1.5"
+ Bundle-ActivationPolicy: lazy
+-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
++Bundle-RequiredExecutionEnvironment: J2SE-1.5,
++ JavaSE-1.6
+diff -r bb6160d0b6f2 org.chromium.sdk/META-INF/MANIFEST.MF
+--- a/org.chromium.sdk/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
++++ b/org.chromium.sdk/META-INF/MANIFEST.MF	Thu Jan 28 11:23:45 2010 -0800
+@@ -13,4 +13,5 @@
+  org.chromium.sdk.internal.tools.v8.processor;x-internal:=true,
+  org.chromium.sdk.internal.tools.v8.request;x-internal:=true,
+  org.chromium.sdk.internal.transport;x-internal:=true
+-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
++Bundle-RequiredExecutionEnvironment: J2SE-1.5,
++ JavaSE-1.6
+diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java
+--- a/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java	Thu Jan 28 10:18:04 2010 -0800
++++ b/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java	Thu Jan 28 11:23:45 2010 -0800
+@@ -17,6 +17,7 @@
+ 
+ import org.chromium.sdk.Browser;
+ import org.chromium.sdk.BrowserTab;
++import org.chromium.sdk.ChromiumIOException;
+ import org.chromium.sdk.TabDebugEventListener;
+ import org.chromium.sdk.UnsupportedVersionException;
+ import org.chromium.sdk.Version;
+@@ -102,7 +103,7 @@
+       try {
+         serverVersionString = devToolsHandler.version(OPERATION_TIMEOUT_MS);
+       } catch (TimeoutException e) {
+-        throw new IOException("Failed to get protocol version from remote", e);
++        throw new ChromiumIOException("Failed to get protocol version from remote", e);
+       }
+       if (serverVersionString == null) {
+         throw new UnsupportedVersionException(BrowserImpl.PROTOCOL_VERSION, null);
+@@ -291,7 +292,7 @@
+         ticket = connectInternal();
+       } catch (UnsupportedVersionException e) {
+         // This exception should have happened on tab fetcher creation.
+-        throw new IOException("Unexpected version problem", e);
++        throw new ChromiumIOException("Unexpected version problem", e);
+       }
+ 
+       Session session = ticket.getSession();
+diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java
+--- a/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java	Thu Jan 28 10:18:04 2010 -0800
++++ b/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java	Thu Jan 28 11:23:45 2010 -0800
+@@ -8,6 +8,7 @@
+ 
+ import org.chromium.sdk.Browser;
+ import org.chromium.sdk.BrowserTab;
++import org.chromium.sdk.ChromiumIOException;
+ import org.chromium.sdk.DebugEventListener;
+ import org.chromium.sdk.TabDebugEventListener;
+ import org.chromium.sdk.internal.tools.ToolHandler;
+@@ -89,7 +90,7 @@
+       try {
+         result = devToolSessionManager.attachToTab();
+       } catch (AttachmentFailureException e) {
+-        throw new IOException(e);
++        throw new ChromiumIOException(e);
+       }
+       if (Result.OK != result) {
+         throw new IOException("Failed to attach with result: " + result);
+diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java
+--- a/org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java	Thu Jan 28 10:18:04 2010 -0800
++++ b/org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java	Thu Jan 28 11:23:45 2010 -0800
+@@ -12,6 +12,7 @@
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ 
++import org.chromium.sdk.ChromiumIOException;
+ import org.chromium.sdk.DebugEventListener;
+ import org.chromium.sdk.StandaloneVm;
+ import org.chromium.sdk.UnsupportedVersionException;
+@@ -121,9 +122,9 @@
+     } catch (InterruptedException e) {
+       throw new RuntimeException(e);
+     } catch (ExecutionException e) {
+-      throw new IOException("Failed to get version", e);
++      throw new ChromiumIOException("Failed to get version", e);
+     } catch (TimeoutException e) {
+-      throw new IOException("Timed out waiting for version", e);
++      throw new ChromiumIOException("Timed out waiting for version", e);
+     }
+ 
+     String versionString = remoteInfo.getProtocolVersion();
+diff -r bb6160d0b6f2 org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java
+--- a/org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java	Thu Jan 28 10:18:04 2010 -0800
++++ b/org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java	Thu Jan 28 11:23:45 2010 -0800
+@@ -10,8 +10,8 @@
+ import java.util.concurrent.ExecutionException;
+ import java.util.concurrent.Future;
+ import java.util.concurrent.FutureTask;
+-import java.util.concurrent.RunnableFuture;
+ 
++import org.chromium.sdk.ChromiumIOException;
+ import org.chromium.sdk.LineReader;
+ import org.chromium.sdk.internal.transport.Message.MalformedMessageException;
+ 
+@@ -85,7 +85,7 @@
+       return runnableFuture;
+     }
+ 
+-    private final RunnableFuture<RemoteInfo> runnableFuture =
++    private final FutureTask<RemoteInfo> runnableFuture =
+         new FutureTask<RemoteInfo>(new HandshakeTaks());
+ 
+     private LineReader input = null;
+@@ -100,7 +100,7 @@
+       } catch (InterruptedException e) {
+         throw new RuntimeException(e);
+       } catch (ExecutionException e) {
+-        throw new IOException("Failed to perform handshake", e);
++        throw new ChromiumIOException("Failed to perform handshake", e);
+       }
+ 
+     }
+@@ -111,7 +111,7 @@
+         try {
+           message = Message.fromBufferedReader(input);
+         } catch (MalformedMessageException e) {
+-          throw new IOException("Unrecognized handshake message from remote", e);
++          throw new ChromiumIOException("Unrecognized handshake message from remote", e);
+         }
+         if (message == null) {
+           throw new IOException("End of stream");
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.chromium.debug.core/META-INF/MANIFEST.MF
--- a/org.chromium.debug.core/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.debug.core/META-INF/MANIFEST.MF	Thu Jan 28 11:27:14 2010 -0800
@@ -20,4 +20,5 @@
  org.chromium.debug.core.model,
  org.chromium.debug.core.util
 Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.chromium.debug.ui/META-INF/MANIFEST.MF
--- a/org.chromium.debug.ui/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.debug.ui/META-INF/MANIFEST.MF	Thu Jan 28 11:27:14 2010 -0800
@@ -16,4 +16,5 @@
  org.chromium.debug.core;bundle-version="0.1.5",
  org.chromium.sdk;bundle-version="0.1.5"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.chromium.sdk/META-INF/MANIFEST.MF
--- a/org.chromium.sdk/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/META-INF/MANIFEST.MF	Thu Jan 28 11:27:14 2010 -0800
@@ -13,4 +13,5 @@
  org.chromium.sdk.internal.tools.v8.processor;x-internal:=true,
  org.chromium.sdk.internal.tools.v8.request;x-internal:=true,
  org.chromium.sdk.internal.transport;x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.chromium.sdk/src/org/chromium/sdk/ChromiumIOException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.chromium.sdk/src/org/chromium/sdk/ChromiumIOException.java	Thu Jan 28 11:27:14 2010 -0800
@@ -0,0 +1,23 @@
+package org.chromium.sdk;
+
+import java.io.IOException;
+
+public class ChromiumIOException extends IOException {
+	private static final long serialVersionUID = 1L;
+
+	private final Throwable cause;
+
+	public ChromiumIOException(Throwable cause) {
+		this.cause = cause;
+	}
+	
+	public ChromiumIOException(String message, Throwable cause) {
+		super(message);
+		this.cause = cause;
+	}
+	
+	@Override
+	public Throwable getCause() {
+		return cause;
+	}
+}
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserImpl.java	Thu Jan 28 11:27:14 2010 -0800
@@ -17,6 +17,7 @@
 
 import org.chromium.sdk.Browser;
 import org.chromium.sdk.BrowserTab;
+import org.chromium.sdk.ChromiumIOException;
 import org.chromium.sdk.TabDebugEventListener;
 import org.chromium.sdk.UnsupportedVersionException;
 import org.chromium.sdk.Version;
@@ -102,7 +103,7 @@
       try {
         serverVersionString = devToolsHandler.version(OPERATION_TIMEOUT_MS);
       } catch (TimeoutException e) {
-        throw new IOException("Failed to get protocol version from remote", e);
+        throw new ChromiumIOException("Failed to get protocol version from remote", e);
       }
       if (serverVersionString == null) {
         throw new UnsupportedVersionException(BrowserImpl.PROTOCOL_VERSION, null);
@@ -291,7 +292,7 @@
         ticket = connectInternal();
       } catch (UnsupportedVersionException e) {
         // This exception should have happened on tab fetcher creation.
-        throw new IOException("Unexpected version problem", e);
+        throw new ChromiumIOException("Unexpected version problem", e);
       }
 
       Session session = ticket.getSession();
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/BrowserTabImpl.java	Thu Jan 28 11:27:14 2010 -0800
@@ -8,6 +8,7 @@
 
 import org.chromium.sdk.Browser;
 import org.chromium.sdk.BrowserTab;
+import org.chromium.sdk.ChromiumIOException;
 import org.chromium.sdk.DebugEventListener;
 import org.chromium.sdk.TabDebugEventListener;
 import org.chromium.sdk.internal.tools.ToolHandler;
@@ -89,7 +90,7 @@
       try {
         result = devToolSessionManager.attachToTab();
       } catch (AttachmentFailureException e) {
-        throw new IOException(e);
+        throw new ChromiumIOException(e);
       }
       if (Result.OK != result) {
         throw new IOException("Failed to attach with result: " + result);
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/StandaloneVmImpl.java	Thu Jan 28 11:27:14 2010 -0800
@@ -12,6 +12,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.chromium.sdk.ChromiumIOException;
 import org.chromium.sdk.DebugEventListener;
 import org.chromium.sdk.StandaloneVm;
 import org.chromium.sdk.UnsupportedVersionException;
@@ -121,9 +122,9 @@
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     } catch (ExecutionException e) {
-      throw new IOException("Failed to get version", e);
+      throw new ChromiumIOException("Failed to get version", e);
     } catch (TimeoutException e) {
-      throw new IOException("Timed out waiting for version", e);
+      throw new ChromiumIOException("Timed out waiting for version", e);
     }
 
     String versionString = remoteInfo.getProtocolVersion();
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java	Thu Jan 28 11:27:14 2010 -0800
@@ -10,8 +10,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
-import java.util.concurrent.RunnableFuture;
 
+import org.chromium.sdk.ChromiumIOException;
 import org.chromium.sdk.LineReader;
 import org.chromium.sdk.internal.transport.Message.MalformedMessageException;
 
@@ -85,7 +85,7 @@
       return runnableFuture;
     }
 
-    private final RunnableFuture<RemoteInfo> runnableFuture =
+    private final FutureTask<RemoteInfo> runnableFuture =
         new FutureTask<RemoteInfo>(new HandshakeTaks());
 
     private LineReader input = null;
@@ -100,7 +100,7 @@
       } catch (InterruptedException e) {
         throw new RuntimeException(e);
       } catch (ExecutionException e) {
-        throw new IOException("Failed to perform handshake", e);
+        throw new ChromiumIOException("Failed to perform handshake", e);
       }
 
     }
@@ -111,7 +111,7 @@
         try {
           message = Message.fromBufferedReader(input);
         } catch (MalformedMessageException e) {
-          throw new IOException("Unrecognized handshake message from remote", e);
+          throw new ChromiumIOException("Unrecognized handshake message from remote", e);
         }
         if (message == null) {
           throw new IOException("End of stream");
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.debug.core/.settings/org.eclipse.jdt.core.prefs
--- a/org.symbian.tools.wrttools.debug.core/.settings/org.eclipse.jdt.core.prefs	Thu Jan 28 10:18:04 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#Thu Dec 17 15:43:16 EET 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.debug.core/META-INF/MANIFEST.MF
--- a/org.symbian.tools.wrttools.debug.core/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/META-INF/MANIFEST.MF	Thu Jan 28 11:27:14 2010 -0800
@@ -17,5 +17,6 @@
  org.eclipse.jface.text;bundle-version="3.5.0",
  org.symbian.tools.wrttools.previewer;bundle-version="1.0.0",
  org.symbian.tools.wrttools;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/DebugConnectionJob.java
--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/DebugConnectionJob.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/DebugConnectionJob.java	Thu Jan 28 11:27:14 2010 -0800
@@ -64,7 +64,6 @@
 		target.fireTerminateEvent();
 	}
 
-	@Override
 	public boolean browserRunning(URI uri) throws CoreException {
 		JavascriptVmEmbedder.ConnectionToRemote remoteServer = createConnectionToRemote(
 				port, launch, uri);
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WRTProjectWorkspaceBridge.java
--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WRTProjectWorkspaceBridge.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WRTProjectWorkspaceBridge.java	Thu Jan 28 11:27:14 2010 -0800
@@ -32,19 +32,16 @@
 			this.project = project;
 		}
 
-		@Override
 		public WorkspaceBridge attachedToVm(DebugTargetImpl debugTargetImpl,
 				JavascriptVm javascriptVm) {
 			return new WRTProjectWorkspaceBridge(debugTargetImpl, javascriptVm,
 					project);
 		}
 
-		@Override
 		public String getDebugModelIdentifier() {
 			return DEBUG_MODEL_ID;
 		}
 
-		@Override
 		public JsLabelProvider getLabelProvider() {
 			return new WrtLabelProvider();
 		}
@@ -69,32 +66,26 @@
 		launch.setSourceLocator(sourceLocator);
 	}
 
-	@Override
 	public void beforeDetach() {
 		// Do nothing
 	}
 
-	@Override
 	public BreakpointHandler getBreakpointHandler() {
 		return breakpointHandler;
 	}
 
-	@Override
 	public IFile getScriptResource(Script script) {
 		return resourceManager.getResource(script);
 	}
 
-	@Override
 	public void handleVmResetEvent() {
 		resourceManager.clear();
 	}
 
-	@Override
 	public void launchRemoved() {
 		// Do nothing
 	}
 
-	@Override
 	public void reloadScriptsAtStart() {
 		javascriptVm.getScripts(new ScriptsCallback() {
 			public void failure(String errorMessage) {
@@ -134,7 +125,6 @@
 		});
 	}
 
-	@Override
 	public void scriptLoaded(Script newScript) {
 		resourceManager.addScript(newScript);
 	}
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WrtLabelProvider.java
--- a/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WrtLabelProvider.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.debug.core/src/org/symbian/tools/wrttools/debug/internal/launch/WrtLabelProvider.java	Thu Jan 28 11:27:14 2010 -0800
@@ -12,7 +12,6 @@
 
 public class WrtLabelProvider implements JsLabelProvider {
 
-	@Override
 	public String getStackFrameLabel(StackFrame stackFrame)
 			throws DebugException {
 		CallFrame callFrame = stackFrame.getCallFrame();
@@ -32,13 +31,11 @@
 		return name;
 	}
 
-	@Override
 	public String getTargetLabel(DebugTargetImpl debugTarget)
 			throws DebugException {
 		return "WRT Runtime";
 	}
 
-	@Override
 	public String getThreadLabel(JavascriptThread thread) throws DebugException {
 		return NLS.bind("JavaScript Thread ({0})",
 				(thread.isSuspended() ? "Suspended" : "Running")); //$NON-NLS-1$ //$NON-NLS-2$
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.jseditors/.settings/org.eclipse.jdt.core.prefs
--- a/org.symbian.tools.wrttools.jseditors/.settings/org.eclipse.jdt.core.prefs	Thu Jan 28 10:18:04 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#Wed Aug 26 17:30:15 PDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.jseditors/META-INF/MANIFEST.MF
--- a/org.symbian.tools.wrttools.jseditors/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.jseditors/META-INF/MANIFEST.MF	Thu Jan 28 11:27:14 2010 -0800
@@ -19,7 +19,8 @@
  org.eclipse.jface,
  org.eclipse.ui.workbench
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
 Bundle-ClassPath: net.sf.wdte.ui.jar,
  net.sf.wdte.core.jar,
  net.sf.wdte.js.core.jar,
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.previewer/.settings/org.eclipse.jdt.core.prefs
--- a/org.symbian.tools.wrttools.previewer/.settings/org.eclipse.jdt.core.prefs	Thu Jan 28 10:18:04 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#Wed Jan 13 17:40:14 PST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.previewer/META-INF/MANIFEST.MF
--- a/org.symbian.tools.wrttools.previewer/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/META-INF/MANIFEST.MF	Thu Jan 28 11:27:14 2010 -0800
@@ -15,7 +15,8 @@
  org.symbian.tools.wrttools;bundle-version="1.0.0",
  org.mozilla.xulrunner;bundle-version="1.9.1";resolution:=optional
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
 Export-Package: org.symbian.tools.wrttools.previewer,
  org.symbian.tools.wrttools.previewer.http
 Import-Package: javax.servlet;version="2.5.0",
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/jsdt/WrtContainerInitializer.java
--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/jsdt/WrtContainerInitializer.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/jsdt/WrtContainerInitializer.java	Thu Jan 28 11:27:14 2010 -0800
@@ -8,7 +8,6 @@
 public class WrtContainerInitializer extends JsGlobalScopeContainerInitializer {
 	public static final String CONTAINER_ID = "org.symbian.wrt";
 	
-	@Override
 	public LibraryLocation getLibraryLocation() {
 		return new WrtLibraryLocation();
 	}
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/jsdt/WrtLibraryLocation.java
--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/jsdt/WrtLibraryLocation.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/jsdt/WrtLibraryLocation.java	Thu Jan 28 11:27:14 2010 -0800
@@ -21,18 +21,15 @@
 		"widget.js".toCharArray(),
 	};
 	
-	@Override
 	public char[][] getLibraryFileNames() {
 		return FILE_NAMES;
 	}
 
-	@Override
 	public String getLibraryPath(String name) {
 		System.out.println(name);
 		return null;
 	}
 
-	@Override
 	public String getLibraryPath(char[] name) {
 		URL entry = FileLocator.find(PreviewerPlugin.getDefault().getBundle(), LIBRARIES_PATH.append(new String(name)), null);
 		if (entry != null) {
@@ -47,12 +44,10 @@
 		return null;
 	}
 
-	@Override
 	public IPath getLibraryPathInPlugin() {
 		return LIBRARIES_PATH;
 	}
 
-	@Override
 	public IPath getWorkingLibPath() {
 		return new Path(getLibraryPath(""));
 	}
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/AbstractPreviewPage.java
--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/AbstractPreviewPage.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/AbstractPreviewPage.java	Thu Jan 28 11:27:14 2010 -0800
@@ -82,7 +82,6 @@
 	public synchronized void process(Collection<IFile> files) {
 		if (!refreshScheduled && needsRefresh(files)) {
 			asyncExec(new Runnable() {
-				@Override
 				public void run() {
 					if (toggleState) {
 						refresh();
@@ -118,7 +117,6 @@
 					.getImageDescriptor(Images.GREEN_SYNC));
 			if (focusControl != null) {
 				asyncExec(new Runnable() {
-					@Override
 					public void run() {
 						focusControl.setFocus();
 					}
@@ -154,23 +152,19 @@
 		return toggleState ? "Disable preview autorefresh" : "Enable preview autorefresh";
 	}
 
-	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		// Do nothing
 	}
 
-	@Override
 	public ISelection getSelection() {
 		return new StructuredSelection(project);
 	}
 
-	@Override
 	public void removeSelectionChangedListener(
 			ISelectionChangedListener listener) {
 		// Do nothing
 	}
 
-	@Override
 	public void setSelection(ISelection selection) {
 		// Do nothing
 	}
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java
--- a/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/src/org/symbian/tools/wrttools/previewer/preview/PreviewView.java	Thu Jan 28 11:27:14 2010 -0800
@@ -45,7 +45,6 @@
 			IResourceDeltaVisitor {
 		public final Collection<IFile> files = new HashSet<IFile>();
 
-		@Override
 		public boolean visit(IResourceDelta delta) throws CoreException {
 			if (isRelevantResource(delta.getResource())) {
 				files.add((IFile) delta.getResource());
@@ -61,7 +60,6 @@
 	}
 
 	private final IResourceChangeListener resourceListener = new IResourceChangeListener() {
-		@Override
 		public void resourceChanged(IResourceChangeEvent event) {
 			ChangedResourcesCollector visitor = new ChangedResourcesCollector();
 			try {
@@ -120,7 +118,7 @@
 	}
 
 	private IPreviewPage createPreviewPage(IProject project) {
-		if (!CoreUtil.isMac() && Platform.getBundle(MozillaPreviewPage.XUL_RUNNER_BUNDLE) != null) {
+		if (Platform.getBundle(MozillaPreviewPage.XUL_RUNNER_BUNDLE) != null) {
 			return new MozillaPreviewPage(project, this);
 		} else {
 			return new SwtBrowserPreviewPage(project, this);
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.product/.settings/org.eclipse.jdt.core.prefs
--- a/org.symbian.tools.wrttools.product/.settings/org.eclipse.jdt.core.prefs	Thu Jan 28 10:18:04 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#Wed Jan 13 10:11:07 PST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.product/META-INF/MANIFEST.MF
--- a/org.symbian.tools.wrttools.product/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.product/META-INF/MANIFEST.MF	Thu Jan 28 11:27:14 2010 -0800
@@ -15,5 +15,6 @@
  org.eclipse.wst.css.ui;bundle-version="1.0.400",
  org.eclipse.wst.html.ui;bundle-version="1.0.400",
  org.eclipse.wst.xml.ui;bundle-version="1.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch
--- a/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.product/launch/WRT IDE Product (Mac OS X).launch	Thu Jan 28 11:27:14 2010 -0800
@@ -9,11 +9,11 @@
 <booleanAttribute key="clearConfig" value="false"/>
 <booleanAttribute key="clearws" value="false"/>
 <booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/WRT IDE (Product) (1)"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/WRT IDE Product (Mac OS X)"/>
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-wrt-ide.product"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms128m -Xmx768m -XX:MaxPermSize=192m"/>
@@ -21,7 +21,7 @@
 <stringAttribute key="product" value="org.symbian.tools.wrttools.product.product"/>
 <stringAttribute key="productFile" value="\org.symbian.tools.wrttools.product\wrt-ide.product"/>
 <booleanAttribute key="restart" value="false"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.wst.validation.ui@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.mortbay.jetty.util@default:default,javax.xml.rpc@default:default,org.eclipse.help.base@default:default,org.eclipse.wst.jsdt.support.ie@default:default,javax.activation*1.1.0.v200906290531@default:default,org.eclipse.dstore.core@default:default,org.eclipse.core.databinding@default:default,org.sat4j.core@default:default,org.eclipse.wst.xml.xpath.core@default:default,org.apache.commons.collections@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.rcp@default:default,javax.xml.stream@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.jsdt.doc@default:default,org.objectweb.asm@default:default,org.apache.xml.resolver@default:default,org.eclipse.ui.editors@default:default,javax.xml.soap@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.wst.command.env.infopop@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.wst.html.ui.infopop@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.mozilla.xpcom@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.help.webapp@default:default,org.mortbay.jetty.server@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jsch.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.equinox.p2.core@default:default,org.apache.commons.codec@default:default,org.eclipse.update.configurator@3:true,org.eclipse.help@default:default,org.eclipse.wst.jsdt.web.ui@default:default,javax.xml@default:default,org.eclipse.debug.core@default:default,org.eclipse.team.cvs.ssh@default:default,org.eclipse.core.commands@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.wst.command.env.core@default:default,javax.transaction@default:false,org.eclipse.ui.net@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.ui.ide@default:default,org.eclipse.help.ui@default:default,org.apache.xml.serializer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.resources@default:default,org.eclipse.platform@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.update.ui@default:default,org.sat4j.pb@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.p2.updatesite@default:default,javax.persistence@default:default,org.eclipse.osgi.services@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.wst.xml.xpath2.processor@default:default,org.apache.velocity@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.apache.commons.httpclient@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.xml.xpath.ui@default:default,commonj.sdo@default:default,org.eclipse.jem.util@default:default,org.eclipse.help.appserver@default:default,org.eclipse.wst.common.environment@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,javax.wsdl@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.ecf@default:default,org.apache.bcel@default:default,org.eclipse.ui@default:default,org.eclipse.wst.doc.user@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.platform.doc.user@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.p2.director@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.util@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.wst.command.env@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.epp.package.jee@default:default,org.eclipse.wst.common.ui@default:default,javax.servlet.jsp@default:default,org.eclipse.search@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.compare.core@default:default,org.apache.commons.jxpath@default:default,org.eclipse.emf@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.gef@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.expressions@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.text@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.team.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.wst.internet.monitor.ui@default:default,org.apache.jasper@default:default,org.eclipse.core.boot@default:default,org.apache.commons.lang*2.3.0.v200803061910@default:default,javax.servlet@default:default,org.eclipse.ui.forms@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.wst.common.core@default:default,org.apache.commons.net@default:default,org.hamcrest.core@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.apache.lucene.analysis@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.edit@default:default,org.apache.lucene@default:default,org.jdom@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.jem@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.mozilla.xulrunner@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.emf@default:default,net.sourceforge.lpg.lpgjavaruntime@default:default,org.eclipse.equinox.common@2:true,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.draw2d@default:default,org.eclipse.wst.xml.core@default:default,javax.mail*1.4.0.v200905040518@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.sse.core@default:default,org.apache.commons.discovery@default:default,org.eclipse.swt@default:default,org.eclipse.ecf.ssl@default:false,java_cup.runtime@default:default,org.eclipse.wst.html.core@default:default,org.apache.commons.logging@default:default,org.apache.axis@default:default,org.eclipse.compare@default:default,org.eclipse.wst.validation.infopop@default:default,org.eclipse.wtp.epp.package.jee.intro@default:default,org.apache.log4j@default:default,org.eclipse.jface.databinding@default:default,javax.xml.bind@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.team.cvs.core@default:default,org.apache.oro@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.net4j.jms.api@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.core.jobs@default:default,org.apache.xalan@default:default,org.eclipse.cvs@default:default,org.eclipse.wst.command.env.doc.user@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.emf.ecore.xmi@default:default,org.apache.commons.el@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.xerces@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources.compatibility@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.app@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.ui.views@default:default,org.eclipse.wst.common.snippets@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding.property@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.views@default:default,org.eclipse.help.webapp@default:default,org.eclipse.cvs@default:default,org.apache.lucene@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.wst.command.env.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.apache.commons.jxpath@default:default,org.eclipse.swt@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.help.ui@default:default,org.mozilla.xulrunner@default:default,org.eclipse.wst.jsdt.support.ie@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.wtp.epp.package.jee.intro@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.http.registry@default:default,org.apache.lucene.analysis@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.wst.jsdt.support.firefox@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.director.app@default:default,javax.transaction@default:false,org.eclipse.core.boot@default:default,org.eclipse.wst.doc.user@default:default,org.apache.xalan@default:default,javax.xml.soap@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.security.macosx@default:false,org.apache.commons.collections@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.help@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.mozilla.xpcom@default:default,javax.servlet@default:default,org.eclipse.ui.console@default:default,org.eclipse.net4j.jms.api@default:default,org.eclipse.wst.xmleditor.doc.user@default:default,org.eclipse.jface.text@default:default,org.apache.xerces@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ui.forms@default:default,javax.xml.stream@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.wst.xml.ui.infopop@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jface@default:default,org.eclipse.emf.common@default:default,org.eclipse.compare@default:default,org.eclipse.swt.cocoa.macosx@default:false,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.launcher@default:default,org.mozilla.xulrunner.carbon.macosx@default:false,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.snippets@default:default,org.eclipse.equinox.p2.updatesite@default:default,javax.mail*1.4.0.v200905040518@default:default,org.eclipse.core.variables@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.wst.html.ui.infopop@default:default,org.eclipse.core.databinding@default:default,org.eclipse.wst.sse.doc.user@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.jem.util@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.gef@default:default,org.eclipse.ui.ide@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.wst.xml.xpath.core@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.command.env@default:default,org.eclipse.ui.browser@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.emf.ecore.xmi@default:default,org.apache.commons.lang*2.3.0.v200803061910@default:default,org.eclipse.ui.editors@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.xml.xpath2.processor@default:default,org.eclipse.wst.validation.infopop@default:default,org.eclipse.wst.xml.ui@default:default,org.apache.commons.logging@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.emf@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.wst.standard.schemas@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.apache.axis@default:default,javax.xml.rpc@default:default,com.ibm.icu@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.apache.commons.el@default:default,org.eclipse.update.ui@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.search@default:default,org.eclipse.epp.package.jee@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.text@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.draw2d@default:default,org.eclipse.wst.command.env.doc.user@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.wst.internet.monitor.ui@default:default,org.apache.xml.resolver@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.core.resources@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.wst.common.ui@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,javax.xml.bind@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.core.commands@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.wst.xml.xpath.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.discovery@default:default,javax.activation*1.1.0.v200906290531@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.ui.intro@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.wst.common.infopop@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.equinox.launcher.cocoa.macosx@default:false,org.eclipse.emf.mapping.ui@default:default,org.apache.oro@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.internet.cache@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.compare.core@default:default,org.eclipse.wst.sse.ui.infopop@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.sat4j.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.commons.net@default:default,java_cup.runtime@default:default,com.jcraft.jsch@default:default,org.eclipse.dstore.core@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.common.uriresolver@default:default,org.objectweb.asm@default:default,org.eclipse.jsch.core@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.wst.jsdt.doc@default:default,org.apache.bcel@default:default,org.eclipse.wst.command.env.infopop@default:default,org.eclipse.ui.cocoa@default:false,commonj.sdo@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.update.core@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.util@default:default,org.eclipse.emf.databinding@default:default,net.sourceforge.lpg.lpgjavaruntime@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.rcp@default:default,org.eclipse.equinox.security@default:default,org.eclipse.osgi.util@default:default,org.hamcrest.core@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.wst.jsdt.web.core@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.core@default:default,org.apache.velocity@default:default,org.jdom@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.help.base@default:default,org.apache.log4j@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.net@default:default,org.eclipse.platform@default:default,javax.wsdl@default:default,org.eclipse.ui@default:default,org.eclipse.jface.databinding@default:default,org.apache.xml.serializer@default:default,javax.xml@default:default,org.apache.jasper@default:default,org.apache.commons.httpclient@default:default,org.eclipse.team.ui@default:default,org.eclipse.core.expressions@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.wst.jsdt.web.ui@default:default,org.apache.commons.codec@default:default,org.eclipse.team.cvs.ssh@default:default,org.eclipse.help.appserver@default:default,javax.persistence@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.sat4j.pb@default:default,org.eclipse.ecf@default:default,org.eclipse.jem@default:default,org.eclipse.jsch.ui@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="org.chromium.sdk@default:default,org.symbian.tools.wrttools@default:default,org.symbian.tools.wrttools.debug.core@default:default,org.symbian.tools.wrttools.previewer@default:default,org.chromium.debug.ui@default:default,org.chromium.debug.core@default:default,org.symbian.tools.wrttools.product@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
diff -r bb6160d0b6f2 -r 22f918ed49f7 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	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewCSSFileAction.java	Thu Jan 28 11:27:14 2010 -0800
@@ -18,24 +18,20 @@
 		return new NewCSSWizard();
 	}
 
-	@Override
 	public void dispose() {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public void init(IWorkbenchWindow window) {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public void run(IAction action) {
 		run();
 	}
 
-	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		// TODO Auto-generated method stub
 
diff -r bb6160d0b6f2 -r 22f918ed49f7 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	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewHTMLFileAction.java	Thu Jan 28 11:27:14 2010 -0800
@@ -18,24 +18,20 @@
 		return new NewHTMLWizard();
 	}
 
-	@Override
 	public void dispose() {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public void init(IWorkbenchWindow window) {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public void run(IAction action) {
 		run();
 	}
 
-	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		// TODO Auto-generated method stub
 
diff -r bb6160d0b6f2 -r 22f918ed49f7 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	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewJSFileAction.java	Thu Jan 28 11:27:14 2010 -0800
@@ -18,24 +18,20 @@
 		return new NewJSWizard();
 	}
 
-	@Override
 	public void dispose() {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public void init(IWorkbenchWindow window) {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public void run(IAction action) {
 		run();
 	}
 
-	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		// TODO Auto-generated method stub
 
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewWRTProjectAction.java
--- a/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewWRTProjectAction.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/actions/NewWRTProjectAction.java	Thu Jan 28 11:27:14 2010 -0800
@@ -13,18 +13,15 @@
 public class NewWRTProjectAction extends AbstractOpenWizardAction implements
 		IWorkbenchWindowActionDelegate {
 
-	@Override
 	public void init(IWorkbenchWindow window) {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public void run(IAction action) {
 		run();
 	}
 
-	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		// TODO Auto-generated method stub
 
@@ -35,7 +32,6 @@
 		return new WrtWidgetWizard();
 	}
 
-	@Override
 	public void dispose() {
 		// TODO Auto-generated method stub
 		
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/perspective/WRTPerspective.java
--- a/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/perspective/WRTPerspective.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools.product/src/org/symbian/tools/wrttools/product/perspective/WRTPerspective.java	Thu Jan 28 11:27:14 2010 -0800
@@ -11,7 +11,6 @@
 
 public class WRTPerspective implements IPerspectiveFactory {
 
-	@Override
 	public void createInitialLayout(IPageLayout layout) {
  		String editorArea = layout.getEditorArea();
 		
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/.settings/org.eclipse.jdt.core.prefs
--- a/org.symbian.tools.wrttools/.settings/org.eclipse.jdt.core.prefs	Thu Jan 28 10:18:04 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#Thu Jan 07 13:06:13 PST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/META-INF/MANIFEST.MF
--- a/org.symbian.tools.wrttools/META-INF/MANIFEST.MF	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/META-INF/MANIFEST.MF	Thu Jan 28 11:27:14 2010 -0800
@@ -23,7 +23,8 @@
  org.eclipse.wst.xml.core;bundle-version="1.1.400",
  org.eclipse.ui.navigator;bundle-version="3.4.0",
  org.eclipse.ui.navigator.resources;bundle-version="3.4.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.velocity;version="1.5.0",
  org.apache.velocity.app;version="1.5.0",
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/FavoriteItemType.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/FavoriteItemType.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/FavoriteItemType.java	Thu Jan 28 11:27:14 2010 -0800
@@ -55,7 +55,6 @@
     	public IFavoriteItem loadFavorite(String info) {
     		return null;
     	}
-		@Override
 		public int compareTo(Object o) {
 			// TODO Auto-generated method stub
 			return 0;
@@ -75,7 +74,6 @@
 		public IFavoriteItem loadFavorite(String info) {
 			return FavoriteResource.loadFavorite(this, info);
 		}
-		@Override
 		public int compareTo(Object o) {
 			// TODO Auto-generated method stub
 			return 0;
@@ -95,7 +93,6 @@
 		public IFavoriteItem loadFavorite(String info) {
 			return FavoriteResource.loadFavorite(this, info);
 		}
-		@Override
 		public int compareTo(Object o) {
 			// TODO Auto-generated method stub
 			return 0;
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/FavoriteResource.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/FavoriteResource.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/FavoriteResource.java	Thu Jan 28 11:27:14 2010 -0800
@@ -36,43 +36,36 @@
 		// TODO Auto-generated constructor stub
 	}
 
-	@Override
 	public String getInfo() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	@Override
 	public String getLocation() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	@Override
 	public String getName() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	@Override
 	public FavoriteItemType getType() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	@Override
 	public boolean isFavoriteFor(Object obj) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
-	@Override
 	public void setName(String newName) {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public Object getAdapter(Class adapter) {
 		// TODO Auto-generated method stub
 		return null;
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/FavoritesManager.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/FavoritesManager.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/FavoritesManager.java	Thu Jan 28 11:27:14 2010 -0800
@@ -148,7 +148,6 @@
 		}
 	}
 	
-	@Override
 	public void resourceChanged(IResourceChangeEvent e) {
 		// process events here
 	}
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/Hashset.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/Hashset.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/Hashset.java	Thu Jan 28 11:27:14 2010 -0800
@@ -27,79 +27,66 @@
 		// TODO Auto-generated constructor stub
 	}
 
-	@Override
 	public boolean add(IFavoriteItem e) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
-	@Override
 	public boolean addAll(Collection<? extends IFavoriteItem> c) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
-	@Override
 	public void clear() {
 		// TODO Auto-generated method stub
 
 	}
 
-	@Override
 	public boolean contains(Object o) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
-	@Override
 	public boolean containsAll(Collection<?> c) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
-	@Override
 	public boolean isEmpty() {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
-	@Override
 	public Iterator<IFavoriteItem> iterator() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	@Override
 	public boolean remove(Object o) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
-	@Override
 	public boolean removeAll(Collection<?> c) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
-	@Override
 	public boolean retainAll(Collection<?> c) {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
-	@Override
 	public int size() {
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
-	@Override
 	public Object[] toArray() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	@Override
 	public <T> T[] toArray(T[] a) {
 		// TODO Auto-generated method stub
 		return null;
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/MyResourceChangeReporter.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/MyResourceChangeReporter.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/MyResourceChangeReporter.java	Thu Jan 28 11:27:14 2010 -0800
@@ -31,7 +31,6 @@
 
    public class MyResourceChangeReporter implements IResourceChangeListener {
 
-	  @Override
 	  // TODO Auto-generated method stub
       public void resourceChanged(IResourceChangeEvent event) {
          IResource res = event.getResource();
@@ -84,7 +83,6 @@
 
    class DeltaPrinter implements IResourceDeltaVisitor {
 
-	   @Override
 	      public boolean visit(IResourceDelta delta) throws CoreException{
 	         IResource res = delta.getResource();
 	         switch (delta.getKind()) {
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/PropertiesAuditorNature.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/PropertiesAuditorNature.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/builder/PropertiesAuditorNature.java	Thu Jan 28 11:27:14 2010 -0800
@@ -38,7 +38,6 @@
 	private IProject project;
 	private static final String NATURE_ID = "org.eclipse.wst.jsdt.core.jsNature";
 	
-	@Override
 	public void configure() throws CoreException {
 		// TODO Auto-generated method stub
 		PropertiesFileAuditor.addBuilderToProject(project); 
@@ -60,20 +59,17 @@
 
 	}
 
-	@Override
 	public void deconfigure() throws CoreException {
 		// TODO Auto-generated method stub
 		PropertiesFileAuditor.removeBuilderFromProject(project);
 		PropertiesFileAuditor.deleteAuditMarkers(project);
 	}
 
-	@Override
 	public IProject getProject() {
 		// TODO Auto-generated method stub
 		return project;
 	}
 
-	@Override
 	public void setProject(IProject project) {
 		// TODO Auto-generated method stub
 		this.project = project;
diff -r bb6160d0b6f2 -r 22f918ed49f7 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	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/navigator/WRTNavigatorContentProvider.java	Thu Jan 28 11:27:14 2010 -0800
@@ -62,7 +62,6 @@
 					.getFolder(p1);
 		}
 
-		@Override
 		public boolean visit(IResourceDelta delta) throws CoreException {
 			if ((delta.getKind() & (IResourceDelta.ADDED | IResourceDelta.REMOVED)) != 0) {
 				resource = getCommonAncestor(resource, delta.getResource()
@@ -75,7 +74,6 @@
 
 	private static final class TreeElementsComparator implements
 			Comparator<Object> {
-		@Override
 		public int compare(Object o1, Object o2) {
 			IResource res1 = getResource(o1);
 			IResource res2 = getResource(o2);
@@ -119,7 +117,6 @@
 	}
 
 	private IResourceChangeListener listener = new IResourceChangeListener() {
-		@Override
 		public void resourceChanged(IResourceChangeEvent event) {
 			RootResourceFinder visitor = new RootResourceFinder();
 			try {
@@ -220,7 +217,6 @@
 
 	protected void refreshViewer(final IResource resource) {
 		viewer.getControl().getDisplay().asyncExec(new Runnable() {
-			@Override
 			public void run() {
 				((TreeViewer) viewer).refresh(resource);
 			}
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/CompoundValidator.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/CompoundValidator.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/CompoundValidator.java	Thu Jan 28 11:27:14 2010 -0800
@@ -38,7 +38,6 @@
 		System.arraycopy(validators, 0, this.validators, 1, validators.length);
 	}
 
-	@Override
 	public IStatus validate(Object value) {
 		IStatus status = Status.OK_STATUS;
 		
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/RegexpValidator.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/RegexpValidator.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/util/RegexpValidator.java	Thu Jan 28 11:27:14 2010 -0800
@@ -38,7 +38,6 @@
 		this.pattern = Pattern.compile(pattern);
 	}
 
-	@Override
 	public IStatus validate(Object value) {
 		String string = value.toString();
 		Matcher matcher = pattern.matcher(string);
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/AbstractDataBindingPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/AbstractDataBindingPage.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/AbstractDataBindingPage.java	Thu Jan 28 11:27:14 2010 -0800
@@ -49,7 +49,6 @@
 			this.propertyName = propertyName;
 		}
 
-		@Override
 		public IStatus validate(Object value) {
 			if (isActive()) {
 				if (value == null || value.toString().trim().length() == 0) {
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/AptanaProjectsImportWizard.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/AptanaProjectsImportWizard.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/AptanaProjectsImportWizard.java	Thu Jan 28 11:27:14 2010 -0800
@@ -61,12 +61,10 @@
 		addPage(mainPage);
 	}
 
-	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		// Do nothing
 	}
 
-	@Override
 	public void setInitializationData(IConfigurationElement config,
 			String propertyName, Object data) throws CoreException {
 		this.config = config;
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/FlickrProjectDetailsWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/FlickrProjectDetailsWizardPage.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/FlickrProjectDetailsWizardPage.java	Thu Jan 28 11:27:14 2010 -0800
@@ -39,7 +39,6 @@
 	}
 
 	public static final class Factory implements IWizardPageFactory { 
-		@Override
 		public WRTProjectDetailsWizardPage createPage(WizardContext context,
 				DataBindingContext bindingContext) {
 			return new FlickrProjectDetailsWizardPage(context, bindingContext);
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/RssReaderProjectDetailsWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/RssReaderProjectDetailsWizardPage.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/RssReaderProjectDetailsWizardPage.java	Thu Jan 28 11:27:14 2010 -0800
@@ -46,7 +46,6 @@
 	}
 	
 	public static final class Factory implements IWizardPageFactory {
-		@Override
 		public WRTProjectDetailsWizardPage createPage(WizardContext context,
 				DataBindingContext bindingContext) {
 			return new RssReaderProjectDetailsWizardPage(context, bindingContext);
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectDetailsWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectDetailsWizardPage.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectDetailsWizardPage.java	Thu Jan 28 11:27:14 2010 -0800
@@ -40,7 +40,6 @@
 		// Subclasses will override
 	}
 	
-	@Override
 	public void createControl(Composite parent) {
 		Composite root = new Composite(parent, SWT.NONE);
 		WizardPageSupport.create(this, bindingContext);
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectFilesWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectFilesWizardPage.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectFilesWizardPage.java	Thu Jan 28 11:27:14 2010 -0800
@@ -30,7 +30,6 @@
 		super(context, bindingContext, "WRTApplicationFiles", "New WRT Application Project", null, "Specify Symbian WRT application file names");
 	}
 
-	@Override
 	public void createControl(Composite parent) {
 		Composite root = new Composite(parent, SWT.NONE);
 		WizardPageSupport.create(this, bindingContext);
diff -r bb6160d0b6f2 -r 22f918ed49f7 org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectTemplateWizardPage.java
--- a/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectTemplateWizardPage.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WRTProjectTemplateWizardPage.java	Thu Jan 28 11:27:14 2010 -0800
@@ -71,7 +71,6 @@
 		setDescription("Select template that will be used to populate your new project");
 	}
 	
-	@Override
 	public void createControl(Composite parent) {
 		ProjectTemplate[] allTemplates = ProjectTemplate.getAllTemplates();
 
@@ -99,8 +98,6 @@
 		templatesData.bottom = new FormAttachment(70, 0);
 		templates.getControl().setLayoutData(templatesData);
 		templates.addSelectionChangedListener(new ISelectionChangedListener() {
-			
-			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				IStructuredSelection selection = (IStructuredSelection)event.getSelection();
 				final ProjectTemplate 
@@ -109,7 +106,6 @@
 			}
 		});
 		templates.addDoubleClickListener(new IDoubleClickListener() {
-			@Override
 			public void doubleClick(DoubleClickEvent arg0) {
 				switchWizardPage();
 			}
@@ -143,7 +139,6 @@
 	protected void switchWizardPage() {
 		Display display = getShell().getDisplay();
 		display.asyncExec(new Runnable() {
-			@Override
 			public void run() {
 				IWizardPage nextPage = getWizard().getNextPage(WRTProjectTemplateWizardPage.this);
 				getContainer().showPage(nextPage);
diff -r bb6160d0b6f2 -r 22f918ed49f7 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	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/WrtWidgetWizard.java	Thu Jan 28 11:27:14 2010 -0800
@@ -75,11 +75,9 @@
 		setWindowTitle("New WRT Widget");
 	}
 
-	@Override
 	public boolean performFinish() {
 		try {
 			getContainer().run(true, true, new IRunnableWithProgress() {
-				@Override
 				public void run(IProgressMonitor monitor)
 						throws InvocationTargetException, InterruptedException {
 					action(monitor);
@@ -97,7 +95,6 @@
 	protected void action(IProgressMonitor monitor) {
 		try {
 			ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
-				@Override
 				public void run(IProgressMonitor monitor) throws CoreException {
 					createAndInitProject(monitor);
 				}
@@ -192,7 +189,6 @@
 		f.create(contents, true, new SubProgressMonitor(monitor, 1));
 	}
 
-	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		context = new WizardContext();
 		bindingContext = new DataBindingContext();
@@ -261,7 +257,6 @@
 		return workspace.isPrefixOf(project);
 	}
 	
-	@Override
 	public void setInitializationData(IConfigurationElement config,
 			String propertyName, Object data) throws CoreException {
 		this.config = config;