Permalink
Browse files

Normalize line endings

Add .gitattributes & do one-time normalization of line endings
  • Loading branch information...
1 parent 6a91b5d commit 567da6aa9feefcbff455049697b599a693868186 @tfmorris tfmorris committed Mar 23, 2013
Showing with 9,781 additions and 9,759 deletions.
  1. +22 −0 .gitattributes
  2. +280 −280 .settings/org.eclipse.jdt.core.prefs
  3. +61 −61 IDEs/eclipse/Refine-codetemplates.xml
  4. +8 −8 IDEs/eclipse/Refine.importorder
  5. +280 −280 broker/appengine/.settings/org.eclipse.jdt.core.prefs
  6. +280 −280 broker/core/.settings/org.eclipse.jdt.core.prefs
  7. +29 −29 broker/core/WEB-INF/butterfly.properties
  8. +5 −5 broker/core/WEB-INF/modules.properties
  9. +5 −5 broker/core/tests/src/tests.log4j.properties
  10. +16 −16 extensions/freebase/.classpath
  11. +12 −12 extensions/freebase/.settings/org.eclipse.jdt.core.prefs
  12. +15 −15 extensions/gdata/.classpath
  13. +8 −8 extensions/jython/.classpath
  14. +280 −280 extensions/jython/.settings/org.eclipse.jdt.core.prefs
  15. +6 −6 extensions/sample/.classpath
  16. +280 −280 extensions/sample/.settings/org.eclipse.jdt.core.prefs
  17. +57 −57 licenses/jrdf.LICENSE.txt
  18. +10 −10 licenses/jsoup.LICENSE.txt
  19. +504 −504 licenses/marc4j.LICENSE.txt
  20. +6 −6 main/.settings/org.eclipse.core.resources.prefs
  21. +280 −280 main/.settings/org.eclipse.jdt.core.prefs
  22. +51 −51 main/src/com/google/refine/clustering/binning/ColognePhoneticKeyer.java
  23. +128 −128 main/src/com/google/refine/exporters/CsvExporter.java
  24. +60 −60 main/src/com/google/refine/expr/functions/arrays/ArgsToArray.java
  25. +77 −77 main/src/com/google/refine/expr/functions/html/HtmlAttr.java
  26. +75 −75 main/src/com/google/refine/expr/functions/html/HtmlText.java
  27. +75 −75 main/src/com/google/refine/expr/functions/html/InnerHtml.java
  28. +75 −75 main/src/com/google/refine/expr/functions/html/OwnText.java
  29. +69 −69 main/src/com/google/refine/expr/functions/html/ParseHtml.java
  30. +77 −77 main/src/com/google/refine/expr/functions/html/SelectHtml.java
  31. +64 −64 main/src/com/google/refine/expr/functions/math/ACos.java
  32. +64 −64 main/src/com/google/refine/expr/functions/math/ASin.java
  33. +64 −64 main/src/com/google/refine/expr/functions/math/ATan.java
  34. +65 −65 main/src/com/google/refine/expr/functions/math/ATan2.java
  35. +65 −65 main/src/com/google/refine/expr/functions/math/Abs.java
  36. +98 −98 main/src/com/google/refine/expr/functions/math/Combin.java
  37. +64 −64 main/src/com/google/refine/expr/functions/math/Cos.java
  38. +65 −65 main/src/com/google/refine/expr/functions/math/Cosh.java
  39. +64 −64 main/src/com/google/refine/expr/functions/math/Degrees.java
  40. +69 −69 main/src/com/google/refine/expr/functions/math/Even.java
  41. +64 −64 main/src/com/google/refine/expr/functions/math/Fact.java
  42. +91 −91 main/src/com/google/refine/expr/functions/math/FactN.java
  43. +69 −69 main/src/com/google/refine/expr/functions/math/GreatestCommonDenominator.java
  44. +81 −81 main/src/com/google/refine/expr/functions/math/LeastCommonMultiple.java
  45. +75 −75 main/src/com/google/refine/expr/functions/math/Multinomial.java
  46. +69 −69 main/src/com/google/refine/expr/functions/math/Odd.java
  47. +66 −66 main/src/com/google/refine/expr/functions/math/Quotient.java
  48. +64 −64 main/src/com/google/refine/expr/functions/math/Radians.java
  49. +64 −64 main/src/com/google/refine/expr/functions/math/Sin.java
  50. +64 −64 main/src/com/google/refine/expr/functions/math/Sinh.java
  51. +64 −64 main/src/com/google/refine/expr/functions/math/Tan.java
  52. +64 −64 main/src/com/google/refine/expr/functions/math/Tanh.java
  53. +45 −45 main/src/com/google/refine/history/HistoryEntryManager.java
  54. +108 −108 main/src/com/google/refine/importers/LineBasedImporter.java
  55. +159 −159 main/src/com/google/refine/importers/RdfTripleImporter.java
  56. +43 −43 main/src/com/google/refine/importers/RdfXmlTripleImporter.java
  57. +69 −69 main/src/com/google/refine/importers/tree/TreeReader.java
  58. +145 −145 main/src/com/google/refine/io/FileHistoryEntryManager.java
  59. +422 −422 main/src/com/google/refine/io/FileProjectManager.java
  60. +118 −118 main/src/com/google/refine/io/ProjectMetadataUtilities.java
  61. +161 −161 main/src/com/google/refine/io/ProjectUtilities.java
  62. +173 −173 main/src/com/google/refine/sorting/BaseSorter.java
  63. +65 −65 main/src/com/google/refine/sorting/BooleanCriterion.java
  64. +128 −128 main/src/com/google/refine/sorting/Criterion.java
  65. +68 −68 main/src/com/google/refine/sorting/DateCriterion.java
  66. +83 −83 main/src/com/google/refine/sorting/NumberCriterion.java
  67. +98 −98 main/src/com/google/refine/sorting/SortingRecordVisitor.java
  68. +108 −108 main/src/com/google/refine/sorting/SortingRowVisitor.java
  69. +83 −83 main/src/com/google/refine/sorting/StringCriterion.java
  70. +8 −8 main/src/log4j.properties
  71. +4 −4 main/tests/data/example-linebreaks-in-cells.tsv
  72. +108 −108 main/tests/server/src/com/google/refine/tests/ProjectManagerStub.java
  73. +253 −253 main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java
  74. +95 −95 main/tests/server/src/com/google/refine/tests/RefineServletStub.java
  75. +304 −304 main/tests/server/src/com/google/refine/tests/RefineServletTests.java
  76. +245 −245 main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
  77. +205 −205 main/tests/server/src/com/google/refine/tests/exporters/HtmlExporterTests.java
  78. +242 −242 main/tests/server/src/com/google/refine/tests/exporters/TemplatingExporterTests.java
  79. +222 −222 main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java
  80. +182 −182 main/tests/server/src/com/google/refine/tests/exporters/XlsExporterTests.java
  81. +85 −85 main/tests/server/src/com/google/refine/tests/expr/functions/strings/DiffTests.java
  82. +106 −106 main/tests/server/src/com/google/refine/tests/expr/functions/strings/TrimTests.java
  83. +177 −177 main/tests/server/src/com/google/refine/tests/grel/GrelTests.java
  84. +102 −102 main/tests/server/src/com/google/refine/tests/history/HistoryTests.java
  85. +99 −99 main/tests/server/src/com/google/refine/tests/importers/FixedWidthImporterTests.java
  86. +43 −43 main/tests/server/src/com/google/refine/tests/model/ProjectStub.java
  87. +47 −47 main/tests/server/src/com/google/refine/tests/model/ReconTests.java
  88. +88 −88 main/tests/server/src/com/google/refine/tests/util/ParsingUtilitiesTests.java
  89. +4 −4 main/tests/server/src/tests.log4j.properties
  90. +38 −38 main/webapp/WEB-INF/butterfly.properties
  91. +40 −40 main/webapp/WEB-INF/lib-src/patches/json-20100208.patch
  92. +8 −8 main/webapp/WEB-INF/modules.properties
  93. +11 −11 main/webapp/WEB-INF/velocity.properties
  94. +35 −35 main/webapp/modules/core/scripts/chrome-frame.js
  95. +280 −280 server/.settings/org.eclipse.jdt.core.prefs
  96. +15 −15 server/IDEs/eclipse/Refine with extensions.launch
  97. +11 −11 server/src/log4j.properties
