cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1065003 - in /cayenne/main/trunk/framework/cayenne-lifecycle: ./ .settings/ src/main/java/org/apache/cayenne/lifecycle/audit/ src/main/java/org/apache/cayenne/lifecycle/cache/ src/main/java/org/apache/cayenne/lifecycle/changeset/ src/main/...
Date Sat, 29 Jan 2011 11:49:51 GMT
Author: aadamchik
Date: Sat Jan 29 11:49:50 2011
New Revision: 1065003

URL: http://svn.apache.org/viewvc?rev=1065003&view=rev
Log:
cayenne-lifecycle - java 1.5 downgrade

Removed:
    cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.maven.ide.eclipse.prefs
Modified:
    cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.eclipse.jdt.core.prefs
    cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.eclipse.jdt.ui.prefs
    cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml
    cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
    cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationFilter.java
    cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/ChangeSetFilter.java
    cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/GenericChangeSet.java
    cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/MixinRelationshipBatchFaultingStrategy.java
    cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/MixinRelationshipFilter.java
    cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilterTest.java

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.eclipse.jdt.core.prefs?rev=1065003&r1=1065002&r2=1065003&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.eclipse.jdt.core.prefs (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.eclipse.jdt.core.prefs Sat
Jan 29 11:49:50 2011
@@ -1,9 +1,9 @@
-#Sat Jan 29 08:59:08 EET 2011
+#Sun Apr 19 22:20:37 EST 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,7 +23,7 @@ org.eclipse.jdt.core.compiler.problem.fa
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
@@ -71,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.un
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.5
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=48
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -146,9 +146,6 @@ org.eclipse.jdt.core.formatter.indent_sw
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
 org.eclipse.jdt.core.formatter.indentation.size=4
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
@@ -317,8 +314,6 @@ org.eclipse.jdt.core.formatter.insert_sp
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not
insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do
not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do
not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.eclipse.jdt.ui.prefs?rev=1065003&r1=1065002&r2=1065003&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.eclipse.jdt.ui.prefs (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/.settings/org.eclipse.jdt.ui.prefs Sat
Jan 29 11:49:50 2011
@@ -1,9 +1,8 @@
-#Sat Jan 29 09:02:28 EET 2011
+#Sun Nov 30 14:02:13 EET 2008
 eclipse.preferences.version=1
 formatter_settings_version=11
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.javadoc=false
 org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?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"/><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"/><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"/><template autoinsert\="true" context\="filecomment_context"
deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment"
name\="
 filecomment">/**\n * \n */</template><template autoinsert\="false" context\="typecomment_context"
deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment"
name\="typecomment"/><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 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"/><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"/><template autoinsert\="false" context\="newtype_context" deleted\="false"
descr
 iption\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype"
name\="newtype">/*****************************************************************\n *
  Licensed to the Apache Software Foundation (ASF) under one\n *  or more contributor license
agreements.  See the NOTICE file\n *  distributed with this work for additional information\n
*  regarding copyright ownership.  The ASF licenses this file\n *  to you under the Apache
License, Version 2.0 (the\n *  "License"); you may not use this file except in compliance\n
*  with the License.  You may obtain a copy of the License at\n *\n *    http\://www.apache.org/licenses/LICENSE-2.0\n
*\n *  Unless required by applicable law or agreed to in writing,\n *  software distributed
under the License is distributed on an\n *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY\n *  KIND, either express or implied.  See the License for the\n *  specific language
governing permissions and limitations
 \n *  under the License.\n ****************************************************************/\n${package_declaration}\n\n${typecomment}\n${type_declaration}</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">${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">${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}</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><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">/**\n
* ${tags}\n * ${see_to_target}\n */</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">\n</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">\n</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">\n</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">\n</template><template autoinsert\="true" context\="gettercomment_context"
deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template
autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment
for setter fu
 nction" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n
* @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true"
context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors"
enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n
* ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context"
deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment"
name\="filecomment">/**\n * \n */</template><template autoinsert\="false" context\="typecomment_context"
deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment"
name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="true"
context\="f
 ieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment"
name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context"
deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment"
name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true"
context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions"
enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/*
(non-Jsdoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true"
context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions"
enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n
* ${tag
 s}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context"
deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype"
name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template
autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new
class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody"
name\="classbody">\n</template><template autoinsert\="true" context\="catchblock_context"
deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock"
name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template
autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created
function stubs" enabled\="true" id\="
 org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated
function stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context"
deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody"
name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template
autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created
getters" enabled\="true" id\="org.eclipse.wst.jsdt.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.wst.jsdt.ui.text.codetemplates.setterbody"
name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><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"></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"></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"></template><template autoinsert\="true" context\="filecomment_context"
deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecom
 ment" name\="filecomment">/**\n * \n */</template><template autoinsert\="false"
context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment"></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"></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"></template><template autoinsert\="fal
 se" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*****************************************************************\n
*   Licensed to the Apache Software Foundation (ASF) under one\n *  or more contributor license
agreements.  See the NOTICE file\n *  distributed with this work for additional information\n
*  regarding copyright ownership.  The ASF licenses this file\n *  to you under the Apache
License, Version 2.0 (the\n *  "License"); you may not use this file except in compliance\n
*  with the License.  You may obtain a copy of the License at\n *\n *    http\://www.apache.org/licenses/LICENSE-2.0\n
*\n *  Unless required by applicable law or agreed to in writing,\n *  software distributed
under the License is distributed on an\n *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY\n *  KIND, either express or implied.  See the License for the\n *  sp
 ecific language governing permissions and limitations\n *  under the License.\n ****************************************************************/\n${package_declaration}\n\n${typecomment}\n${type_declaration}</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">${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">${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}</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><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">/**\n
* ${tags}\n * ${see_to_target}\n */</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">\n</template><template autoinsert\="true" context\="inter
 facebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</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">\n</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">\n</template><template autoinsert\="true" context\="gettercomment_context"
deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template
autoinsert\="true" context\="settercomment_context"
  deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment"
name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template
autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment
for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment"
name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true"
context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript
files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n
* \n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false"
description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment"
name\="typecomment">/**\n * ${tags}\n 
 */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false"
description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment"
name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context"
deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment"
name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true"
context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions"
enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/*
(non-Jsdoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true"
context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions"
enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.d
 elegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template
autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created
files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template
autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new
class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody"
name\="classbody">\n</template><template autoinsert\="true" context\="catchblock_context"
deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock"
name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template
autoinsert\="true" context\="methodbody_context" deleted\="false" description\="
 Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody"
name\="methodbody">// ${todo} Auto-generated function stub\n${body_statement}</template><template
autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code
in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody"
name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template
autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created
getters" enabled\="true" id\="org.eclipse.wst.jsdt.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.wst.jsdt.ui.text.codetemplates.setterbody"
name\="setterbody">${field} \= ${param};</template></templ
 ates>

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml?rev=1065003&r1=1065002&r2=1065003&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml Sat Jan 29 11:49:50 2011
@@ -80,8 +80,8 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.5</source>
+						<target>1.5</target>
 					</configuration>
 				</plugin>
 			</plugins>

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java?rev=1065003&r1=1065002&r2=1065003&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
(original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/audit/AuditableFilter.java
Sat Jan 29 11:49:50 2011
@@ -45,12 +45,10 @@ public class AuditableFilter implements 
         this.processor = processor;
     }
 
-    @Override
     public void init(DataChannel channel) {
         // noop
     }
 
-    @Override
     public QueryResponse onQuery(
             ObjectContext originatingContext,
             Query query,
@@ -58,7 +56,6 @@ public class AuditableFilter implements 
         return filterChain.onQuery(originatingContext, query);
     }
 
-    @Override
     public GraphDiff onSync(
             ObjectContext originatingContext,
             GraphDiff changes,

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationFilter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationFilter.java?rev=1065003&r1=1065002&r2=1065003&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationFilter.java
(original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/cache/CacheInvalidationFilter.java
Sat Jan 29 11:49:50 2011
@@ -45,12 +45,10 @@ public class CacheInvalidationFilter imp
 
     private final ThreadLocal<Set<String>> groups = new ThreadLocal<Set<String>>();
 
-    @Override
     public void init(DataChannel channel) {
         // noop
     }
 
-    @Override
     public QueryResponse onQuery(
             ObjectContext originatingContext,
             Query query,
@@ -58,7 +56,6 @@ public class CacheInvalidationFilter imp
         return filterChain.onQuery(originatingContext, query);
     }
 
-    @Override
     public GraphDiff onSync(
             ObjectContext originatingContext,
             GraphDiff changes,

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/ChangeSetFilter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/ChangeSetFilter.java?rev=1065003&r1=1065002&r2=1065003&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/ChangeSetFilter.java
(original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/ChangeSetFilter.java
Sat Jan 29 11:49:50 2011
@@ -43,12 +43,10 @@ public class ChangeSetFilter implements 
         return PRE_COMMIT_CHANGE_SET.get();
     }
 
-    @Override
     public void init(DataChannel channel) {
         // noop..
     }
 
-    @Override
     public QueryResponse onQuery(
             ObjectContext originatingContext,
             Query query,
@@ -56,7 +54,6 @@ public class ChangeSetFilter implements 
         return filterChain.onQuery(originatingContext, query);
     }
 
-    @Override
     public GraphDiff onSync(
             ObjectContext originatingContext,
             GraphDiff changes,

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/GenericChangeSet.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/GenericChangeSet.java?rev=1065003&r1=1065002&r2=1065003&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/GenericChangeSet.java
(original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/changeset/GenericChangeSet.java
Sat Jan 29 11:49:50 2011
@@ -46,7 +46,6 @@ public class GenericChangeSet implements
         this.diff = diff;
     }
 
-    @Override
     public Map<String, PropertyChange> getChanges(Persistent object) {
         Map<String, PropertyChange> changes = getChanges().get(object.getObjectId());
         return changes != null ? changes : Collections.EMPTY_MAP;
@@ -89,31 +88,26 @@ public class GenericChangeSet implements
                 return change;
             }
 
-            @Override
             public void nodeRemoved(Object nodeId) {
                 // noop, don't care, we'll still track the changes for deleted objects.
             }
 
-            @Override
             public void nodeCreated(Object nodeId) {
                 // noop (??)
             }
 
-            @Override
             public void arcDeleted(Object nodeId, Object targetNodeId, Object arcId) {
                 // record the fact of relationship change... TODO: analyze relationship
                 // semantics and record changset values
                 getChange(nodeId, (String) arcId, null);
             }
 
-            @Override
             public void arcCreated(Object nodeId, Object targetNodeId, Object arcId) {
                 // record the fact of relationship change... TODO: analyze relationship
                 // semantics and record changset values
                 getChange(nodeId, (String) arcId, null);
             }
 
-            @Override
             public void nodePropertyChanged(
                     Object nodeId,
                     String property,
@@ -122,7 +116,6 @@ public class GenericChangeSet implements
                 getChange(nodeId, property, oldValue).setNewValue(newValue);
             }
 
-            @Override
             public void nodeIdChanged(Object nodeId, Object newId) {
 
                 // store the same change set under old and new ids to allow lookup before

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/MixinRelationshipBatchFaultingStrategy.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/MixinRelationshipBatchFaultingStrategy.java?rev=1065003&r1=1065002&r2=1065003&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/MixinRelationshipBatchFaultingStrategy.java
(original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/MixinRelationshipBatchFaultingStrategy.java
Sat Jan 29 11:49:50 2011
@@ -32,7 +32,6 @@ public class MixinRelationshipBatchFault
         this.batchFaultHolder = new ThreadLocal<UuidBatchFault>();
     }
 
-    @Override
     public void afterObjectLoaded(DataObject object) {
 
         UuidBatchFault batchFault = batchFaultHolder.get();
@@ -56,7 +55,6 @@ public class MixinRelationshipBatchFault
         }
     }
 
-    @Override
     public void afterQuery() {
         batchFaultHolder.set(null);
     }

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/MixinRelationshipFilter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/MixinRelationshipFilter.java?rev=1065003&r1=1065002&r2=1065003&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/MixinRelationshipFilter.java
(original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/relationship/MixinRelationshipFilter.java
Sat Jan 29 11:49:50 2011
@@ -38,7 +38,6 @@ public class MixinRelationshipFilter imp
 
     private MixinRelationshipFaultingStrategy faultingStrategy;
 
-    @Override
     public void init(DataChannel channel) {
         this.faultingStrategy = createFaultingStrategy();
     }
@@ -47,7 +46,6 @@ public class MixinRelationshipFilter imp
         return new MixinRelationshipBatchFaultingStrategy();
     }
 
-    @Override
     public GraphDiff onSync(
             ObjectContext context,
             GraphDiff diff,
@@ -57,7 +55,6 @@ public class MixinRelationshipFilter imp
         return chain.onSync(context, diff, syncType);
     }
 
-    @Override
     public QueryResponse onQuery(
             ObjectContext context,
             Query query,

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilterTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilterTest.java?rev=1065003&r1=1065002&r2=1065003&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilterTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/src/test/java/org/apache/cayenne/lifecycle/audit/AuditableFilterTest.java
Sat Jan 29 11:49:50 2011
@@ -111,7 +111,6 @@ public class AuditableFilterTest extends
         when(chain.onSync(context, changes, DataChannel.FLUSH_CASCADE_SYNC)).thenAnswer(
                 new Answer<GraphDiff>() {
 
-                    @Override
                     public GraphDiff answer(InvocationOnMock invocation) throws Throwable
{
                         filter.updateAudit(auditedParent1);
                         filter.updateAuditChild(audited11);



Mime
View raw message