Merge pull request #69 from welovecoding/issue-68-cyclic

Fixes #68

Author: bennycode

src/main/java/com/welovecoding/nbeditorconfig/config/LoggerSettings.java

@@ -0,0 +1,15 @@
+package com.welovecoding.nbeditorconfig.config;
+
+import java.util.logging.Level;
+
+public class LoggerSettings {
+
+  public static final Level OPERATION_LOG_LEVEL = Level.INFO;
+  public static final Level PROCESSOR_LOG_LEVEL = Level.INFO;
+  public static final Level LISTENER_LOG_LEVEL = Level.INFO;
+  public static final Level MAPPER_LOG_LEVEL = Level.INFO;
+
+  private LoggerSettings() {
+  }
+
+}

src/main/java/com/welovecoding/nbeditorconfig/config/Settings.java

@@ -6,6 +6,7 @@ public final class Settings {
 
   public static final String MIME_TYPE = "text/x-editorconfig"; // NOI18N
   public static final String EXTENSION = "editorconfig"; // NOI18N
+  public static final String DEFAULT_FILE_NAME = ".editorconfig"; // NOI18N
   public static final String RESOURCE_PATH = "com/welovecoding/nbeditorconfig"; // NOI18N
 
   @StaticResource

src/main/java/com/welovecoding/nbeditorconfig/listener/EditorConfigChangeListener.java

@@ -1,5 +1,6 @@
 package com.welovecoding.nbeditorconfig.listener;
 
+import static com.welovecoding.nbeditorconfig.config.LoggerSettings.LISTENER_LOG_LEVEL;
 import java.util.Collections;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -24,7 +25,7 @@ public class EditorConfigChangeListener extends FileChangeAdapter {
   private final FileChangeListener subsequentFilesListener;
 
   static {
-    LOG.setLevel(Level.INFO);
+    LOG.setLevel(LISTENER_LOG_LEVEL);
   }
 
   public EditorConfigChangeListener(Project project, FileObject editorConfigFileObject) {

src/main/java/com/welovecoding/nbeditorconfig/listener/FileChangeListener.java

@@ -1,7 +1,10 @@
 package com.welovecoding.nbeditorconfig.listener;
 
+import static com.welovecoding.nbeditorconfig.config.LoggerSettings.LISTENER_LOG_LEVEL;
 import com.welovecoding.nbeditorconfig.processor.EditorConfigProcessor;
 import com.welovecoding.nbeditorconfig.processor.SmartSkip;
+import com.welovecoding.nbeditorconfig.processor.WriteEditorAction;
+import com.welovecoding.nbeditorconfig.processor.WriteStringToFileAction;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.api.project.Project;
@@ -24,7 +27,7 @@ public class FileChangeListener extends FileChangeAdapter {
   private final FileObject editorConfigFileObject;
 
   static {
-    LOG.setLevel(Level.INFO);
+    LOG.setLevel(LISTENER_LOG_LEVEL);
   }
 
   public FileChangeListener(Project project, FileObject editorConfigFileObject) {
@@ -47,17 +50,22 @@ public void fileChanged(FileEvent event) {
 
     LOG.log(Level.INFO, "[EC for {0}] File content changed: {1}", new Object[]{editorConfigFileObject.getPath(), path});
 
-    if (applyRulesToFile(event)) {
-      try {
-        new EditorConfigProcessor().applyRulesToFile(DataObject.find(event.getFile()));
-      } catch (DataObjectNotFoundException ex) {
-        Exceptions.printStackTrace(ex);
-      } catch (Exception ex) {
-        Exceptions.printStackTrace(ex);
+    if (!event.firedFrom(new WriteEditorAction()) && !event.firedFrom(new WriteStringToFileAction())) {
+      if (applyRulesToFile(event)) {
+        try {
+          new EditorConfigProcessor().applyRulesToFile(DataObject.find(event.getFile()));
+        } catch (DataObjectNotFoundException ex) {
+          Exceptions.printStackTrace(ex);
+        } catch (Exception ex) {
+          Exceptions.printStackTrace(ex);
+        }
+      } else {
+        LOG.log(Level.INFO, "[EC for {0}] Rules will not be applied to: {1}", new Object[]{editorConfigFileObject.getPath(), path});
       }
     } else {
-      LOG.log(Level.INFO, "[EC for {0}] Rules will not be applied to: {1}", new Object[]{editorConfigFileObject.getPath(), path});
+      LOG.log(Level.INFO, "[EC for {0}] Rules will not be applied to: {1} - Change triggered by EditorConfig plugin", new Object[]{editorConfigFileObject.getPath(), path});
     }
+
   }
 
   private boolean applyRulesToFile(FileEvent event) {

src/main/java/com/welovecoding/nbeditorconfig/listener/ListenerAttacher.java

@@ -1,6 +1,8 @@
 package com.welovecoding.nbeditorconfig.listener;
 
-import com.welovecoding.nbeditorconfig.config.Settings;
+import static com.welovecoding.nbeditorconfig.config.LoggerSettings.LISTENER_LOG_LEVEL;
+import static com.welovecoding.nbeditorconfig.config.Settings.DEFAULT_FILE_NAME;
+import static com.welovecoding.nbeditorconfig.config.Settings.EXTENSION;
 import com.welovecoding.nbeditorconfig.processor.SmartSkip;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -12,7 +14,7 @@ public class ListenerAttacher {
   private static final Logger LOG = Logger.getLogger(ListenerAttacher.class.getName());
 
   static {
-    LOG.setLevel(Level.INFO);
+    LOG.setLevel(LISTENER_LOG_LEVEL);
   }
 
   /**
@@ -35,7 +37,7 @@ public static void attachListeners(FileObject file, Project project) {
         }
       }
     } else {
-      if (file.getExt().equals(Settings.EXTENSION)) {
+      if (file.getExt().equals(EXTENSION) || file.getName().equals(DEFAULT_FILE_NAME)) {
         file.addFileChangeListener(new EditorConfigChangeListener(project, file));
         LOG.log(Level.INFO, "\u00ac Found EditorConfig: {0}", file.getPath());
       } else {

src/main/java/com/welovecoding/nbeditorconfig/listener/ProjectChangeListener.java

@@ -1,5 +1,6 @@
 package com.welovecoding.nbeditorconfig.listener;
 
+import static com.welovecoding.nbeditorconfig.config.LoggerSettings.LISTENER_LOG_LEVEL;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.api.project.Project;
@@ -17,7 +18,7 @@ public class ProjectChangeListener extends FileChangeAdapter {
   private final Project project;
 
   static {
-    LOG.setLevel(Level.INFO);
+    LOG.setLevel(LISTENER_LOG_LEVEL);
   }
 
   public ProjectChangeListener(Project project) {

src/main/java/com/welovecoding/nbeditorconfig/listener/ProjectHookLookup.java

@@ -1,5 +1,6 @@
 package com.welovecoding.nbeditorconfig.listener;
 
+import static com.welovecoding.nbeditorconfig.config.LoggerSettings.LISTENER_LOG_LEVEL;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.api.project.Project;
@@ -32,7 +33,7 @@ public class ProjectHookLookup implements LookupProvider {
   private static final Logger LOG = Logger.getLogger(ProjectHookLookup.class.getName());
 
   static {
-    LOG.setLevel(Level.INFO);
+    LOG.setLevel(LISTENER_LOG_LEVEL);
   }
 
   @Override

src/main/java/com/welovecoding/nbeditorconfig/listener/ProjectOpenCloseListener.java

@@ -1,5 +1,6 @@
 package com.welovecoding.nbeditorconfig.listener;
 
+import static com.welovecoding.nbeditorconfig.config.LoggerSettings.LISTENER_LOG_LEVEL;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.netbeans.api.project.Project;
@@ -12,7 +13,7 @@ public class ProjectOpenCloseListener extends ProjectOpenedHook {
   private Project project;
 
   static {
-    LOG.setLevel(Level.INFO);
+    LOG.setLevel(LISTENER_LOG_LEVEL);
   }
 
   public ProjectOpenCloseListener() {

src/main/java/com/welovecoding/nbeditorconfig/mapper/EditorConfigPropertyMapper.java

@@ -1,9 +1,10 @@
 package com.welovecoding.nbeditorconfig.mapper;
 
+import com.welovecoding.nbeditorconfig.config.LoggerSettings;
 import com.welovecoding.nbeditorconfig.io.model.MappedCharset;
 import com.welovecoding.nbeditorconfig.io.model.SupportedCharsets;
-import com.welovecoding.nbeditorconfig.model.MappedEditorConfig;
 import com.welovecoding.nbeditorconfig.model.EditorConfigConstant;
+import com.welovecoding.nbeditorconfig.model.MappedEditorConfig;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,6 +19,10 @@ public class EditorConfigPropertyMapper {
 
   private static final Logger LOG = Logger.getLogger(EditorConfigPropertyMapper.class.getName());
 
+  static {
+    LOG.setLevel(LoggerSettings.MAPPER_LOG_LEVEL);
+  }
+
   public static synchronized MappedEditorConfig createEditorConfig(String filePath) {
     return createEditorConfig(filePath, null);
   }
@@ -133,12 +138,12 @@ protected static synchronized String getFileMark(String editorConfigCharset) {
    *
    * @param ecCharset String value for these charsets: "latin1", "utf-8",
    * "utf-8-bom", "utf-16be" or "utf-16le"
-   * 
+   *
    * @return the mapped charset
    */
   protected static synchronized MappedCharset mapCharset(String ecCharset) {
     MappedCharset charset;
-    
+
     if (ecCharset == null) {
       return SupportedCharsets.UTF_8;
     }

src/main/java/com/welovecoding/nbeditorconfig/processor/EditorConfigProcessor.java

@@ -1,8 +1,7 @@
 package com.welovecoding.nbeditorconfig.processor;
 
-import com.welovecoding.nbeditorconfig.io.exception.FileAccessException;
+import static com.welovecoding.nbeditorconfig.config.LoggerSettings.PROCESSOR_LOG_LEVEL;
 import com.welovecoding.nbeditorconfig.io.model.MappedCharset;
-import com.welovecoding.nbeditorconfig.io.writer.StyledDocumentWriter;
 import com.welovecoding.nbeditorconfig.mapper.EditorConfigPropertyMapper;
 import com.welovecoding.nbeditorconfig.model.EditorConfigConstant;
 import com.welovecoding.nbeditorconfig.model.MappedEditorConfig;
@@ -24,6 +23,8 @@
 import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;
 import org.openide.cookies.EditorCookie;
 import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileSystem.AtomicAction;
+import org.openide.filesystems.FileUtil;
 import org.openide.loaders.DataObject;
 import org.openide.text.NbDocument;
 import org.openide.util.Lookup;
@@ -32,11 +33,14 @@
 public class EditorConfigProcessor {
 
   private static final Logger LOG = Logger.getLogger(EditorConfigProcessor.class.getName());
-  public static final Level OPERATION_LOG_LEVEL = Level.INFO;
 
   private String filePath;
   private final String projectPath;
 
+  static {
+    LOG.setLevel(PROCESSOR_LOG_LEVEL);
+  }
+
   public EditorConfigProcessor() {
     // Project nbProject = OpenProjects.getDefault().getMainProject();
     Lookup lookup = Utilities.actionsGlobalContext();
@@ -248,8 +252,8 @@ private void updateChangesInEditorWindow(final FileInfo info) {
     Runnable runner = () -> {
       NbDocument.runAtomic(cookie.getDocument(), () -> {
         try {
-          StyledDocumentWriter.writeWithEditorKit(info);
-        } catch (FileAccessException ex) {
+          FileUtil.runAtomicAction((AtomicAction) new WriteEditorAction(info));
+        } catch (IOException ex) {
           LOG.log(Level.SEVERE, ex.getMessage());
         }
       });
@@ -270,7 +274,10 @@ private void updateChangesInFile(FileInfo info) {
     LOG.log(Level.INFO, "Write content (with all rules applied) to file: {0}",
             info.getFileObject().getPath());
 
-    WriteStringToFileTask task = new WriteStringToFileTask(info);
-    task.run();
+    try {
+      FileUtil.runAtomicAction((AtomicAction) new WriteStringToFileAction(info));
+    } catch (IOException ex) {
+      LOG.log(Level.SEVERE, ex.getMessage());
+    }
   }
 }