Merge pull request #35 from rage/lint

Cleanup whitespace, reorder imports and some minor maintenance

Author: jamo

tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadExercisesAction.java

@@ -100,4 +100,4 @@ public void bgTaskFailed(Throwable ex) {
             dialogs.displayError("Failed to download exercises.\n" + ServerErrorHelper.getServerExceptionMsg(ex));
         }
     };
-}
+}

tmc-plugin/src/fi/helsinki/cs/tmc/model/CourseDb.java

@@ -18,7 +18,6 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.swing.SwingUtilities;
 
 /**
  * Stores the list of available courses, the current course and its exercise

tmc-plugin/src/fi/helsinki/cs/tmc/model/ExerciseUpdateOverwritingDecider.java

@@ -3,15 +3,15 @@
 import fi.helsinki.cs.tmc.core.domain.Review;
 import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.logging.Logger;
 
 /**
  * Stores and periodically updates reviews.
- * 
+ *
  * <p>
  * Currently this is an in-memory-only store, so it's always initially empty when the program starts.
  */
@@ -23,23 +23,23 @@ public NewUnreadReviewEvent(Review review) {
             this.review = review;
         }
     }
-    
+
     public static final Logger logger = Logger.getLogger(CourseDb.class.getName());
     private static ReviewDb instance;
-    
+
     private TmcEventBus eventBus; //TODO: send out an event on new unread reviews
-    
+
     public static ReviewDb getInstance() {
         if (instance == null) {
             instance = new ReviewDb();
         }
         return instance;
     }
-    
-    
+
+
     private ArrayList<Review> reviews;
     private HashSet<Integer> reviewIdsNotifiedAbout;
-    
+
     private ReviewDb() {
         this(TmcEventBus.getDefault());
         this.reviews = new ArrayList<Review>();
@@ -49,10 +49,10 @@ private ReviewDb() {
     public ReviewDb(TmcEventBus eventBus) {
         this.eventBus = eventBus;
     }
-    
+
     /**
      * Updates the review store and fires an event if there is a new unread review.
-     * 
+     *
      * @return whether there were any new unread reviews (for which events were fired).
      */
     public boolean setReviews(List<Review> newReviews) {
@@ -63,22 +63,22 @@ public boolean setReviews(List<Review> newReviews) {
                 notifyAboutNewReview(review);
             }
         }
-        
+
         this.reviews.clear();
         this.reviews.addAll(newReviews);
         return newUnreadReviewsSeen;
     }
-    
+
     /**
      * Makes it so that all unread reviews cause a notification again.
      * Normally an unread review is not notified about twice.
      */
     public void forgetReviewsNotifiedAbout() {
         reviewIdsNotifiedAbout.clear();
     }
-    
+
     private void notifyAboutNewReview(Review review) {
         reviewIdsNotifiedAbout.add(review.getId());
         eventBus.post(new NewUnreadReviewEvent(review));
     }
-}
+}

tmc-plugin/src/fi/helsinki/cs/tmc/model/ReviewDb.java

@@ -1,10 +1,5 @@
 package fi.helsinki.cs.tmc.model;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.reflect.TypeToken;
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.data.FeedbackAnswer;
@@ -20,6 +15,15 @@
 import fi.helsinki.cs.tmc.utilities.http.FailedHttpResponseException;
 import fi.helsinki.cs.tmc.utilities.http.HttpTasks;
 import fi.helsinki.cs.tmc.core.TmcCore;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.reflect.TypeToken;
+
+import org.openide.modules.Modules;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -31,21 +35,23 @@
 import java.util.List;
 import java.util.Map;
 import java.util.zip.GZIPOutputStream;
-import org.openide.modules.Modules;
 
 /**
  * A frontend for the server.
+ *
+ * @deprecated Users are suggested to rely on the tmc-core instead of this implementation.
  */
+@Deprecated
 public class ServerAccess {
     public static final int API_VERSION = 7;
-    
+
     private NbTmcSettings settings;
     private CourseListParser courseListParser;
     private CourseInfoParser courseInfoParser;
     private ReviewListParser reviewListParser;
     private String clientVersion;
     private TmcCore tmcCore;
-    
+
     public ServerAccess() {
         this(NbTmcSettings.getDefault());
     }
@@ -66,30 +72,30 @@ public ServerAccess(
         this.reviewListParser = reviewListParser;
         this.clientVersion = getClientVersion();
     }
-    
+
     private static String getClientVersion() {
         return Modules.getDefault().ownerOf(ServerAccess.class).getSpecificationVersion().toString();
     }
-    
+
     public void setSettings(NbTmcSettings settings) {
         this.settings = settings;
     }
-    
+
     private String getCourseListUrl() {
         return addApiCallQueryParameters(settings.getServerAddress() + "/courses.json");
     }
-    
+
     public String addApiCallQueryParameters(String url) {
         url = UriUtils.withQueryParam(url, "api_version", ""+API_VERSION);
         url = UriUtils.withQueryParam(url, "client", "netbeans_plugin");
         url = UriUtils.withQueryParam(url, "client_version", getClientVersion());
         return url;
     }
-    
+
     private HttpTasks createHttpTasks() {
         return new HttpTasks().setCredentials(settings.getUsername(), settings.getPassword());
     }
-    
+
     public boolean hasEnoughSettings() {
         return
                 !settings.getUsername().isEmpty() &&
@@ -103,7 +109,7 @@ public boolean needsOnlyPassword() {
                 settings.getPassword().isEmpty() &&
                 !settings.getServerAddress().isEmpty();
     }
-    
+
     @Deprecated
     public CancellableCallable<List<Course>> getDownloadingCourseListTask() {
         final CancellableCallable<String> download = createHttpTasks().getForText(getCourseListUrl());
@@ -146,7 +152,7 @@ public boolean cancel() {
             }
         };
     }
-    
+
     public CancellableCallable<Void> getUnlockingTask(Course course) {
         Map<String, String> params = Collections.emptyMap();
         final CancellableCallable<String> download = createHttpTasks().postForText(getUnlockUrl(course), params);
@@ -167,16 +173,16 @@ public boolean cancel() {
             }
         };
     }
