Changeset 9565


Ignore:
Timestamp:
2005-04-06T13:55:19+12:00 (19 years ago)
Author:
kjdon
Message:

made it compile with Java 1.4: replaced replace with replaceAll, added toString method to ArrayHelper and used that instead of Arrays.toString

Location:
branches/ant-install-branch
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • branches/ant-install-branch/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/AlertingService.java

    r8888 r9565  
    8686            String title = "Unknown action";
    8787            String message = "I don't know how to " + action;
    88             String details = "The only actions I know are " + Arrays.toString(actions);
     88            String details = "The only actions I know are " + ArrayHelper.toString(actions);
    8989            return showError(context, message, details);
    9090        }

  • branches/ant-install-branch/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/EventStore.java

    r8888 r9565  
    101101     */
    102102    private String encodeSpecialChars(String string) {
    103         String encodedString = string.replace("&", "&");
    104         encodedString = encodedString.replace("<", "&lt;");
    105         encodedString = encodedString.replace(">", "&gt;");
    106         encodedString = encodedString.replace("'", "&apos;");
    107         encodedString = encodedString.replace("\"", "&quot;");
     103        String encodedString = string.replaceAll("&", "&amp;");
     104        encodedString = encodedString.replaceAll("<", "&lt;");
     105        encodedString = encodedString.replaceAll(">", "&gt;");
     106        encodedString = encodedString.replaceAll("\'", "&apos;");
     107        encodedString = encodedString.replaceAll("\"", "&quot;");
    108108        return encodedString;
    109109    }

  • branches/ant-install-branch/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/GreenstoneCommunicator.java

    r8874 r9565  
    2121import org.w3c.dom.*;
    2222
     23import org.greenstone.gsdlas.util.ArrayHelper;
    2324
    2425/**
    … …  
    7071        }
    7172       
    72         System.out.println(Arrays.toString(result));
     73    System.out.println(ArrayHelper.toString(result));
    7374       
    7475        return result;

  • branches/ant-install-branch/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/NotificationStore.java

    r8738 r9565  
    5454            String key = (String) iter.next();
    5555            String value = (String) event.get(key);
    56             String encodedValue = value.replace("&", "&amp;");
    57             encodedValue = encodedValue.replace("<", "&lt;");
    58             encodedValue = encodedValue.replace(">", "&gt;");
    59             encodedValue = encodedValue.replace("'", "&apos;");
    60             encodedValue = encodedValue.replace("\"", "&quot;");
     56            String encodedValue = value.replaceAll("&", "&amp;");
     57            encodedValue = encodedValue.replaceAll("<", "&lt;");
     58            encodedValue = encodedValue.replaceAll(">", "&gt;");
     59            encodedValue = encodedValue.replaceAll("\'", "&apos;");
     60            encodedValue = encodedValue.replaceAll("\"", "&quot;");
    6161           
    6262            event.put(key, encodedValue);

  • branches/ant-install-branch/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/util/ArrayHelper.java

    r8775 r9565  
    2626        return index > -1 && index <= array.length;
    2727    }
     28
     29    static public String toString(String [] array) {
     30    StringBuffer buffer = new StringBuffer();
     31    buffer.append("[");
     32    for (int i=0; i<array.length; i++) {
     33        buffer.append((String)array[i]);
     34        buffer.append(",");
     35    }
     36    buffer.append("]");
     37    return buffer.toString();
     38
     39    }
    2840}

  • branches/ant-install-branch/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/AlertingService.java

    r8888 r9565  
    8686            String title = "Unknown action";
    8787            String message = "I don't know how to " + action;
    88             String details = "The only actions I know are " + Arrays.toString(actions);
     88            String details = "The only actions I know are " + ArrayHelper.toString(actions);
    8989            return showError(context, message, details);
    9090        }

  • branches/ant-install-branch/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/EventStore.java

    r8888 r9565  
    101101     */
    102102    private String encodeSpecialChars(String string) {
    103         String encodedString = string.replace("&", "&amp;");
    104         encodedString = encodedString.replace("<", "&lt;");
    105         encodedString = encodedString.replace(">", "&gt;");
    106         encodedString = encodedString.replace("'", "&apos;");
    107         encodedString = encodedString.replace("\"", "&quot;");
     103        String encodedString = string.replaceAll("&", "&amp;");
     104        encodedString = encodedString.replaceAll("<", "&lt;");
     105        encodedString = encodedString.replaceAll(">", "&gt;");
     106        encodedString = encodedString.replaceAll("\'", "&apos;");
     107        encodedString = encodedString.replaceAll("\"", "&quot;");
    108108        return encodedString;
    109109    }

  • branches/ant-install-branch/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/GreenstoneCommunicator.java

    r8874 r9565  
    2121import org.w3c.dom.*;
    2222
     23import org.greenstone.gsdlas.util.ArrayHelper;
    2324
    2425/**
    … …  
    7071        }
    7172       
    72         System.out.println(Arrays.toString(result));
     73    System.out.println(ArrayHelper.toString(result));
    7374       
    7475        return result;

  • branches/ant-install-branch/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/NotificationStore.java

    r8738 r9565  
    5454            String key = (String) iter.next();
    5555            String value = (String) event.get(key);
    56             String encodedValue = value.replace("&", "&amp;");
    57             encodedValue = encodedValue.replace("<", "&lt;");
    58             encodedValue = encodedValue.replace(">", "&gt;");
    59             encodedValue = encodedValue.replace("'", "&apos;");
    60             encodedValue = encodedValue.replace("\"", "&quot;");
     56            String encodedValue = value.replaceAll("&", "&amp;");
     57            encodedValue = encodedValue.replaceAll("<", "&lt;");
     58            encodedValue = encodedValue.replaceAll(">", "&gt;");
     59            encodedValue = encodedValue.replaceAll("\'", "&apos;");
     60            encodedValue = encodedValue.replaceAll("\"", "&quot;");
    6161           
    6262            event.put(key, encodedValue);

  • branches/ant-install-branch/gsdl3/extensions/gsdl-as/src/org/greenstone/gsdlas/util/ArrayHelper.java

    r8775 r9565  
    2626        return index > -1 && index <= array.length;
    2727    }
     28
     29    static public String toString(String [] array) {
     30    StringBuffer buffer = new StringBuffer();
     31    buffer.append("[");
     32    for (int i=0; i<array.length; i++) {
     33        buffer.append((String)array[i]);
     34        buffer.append(",");
     35    }
     36    buffer.append("]");
     37    return buffer.toString();
     38
     39    }
    2840}

  • branches/ant-install-branch/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/AlertingService.java

    r8888 r9565  
    8686            String title = "Unknown action";
    8787            String message = "I don't know how to " + action;
    88             String details = "The only actions I know are " + Arrays.toString(actions);
     88            String details = "The only actions I know are " + ArrayHelper.toString(actions);
    8989            return showError(context, message, details);
    9090        }

  • branches/ant-install-branch/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/EventStore.java

    r8888 r9565  
    101101     */
    102102    private String encodeSpecialChars(String string) {
    103         String encodedString = string.replace("&", "&amp;");
    104         encodedString = encodedString.replace("<", "&lt;");
    105         encodedString = encodedString.replace(">", "&gt;");
    106         encodedString = encodedString.replace("'", "&apos;");
    107         encodedString = encodedString.replace("\"", "&quot;");
     103        String encodedString = string.replaceAll("&", "&amp;");
     104        encodedString = encodedString.replaceAll("<", "&lt;");
     105        encodedString = encodedString.replaceAll(">", "&gt;");
     106        encodedString = encodedString.replaceAll("\'", "&apos;");
     107        encodedString = encodedString.replaceAll("\"", "&quot;");
    108108        return encodedString;
    109109    }

  • branches/ant-install-branch/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/GreenstoneCommunicator.java

    r8874 r9565  
    2121import org.w3c.dom.*;
    2222
     23import org.greenstone.gsdlas.util.ArrayHelper;
    2324
    2425/**
    … …  
    7071        }
    7172       
    72         System.out.println(Arrays.toString(result));
     73    System.out.println(ArrayHelper.toString(result));
    7374       
    7475        return result;

  • branches/ant-install-branch/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/NotificationStore.java

    r8738 r9565  
    5454            String key = (String) iter.next();
    5555            String value = (String) event.get(key);
    56             String encodedValue = value.replace("&", "&amp;");
    57             encodedValue = encodedValue.replace("<", "&lt;");
    58             encodedValue = encodedValue.replace(">", "&gt;");
    59             encodedValue = encodedValue.replace("'", "&apos;");
    60             encodedValue = encodedValue.replace("\"", "&quot;");
     56            String encodedValue = value.replaceAll("&", "&amp;");
     57            encodedValue = encodedValue.replaceAll("<", "&lt;");
     58            encodedValue = encodedValue.replaceAll(">", "&gt;");
     59            encodedValue = encodedValue.replaceAll("\'", "&apos;");
     60            encodedValue = encodedValue.replaceAll("\"", "&quot;");
    6161           
    6262            event.put(key, encodedValue);

  • branches/ant-install-branch/gsdl3/packages/gsdl-as/src/org/greenstone/gsdlas/util/ArrayHelper.java

    r8775 r9565  
    2626        return index > -1 && index <= array.length;
    2727    }
     28
     29    static public String toString(String [] array) {
     30    StringBuffer buffer = new StringBuffer();
     31    buffer.append("[");
     32    for (int i=0; i<array.length; i++) {
     33        buffer.append((String)array[i]);
     34        buffer.append(",");
     35    }
     36    buffer.append("]");
     37    return buffer.toString();
     38
     39    }
    2840}
Note: See TracChangeset for help on using the changeset viewer.