- Fixed ignore line ending problem that caused duplicate gitignore entries in windows

Author: Matt York

AndroidGears/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin version="2">
     <id>com.github.androidgears.plugin5</id>
     <name>Android Gears</name>
-    <version>0.5.3</version>
+    <version>0.5.4</version>
     <vendor email="myork@cs.ua.edu" url="http://www.androidgears.org">Android Gears</vendor>
 
     <description><![CDATA[

AndroidGears/src/Singletons/SettingsManager.java

@@ -22,7 +22,7 @@ public class SettingsManager {
     //Singleton instance for settings
     private static SettingsManager settingsManager;
     private Project[] targetProjects;
-    private static String IGNORE_STRING = "\n#Android Gears\nGears/";
+    private static String IGNORE_STRING = Utils.newLine()+Utils.newLine()+"#Android Gears"+Utils.newLine()+"Gears/";
     private static String IGNORE_COMMENT_STRING = "#Android Gears";
     private static String IGNORE_CONTENT_STRING = "Gears/";
 
@@ -257,7 +257,7 @@ else if (hgignoreFile.exists()){
                     String ignoreFileString = FileUtils.readFileToString(ignoreFile);
 
                     //Check if it exists already. If it does, we're good
-                    if (!ignoreFileString.contains(IGNORE_STRING)){
+                    if (!ignoreFileString.contains(IGNORE_COMMENT_STRING) && !ignoreFileString.contains(IGNORE_CONTENT_STRING)){
                         //Add entry
                         ignoreFileString = ignoreFileString+IGNORE_STRING;
 

AndroidGears/src/Utilities/Utils.java

@@ -49,6 +49,10 @@ public static String pathSeparator(){
         return (OSValidator.isWindows()) ? "\\":"/";
     }
 
+    public static String newLine(){
+        return (OSValidator.isWindows()) ? "\r\n":"\n";
+    }
+
     public static boolean ping(String url, int timeout) {
         //url = url.replaceFirst("https", "http"); // Otherwise an exception may be thrown on invalid SSL certificates.