Corrects syntax errors in last commit.

rcartwright · rcartwright · commit 8adac0e6b18d · 2012-04-09T15:53:18.000Z
The following files were changed:

M    drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
M    drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M    drjava/src/edu/rice/cs/drjava/model/DrJavaFileUtils.java


git-svn-id: file:///tmp/test-svn/branches/drscala@5521 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java b/drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
@@ -3490,7 +3490,7 @@ private File _locateClassFile() {
       
       File buildDir = getBuildDirectory();
       
-      if (buildDir != FileOps.NULL_FILE && ! roots.contain(buildDir) roots.add(buildDir);
+      if (buildDir != FileOps.NULL_FILE && ! roots.contains(buildDir)) roots.add(buildDir);
       
       // Add the current document to the beginning of the roots list
       try {
diff --git a/drjava/src/edu/rice/cs/drjava/model/DrJavaFileUtils.java b/drjava/src/edu/rice/cs/drjava/model/DrJavaFileUtils.java
@@ -37,8 +37,9 @@
 package edu.rice.cs.drjava.model;
 
 import java.io.File;
-import java.util.Set;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Set;
 import edu.rice.cs.drjava.DrJava;
 import edu.rice.cs.drjava.config.OptionConstants;
 import edu.rice.cs.plt.io.IOUtil;
@@ -174,8 +175,10 @@ public static String getExtension(String fileName) {
   }
  
   /** Adds element to list provided list does not already contain element. */
-  public static <T> ArrayList<T> addUnique(ArrayList<T> list, T element) {
-    return list.contains(element) ? list : list.add(element);
+  public static <T> boolean addUnique(ArrayList<T> list, T element) {
+    boolean result = ! list.contains(element);
+    if (result) list.add(element);
+    return result;
   }
 
 }
diff --git a/drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java b/drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
@@ -346,7 +346,7 @@ protected static String _transformCommand(String s, String command) {
     * @return true if the specified file is a source file for this compiler. */
   public boolean isSourceFileForThisCompiler(File f) {
     String fileName = f.getName();
-    return fileName.endsWith(OptionConstants.JAVA_FILE_EXTENSION)
+    return fileName.endsWith(OptionConstants.JAVA_FILE_EXTENSION);
   }
   
   /** Return the set of source file extensions that this compiler supports.

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ protected static String _transformCommand(String s, String command) {`
`346`	`346`	`* @return true if the specified file is a source file for this compiler. */`
`347`	`347`	`public boolean isSourceFileForThisCompiler(File f) {`
`348`	`348`	`String fileName = f.getName();`
`349`		`- return fileName.endsWith(OptionConstants.JAVA_FILE_EXTENSION)`
	`349`	`+ return fileName.endsWith(OptionConstants.JAVA_FILE_EXTENSION);`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`/** Return the set of source file extensions that this compiler supports.`