move to Java 1.6

net.sf.eclipsefp.haskell-feature/feature.xml

@@ -58,13 +58,21 @@ available at http://www.eclipse.org/legal/epl-v10.html.
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.core.resources" version="3.5.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface.text" version="3.5.2" match="greaterOrEqual"/>
+      <import plugin="net.sf.eclipsefp.haskell.ui"/>
+      <import plugin="net.sf.eclipsefp.haskell.haddock"/>
+      <import plugin="net.sf.eclipsefp.haskell.core"/>
+      <import plugin="net.sf.eclipsefp.haskell.util"/>
+      <import plugin="net.sf.eclipsefp.haskell.debug.ui"/>
+      <import plugin="net.sf.eclipsefp.haskell.debug.core"/>
+      <import plugin="net.sf.eclipsefp.haskell.ghccompiler"/>
+      <import plugin="net.sf.eclipsefp.haskell.compat"/>
    </requires>
 
    <plugin
          id="net.sf.eclipsefp.haskell"
          download-size="0"
          install-size="0"
-         version="2.0.3"
+         version="2.2.4"
          unpack="false"/>
 
    <plugin
@@ -92,7 +100,7 @@ available at http://www.eclipse.org/legal/epl-v10.html.
          id="net.sf.eclipsefp.haskell.hugs"
          download-size="0"
          install-size="0"
-         version="2.2.1"
+         version="2.2.4"
          unpack="false"/>
 
    <plugin
@@ -120,7 +128,7 @@ available at http://www.eclipse.org/legal/epl-v10.html.
          id="net.sf.eclipsefp.haskell.compat"
          download-size="0"
          install-size="0"
-         version="2.0.2"
+         version="2.2.4"
          unpack="false"/>
 
    <plugin
@@ -134,21 +142,21 @@ available at http://www.eclipse.org/legal/epl-v10.html.
          id="net.sf.eclipsefp.haskell.browser"
          download-size="0"
          install-size="0"
-         version="2.2.3"
+         version="2.2.4"
          unpack="false"/>
 
    <plugin
          id="net.sf.eclipsefp.haskell.hlint"
          download-size="0"
          install-size="0"
-         version="2.2.3"
+         version="2.2.4"
          unpack="false"/>
 
    <plugin
          id="net.sf.eclipsefp.haskell.profiler"
          download-size="0"
          install-size="0"
-         version="2.2.0"
+         version="2.2.4"
          unpack="false"/>
 
    <plugin

net.sf.eclipsefp.haskell.browser/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.browser; singleton:=true
-Bundle-Version: 2.2.3
+Bundle-Version: 2.2.4
 Bundle-Localization: plugin
 Bundle-Activator: net.sf.eclipsefp.haskell.browser.BrowserPlugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.2.0",
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.2.0",
  net.sf.eclipsefp.haskell.util;bundle-version="2.0.3",
  org.eclipse.jface.text;bundle-version="3.2.0"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %bundleVendor
 Export-Package: net.sf.eclipsefp.haskell.browser,
  net.sf.eclipsefp.haskell.browser.items

net.sf.eclipsefp.haskell.buildwrapper/META-INF/MANIFEST.MF

@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide;bundle-version="3.5.2",
  org.eclipse.jface.text;bundle-version="3.5.2",
  org.eclipse.ui.editors;bundle-version="3.5.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: net.sf.eclipsefp.haskell.buildwrapper,
  net.sf.eclipsefp.haskell.buildwrapper.types,

net.sf.eclipsefp.haskell.compat/META-INF/MANIFEST.MF

@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.compat;singleton:=true
-Bundle-Version: 2.0.2
+Bundle-Version: 2.2.4
 Bundle-Activator: net.sf.eclipsefp.haskell.compat.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: net.sf.eclipsefp.haskell.compat
 Import-Package: org.osgi.framework;version="1.5.0"
 Bundle-Localization: plugin

net.sf.eclipsefp.haskell.core/META-INF/MANIFEST.MF

