- Make private elements final where possible.
diff --git a/src/main/java/org/apache/bsf/Main.java b/src/main/java/org/apache/bsf/Main.java
index 49672a5..d7b4ec0 100644
--- a/src/main/java/org/apache/bsf/Main.java
+++ b/src/main/java/org/apache/bsf/Main.java
@@ -40,16 +40,16 @@
  * @author   Sam Ruby
  */
 public class Main {
-    private static String ARG_IN = "-in";
-    private static String ARG_LANG = "-lang";
-    private static String ARG_MODE = "-mode";
-    private static String ARG_OUT = "-out";
-    private static String ARG_VAL_EVAL = "eval";
-    private static String ARG_VAL_EXEC = "exec";
-    private static String ARG_VAL_COMPILE = "compile";
-    private static String DEFAULT_IN_FILE_NAME = "<STDIN>";
-    private static String DEFAULT_MODE = ARG_VAL_EVAL;
-    private static String DEFAULT_CLASS_NAME = "Test";
+    private static final String ARG_IN = "-in";
+    private static final String ARG_LANG = "-lang";
+    private static final String ARG_MODE = "-mode";
+    private static final String ARG_OUT = "-out";
+    private static final String ARG_VAL_EVAL = "eval";
+    private static final String ARG_VAL_EXEC = "exec";
+    private static final String ARG_VAL_COMPILE = "compile";
+    private static final String DEFAULT_IN_FILE_NAME = "<STDIN>";
+    private static final String DEFAULT_MODE = ARG_VAL_EVAL;
+    private static final String DEFAULT_CLASS_NAME = "Test";
 
     /**
      * Static driver to be able to run BSF scripts from the command line.
diff --git a/src/main/java/org/apache/bsf/util/ObjInfo.java b/src/main/java/org/apache/bsf/util/ObjInfo.java
index 0ffe320..15dc283 100644
--- a/src/main/java/org/apache/bsf/util/ObjInfo.java
+++ b/src/main/java/org/apache/bsf/util/ObjInfo.java
@@ -25,8 +25,8 @@
  */
 public class ObjInfo
 {
-  static private String QUOTE_CHARS = "\'\"",
-						EXEC_CHARS  = "(=";
+     static private final String QUOTE_CHARS = "\'\"";
+     static private final String EXEC_CHARS  = "(=";
 		 public  String objName;
 		 public  Class  objClass;
 
diff --git a/src/main/java/org/apache/bsf/util/event/EventAdapterRegistry.java b/src/main/java/org/apache/bsf/util/event/EventAdapterRegistry.java
index 8f4a45e..91cebd6 100644
--- a/src/main/java/org/apache/bsf/util/event/EventAdapterRegistry.java
+++ b/src/main/java/org/apache/bsf/util/event/EventAdapterRegistry.java
@@ -57,10 +57,10 @@
  */
 
 public class EventAdapterRegistry {
-  private static Hashtable reg = new Hashtable ();
+  private static final Hashtable reg = new Hashtable ();
   private static ClassLoader cl = null;
-  private static String adapterPackage = "org.apache.bsf.util.event.adapters";
-  private static String adapterSuffix = "Adapter";
+  private static final String adapterPackage = "org.apache.bsf.util.event.adapters";
+  private static final String adapterSuffix = "Adapter";
   private static boolean dynamic = true;
 
   public static Class lookup (final Class listenerType) {
diff --git a/src/main/java/org/apache/bsf/util/event/generator/AdapterClassLoader.java b/src/main/java/org/apache/bsf/util/event/generator/AdapterClassLoader.java
index a859ccf..45ea089 100644
--- a/src/main/java/org/apache/bsf/util/event/generator/AdapterClassLoader.java
+++ b/src/main/java/org/apache/bsf/util/event/generator/AdapterClassLoader.java
@@ -35,7 +35,7 @@
 
 public class AdapterClassLoader extends ClassLoader
 {
-  private static Hashtable classCache = new Hashtable();
+  private static final Hashtable classCache = new Hashtable();
   private Class c;
 
   // private Log logger = LogFactory.getLog(this.getClass().getName());