Changeset 32318 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/Dictionary.java

Timestamp:

2018-07-31T09:52:33+12:00 (6 years ago)

Author:

kjdon

Message:

removed some commented out code

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/Dictionary.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/Dictionary.java

@@ -208 +208 @@
     public String get(String key, String args[])
     {
-        // The following 'argsStr' doesn't appear to be used in rest of method, so
-        // commenting out
-        /*
-        String argsStr = "";
-        if (args != null)
-        {
-            for (String arg : args)
-            {
-                argsStr += arg + " ";
-            }
-        }
-        */
         
         if (this.raw == null)
@@ -238 +226 @@
 
             return processArgs(initial,args);
-            /*
-            // If the string contains arguments we have to insert them.
-            StringBuffer complete = new StringBuffer();
-            // While we still have initial string left.
-            while (initial.length() > 0 && initial.indexOf('{') != -1 && initial.indexOf('}') != -1)
-            {
-                // Remove preamble
-                int opening = initial.indexOf('{');
-                int closing = initial.indexOf('}');
-                int comment_mark = initial.indexOf('-', opening); // May not exist
-                if (comment_mark > closing)
-                { // May also be detecting a later comment
-                    comment_mark = -1;
-                }
-                complete.append(initial.substring(0, opening));
-
-                // Parse arg_num
-                String arg_str = null;
-                if (comment_mark != -1)
-                {
-                    arg_str = initial.substring(opening + 1, comment_mark);
-                }
-                else
-                {
-                    arg_str = initial.substring(opening + 1, closing);
-                }
-                if (closing + 1 < initial.length())
-                {
-                    initial = initial.substring(closing + 1);
-                }
-                else
-                {
-                    initial = "";
-                }
-                int arg_num = Integer.parseInt(arg_str);
-                // Insert argument
-                if (args != null && 0 <= arg_num && arg_num < args.length)
-                {
-                    complete.append(args[arg_num]);
-                }
-            }
-            complete.append(initial);
-            return complete.toString();
-            */
-        }
-        catch (Exception e)
-        {
-            //logger.debug("Dictionary Error: couldn't find string for key:" + key +" in resource "+this.resource);
+        }
+        catch (Exception e)
+        {
+          //logger.debug("Dictionary Error: couldn't find string for key:" + key +" in resource "+this.resource);
             return null;
         }