View
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs diff=csharp
+*.sln merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc diff=astextplain
+*.DOC diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot diff=astextplain
+*.DOT diff=astextplain
+*.pdf diff=astextplain
+*.PDF diff=astextplain
+*.rtf diff=astextplain
+*.RTF diff=astextplain
Oops, something went wrong.
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><templates><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
- * @return the ${bare_field_name}
- */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment">/**
- * @param ${param} the ${bare_field_name} to set
- */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
- * ${tags}
- */</template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/*
-
-Copyright ${year}, ${user}
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- */</template><template autoinsert="true" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/**
- * @author ${user}
- *
- * ${tags}
- */</template><template autoinsert="true" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment">/**
- *
- */</template><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
- * ${tags}
- */</template><template autoinsert="true" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment">/* (non-Javadoc)
- * ${see_to_overridden}
- */</template><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
- * ${tags}
- * ${see_to_target}
- */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
-${package_declaration}
-
-${typecomment}
-${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody">
-</template><template autoinsert="true" context="interfacebody_context" deleted="false" description="Code in new interface type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody">
-</template><template autoinsert="true" context="enumbody_context" deleted="false" description="Code in new enum type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody">
-</template><template autoinsert="true" context="annotationbody_context" deleted="false" description="Code in new annotation type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody">
-</template><template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
-${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated method stub
-${body_statement}</template><template autoinsert="true" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><templates><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
+ * @return the ${bare_field_name}
+ */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment">/**
+ * @param ${param} the ${bare_field_name} to set
+ */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
+ * ${tags}
+ */</template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/*
+
+Copyright ${year}, ${user}
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */</template><template autoinsert="true" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/**
+ * @author ${user}
+ *
+ * ${tags}
+ */</template><template autoinsert="true" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment">/**
+ *
+ */</template><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
+ * ${tags}
+ */</template><template autoinsert="true" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment">/* (non-Javadoc)
+ * ${see_to_overridden}
+ */</template><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
+ * ${tags}
+ * ${see_to_target}
+ */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
+${package_declaration}
+
+${typecomment}
+${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody">
+</template><template autoinsert="true" context="interfacebody_context" deleted="false" description="Code in new interface type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody">
+</template><template autoinsert="true" context="enumbody_context" deleted="false" description="Code in new enum type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody">
+</template><template autoinsert="true" context="annotationbody_context" deleted="false" description="Code in new annotation type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody">
+</template><template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
+${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated method stub
+${body_statement}</template><template autoinsert="true" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template></templates>
@@ -1,8 +1,8 @@
-#Organize Import Order
-#Tue Aug 02 16:49:34 EDT 2011
-5=com.google.refine
-4=com.google
-3=com
-2=org
-1=javax
-0=java
+#Organize Import Order
+#Tue Aug 02 16:49:34 EDT 2011
+5=com.google.refine
+4=com.google
+3=com
+2=org
+1=javax
+0=java
Oops, something went wrong.

0 comments on commit 567da6a

Please sign in to comment.