You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2010/07/26 23:09:24 UTC
svn commit: r979443 - in
/openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools:
action/Actions.java util/Option.java
Author: mikedd
Date: Mon Jul 26 21:09:24 2010
New Revision: 979443
URL: http://svn.apache.org/viewvc?rev=979443&view=rev
Log:
remove @override annotations on methods which aren't overidden
Modified:
openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java
openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/util/Option.java
Modified: openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java?rev=979443&r1=979442&r2=979443&view=diff
==============================================================================
--- openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java (original)
+++ openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/action/Actions.java Mon Jul 26 21:09:24 2010
@@ -241,7 +241,6 @@ public interface Actions {//extends Comp
targetName = getAttribute("to", "from");
}
- @Override
public Node run(Document targetDoc, Element source, Element current,
Collection<String> consumedAttrs, Collection<String> consumedElements) {
Element sourceNode = getElementByName(source, sourcetName, false);
@@ -373,7 +372,6 @@ public interface Actions {//extends Comp
super(Code.IGNORE_ATTR, e);
}
- @Override
public Node run(Document targetDoc, Element source, Element current,
Collection<String> consumedAttrs, Collection<String> consumedElements) {
consumedAttrs.add(original.getAttribute("name"));
@@ -386,7 +384,6 @@ public interface Actions {//extends Comp
super(Code.IGNORE_NODE, e);
}
- @Override
public Node run(Document targetDoc, Element source, Element current,
Collection<String> consumedAttrs, Collection<String> consumedElements) {
consumedElements.add(original.getAttribute("name"));
@@ -410,7 +407,6 @@ public interface Actions {//extends Comp
sourceAttrName = e.getAttribute("on");
}
- @Override
public Node run(Document targetDoc, Element source, Element current,
Collection<String> consumedAttrs, Collection<String> consumedElements) {
Element forParent = targetDoc.createElement(targetName);
@@ -435,7 +431,6 @@ public interface Actions {//extends Comp
super(Code.CUSTOM_NODE, e);
}
- @Override
public Node run(Document targetDoc, Element source, Element current,
Collection<String> consumedAttrs, Collection<String> consumedElements) {
consumedAttrs.add("embed-xml");
Modified: openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/util/Option.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/util/Option.java?rev=979443&r1=979442&r2=979443&view=diff
==============================================================================
--- openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/util/Option.java (original)
+++ openjpa/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/util/Option.java Mon Jul 26 21:09:24 2010
@@ -206,7 +206,6 @@ public class Option<T> implements Compar
return v;
}
- @Override
public int compareTo(Option<T> o) {
if (isMandatory() && !o.isMandatory()) {
return -1;