@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
  net.sf.eclipsefp.haskell.buildwrapper;bundle-version="2.2.0"
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: net.sf.eclipsefp.haskell.core;uses:="org.osgi.framework,org.eclipse.core.runtime",
  net.sf.eclipsefp.haskell.core.builder;uses:="org.eclipse.core.resources,org.eclipse.core.runtime",
  net.sf.eclipsefp.haskell.core.cabal;uses:="net.sf.eclipsefp.haskell.core.internal.hsimpl",

net.sf.eclipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/builder/BuildVisitor.java

@@ -16,6 +16,7 @@ class BuildVisitor extends Visitor implements IResourceVisitor {
     super( monitor );
   }
 
+  @Override
   public boolean visit( final IResource res ) {
     //build the specified resource.
     //return true to continue visiting children.

net.sf.eclipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/builder/CleanOutFoldersOperation.java

@@ -28,6 +28,7 @@ class CleanOutFoldersOperation implements IWorkspaceRunnable {
     this.project = project;
   }
 
+  @Override
   public void run( final IProgressMonitor mon ) throws CoreException {
     mon.beginTask( CoreTexts.cleanOutFoldersOperation_cleaning, 12 );
     try {
@@ -68,6 +69,7 @@ private void shrubOutFolder( final IProgressMonitor mon )
   ////////////////
 
   private static class FolderCleaner implements IResourceProxyVisitor {
+    @Override
     public boolean visit( final IResourceProxy proxy ) throws CoreException {
       if( proxy.getType() == IResource.FILE ) {
         IResource resource = proxy.requestResource();

net.sf.eclipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/builder/DeltaBuildVisitor.java

@@ -23,6 +23,7 @@ class DeltaBuildVisitor extends Visitor implements IResourceDeltaVisitor {
     super( monitor );
   }
 
+  @Override
   public boolean visit( final IResourceDelta delta ) {
     // we return whether to visit the children also
     boolean result = false;

net.sf.eclipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/cabal/CabalImplementationManager.java

@@ -225,6 +225,7 @@ public static List<CabalImplementation> autoDetectCabalImpls() {
     List<CabalImplementation> impls=new ArrayList<CabalImplementation>();
     for (File loc : candidateLocs) {
       File[] files = loc.listFiles( new FilenameFilter() {
+        @Override
         public boolean accept( final File dir, final String name ) {
           // Catch anything starting with "cabal", because MacPorts (and others) may install
           // "cabal-1.8.0" as a legitimate cabal executable.

net.sf.eclipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/cabal/CabalPackageVersion.java

@@ -34,6 +34,7 @@ public boolean isLast(){
     return index==ref.getVersions().size()-1;
   }
 
+  @Override
   public int compareTo( final CabalPackageVersion o ) {
     String s1=toString();
     String s2=o.toString();

net.sf.eclipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/compiler/CompilerManager.java

@@ -156,7 +156,8 @@ public static List<String> getExtensions(){
 	 * returns the ids of all compilers registered with the compiler manager.
 	 * </p>
 	 */
-	public String[] getRegisteredCompilers() {
+	@Override
+  public String[] getRegisteredCompilers() {
 		int size = htRegisteredCompilers.size();
 		String[] result = new String[size + 1];
 		htRegisteredCompilers.keySet().toArray(result);
@@ -169,7 +170,8 @@ public String[] getRegisteredCompilers() {
 	 * returns the currently used Haskell compiler.
 	 * </p>
 	 */
-	public IHaskellCompiler getCompiler() {
+	@Override
+  public IHaskellCompiler getCompiler() {
 		return htInstalledCompilers.get(selectedCompiler);
 	}
 
@@ -179,7 +181,8 @@ public IHaskellCompiler getCompiler() {
 	 * selected and will be the one returned by getCompiler() from now on.
 	 * </p>
 	 */
-	public boolean selectCompiler(final String id) throws Exception {
+	@Override
+  public boolean selectCompiler(final String id) throws Exception {
 		boolean result = false;
 		if (htInstalledCompilers.containsKey(id)) {
 			selectedCompiler = id;
@@ -205,7 +208,8 @@ public boolean selectCompiler(final String id) throws Exception {
 	 * plugin.xml with the CompilerManager.
 	 * </p>
 	 */
-	public void registerCompiler(final String id, final IConfigurationElement info) {
+	@Override
+  public void registerCompiler(final String id, final IConfigurationElement info) {
 		htRegisteredCompilers.put(id, info);
 	}
 
@@ -215,7 +219,8 @@ public void registerCompiler(final String id, final IConfigurationElement info)
 	 * (if it is a registered compiler).
 	 * </p>
 	 */
-	public String getCompilerName( final String id ) {
+	@Override
+  public String getCompilerName( final String id ) {
     String result;
     if( id.equals( DEFAULT ) ) {
       result = CoreTexts.compilerManager_noNamePlaceHolder;
@@ -226,7 +231,8 @@ public String getCompilerName( final String id ) {
     return result;
   }
 
-	public IHsImplementation getCurrentHsImplementation() {
+	@Override
+  public IHsImplementation getCurrentHsImplementation() {
 	  return currentHsImplementation;
 	}
 
@@ -259,7 +265,8 @@ private void installCompilerExecutable(final String id,
 		installCompiler(id, haskellCompiler);
 	}
 
-	public void installCompiler(final String id,
+	@Override
+  public void installCompiler(final String id,
 			final IHaskellCompiler haskellCompiler) {
 		htInstalledCompilers.put(id, new ListenableCompilerDecorator(
 				haskellCompiler));
@@ -269,11 +276,13 @@ private void fireHCEx(final String message) throws HaskellCoreException {
 		throw new HaskellCoreException(message);
 	}
 
-	public void addCompilerListener(final ICompilerListener listener) {
+	@Override
+  public void addCompilerListener(final ICompilerListener listener) {
 		getSelectedCompilerDecorator().addListener(listener);
 	}
 
-	public void removeCompilerListener(final ICompilerListener listener) {
+	@Override
+  public void removeCompilerListener(final ICompilerListener listener) {
 		getSelectedCompilerDecorator().removeListener(listener);
 	}
 
@@ -320,6 +329,7 @@ private Map<String, IHsImplementation> loadImpls() {
 
   private void listenForImplPref() {
     HaskellCorePlugin.instanceScopedPreferences().addPreferenceChangeListener( new IPreferenceChangeListener() {
+      @Override
       public void preferenceChange( final PreferenceChangeEvent event ) {
         String key = event.getKey();
         if(    ICorePreferenceNames.HS_IMPLEMENTATIONS.equals( key )
@@ -335,6 +345,7 @@ public static List<IHsImplementation> autodetectGHCImpls(){
     List<IHsImplementation> impls=new ArrayList<IHsImplementation>();
     for (File loc : candidateLocs) {
       File[] files = loc.listFiles( new FilenameFilter() {
+        @Override
         public boolean accept( final File dir, final String name ) {
           return name.equals( GHCSyntax.GHC );
         }

net.sf.eclipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/compiler/DefaultHaskellCompiler.java

@@ -29,11 +29,13 @@
  */
 public class DefaultHaskellCompiler implements IHaskellCompiler {
 
-	public void compile(final IFile file, final Writer outputWriter) {
+	@Override
+  public void compile(final IFile file, final Writer outputWriter) {
 	  // unused
 	}
 
-	public void compile(final IFile file) {
+	@Override
+  public void compile(final IFile file) {
 		compile(file, new NullWriter());
 	}
 }

net.sf.eclipsefp.haskell.core/src/net/sf/eclipsefp/haskell/core/compiler/HsImplementation.java

@@ -58,22 +58,27 @@ public IStatus[] validate() {
   // interface methods of IInstalledHaskellImplementation
   // /////////////////////////////////////////////////////
 
+  @Override
   public String getName() {
     return name;
   }
 
+  @Override
   public HsImplementationType getType() {
     return type;
   }
 
+  @Override
   public String getVersion() {
     return version;
   }
 
+  @Override
   public String getLibDir() {
    return libDir;
   }
 
+  @Override
   public String getBinDir() {
     return binDir;
   }