-    
+
     private String getUnlockUrl(Course course) {
         return addApiCallQueryParameters(course.getUnlockUrl());
     }
-    
+
     public CancellableCallable<byte[]> getDownloadingExerciseZipTask(Exercise exercise) {
         String zipUrl = exercise.getDownloadUrl();
         return createHttpTasks().getForBinary(zipUrl);
     }
-    
+
     public CancellableCallable<byte[]> getDownloadingExerciseSolutionZipTask(Exercise exercise) {
         String zipUrl = exercise.getSolutionDownloadUrl();
         return createHttpTasks().getForBinary(zipUrl);
@@ -192,7 +198,7 @@ public CancellableCallable<SubmissionResponse> getSubmittingExerciseTask(final E
 
         final CancellableCallable<String> upload =
                 createHttpTasks().uploadFileForTextDownload(submitUrl, params, "submission[file]", sourceZip);
-        
+
         return new CancellableCallable<SubmissionResponse>() {
             @Override
             public SubmissionResponse call() throws Exception {
@@ -202,7 +208,7 @@ public SubmissionResponse call() throws Exception {
                 } catch (FailedHttpResponseException ex) {
                     return checkForObsoleteClient(ex);
                 }
-                
+
                 JsonObject respJson = new JsonParser().parse(response).getAsJsonObject();
                 if (respJson.get("error") != null) {
                     throw new RuntimeException("Server responded with error: " + respJson.get("error"));
@@ -234,11 +240,11 @@ public SubmissionResponse(URI submissionUrl, URI pasteUrl) {
             this.pasteUrl = pasteUrl;
         }
     }
-    
+
     public CancellableCallable<String> getSubmissionFetchTask(String submissionUrl) {
         return createHttpTasks().getForText(submissionUrl);
     }
-    
+
     public CancellableCallable<List<Review>> getDownloadingReviewListTask(Course course) {
         String url = addApiCallQueryParameters(course.getReviewsUrl());
         final CancellableCallable<String> download = createHttpTasks().getForText(url);
@@ -259,7 +265,7 @@ public boolean cancel() {
             }
         };
     }
-    
+
     public CancellableCallable<Void> getMarkingReviewAsReadTask(Review review, boolean read) {
         String url = addApiCallQueryParameters(review.getUpdateUrl() + ".json");
         Map<String, String> params = new HashMap<String, String>();
@@ -269,7 +275,7 @@ public CancellableCallable<Void> getMarkingReviewAsReadTask(Review review, boole
         } else {
             params.put("mark_as_unread", "1");
         }
-        
+
         final CancellableCallable<String> task = createHttpTasks().postForText(url, params);
         return new CancellableCallable<Void>() {
             @Override
@@ -284,20 +290,20 @@ public boolean cancel() {
             }
         };
     }
-    
+
     public CancellableCallable<String> getFeedbackAnsweringJob(String answerUrl, List<FeedbackAnswer> answers) {
         final String submitUrl = addApiCallQueryParameters(answerUrl);
-        
+
         Map<String, String> params = new HashMap<String, String>();
         for (int i = 0; i < answers.size(); ++i) {
             String keyPrefix = "answers[" + i + "]";
             FeedbackAnswer answer = answers.get(i);
             params.put(keyPrefix + "[question_id]", "" + answer.getQuestion().getId());
             params.put(keyPrefix + "[answer]", answer.getAnswer());
         }
-        
+
         final CancellableCallable<String> upload = createHttpTasks().postForText(submitUrl, params);
-        
+
         return new CancellableCallable<String>() {
             @Override
             public String call() throws Exception {
@@ -314,7 +320,7 @@ public boolean cancel() {
             }
         };
     }
-    
+
     public CancellableCallable<Object> getSendEventLogJob(String spywareServerUrl, List<LoggableEvent> events) {
         String url = addApiCallQueryParameters(spywareServerUrl);
 
@@ -361,7 +367,7 @@ public byte[] eventListToPostBody(List<LoggableEvent> events) throws IOException
 
         return bufferBos.toByteArray();
     }
-    
+
     private <T> T checkForObsoleteClient(FailedHttpResponseException ex) throws ObsoleteClientException, FailedHttpResponseException {
         if (ex.getStatusCode() == 404) {
             boolean obsolete;
@@ -377,4 +383,4 @@ private <T> T checkForObsoleteClient(FailedHttpResponseException ex) throws Obso
 
         throw ex;
     }
-}
+}

tmc-plugin/src/fi/helsinki/cs/tmc/model/ServerAccess.java

@@ -1,6 +1,7 @@
 package fi.helsinki.cs.tmc.model;
 
 import fi.helsinki.cs.tmc.core.domain.Exercise;
+
 import org.netbeans.api.java.classpath.GlobalPathRegistry;
 import org.openide.filesystems.FileObject;
 
@@ -38,4 +39,4 @@ public FileObject findSourceFileFor(Exercise exercise, String className) {
         // Fall back to findResource picking a source root from any project.
         return GlobalPathRegistry.getDefault().findResource(path);
     }
-}
+}