OODT-902 tidy up fix enums
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/39306ff3 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/39306ff3 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/39306ff3 Branch: refs/heads/master Commit: 39306ff369ae6714cda845e6d3549dee155c8dec Parents: 73d960e Author: Tom Barber <[email protected]> Authored: Sun Oct 25 15:32:31 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Sun Oct 25 15:32:31 2015 +0000 ---------------------------------------------------------------------- .../cas/workflow/gui/perspective/view/View.java | 2 +- .../cas/catalog/query/parser/QueryParser.java | 20 ---------------- .../org/apache/oodt/cas/catalog/term/Term.java | 6 ++--- .../validator/CmdLineOptionValidator.java | 2 +- .../org/apache/oodt/cas/cli/util/ParsedArg.java | 2 +- .../handler/TestApplyToActionHandler.java | 3 ++- .../org/apache/oodt/commons/date/DateUtils.java | 2 +- .../oodt/cas/crawl/status/IngestStatus.java | 2 +- .../oodt/cas/filemgr/tools/QueryTool.java | 4 ++-- .../cli/action/TestGetPrevPageCliAction.java | 2 +- .../oodt/cas/pge/metadata/PgeMetadata.java | 2 +- .../oodt/profile/ProfileAttributesTest.java | 4 ++-- .../oodt/profile/ProfileElementTestCase.java | 2 +- .../oodt/profile/ResourceAttributesTest.java | 24 ++++++++++---------- 14 files changed, 29 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/View.java ---------------------------------------------------------------------- diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/View.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/View.java index b669267..4f6c35d 100644 --- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/View.java +++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/View.java @@ -36,7 +36,7 @@ public abstract class View extends JPanel { private static final long serialVersionUID = -708692459667309413L; public enum Mode { - DELETE, EDIT, MOVE, ZOOM_IN, ZOOM_OUT; + DELETE, EDIT, MOVE, ZOOM_IN, ZOOM_OUT } private Vector<ViewListener> listeners; http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/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 229d3f8..8150c10 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 @@ -64,7 +64,6 @@ import java.util.Vector; label_1: while (true) { if (jj_2_1(2147483647)) { - ; } else { break label_1; } @@ -172,7 +171,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[1] = jj_gen; @@ -185,7 +183,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[2] = jj_gen; @@ -198,7 +195,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[3] = jj_gen; @@ -211,7 +207,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[4] = jj_gen; @@ -226,7 +221,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[5] = jj_gen; @@ -238,13 +232,11 @@ import java.util.Vector; break; default: jj_la1[6] = jj_gen; - ; } label_7: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[7] = jj_gen; @@ -295,7 +287,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[8] = jj_gen; @@ -328,7 +319,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[10] = jj_gen; @@ -415,7 +405,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[11] = jj_gen; @@ -428,7 +417,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[12] = jj_gen; @@ -441,7 +429,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[13] = jj_gen; @@ -457,7 +444,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[14] = jj_gen; @@ -468,13 +454,11 @@ import java.util.Vector; jj_consume_token(SEMI_COLON); getProperties(p); } else { - ; } label_14: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[15] = jj_gen; @@ -521,7 +505,6 @@ import java.util.Vector; label_15: while (true) { if (jj_2_7(2147483647)) { - ; } else { break label_15; } @@ -564,7 +547,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[16] = jj_gen; @@ -577,7 +559,6 @@ import java.util.Vector; while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[17] = jj_gen; @@ -589,7 +570,6 @@ import java.util.Vector; label_18: while (true) { if (jj_2_8(2147483647)) { - ; } else { break label_18; } http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java index 653a9ca..eb89e49 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/term/Term.java @@ -81,9 +81,9 @@ public class Term implements Cloneable { xml_NMTOKENS, xml_anyType, xml_anySimpleType - }; - - public Term() { + } + + public Term() { this.type = Type.xml_string; this.values = Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java ---------------------------------------------------------------------- diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java b/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java index 2e4faa6..e49524c 100755 --- a/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java +++ b/cli/src/main/java/org/apache/oodt/cas/cli/option/validator/CmdLineOptionValidator.java @@ -28,7 +28,7 @@ public interface CmdLineOptionValidator { class Result { public enum Grade { - PASS, FAIL; + PASS, FAIL } private String message; http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/cli/src/main/java/org/apache/oodt/cas/cli/util/ParsedArg.java ---------------------------------------------------------------------- diff --git a/cli/src/main/java/org/apache/oodt/cas/cli/util/ParsedArg.java b/cli/src/main/java/org/apache/oodt/cas/cli/util/ParsedArg.java index 03f9acd..dbb1477 100644 --- a/cli/src/main/java/org/apache/oodt/cas/cli/util/ParsedArg.java +++ b/cli/src/main/java/org/apache/oodt/cas/cli/util/ParsedArg.java @@ -24,7 +24,7 @@ package org.apache.oodt.cas.cli.util; public class ParsedArg { public enum Type { - OPTION, VALUE; + OPTION, VALUE } private String name; http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/cli/src/test/java/org/apache/oodt/cas/cli/option/handler/TestApplyToActionHandler.java ---------------------------------------------------------------------- diff --git a/cli/src/test/java/org/apache/oodt/cas/cli/option/handler/TestApplyToActionHandler.java b/cli/src/test/java/org/apache/oodt/cas/cli/option/handler/TestApplyToActionHandler.java index 1b8a0a3..83b6917 100644 --- a/cli/src/test/java/org/apache/oodt/cas/cli/option/handler/TestApplyToActionHandler.java +++ b/cli/src/test/java/org/apache/oodt/cas/cli/option/handler/TestApplyToActionHandler.java @@ -90,7 +90,8 @@ public class TestApplyToActionHandler extends TestCase { } public static class TestCmdLineAction extends CmdLineAction { - public enum CallType { ADD, SET }; + public enum CallType { ADD, SET } + private CallType callType; @Override http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java index 83b823d..4f31a67 100644 --- a/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java +++ b/commons/src/main/java/org/apache/oodt/commons/date/DateUtils.java @@ -35,7 +35,7 @@ import java.util.TimeZone; */ public class DateUtils { - public enum FormatType { UTC_FORMAT, LOCAL_FORMAT, TAI_FORMAT }; + public enum FormatType { UTC_FORMAT, LOCAL_FORMAT, TAI_FORMAT } public static Calendar tai93epoch = new GregorianCalendar(1993, GregorianCalendar.JANUARY, 1); http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java ---------------------------------------------------------------------- diff --git a/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java b/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java index ac9958f..f815075 100644 --- a/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java +++ b/crawler/src/main/java/org/apache/oodt/cas/crawl/status/IngestStatus.java @@ -31,7 +31,7 @@ import java.io.File; public interface IngestStatus { enum Result { - SUCCESS, FAILURE, SKIPPED, PRECONDS_FAILED; + SUCCESS, FAILURE, SKIPPED, PRECONDS_FAILED } File getProduct(); http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java index ba77bb8..c150025 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/QueryTool.java @@ -67,8 +67,8 @@ public final class QueryTool { private XmlRpcFileManagerClient client = null; - private enum QueryType { LUCENE, SQL }; - + private enum QueryType { LUCENE, SQL } + /* our log stream */ private static final Logger LOG = Logger.getLogger(QueryTool.class.getName()); http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestGetPrevPageCliAction.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestGetPrevPageCliAction.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestGetPrevPageCliAction.java index 7248870..12abeb3 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestGetPrevPageCliAction.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/cli/action/TestGetPrevPageCliAction.java @@ -208,5 +208,5 @@ public class TestGetPrevPageCliAction extends TestCase { pp.setPageProducts(Lists.newArrayList(p4)); return pp; } - }; + } } http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/pge/src/main/java/org/apache/oodt/cas/pge/metadata/PgeMetadata.java ---------------------------------------------------------------------- diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/metadata/PgeMetadata.java b/pge/src/main/java/org/apache/oodt/cas/pge/metadata/PgeMetadata.java index a56c8c4..34e0c24 100644 --- a/pge/src/main/java/org/apache/oodt/cas/pge/metadata/PgeMetadata.java +++ b/pge/src/main/java/org/apache/oodt/cas/pge/metadata/PgeMetadata.java @@ -51,7 +51,7 @@ import com.google.common.collect.Sets; public class PgeMetadata { public enum Type { - STATIC, DYNAMIC, LOCAL; + STATIC, DYNAMIC, LOCAL } public static final List<Type> DEFAULT_COMBINE_ORDER = Lists .newArrayList(Type.LOCAL, Type.DYNAMIC, Type.STATIC); http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/profile/src/test/java/org/apache/oodt/profile/ProfileAttributesTest.java ---------------------------------------------------------------------- diff --git a/profile/src/test/java/org/apache/oodt/profile/ProfileAttributesTest.java b/profile/src/test/java/org/apache/oodt/profile/ProfileAttributesTest.java index 223a86f..04792f0 100644 --- a/profile/src/test/java/org/apache/oodt/profile/ProfileAttributesTest.java +++ b/profile/src/test/java/org/apache/oodt/profile/ProfileAttributesTest.java @@ -129,11 +129,11 @@ public class ProfileAttributesTest extends TestCase { } else if ("profParentId".equals(name)) { assertEquals("parent", XML.text(child)); } else if ("profChildId".equals(name)) { - ; // ignore, list serialization tested in XMLTest + // ignore, list serialization tested in XMLTest } else if ("profRegAuthority".equals(name)) { assertEquals("regAuthority", XML.text(child)); } else if ("profRevisionNote".equals(name)) { - ; // ignore, list serialization tested in XMLTest + // ignore, list serialization tested in XMLTest } else fail("Unknown node \"" + name + "\" in XML result"); } ProfileAttributes p = new ProfileAttributes(root); http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/profile/src/test/java/org/apache/oodt/profile/ProfileElementTestCase.java ---------------------------------------------------------------------- diff --git a/profile/src/test/java/org/apache/oodt/profile/ProfileElementTestCase.java b/profile/src/test/java/org/apache/oodt/profile/ProfileElementTestCase.java index 617c69c..6a54635 100644 --- a/profile/src/test/java/org/apache/oodt/profile/ProfileElementTestCase.java +++ b/profile/src/test/java/org/apache/oodt/profile/ProfileElementTestCase.java @@ -172,7 +172,7 @@ public abstract class ProfileElementTestCase extends TestCase { } else if ("elemMaxValue".equals(name)) { checkMaxValue(text); } else if ("elemSynonym".equals(name)) { - ; // ignore + // ignore } else if ("elemObligation".equals(name)) { assertEquals("Optional", text); } else if ("elemMaxOccurrence".equals(name)) { http://git-wip-us.apache.org/repos/asf/oodt/blob/39306ff3/profile/src/test/java/org/apache/oodt/profile/ResourceAttributesTest.java ---------------------------------------------------------------------- diff --git a/profile/src/test/java/org/apache/oodt/profile/ResourceAttributesTest.java b/profile/src/test/java/org/apache/oodt/profile/ResourceAttributesTest.java index 96faa54..ac216e7 100644 --- a/profile/src/test/java/org/apache/oodt/profile/ResourceAttributesTest.java +++ b/profile/src/test/java/org/apache/oodt/profile/ResourceAttributesTest.java @@ -117,29 +117,29 @@ public class ResourceAttributesTest extends TestCase { } else if ("Title".equals(name)) { assertEquals("title", XML.text(child)); } else if ("Format".equals(name)) { - ; // ignore + // ignore } else if ("Description".equals(name)) { assertEquals("desc", XML.text(child)); } else if ("Creator".equals(name)) { - ; // ignore + // ignore } else if ("Subject".equals(name)) { - ; // ignore + // ignore } else if ("Publisher".equals(name)) { - ; // ignore + // ignore } else if ("Contributor".equals(name)) { - ; // ignore + // ignore } else if ("Date".equals(name)) { - ; // ignore + // ignore } else if ("Type".equals(name)) { - ; // ignore + // ignore } else if ("Source".equals(name)) { - ; // ignore + // ignore } else if ("Language".equals(name)) { - ; // ignore + // ignore } else if ("Coverage".equals(name)) { - ; // ignore + // ignore } else if ("Rights".equals(name)) { - ; // ignore + // ignore } else if ("resContext".equals(name)) { assertEquals("context", XML.text(child)); } else if ("resAggregation".equals(name)) { @@ -147,7 +147,7 @@ public class ResourceAttributesTest extends TestCase { } else if ("resClass".equals(name)) { assertEquals("class", XML.text(child)); } else if ("resLocation".equals(name)) { - ; // ignore + // ignore } else fail("Unknown node \"" + name + "\" in XML result"); } ResourceAttributes q = new ResourceAttributes(null, root);
