Changeset 2103

Timestamp:

08/15/12 16:51:12 (12 years ago)

Author:

oschonef

Message:

• fix some code style issues
• remove unnecessary code

Location:

SRUServer/trunk/src/main/java/eu/clarin/sru/server

Files:

• SRUAbstractResult.java (modified) (1 diff)
• SRUOperation.java (modified) (1 diff)
• SRURecordPacking.java (modified) (1 diff)
• SRURequestImpl.java (modified) (2 diffs)
• SRUScanResultSet.java (modified) (1 diff)
• SRUServerConfig.java (modified) (3 diffs)
• SRUXMLStreamWriter.java (modified) (1 diff)
• utils/SRUServerServlet.java (modified) (2 diffs)

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUAbstractResult.java

@@ -28 +28 @@
 
 
-    protected SRUAbstractResult(SRUDiagnosticList diagnosticList) {
+    SRUAbstractResult(SRUDiagnosticList diagnosticList) {
         if (diagnosticList == null) {
             throw new NullPointerException("Implementation error: "

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUOperation.java

@@ -34 +34 @@
      * A <em>scan</em> operation
      */
-    SCAN;
+    SCAN
 } // enum SRUOperation

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRURecordPacking.java

@@ -29 +29 @@
      * String record packing
      */
-    STRING;
+    STRING
 } // enum SRURecordPacking

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRURequestImpl.java

@@ -230 +230 @@
         if (diagnostics == null) {
             // check mandatory/optional parameters for operation
-            ParameterInfo[] parameters = null;
+            ParameterInfo[] parameters;
             switch (operation) {
             case EXPLAIN:
@@ -383 +383 @@
         }
 
-        return (diagnostics == null) ? true : false;
+        // diagnostics != null -> consider as sucesss 
+        return (diagnostics == null);
     }
 

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUScanResultSet.java

@@ -66 +66 @@
          * Any other term (<em>inner</em>)
          */
-        INNER;
-    };
+        INNER
+    }
 
 

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUServerConfig.java

@@ -771 +771 @@
         } catch (SAXException e) {
             throw new SRUConfigException("error parsing configuration file", e);
-        } catch (SRUConfigException e) {
-            throw e;
         }
     }
@@ -834 +832 @@
             }
         } else {
-            return Boolean.valueOf(value).booleanValue();
+            return Boolean.valueOf(value);
         }
     }
@@ -1041 +1039 @@
         Attr attr = e.getAttributeNode(localName);
         if ((attr != null) && attr.getSpecified()) {
-            result = Boolean.valueOf(attr.getValue()).booleanValue();
+            result = Boolean.valueOf(attr.getValue());
         }
         return result;

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUXMLStreamWriter.java

@@ -42 +42 @@
         SEEN_NOTHING,
         SEEN_ELEMENT,
-        SEEN_DATA;
+        SEEN_DATA
     }
     private static final SAXParserFactory factory;

SRUServer/trunk/src/main/java/eu/clarin/sru/server/utils/SRUServerServlet.java

@@ -106 +106 @@
         }
 
-        URL sruServerConfigFile = null;
+        URL sruServerConfigFile;
         try {
             sruServerConfigFile = ctx.getResource(sruServerConfigLocation);
@@ -170 +170 @@
 
         // parse configuration
-        SRUServerConfig sruServerConfig = null;
+        SRUServerConfig sruServerConfig;
         try {
             sruServerConfig =