svn commit: r1438630 - in /accumulo/trunk/contrib: Eclipse-Accumulo-Codestyle.xml Eclipse-Accumulo-Template.xml

[ctubbsii]

Author: ctubbsii
Date: Fri Jan 25 18:23:18 2013
New Revision: 1438630

URL: http://svn.apache.org/viewvc?rev=1438630&view=rev
Log:
ACCUMULO-957 Enable turning formatter on/off for special use cases. Remove 
comment from overriding methods, and make LICENSE header comment a regular 
comment.

Modified:
    accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml
    accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml

Modified: accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml?rev=1438630&r1=1438629&r2=1438630&view=diff
==============================================================================
--- accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml (original)
+++ accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml Fri Jan 25 18:23:18 
2013
@@ -32,7 +32,7 @@
 <setting 
id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation"
 value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" 
value="0"/>
 <setting 
id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" 
value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
 <setting 
id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration"
 value="do not insert"/>
 <setting 
id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" 
value="do not insert"/>
 <setting 
id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" 
value="do not insert"/>

Modified: accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml?rev=1438630&r1=1438629&r2=1438630&view=diff
==============================================================================
--- accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml (original)
+++ accumulo/trunk/contrib/Eclipse-Accumulo-Template.xml Fri Jan 25 18:23:18 
2013
@@ -22,7 +22,7 @@
  * @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">/**&#13;
+ */</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">/*&#13;
  * Licensed to the Apache Software Foundation (ASF) under one or more&#13;
  * contributor license agreements.  See the NOTICE file distributed with&#13;
  * this work for additional information regarding copyright ownership.&#13;
@@ -41,9 +41,7 @@
  * ${tags}
  */</template><template autoinsert="false" context="fieldcomment_context" 
deleted="false" description="Comment for fields" enabled="true" 
id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" 
name="fieldcomment"/><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">/**
+ */</template><template autoinsert="false" context="overridecomment_context" 
deleted="false" description="Comment for overriding methods" enabled="true" 
id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" 
name="overridecomment"/><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}
@@ -59,4 +57,4 @@ ${exception_var}.printStackTrace();</tem
 ${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>
\ No newline at end of file
+</templates>