Author: curtisr7
Date: Wed Oct 13 18:17:40 2010
New Revision: 1022223
URL: http://svn.apache.org/viewvc?rev=1022223&view=rev
Log:
Remove invalid @Override annotations from methods that don't override a
superclass method.
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/GradientPanel.java
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultEdge.java
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultEdgeRenderer.java
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultGraphModel.java
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/GraphPanel.java
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/layout/FRLayoutManager.java
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/print/PrintableDelegateComponent.java
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/print/Vista.java
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/AttributeView.java
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/EntityTypeView.java
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/MetamodelHelper.java
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/GradientPanel.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/GradientPanel.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/GradientPanel.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/GradientPanel.java
Wed Oct 13 18:17:40 2010
@@ -170,7 +170,6 @@ public class GradientPanel extends JPane
JButton update = new JButton("UPDATE");
update.addActionListener(new ActionListener() {
- @Override
public void actionPerformed(ActionEvent e) {
panel.setColorGradient(newColor(RGB[0]), newColor(RGB[1]));
panel.repaint();
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultEdge.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultEdge.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultEdge.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultEdge.java
Wed Oct 13 18:17:40 2010
@@ -30,12 +30,10 @@ public class DefaultEdge<V1,V2> implemen
this.v2 = v2;
}
- @Override
public V1 getSource() {
return v1;
}
- @Override
public V2 getTarget() {
return v2;
}
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultEdgeRenderer.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultEdgeRenderer.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultEdgeRenderer.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultEdgeRenderer.java
Wed Oct 13 18:17:40 2010
@@ -34,7 +34,6 @@ public class DefaultEdgeRenderer<V> impl
boolean showArrowAtEnd = true;
boolean showArrowAtStart = false;
- @Override
public void render(Graphics2D g2, Path2D edgePath, Edge<V,V> edge) {
g2.draw(edgePath);
@@ -45,7 +44,6 @@ public class DefaultEdgeRenderer<V> impl
g2.fill(arrow2);
}
- @Override
public String getLabelText(Edge<V, V> edge) {
return edge.getSource().toString() + ":" + edge.getTarget().toString();
}
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultGraphModel.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultGraphModel.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultGraphModel.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/DefaultGraphModel.java
Wed Oct 13 18:17:40 2010
@@ -33,12 +33,11 @@ public class DefaultGraphModel<V> implem
_edges = new HashMap<V,Set<Edge<V,V>>>();
_edgeFactory = this;
}
- @Override
+
public Set<V> getNodes() {
return _edges.keySet();
}
- @Override
public boolean isLinked(V v1, V v2) {
Set<Edge<V,V>> edges = _edges.get(v1);
if (edges == null)
@@ -50,7 +49,6 @@ public class DefaultGraphModel<V> implem
return false;
}
- @Override
public <V1 extends V,V2 extends V> void link(Edge<V1,V2> edge) {
addVertex(edge.getSource());
addVertex(edge.getTarget());
@@ -88,12 +86,10 @@ public class DefaultGraphModel<V> implem
return all;
}
- @Override
public EdgeFactory<V,V> getEdgeFactory() {
return _edgeFactory;
}
- @Override
public void setEdgeFactory(EdgeFactory<V,V> factory) {
_edgeFactory = factory;
}
@@ -102,13 +98,13 @@ public class DefaultGraphModel<V> implem
public Edge<V, V> newEdge(V v1, V v2) {
return new DefaultEdge<V, V>(v1,v2);
}
- @Override
+
public void addVertex(V v) {
if (!_edges.containsKey(v)) {
_edges.put(v, new HashSet<Edge<V, V>>());
}
}
- @Override
+
public Set<Edge<V, V>> getOutEdges(V v) {
return _edges.get(v);
}
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/GraphPanel.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/GraphPanel.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/GraphPanel.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/graph/GraphPanel.java
Wed Oct 13 18:17:40 2010
@@ -339,7 +339,6 @@ public class GraphPanel<V> extends JPane
return c == _selected;
}
- @Override
public void mouseClicked(MouseEvent evt) {
deselect();
@@ -355,15 +354,13 @@ public class GraphPanel<V> extends JPane
}
- @Override
+
public void mouseEntered(MouseEvent e) {
}
- @Override
public void mouseExited(MouseEvent e) {
}
- @Override
public void mousePressed(MouseEvent evt) {
deselect();
Component c = select(evt.getPoint());
@@ -374,13 +371,11 @@ public class GraphPanel<V> extends JPane
}
}
- @Override
public void mouseReleased(MouseEvent evt) {
deselect();
this.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
- @Override
public void mouseDragged(MouseEvent evt) {
this.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
Point p = evt.getPoint();
@@ -393,7 +388,6 @@ public class GraphPanel<V> extends JPane
}
}
- @Override
public void mouseMoved(MouseEvent evt) {
}
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/layout/FRLayoutManager.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/layout/FRLayoutManager.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/layout/FRLayoutManager.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/layout/FRLayoutManager.java
Wed Oct 13 18:17:40 2010
@@ -93,32 +93,27 @@ public class FRLayoutManager implements
* Adds a component to be laid out. The constraints must be in the form of
* list of other components in the same container.
*/
- @Override
public void addLayoutComponent(Component comp, Object constraints) {
log("addLayoutComponent: " + comp + " constraints " + constraints);
layout.put(comp, (List<Component>)constraints);
_dirty = true;
}
- @Override
public float getLayoutAlignmentX(Container target) {
log("getLayoutAlignmentX: " + target);
return 0;
}
- @Override
public float getLayoutAlignmentY(Container target) {
log("getLayoutAlignmentY: " + target);
return 0;
}
- @Override
public void invalidateLayout(Container target) {
info("FRLayoutManager.invalidateLayout");
_dirty = true;
}
- @Override
public void addLayoutComponent(String name, Component comp) {
log("addLayoutComponent: " + comp + " name " + name);
_dirty = true;
@@ -342,7 +337,6 @@ public class FRLayoutManager implements
* components.
*
*/
- @Override
public void layoutContainer(Container parent) {
// find(parent);
if (isInitialized()) {
@@ -460,7 +454,6 @@ public class FRLayoutManager implements
return layout.get(c);
}
- @Override
public Dimension maximumLayoutSize(Container target) {
double area = 0.0;
if (_dirty || maxSize == null) {
@@ -474,7 +467,6 @@ public class FRLayoutManager implements
return maxSize;
}
- @Override
public Dimension minimumLayoutSize(Container parent) {
double area = 0.0;
if (_dirty || minSize == null) {
@@ -488,7 +480,6 @@ public class FRLayoutManager implements
return minSize;
}
- @Override
public Dimension preferredLayoutSize(Container parent) {
double area = 0.0;
if (_dirty || preferredSize == null) {
@@ -502,7 +493,6 @@ public class FRLayoutManager implements
return preferredSize;
}
- @Override
public void removeLayoutComponent(Component comp) {
log("removeLayoutComponent: " + comp);
_dirty = true;
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/print/PrintableDelegateComponent.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/print/PrintableDelegateComponent.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/print/PrintableDelegateComponent.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/print/PrintableDelegateComponent.java
Wed Oct 13 18:17:40 2010
@@ -44,7 +44,6 @@ public class PrintableDelegateComponent
return this;
}
- @Override
public int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
throws PrinterException {
if (pageIndex >= getNumberOfPages())
return NO_SUCH_PAGE;
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/print/Vista.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/print/Vista.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/print/Vista.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/swing/print/Vista.java
Wed Oct 13 18:17:40 2010
@@ -32,12 +32,10 @@ public abstract class Vista implements P
}
- @Override
public int getNumberOfPages() {
return totalPages;
}
- @Override
public PageFormat getPageFormat(int pageIndex) throws
IndexOutOfBoundsException {
if (pageIndex > totalPages) {
throw new IndexOutOfBoundsException();
@@ -45,7 +43,6 @@ public abstract class Vista implements P
return format;
}
- @Override
public Printable getPrintable(int pageIndex) throws
IndexOutOfBoundsException {
if (pageIndex > totalPages) {
throw new IndexOutOfBoundsException();
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/AttributeView.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/AttributeView.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/AttributeView.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/AttributeView.java
Wed Oct 13 18:17:40 2010
@@ -122,17 +122,14 @@ public class AttributeView extends JPane
public static class AttributeEdgeRenderer implements
EdgeRenderer<ManagedType<?>> {
- @Override
public String getLabelText(Edge<ManagedType<?>, ManagedType<?>> edge) {
return
((AttributeView.AttributeLink)edge).getAttribute().getName();
}
- @Override
public JLabel getLabel(String text) {
return new JLabel(text);
}
- @Override
public void render(Graphics2D g, Path2D edgePath, Edge<ManagedType<?>,
ManagedType<?>> edge) {
Color newColor =
MetamodelUIManager.getColor(((AttributeView.AttributeLink)edge).getAttribute());
g.setColor(newColor);
@@ -147,7 +144,7 @@ public class AttributeView extends JPane
public static class IdLinkRenderer implements EdgeRenderer<ManagedType<?>>
{
private static Stroke THICK_LINE = new BasicStroke(2);
- @Override
+
public String getLabelText(Edge<ManagedType<?>, ManagedType<?>> edge) {
return ((IdLink)edge).getAttribute().getName();
}
@@ -185,7 +182,6 @@ public class AttributeView extends JPane
g2.fill(arrow);
}
- @Override
public String getLabelText(Edge<ManagedType<?>, ManagedType<?>> edge) {
return "extends";
}
@@ -207,12 +203,10 @@ public class AttributeView extends JPane
this.target = target;
}
- @Override
public final ManagedType<?> getSource() {
return source;
}
- @Override
public final ManagedType<?> getTarget() {
return target;
}
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/EntityTypeView.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/EntityTypeView.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/EntityTypeView.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/EntityTypeView.java
Wed Oct 13 18:17:40 2010
@@ -128,7 +128,6 @@ public class EntityTypeView<T> extends S
return new Line2D.Double[]{line};
}
- @Override
public Line2D[] getEntryPins(Edge<ManagedType<?>, ManagedType<?>> edge,
Connectable<ManagedType<?>> source) {
double P = PIN_SIZE;
@@ -162,7 +161,6 @@ public class EntityTypeView<T> extends S
return new Line2D.Double(x,y, x,y+L);
}
- @Override
public JComponent asComponent() {
return this;
}
Modified:
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/MetamodelHelper.java
URL:
http://svn.apache.org/viewvc/openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/MetamodelHelper.java?rev=1022223&r1=1022222&r2=1022223&view=diff
==============================================================================
---
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/MetamodelHelper.java
(original)
+++
openjpa/tools/trunk/openjpa-tools/src/main/java/org/apache/openjpa/tools/metamodel/MetamodelHelper.java
Wed Oct 13 18:17:40 2010
@@ -174,7 +174,6 @@ public class MetamodelHelper {
*
*/
public static class EntityComparator implements Comparator<EntityType<?>> {
- @Override
public int compare(EntityType<?> o1, EntityType<?> o2) {
if (derivedTarget(o1) == o2)
return 1;
@@ -198,7 +197,6 @@ public class MetamodelHelper {
*
*/
public static class AttributeComparator implements
Comparator<Attribute<?,?>> {
- @Override
public int compare(Attribute<?, ?> a1, Attribute<?, ?> a2) {
Integer t1 = getAttributeTypeCode(a1);
Integer t2 = getAttributeTypeCode(a2);
