Merge pull request #37 from mfulgo/master

Cleaning up Compiler Warnings

README.md

@@ -10,25 +10,30 @@ NetBeans Plugin for Scala
 3. Project Details
 
 ## Common Informations
-This is a plugin of the Netbeans Platform for the [scala language](http://http://www.scala-lang.org/). It targets version 2.9.x. In case of a maven scala project, no local installation of scala is needed. It enables syntax checking, syntax highlighting, auto-completion, pretty formatter, occurrences mark, brace matching, indentation, code folding, function navigator, go to declaration, project management and a shell console. It's is specially useful if you are maven user.
+This is a plugin of the Netbeans Platform for the [scala language](http://http://www.scala-lang.org/). It targets version 2.9.x. In the case of a maven scala project, no local installation of scala is needed. It enables syntax checking, syntax highlighting, auto-completion, pretty formatter, occurrences mark, brace matching, indentation, code folding, function navigator, go to declaration, project management and a shell console. It's is specially useful if you are a maven user.
 
 ### Where to start ?
-The project central point is [https://github.com/dcaoyuan/nbscala](). There are some over places, where the project was hosted before, but they are abandoned now.
+The project central point is [https://github.com/dcaoyuan/nbscala](). There are some other places, where the project was hosted before, but they are abandoned now.
 
 ### Community
-Well, till now this is mostly a one man project. Some patches were supplied by different people. But I'm still convinced, that it will gather a community soon. For questions and bug reports use the [issue tracker](https://github.com/dcaoyuan/nbscala/issues). If interested in joining the project you can write me directly or send patches/pull requests.
+Until recently, this has mostly been a one man project. Some patches were supplied by different people, but I'm still convinced that it will gather a community soon. For questions and bug reports use the [issue tracker](https://github.com/dcaoyuan/nbscala/issues). If interested in joining the project, you can write me directly or send patches/pull requests.
 
 ### Snapshot Builds
 Snapshot builds can be found here [http://sourceforge.net/projects/erlybird](). I'm using sourceforge because of their supply of higher bandwidth.
 
 ### Installation
-Make sure you don't have an old version installed. (Check your netbeans installation if there exists a directory 'nbscala'. If yes delete it)
-Download the latest release at sourceforge. Extract all files into a directory. Start Netbeans. Select Tools -> Plugins -> Downloaded -> Add Plugins ... . Select all extracted files. Accept the licence and the installation of unsigned plugins. 
+Make sure you don't have an old version installed. (Check your netbeans installation for a 'nbscala' directory: if it exists, delete it.)
+ 1. Download the latest release at sourceforge.
+ 1. Extract all files into a directory.
+ 1. Start Netbeans.
+ 1. Select Tools -> Plugins -> Downloaded -> Add Plugins...
+ 1. Select all extracted files.
+ 1. Accept the licence and the installation of unsigned plugins. 
 
 ## Build Instructions
 
 ### Requirement:
-* Java 1.6 (Java 1.7 not supported yet)
+* Java 1.6 (Java 1.7 is not supported yet)
 * Maven 2.x/3.x 
 * NetBeans 7.1
 

scala.core/src/main/scala/org/netbeans/api/language/util/ast/AstScope.scala

@@ -219,7 +219,7 @@ class AstScope(var boundsTokens: Array[Token[TokenId]]) {
     None
   }
 
-  @deprecated("use AstRootScope#findOccurrences")
+  @deprecated(message="use AstRootScope#findOccurrences", since="1.0")
   def findOccurrences(item: AstItem): Seq[AstItem] = {
     var dfn: Option[AstDfn] = item match {
       case x: AstDfn => Some(x)
@@ -240,7 +240,7 @@ class AstScope(var boundsTokens: Array[Token[TokenId]]) {
     }
   }
 
-  @deprecated("For reference only, use AstRootScope#findDfnOf")
+  @deprecated("For reference only, use AstRootScope#findDfnOf", since="1.0")
   def findDfnOf_(item: AstItem): Option[AstDfn] = {
     item match {
       case dfn: AstDfn => Some(dfn)

scala.stdplatform/src/main/java/org/netbeans/modules/scala/stdplatform/platformdefinition/J2SEPlatformImpl.java

@@ -160,6 +160,7 @@ protected J2SEPlatformImpl (String dispName, String antName, List<URL> installFo
     /**
      * @return  a descriptive, human-readable name of the platform
      */
+    @Override
     public String getDisplayName() {
         return displayName;
     }
@@ -204,6 +205,7 @@ public void setArchFolder (final String folder) {
     }
 
 
+    @Override
     public ClassPath getBootstrapLibraries() {
         synchronized (this) {
             ClassPath cp = (bootstrap == null ? null : bootstrap.get());
@@ -225,6 +227,7 @@ public ClassPath getBootstrapLibraries() {
      * out of it.
      * @return  ClassPath that represents contents of system property java.class.path.
      */
+    @Override
     public ClassPath getStandardLibraries() {
         synchronized (this) {
             ClassPath cp = (standardLibs == null ? null : standardLibs.get());
@@ -242,6 +245,7 @@ public ClassPath getStandardLibraries() {
      * where the Platform is installed. Typically it returns one folder, but
      * in some cases there can be more of them.
      */
+    @Override
     public final Collection<FileObject> getInstallFolders() {
         Collection<FileObject> result = new ArrayList<FileObject> ();
         for (Iterator<URL> it = this.installFolders.iterator(); it.hasNext();) {
@@ -255,6 +259,7 @@ public final Collection<FileObject> getInstallFolders() {
     }
 
 
+    @Override
     public final FileObject findTool(final String toolName) {
         String archFolder = getProperties().get(PLAT_PROP_ARCH_FOLDER);        
         FileObject tool = null;
@@ -272,6 +277,7 @@ public final FileObject findTool(final String toolName) {
      * Returns the location of the source of platform
      * @return List&lt;URL&gt;
      */
+    @Override
     public final ClassPath getSourceFolders () {
         return this.sources;
     }
@@ -286,6 +292,7 @@ public final void setSourceFolders (ClassPath c) {
      * Returns the location of the Javadoc for this platform
      * @return FileObject
      */
+    @Override
     public final List<URL> getJavadocFolders () {
         return this.javadoc;
     }
@@ -303,11 +310,13 @@ public final void setJavadocFolders (List<URL> c) {
         this.firePropertyChange(PROP_JAVADOC_FOLDER, null, null);
     }
 
+    @Override
     public String getVendor() {
         String s = getSystemProperties().get("java.vm.vendor"); // NOI18N
         return s == null ? "" : s; // NOI18N
     }
 
+    @Override
     public Specification getSpecification() {
         if (spec == null) {
             spec = new Specification (PLATFORM_J2SE, Util.getSpecificationVersion(this)); //NOI18N