You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2006/11/28 23:29:26 UTC
svn commit: r480254 - in /incubator/uima/site/trunk/uima-website:
docs/codeConventions.html docs/downloads/ApacheUima_EclipseCodeStylePrefs.xml
xdocs/codeConventions.xml
xdocs/downloads/ApacheUima_EclipseCodeStylePrefs.xml
Author: alally
Date: Tue Nov 28 14:29:25 2006
New Revision: 480254
URL: http://svn.apache.org/viewvc?view=rev&rev=480254
Log:
Fixed Eclipse style preferences file on website - indent after
line wrapping was incorrect.
Modified:
incubator/uima/site/trunk/uima-website/docs/codeConventions.html
incubator/uima/site/trunk/uima-website/docs/downloads/ApacheUima_EclipseCodeStylePrefs.xml
incubator/uima/site/trunk/uima-website/xdocs/codeConventions.xml
incubator/uima/site/trunk/uima-website/xdocs/downloads/ApacheUima_EclipseCodeStylePrefs.xml
Modified: incubator/uima/site/trunk/uima-website/docs/codeConventions.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/codeConventions.html?view=diff&rev=480254&r1=480253&r2=480254
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/codeConventions.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/codeConventions.html Tue Nov 28 14:29:25 2006
@@ -162,16 +162,10 @@
</ol>
</li>
<li>Do not use package imports (for example <code>import org.apache.uima.*</code>)</li>
- <li>Preferrably, alphabetize imports by package name, and within a package by class name.</li>
<li>For other cases, we try to follow Sun's code conventions as much as possible: see
<a class="external" href="http://java.sun.com/docs/codeconv/">http://java.sun.com/docs/codeconv</a>
</li>
</ul>
-</p>
- <p>
- <b>Note: </b> These guidelines were very recently adopted and much of the UIMA codebase
- does not yet conform. We're working on that. For all new commits, these guidelines
- should be followed.
</p>
</blockquote>
</p>
Modified: incubator/uima/site/trunk/uima-website/docs/downloads/ApacheUima_EclipseCodeStylePrefs.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/downloads/ApacheUima_EclipseCodeStylePrefs.xml?view=diff&rev=480254&r1=480253&r2=480254
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/downloads/ApacheUima_EclipseCodeStylePrefs.xml (original)
+++ incubator/uima/site/trunk/uima-website/docs/downloads/ApacheUima_EclipseCodeStylePrefs.xml Tue Nov 28 14:29:25 2006
@@ -54,7 +54,7 @@
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="8"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
Modified: incubator/uima/site/trunk/uima-website/xdocs/codeConventions.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/codeConventions.xml?view=diff&rev=480254&r1=480253&r2=480254
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/codeConventions.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/codeConventions.xml Tue Nov 28 14:29:25 2006
@@ -65,16 +65,10 @@
</ol>
</li>
<li>Do not use package imports (for example <code>import org.apache.uima.*</code>)</li>
- <li>Preferrably, alphabetize imports by package name, and within a package by class name.</li>
<li>For other cases, we try to follow Sun's code conventions as much as possible: see
<a class="external" href="http://java.sun.com/docs/codeconv/">http://java.sun.com/docs/codeconv</a>
</li>
</ul>
-</p>
-<p>
- <b>Note: </b> These guidelines were very recently adopted and much of the UIMA codebase
- does not yet conform. We're working on that. For all new commits, these guidelines
- should be followed.
</p>
</section>
<section name="For Eclipse Users">
Modified: incubator/uima/site/trunk/uima-website/xdocs/downloads/ApacheUima_EclipseCodeStylePrefs.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/downloads/ApacheUima_EclipseCodeStylePrefs.xml?view=diff&rev=480254&r1=480253&r2=480254
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/downloads/ApacheUima_EclipseCodeStylePrefs.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/downloads/ApacheUima_EclipseCodeStylePrefs.xml Tue Nov 28 14:29:25 2006
@@ -54,7 +54,7 @@
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="8"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>