Repository: oodt Updated Branches: refs/heads/master d7bbba082 -> 559a65f61
OODT-898 remove redundant private final Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/bd08d403 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/bd08d403 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/bd08d403 Branch: refs/heads/master Commit: bd08d403a7852a2812da9b2c458d179936fc26f5 Parents: d7bbba0 Author: Tom Barber <[email protected]> Authored: Sun Oct 25 11:28:50 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Sun Oct 25 11:28:50 2015 +0000 ---------------------------------------------------------------------- .../cas/catalog/query/parser/QueryParser.java | 42 +++++++++---------- .../query/parser/QueryParserTokenManager.java | 44 ++++++++++---------- .../org/apache/oodt/opendapps/Profiler.java | 2 +- .../xmlquery/ChunkedProductInputStream.java | 2 +- 4 files changed, 45 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/bd08d403/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java index 44c19be..229d3f8 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParser.java @@ -620,68 +620,68 @@ import java.util.Vector; } } - final private boolean jj_2_1(int xla) { + private boolean jj_2_1(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_1(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(0, xla); } } - final private boolean jj_2_2(int xla) { + private boolean jj_2_2(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_2(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(1, xla); } } - final private boolean jj_2_3(int xla) { + private boolean jj_2_3(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_3(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(2, xla); } } - final private boolean jj_2_4(int xla) { + private boolean jj_2_4(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_4(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(3, xla); } } - final private boolean jj_2_5(int xla) { + private boolean jj_2_5(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_5(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(4, xla); } } - final private boolean jj_2_6(int xla) { + private boolean jj_2_6(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_6(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(5, xla); } } - final private boolean jj_2_7(int xla) { + private boolean jj_2_7(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_7(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(6, xla); } } - final private boolean jj_2_8(int xla) { + private boolean jj_2_8(int xla) { jj_la = xla; jj_lastpos = jj_scanpos = token; try { return !jj_3_8(); } catch(LookaheadSuccess ls) { return true; } finally { jj_save(7, xla); } } - final private boolean jj_3_8() { + private boolean jj_3_8() { if (jj_scan_token(COMMA)) return true; return false; } - final private boolean jj_3_3() { + private boolean jj_3_3() { if (jj_scan_token(OPEN_BRACES)) return true; Token xsp; while (true) { @@ -692,17 +692,17 @@ import java.util.Vector; return false; } - final private boolean jj_3_2() { + private boolean jj_3_2() { if (jj_scan_token(OPEN_PARENS)) return true; return false; } - final private boolean jj_3_7() { + private boolean jj_3_7() { if (jj_scan_token(COMMA)) return true; return false; } - final private boolean jj_3_1() { + private boolean jj_3_1() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(5)) { @@ -712,12 +712,12 @@ import java.util.Vector; return false; } - final private boolean jj_3_5() { + private boolean jj_3_5() { if (jj_scan_token(TERM)) return true; return false; } - final private boolean jj_3_6() { + private boolean jj_3_6() { Token xsp; while (true) { xsp = jj_scanpos; @@ -727,7 +727,7 @@ import java.util.Vector; return false; } - final private boolean jj_3_4() { + private boolean jj_3_4() { if (jj_scan_token(OPEN_BRACES)) return true; Token xsp; while (true) { @@ -826,7 +826,7 @@ import java.util.Vector; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } - final private Token jj_consume_token(int kind) throws ParseException { + private Token jj_consume_token(int kind) throws ParseException { Token oldToken; if ((oldToken = token).next != null) token = token.next; else token = token.next = token_source.getNextToken(); @@ -852,7 +852,7 @@ import java.util.Vector; static private final class LookaheadSuccess extends java.lang.Error { } final private LookaheadSuccess jj_ls = new LookaheadSuccess(); - final private boolean jj_scan_token(int kind) { + private boolean jj_scan_token(int kind) { if (jj_scanpos == jj_lastpos) { jj_la--; if (jj_scanpos.next == null) { @@ -890,7 +890,7 @@ import java.util.Vector; return t; } - final private int jj_ntk() { + private int jj_ntk() { if ((jj_nt=token.next) == null) return (jj_ntk = (token.next=token_source.getNextToken()).kind); else @@ -973,7 +973,7 @@ import java.util.Vector; final public void disable_tracing() { } - final private void jj_rescan_token() { + private void jj_rescan_token() { jj_rescan = true; for (int i = 0; i < 8; i++) { try { @@ -999,7 +999,7 @@ import java.util.Vector; jj_rescan = false; } - final private void jj_save(int index, int xla) { + private void jj_save(int index, int xla) { JJCalls p = jj_2_rtns[index]; while (p.gen > jj_gen) { if (p.next == null) { p = p.next = new JJCalls(); break; } http://git-wip-us.apache.org/repos/asf/oodt/blob/bd08d403/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java index 1babab2..30eeff7 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/query/parser/QueryParserTokenManager.java @@ -5,7 +5,7 @@ public class QueryParserTokenManager implements QueryParserConstants { public java.io.PrintStream debugStream = System.out; public void setDebugStream(java.io.PrintStream ds) { debugStream = ds; } -private final int jjStopStringLiteralDfa_0(int pos, long active0) +private int jjStopStringLiteralDfa_0(int pos, long active0) { switch (pos) { @@ -96,17 +96,17 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0) return -1; } } -private final int jjStartNfa_0(int pos, long active0) +private int jjStartNfa_0(int pos, long active0) { return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1); } -private final int jjStopAtPos(int pos, int kind) +private int jjStopAtPos(int pos, int kind) { jjmatchedKind = kind; jjmatchedPos = pos; return pos + 1; } -private final int jjStartNfaWithStates_0(int pos, int kind, int state) +private int jjStartNfaWithStates_0(int pos, int kind, int state) { jjmatchedKind = kind; jjmatchedPos = pos; @@ -114,7 +114,7 @@ private final int jjStartNfaWithStates_0(int pos, int kind, int state) catch(java.io.IOException e) { return pos + 1; } return jjMoveNfa_0(state, pos + 1); } -private final int jjMoveStringLiteralDfa0_0() +private int jjMoveStringLiteralDfa0_0() { switch(curChar) { @@ -155,7 +155,7 @@ private final int jjMoveStringLiteralDfa0_0() return jjMoveNfa_0(3, 0); } } -private final int jjMoveStringLiteralDfa1_0(long active0) +private int jjMoveStringLiteralDfa1_0(long active0) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -189,7 +189,7 @@ private final int jjMoveStringLiteralDfa1_0(long active0) } return jjStartNfa_0(0, active0); } -private final int jjMoveStringLiteralDfa2_0(long old0, long active0) +private int jjMoveStringLiteralDfa2_0(long old0, long active0) { if (((active0 &= old0)) == 0L) return jjStartNfa_0(0, old0); @@ -213,7 +213,7 @@ private final int jjMoveStringLiteralDfa2_0(long old0, long active0) } return jjStartNfa_0(1, active0); } -private final int jjMoveStringLiteralDfa3_0(long old0, long active0) +private int jjMoveStringLiteralDfa3_0(long old0, long active0) { if (((active0 &= old0)) == 0L) return jjStartNfa_0(1, old0); @@ -241,7 +241,7 @@ private final int jjMoveStringLiteralDfa3_0(long old0, long active0) } return jjStartNfa_0(2, active0); } -private final int jjMoveStringLiteralDfa4_0(long old0, long active0) +private int jjMoveStringLiteralDfa4_0(long old0, long active0) { if (((active0 &= old0)) == 0L) return jjStartNfa_0(2, old0); @@ -263,7 +263,7 @@ private final int jjMoveStringLiteralDfa4_0(long old0, long active0) } return jjStartNfa_0(3, active0); } -private final int jjMoveStringLiteralDfa5_0(long old0, long active0) +private int jjMoveStringLiteralDfa5_0(long old0, long active0) { if (((active0 &= old0)) == 0L) return jjStartNfa_0(3, old0); @@ -281,7 +281,7 @@ private final int jjMoveStringLiteralDfa5_0(long old0, long active0) } return jjStartNfa_0(4, active0); } -private final int jjMoveStringLiteralDfa6_0(long old0, long active0) +private int jjMoveStringLiteralDfa6_0(long old0, long active0) { if (((active0 &= old0)) == 0L) return jjStartNfa_0(4, old0); @@ -299,7 +299,7 @@ private final int jjMoveStringLiteralDfa6_0(long old0, long active0) } return jjStartNfa_0(5, active0); } -private final int jjMoveStringLiteralDfa7_0(long old0, long active0) +private int jjMoveStringLiteralDfa7_0(long old0, long active0) { if (((active0 &= old0)) == 0L) return jjStartNfa_0(5, old0); @@ -317,7 +317,7 @@ private final int jjMoveStringLiteralDfa7_0(long old0, long active0) } return jjStartNfa_0(6, active0); } -private final int jjMoveStringLiteralDfa8_0(long old0, long active0) +private int jjMoveStringLiteralDfa8_0(long old0, long active0) { if (((active0 &= old0)) == 0L) return jjStartNfa_0(6, old0); @@ -335,7 +335,7 @@ private final int jjMoveStringLiteralDfa8_0(long old0, long active0) } return jjStartNfa_0(7, active0); } -private final int jjMoveStringLiteralDfa9_0(long old0, long active0) +private int jjMoveStringLiteralDfa9_0(long old0, long active0) { if (((active0 &= old0)) == 0L) return jjStartNfa_0(7, old0); @@ -353,7 +353,7 @@ private final int jjMoveStringLiteralDfa9_0(long old0, long active0) } return jjStartNfa_0(8, active0); } -private final int jjMoveStringLiteralDfa10_0(long old0, long active0) +private int jjMoveStringLiteralDfa10_0(long old0, long active0) { if (((active0 &= old0)) == 0L) return jjStartNfa_0(8, old0); @@ -373,7 +373,7 @@ private final int jjMoveStringLiteralDfa10_0(long old0, long active0) } return jjStartNfa_0(9, active0); } -private final void jjCheckNAdd(int state) +private void jjCheckNAdd(int state) { if (jjrounds[state] != jjround) { @@ -381,29 +381,29 @@ private final void jjCheckNAdd(int state) jjrounds[state] = jjround; } } -private final void jjAddStates(int start, int end) +private void jjAddStates(int start, int end) { do { jjstateSet[jjnewStateCnt++] = jjnextStates[start]; } while (start++ != end); } -private final void jjCheckNAddTwoStates(int state1, int state2) +private void jjCheckNAddTwoStates(int state1, int state2) { jjCheckNAdd(state1); jjCheckNAdd(state2); } -private final void jjCheckNAddStates(int start, int end) +private void jjCheckNAddStates(int start, int end) { do { jjCheckNAdd(jjnextStates[start]); } while (start++ != end); } -private final void jjCheckNAddStates(int start) +private void jjCheckNAddStates(int start) { jjCheckNAdd(jjnextStates[start]); jjCheckNAdd(jjnextStates[start + 1]); } -private final int jjMoveNfa_0(int startState, int curPos) +private int jjMoveNfa_0(int startState, int curPos) { int[] nextStates; int startsAt = 0; @@ -637,7 +637,7 @@ public void ReInit(SimpleCharStream stream) input_stream = stream; ReInitRounds(); } -private final void ReInitRounds() +private void ReInitRounds() { int i; jjround = 0x80000001; http://git-wip-us.apache.org/repos/asf/oodt/blob/bd08d403/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java ---------------------------------------------------------------------- diff --git a/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java b/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java index ae85684..6ffc432 100644 --- a/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java +++ b/opendapps/src/main/java/org/apache/oodt/opendapps/Profiler.java @@ -145,7 +145,7 @@ public class Profiler { } - private final static void usage() { + private static void usage() { System.out .println("Usage: java -classpath [path to opendapps-version-jar-with-dependencies.jar] org.apache.oodt.opendapps.Profiler <config file location> [<output_dir>]"); System.out http://git-wip-us.apache.org/repos/asf/oodt/blob/bd08d403/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java ---------------------------------------------------------------------- diff --git a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java index b5dceee..bdf21d1 100644 --- a/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java +++ b/product/src/main/java/org/apache/oodt/xmlquery/ChunkedProductInputStream.java @@ -170,7 +170,7 @@ final class ChunkedProductInputStream extends InputStream { * * @throws IOException if the stream's closed. */ - private final void checkOpen() throws IOException { + private void checkOpen() throws IOException { if (open) return; throw new IOException("Stream closed"); }
