More cleanup

Author: jamo

tmc-plugin/src/fi/helsinki/cs/tmc/events/TmcEventBus.java

@@ -16,7 +16,7 @@ public class TmcEventBus {
     public static TmcEventBus getDefault() {
         return instance;
     }
-    
+
     // Factory method to avoid accidental creation when getDefault was meant.
     public static TmcEventBus createNewInstance() {
         return new TmcEventBus();
@@ -28,22 +28,22 @@ public static TmcEventBus createNewInstance() {
     private static interface Wrapper {
         public boolean wraps(TmcEventListener that);
     }
-    
+
     private static class WeakListener extends TmcEventListener implements Wrapper {
         private WeakReference<TmcEventListener> weakRef;
-        
+
         public WeakListener(TmcEventListener listener) {
             this.weakRef = new WeakReference<TmcEventListener>(listener);
         }
-        
+
         @Override
         public void receive(TmcEvent event) throws Throwable {
             TmcEventListener listener = weakRef.get();
             if (listener != null) {
                 listener.receive(event);
             }
         }
-        
+
         @Override
         public boolean mayBeUnsubscribed() {
             return weakRef.get() == null;
@@ -54,16 +54,16 @@ public boolean wraps(TmcEventListener that) {
             return that == weakRef.get();
         }
     }
-    
+
     private static class DependentListener extends TmcEventListener implements Wrapper {
         private TmcEventListener listener;
         private WeakReference<Object> weakRef;
-        
+
         public DependentListener(TmcEventListener listener, Object dependency) {
             this.listener = listener;
             this.weakRef = new WeakReference<Object>(dependency);
         }
-        
+
         @Override
         public void receive(TmcEvent event) throws Throwable {
             listener.receive(event);
@@ -91,15 +91,15 @@ private TmcEventBus() {
     public synchronized void subscribeStrongly(TmcEventListener listener) {
         this.listeners.add(listener);
     }
-    
+
     /**
      * Subscribes a weak reference to a listener.
      * After all normal references to the listener disappear, it will eventually be unsubscribed.
      */
     public synchronized void subscribeWeakly(TmcEventListener listener) {
         this.listeners.add(new WeakListener(listener));
     }
-    
+
     /**
      * Subscribes a listener that is eventually removed after a given dependency is garbage-collected.
      */
@@ -125,7 +125,7 @@ public synchronized void post(TmcEvent event) {
         eventQueue.add(event);
         processEventQueue();
     }
-    
+
     private void processEventQueue() {
         // This handles post() during post()
         // but not yet subscribe*() during post().
@@ -146,4 +146,4 @@ private void processEventQueue() {
             }
         }
     }
-}
+}

tmc-plugin/src/fi/helsinki/cs/tmc/events/TmcEventListener.java

@@ -33,11 +33,11 @@ public void receive(TmcEvent event) throws Throwable {
             }
         }
     }
-    
+
     /**
      * Whether this listener may be unsubscribed at any point by the event bus.
      */
     public boolean mayBeUnsubscribed() {
         return false;
     }
-}
+}

tmc-plugin/src/fi/helsinki/cs/tmc/exerciseSubmitter/ExerciseSubmitter.java

@@ -1,7 +1,5 @@
 package fi.helsinki.cs.tmc.exerciseSubmitter;
 
-import com.google.common.base.Strings;
-import com.google.common.util.concurrent.ListenableFuture;
 import fi.helsinki.cs.tmc.actions.CheckForNewExercisesOrUpdates;
 import fi.helsinki.cs.tmc.actions.ServerErrorHelper;
 import fi.helsinki.cs.tmc.actions.SubmitExerciseAction;
@@ -22,11 +20,15 @@
 import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 import fi.helsinki.cs.tmc.utilities.CancellableCallable;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import com.google.common.base.Strings;
+import com.google.common.util.concurrent.ListenableFuture;
 
 import org.netbeans.api.project.Project;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 public class ExerciseSubmitter {
 
     private static final Logger log = Logger.getLogger(SubmitExerciseAction.class.getName());

tmc-plugin/src/fi/helsinki/cs/tmc/layergen/UpdateCenterLayerGen.java

@@ -4,23 +4,25 @@
 import fi.helsinki.cs.tmc.tailoring.Tailoring;
 import fi.helsinki.cs.tmc.utilities.urlcallback.CallbackURLStreamHandler;
 import fi.helsinki.cs.tmc.utilities.urlcallback.URLCallback;
+
+import org.openide.filesystems.Repository;
+import org.openide.filesystems.Repository.LayerProvider;
+import org.openide.util.lookup.ServiceProvider;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collection;
-import org.openide.filesystems.Repository;
-import org.openide.filesystems.Repository.LayerProvider;
-import org.openide.util.lookup.ServiceProvider;
 
 /**
  * Generates an update center instance based on the selected tailoring.
  */
 @ServiceProvider(service=LayerProvider.class)
 public class UpdateCenterLayerGen extends Repository.LayerProvider {
     private static final String CALLBACK_NAME = "/" + UpdateCenterLayerGen.class.getCanonicalName();
-    
+
     private static URLCallback callback = new URLCallback() {
         @Override
         public String getInputEncoding() {
@@ -36,9 +38,9 @@ public InputStream openInputStream() {
             }
         }
     };
-    
+
     private static boolean callbackRegistered = false;
-    
+
     public UpdateCenterLayerGen() {
         synchronized (UpdateCenterLayerGen.class) {
             if (!callbackRegistered) {
@@ -47,7 +49,7 @@ public UpdateCenterLayerGen() {
             callbackRegistered = true;
         }
     }
-    
+
     @Override
     protected void registerLayers(Collection<? super URL> layers) {
         try {
@@ -56,10 +58,10 @@ protected void registerLayers(Collection<? super URL> layers) {
             throw new RuntimeException(ex);
         }
     }
-    
+
     private static String getInstanceXML() {
         Tailoring tailoring = SelectedTailoring.get();
-        
+
         return
                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
                 "<!DOCTYPE filesystem PUBLIC \"-//NetBeans//DTD Filesystem 1.2//EN\" \"http://www.netbeans.org/dtds/filesystem-1_2.dtd\">\n" +
@@ -77,4 +79,4 @@ private static String getInstanceXML() {
                 "    </folder>\n" +
                 "</filesystem>";
     }
-}
+}

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

@@ -1,24 +1,25 @@
 package fi.helsinki.cs.tmc.model;
 
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
-import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileUtil;
 
 public class ConfigFile {
-    
+
     private final String name;
     private FileObject fileObject;
-    
+
     public ConfigFile(String name) {
         this.name = name;
     }
-    
+
     public FileObject getFileObject() throws IOException {
         if (fileObject == null) {
             FileObject root = FileUtil.getConfigRoot();
@@ -33,19 +34,19 @@ public FileObject getFileObject() throws IOException {
         }
         return fileObject;
     }
-    
+
     public boolean exists() throws IOException {
         return getFileObject().getSize() > 0;
     }
 
     public Writer getWriter() throws IOException {
         return new OutputStreamWriter(new BufferedOutputStream(getFileObject().getOutputStream()), "UTF-8");
     }
-    
+
     public Reader getReader() throws IOException {
         return new InputStreamReader(new BufferedInputStream(getFileObject().getInputStream()), "UTF-8");
     }
-    
+
     public void writeContents(String s) throws IOException {
         Writer w = getWriter();
         try {
@@ -54,8 +55,8 @@ public void writeContents(String s) throws IOException {
             w.close();
         }
     }
-    
+
     public String readContents() throws IOException {
         return getFileObject().asText("UTF-8");
     }
-}
+}