Fix config dir path and cleaned up whitespace

Author: jamo

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

@@ -2,6 +2,7 @@
 
 import fi.helsinki.cs.tmc.core.TmcCore;
 import fi.helsinki.cs.tmc.core.communication.TmcServerCommunicationTaskFactory;
+import fi.helsinki.cs.tmc.core.configuration.TmcSettings;
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.holders.TmcLangsHolder;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
@@ -36,19 +37,22 @@ public class TmcModuleInstall extends ModuleInstall {
 
     @Override
     public void restored() {
+        TmcSettingsHolder.set(new TmcCoreSettingsImpl());
+        TmcLangsHolder.set(new TaskExecutorImpl());
+
         WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
             @Override
             public void run() {
-                TmcLangsHolder.set(new TaskExecutorImpl());
-                TmcSettingsHolder.set(new TmcCoreSettingsImpl());
+
                 TmcCore.setInstance(new TmcCore());
-                
+
                 CheckForNewExercisesOrUpdates.startTimer();
                 CheckForNewReviews.startTimer();
                 ReviewEventListener.start();
                 PushEventListener.start();
+                TmcSettings settings = TmcSettingsHolder.get();
                 SpywareFacade.start();
-                
+
                 Preferences prefs = NbPreferences.forModule(TmcModuleInstall.class);
 
                 SpecificationVersion currentVersion = getCurrentModuleVersion();
@@ -90,7 +94,7 @@ public void bgTaskFailed(Throwable ex) {
                             log.warning("moduleInstall refresh failed " + ex);
                         }
                     }).run();
-*/                
+*/
                 }
             }
         });

tmc-plugin/src/fi/helsinki/cs/tmc/coreimpl/TmcCoreSettingsImpl.java

@@ -10,11 +10,16 @@
 import fi.helsinki.cs.tmc.tailoring.Tailoring;
 
 import com.google.common.base.Optional;
+import java.io.IOException;
 import java.net.ProxySelector;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Locale;
 import org.apache.http.impl.conn.SystemDefaultRoutePlanner;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileStateInvalidException;
+import org.openide.filesystems.FileUtil;
+import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.NbPreferences;
 
@@ -105,7 +110,18 @@ public void setConfigRoot(Path path) {
 
     @Override
     public Path getConfigRoot() {
-        return Paths.get(NbPreferences.forModule(TmcCoreSettingsImpl.class).absolutePath());
+        FileObject root = FileUtil.getConfigRoot();
+        FileObject tmcRoot = root.getFileObject("tmc");
+
+        if (tmcRoot == null) {
+            try {
+                tmcRoot = root.createFolder("tmc");
+            } catch (IOException ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+       
+        return FileUtil.toFile(tmcRoot).toPath();
     }
 
     public static class SavedEvent implements TmcEvent {}

tmc-plugin/src/fi/helsinki/cs/tmc/ui/ExerciseIconAnnotator.java

@@ -23,6 +23,7 @@
 import org.netbeans.api.project.Project;
 import org.netbeans.spi.project.ProjectIconAnnotator;
 import org.openide.util.ChangeSupport;
+import org.openide.util.Exceptions;
 import org.openide.util.ImageUtilities;
 import org.openide.util.lookup.ServiceProvider;
 
@@ -44,7 +45,7 @@ public ExerciseIconAnnotator() {
         this.courses = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
         this.iconCache = new HashMap<String, Image>();
-        
+
         eventBus.subscribeDependent(new TmcEventListener() {
             public void receive(CourseDb.ChangedEvent event) {
                 SwingUtilities.invokeLater(new Runnable() {
@@ -64,10 +65,10 @@ public Image annotateIcon(Project nbProject, Image origImg, boolean openedNode)
         if (exercise == null || !exercise.getCourseName().equals(courses.getCurrentCourseName())) {
             return origImg;
         }
-        
+
         //TODO: use ImageUtilities.createDisabledImage for expired exercises.
         //Had some very weird problems with that. Try again some day.
-        
+
         Image img = origImg;
         try {
             Image annotation = annotationIconForExericse(exercise);
@@ -77,13 +78,13 @@ public Image annotateIcon(Project nbProject, Image origImg, boolean openedNode)
         } catch (IOException e) {
             log.log(Level.WARNING, "Failed to load exercise icon annotation", e);
         }
-        
+
         String tooltip = tooltipForExercise(exercise);
         img = ImageUtilities.assignToolTipToImage(img, tooltip);
-        
+
         return img;
     }
-    
+
     private Image annotationIconForExericse(Exercise exercise) throws IOException {
         String name = annotationIconNameForExercise(exercise);
         if (name != null) {
@@ -96,7 +97,7 @@ private Image annotationIconForExericse(Exercise exercise) throws IOException {
             return null;
         }
     }
-    
+
     private String annotationIconNameForExercise(Exercise exercise) {
         if (exercise.hasDeadlinePassed()) {
             return null;
@@ -110,7 +111,7 @@ private String annotationIconNameForExercise(Exercise exercise) {
             return "black-project-dot.png";
         }
     }
-    
+
     private String tooltipForExercise(Exercise exercise) {
         List<String> parts = new ArrayList<String>();
         if (exercise.isAttempted()) {
@@ -129,23 +130,23 @@ private String tooltipForExercise(Exercise exercise) {
                     parts.add("code review not yet done");
                 }
             }
-            
+
         } else {
             parts.add("exercise not yet submitted");
         }
-        
+
         if (!exercise.isCompleted() && exercise.getDeadline() != null) {
             DateFormat df = new SimpleDateFormat("dd.MM.yyyy HH:mm");
             parts.add("deadline: " + df.format(exercise.getDeadline()));
         }
-        
+
         return StringUtils.capitalize(StringUtils.join(parts, " - "));
     }
-    
+
     public void updateAllIcons() {
         changeSupport.fireChange();
     }
-    
+
     @Override
     public void addChangeListener(ChangeListener listener) {
         changeSupport.addChangeListener(listener);