java/code/src/com/redhat/rhn/common/conf/Config.java | 1 -
java/code/src/com/redhat/rhn/common/filediff/RhnHtmlDiffWriter.java | 5 -----
java/code/src/com/redhat/rhn/common/filediff/RhnPatchDiffWriter.java | 5 -----
java/code/src/com/redhat/rhn/common/finder/FileFinder.java | 2 --
java/code/src/com/redhat/rhn/common/finder/JarFinder.java | 2 --
java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 1 -
6 files changed, 16 deletions(-)
New commits:
commit c1a525cbedd270f298e45eb625b71a2a647395c5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 29 10:50:44 2012 +0100
removing @Override annotation from methods that aren't overriden
diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java
b/java/code/src/com/redhat/rhn/common/conf/Config.java
index d37f69f..dad76d3 100644
--- a/java/code/src/com/redhat/rhn/common/conf/Config.java
+++ b/java/code/src/com/redhat/rhn/common/conf/Config.java
@@ -85,7 +85,6 @@ public class Config {
private final TreeSet<File> fileList = new TreeSet<File>(new Comparator()
{
/** {inheritDoc} */
- @Override
public int compare(Object o1, Object o2) {
// Need to make sure we read the child namespace before the base
// namespace. To do that, we sort the list in reverse order based
diff --git a/java/code/src/com/redhat/rhn/common/filediff/RhnHtmlDiffWriter.java
b/java/code/src/com/redhat/rhn/common/filediff/RhnHtmlDiffWriter.java
index 245abcb..a997629 100644
--- a/java/code/src/com/redhat/rhn/common/filediff/RhnHtmlDiffWriter.java
+++ b/java/code/src/com/redhat/rhn/common/filediff/RhnHtmlDiffWriter.java
@@ -53,7 +53,6 @@ public class RhnHtmlDiffWriter implements DiffWriter, DiffVisitor {
/**
* {@inheritDoc}
*/
- @Override
public void writeHunk(Hunk hunk) {
hunk.visit(this);
}
@@ -61,7 +60,6 @@ public class RhnHtmlDiffWriter implements DiffWriter, DiffVisitor {
/**
* {@inheritDoc}
*/
- @Override
public void accept(ChangeHunk hunk) {
printStartDiv("changed");
int numOld = printLines(oldfile, hunk.getOldLines());
@@ -80,7 +78,6 @@ public class RhnHtmlDiffWriter implements DiffWriter, DiffVisitor {
/**
* {@inheritDoc}
*/
- @Override
public void accept(DeleteHunk hunk) {
printStartDiv("deleted");
int numlines = printLines(oldfile, hunk.getOldLines());
@@ -95,7 +92,6 @@ public class RhnHtmlDiffWriter implements DiffWriter, DiffVisitor {
/**
* {@inheritDoc}
*/
- @Override
public void accept(MatchHunk hunk) {
if (!onlyChanged) {
printLines(oldfile, hunk.getOldLines());
@@ -111,7 +107,6 @@ public class RhnHtmlDiffWriter implements DiffWriter, DiffVisitor {
/**
* {@inheritDoc}
*/
- @Override
public void accept(InsertHunk hunk) {
printStartDiv("inserted");
int numlines = printLines(newfile, hunk.getNewLines());
diff --git a/java/code/src/com/redhat/rhn/common/filediff/RhnPatchDiffWriter.java
b/java/code/src/com/redhat/rhn/common/filediff/RhnPatchDiffWriter.java
index a346b2f..226696f 100644
--- a/java/code/src/com/redhat/rhn/common/filediff/RhnPatchDiffWriter.java
+++ b/java/code/src/com/redhat/rhn/common/filediff/RhnPatchDiffWriter.java
@@ -75,7 +75,6 @@ public class RhnPatchDiffWriter implements DiffVisitor, DiffWriter {
/**
* {@inheritDoc}
*/
- @Override
public void writeHunk(Hunk hunkIn) {
hunkIn.visit(this);
}
@@ -83,7 +82,6 @@ public class RhnPatchDiffWriter implements DiffVisitor, DiffWriter {
/**
* {@inheritDoc}
*/
- @Override
public void accept(ChangeHunk hunk) {
processEditHunk(hunk);
}
@@ -91,7 +89,6 @@ public class RhnPatchDiffWriter implements DiffVisitor, DiffWriter {
/**
* {@inheritDoc}
*/
- @Override
public void accept(DeleteHunk hunk) {
processEditHunk(hunk);
}
@@ -99,7 +96,6 @@ public class RhnPatchDiffWriter implements DiffVisitor, DiffWriter {
/**
* {@inheritDoc}
*/
- @Override
public void accept(InsertHunk hunk) {
processEditHunk(hunk);
}
@@ -133,7 +129,6 @@ public class RhnPatchDiffWriter implements DiffVisitor, DiffWriter {
/**
* {@inheritDoc}
*/
- @Override
public void accept(MatchHunk hunk) {
int startLine = hunk.getOldLines().getFromLine();
int endLine = hunk.getOldLines().getToLine();
diff --git a/java/code/src/com/redhat/rhn/common/finder/FileFinder.java
b/java/code/src/com/redhat/rhn/common/finder/FileFinder.java
index a0f0045..c859eb3 100644
--- a/java/code/src/com/redhat/rhn/common/finder/FileFinder.java
+++ b/java/code/src/com/redhat/rhn/common/finder/FileFinder.java
@@ -42,13 +42,11 @@ class FileFinder implements Finder {
}
/** {@inheritDoc} */
- @Override
public List<String> find(String endStr) {
return findExcluding(null, endStr);
}
/** {@inheritDoc} */
- @Override
public List<String> findExcluding(String[] excludes, String endStr) {
List<String> results = new LinkedList<String>();
diff --git a/java/code/src/com/redhat/rhn/common/finder/JarFinder.java
b/java/code/src/com/redhat/rhn/common/finder/JarFinder.java
index fe2a33f..9d958e9 100644
--- a/java/code/src/com/redhat/rhn/common/finder/JarFinder.java
+++ b/java/code/src/com/redhat/rhn/common/finder/JarFinder.java
@@ -42,13 +42,11 @@ class JarFinder implements Finder {
}
/** {@inheritDoc} */
- @Override
public List<String> find(String endStr) {
return findExcluding(null, endStr);
}
/** {@inheritDoc} */
- @Override
public List<String> findExcluding(String[] excludes, String endStr) {
try {
JarURLConnection conn = (JarURLConnection)url.openConnection();
diff --git a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
index 8d207d4..36e5808 100644
--- a/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/user/UserFactory.java
@@ -522,7 +522,6 @@ public class UserFactory extends HibernateFactory {
//All other timezones are sorted West to East based on raw off-set.
if (timeZones != null) {
Collections.sort(timeZones, new Comparator() {
- @Override
public int compare(Object o1, Object o2) {
int offSet1 = ((RhnTimeZone)o1).getTimeZone().getRawOffset();
int offSet2 = ((RhnTimeZone)o2).getTimeZone().getRawOffset();