(commons-jci) 29/34: Add @Override

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jci.git

commit 6511a12796c3139b350de6854646ffddeb1c41a6
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Jul 9 14:34:12 2024 -0400

    Add @Override
    
    - Use diamonds
    - Use multi-catch
---
 .../commons/jci2/compiler/rhino/RhinoJavaCompiler.java      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/compilers/rhino/src/main/java/org/apache/commons/jci2/compiler/rhino/RhinoJavaCompiler.java
 
b/compilers/rhino/src/main/java/org/apache/commons/jci2/compiler/rhino/RhinoJavaCompiler.java
index 2560c73..7cfe91e 100644
--- 
a/compilers/rhino/src/main/java/org/apache/commons/jci2/compiler/rhino/RhinoJavaCompiler.java
+++ 
b/compilers/rhino/src/main/java/org/apache/commons/jci2/compiler/rhino/RhinoJavaCompiler.java
@@ -70,10 +70,11 @@ public final class RhinoJavaCompiler extends 
AbstractJavaCompiler {
         private final ResourceReader reader;
         private final ResourceStore store;
 
-        private final Collection<CompilationProblem> problems = new 
ArrayList<CompilationProblem>();
+        private final Collection<CompilationProblem> problems = new 
ArrayList<>();
 
         private final class ProblemCollector implements ErrorReporter {
 
+            @Override
             public void error(final String pMessage, final String pFileName, 
final int pLine, final String pScript, final int pColumn) {
 
                 final CompilationProblem problem = new 
RhinoCompilationProblem(pMessage, pFileName, pLine, pScript, pColumn, true);
@@ -85,6 +86,7 @@ public final class RhinoJavaCompiler extends 
AbstractJavaCompiler {
                 problems.add(problem);
             }
 
+            @Override
             public void warning(final String pMessage, final String pFileName, 
final int pLine, final String pScript, final int pColumn) {
 
                 final CompilationProblem problem = new 
RhinoCompilationProblem(pMessage, pFileName, pLine, pScript, pColumn, false);
@@ -96,6 +98,7 @@ public final class RhinoJavaCompiler extends 
AbstractJavaCompiler {
                 problems.add(problem);
             }
 
+            @Override
             public EvaluatorException runtimeError(final String pMessage, 
final String pFileName, final int pLine, final String pScript, final int 
pColumn) {
                 return new EvaluatorException(pMessage, pFileName, pLine, 
pScript, pColumn);
             }
@@ -123,9 +126,7 @@ public final class RhinoJavaCompiler extends 
AbstractJavaCompiler {
 
             try {
                 return compileClass(context, pName);
-            } catch ( final EvaluatorException e ) {
-                throw new ClassNotFoundException(e.getMessage(), e);
-            } catch (final IOException e) {
+            } catch (final EvaluatorException | IOException e) {
                 throw new ClassNotFoundException(e.getMessage(), e);
             } finally {
                 Context.exit();
@@ -146,7 +147,7 @@ public final class RhinoJavaCompiler extends 
AbstractJavaCompiler {
                 superclass = Class.forName((String) baseClassName);
             }
 
-            final List<Class<?>> interfaceClasses = new ArrayList<Class<?>>();
+            final List<Class<?>> interfaceClasses = new ArrayList<>();
 
             final Object interfaceNames = ScriptableObject.getProperty(target, 
"__implements__");
 
@@ -252,6 +253,7 @@ public final class RhinoJavaCompiler extends 
AbstractJavaCompiler {
 
     }
 
+    @Override
     public CompilationResult compile( final String[] pResourcePaths, final 
ResourceReader pReader, final ResourceStore pStore, final ClassLoader 
pClassLoader, final JavaCompilerSettings pSettings ) {
 
         final RhinoCompilingClassLoader cl = new 
RhinoCompilingClassLoader(pReader, pStore, pClassLoader);
@@ -272,6 +274,7 @@ public final class RhinoJavaCompiler extends 
AbstractJavaCompiler {
         return new CompilationResult(result);
     }
 
+    @Override
     public JavaCompilerSettings createDefaultSettings() {
         return defaultSettings;
     }