jdk/src/share/classes/sun/io/CharToByteDBCS_ASCII.java
author martin
Mon, 31 Aug 2009 15:00:04 -0700
changeset 3714 6a4eb8f53f91
parent 2921 d9d491a5a169
child 5506 202f599c92aa
permissions -rw-r--r--
6860431: Character.isSurrogate(char ch) Summary: Add new method Character.isSurrogate(char ch) Reviewed-by: sherman, darcy, okutsu
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
/*
90ce3da70b43 Initial load
duke
parents:
diff changeset
     2
 * Copyright 1997 Sun Microsystems, Inc.  All Rights Reserved.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
90ce3da70b43 Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Sun designates this
90ce3da70b43 Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
90ce3da70b43 Initial load
duke
parents:
diff changeset
     9
 * by Sun in the LICENSE file that accompanied this code.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    20
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    21
 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    22
 * CA 95054 USA or visit www.sun.com if you need additional information or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    23
 * have any questions.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
package sun.io;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    26
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    27
import sun.nio.cs.Surrogate;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    28
import sun.nio.cs.ext.DoubleByte;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    29
import static sun.nio.cs.CharsetMapping.*;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    30
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    31
public abstract class CharToByteDBCS_ASCII extends CharToByteConverter
90ce3da70b43 Initial load
duke
parents:
diff changeset
    32
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
    33
90ce3da70b43 Initial load
duke
parents:
diff changeset
    34
    private char highHalfZoneCode;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    35
    private byte[] outputByte = new byte[2];
90ce3da70b43 Initial load
duke
parents:
diff changeset
    36
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    37
    private DoubleByte.Encoder enc;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    38
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    39
    public CharToByteDBCS_ASCII(DoubleByte.Encoder enc) {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    40
        super();
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    41
        this.enc = enc;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    42
    }
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    43
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    44
    int encodeChar(char c) {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    45
        return enc.encodeChar(c);
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    46
    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
      * flush out any residual data and reset the buffer state
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
      */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    51
    public int flush(byte [] output, int outStart, int outEnd)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    52
        throws MalformedInputException, ConversionBufferFullException
90ce3da70b43 Initial load
duke
parents:
diff changeset
    53
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    54
90ce3da70b43 Initial load
duke
parents:
diff changeset
    55
       if (highHalfZoneCode != 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    56
          reset();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    57
          badInputLength = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    58
          throw new MalformedInputException();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    59
       }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    60
90ce3da70b43 Initial load
duke
parents:
diff changeset
    61
       reset();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    62
       return 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    63
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    64
90ce3da70b43 Initial load
duke
parents:
diff changeset
    65
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
    66
     * Character conversion
90ce3da70b43 Initial load
duke
parents:
diff changeset
    67
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    68
    public int convert(char[] input, int inOff, int inEnd,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    69
                       byte[] output, int outOff, int outEnd)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
        throws UnknownCharacterException, MalformedInputException,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
               ConversionBufferFullException
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
        char    inputChar;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    74
        int     inputSize;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    75
90ce3da70b43 Initial load
duke
parents:
diff changeset
    76
        byteOff = outOff;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    77
        charOff = inOff;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    78
90ce3da70b43 Initial load
duke
parents:
diff changeset
    79
        while(charOff < inEnd) {
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    80
            int   index;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    81
            int   theBytes;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    82
            int   spaceNeeded;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    83
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    84
            if (highHalfZoneCode == 0) {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    85
                inputChar = input[charOff];
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    86
                inputSize = 1;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    87
            } else {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    88
                inputChar = highHalfZoneCode;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    89
                inputSize = 0;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    90
                highHalfZoneCode = 0;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    91
            }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    92
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    93
            // Is this a high surrogate?
3714
6a4eb8f53f91 6860431: Character.isSurrogate(char ch)
martin
parents: 2921
diff changeset
    94
            if (Character.isHighSurrogate(inputChar)) {
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    95
                // Is this the last character of the input?
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    96
                if (charOff + inputSize >= inEnd) {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    97
                    highHalfZoneCode = inputChar;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    98
                    charOff += inputSize;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
    99
                    break;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   100
                }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   101
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   102
                // Is there a low surrogate following?
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   103
                inputChar = input[charOff + inputSize];
3714
6a4eb8f53f91 6860431: Character.isSurrogate(char ch)
martin
parents: 2921
diff changeset
   104
                if (Character.isLowSurrogate(inputChar)) {
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   105
                    // We have a valid surrogate pair.  Too bad we don't do
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   106
                    // surrogates.  Is substitution enabled?
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   107
                    if (subMode) {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   108
                        if (subBytes.length == 1) {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   109
                            outputByte[0] = 0x00;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   110
                            outputByte[1] = subBytes[0];
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   111
                        }
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   112
                        else {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   113
                            outputByte[0] = subBytes[0];
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   114
                            outputByte[1] = subBytes[1];
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   115
                        }
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   116
                        inputSize++;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   117
                    } else {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   118
                        badInputLength = 2;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   119
                        throw new UnknownCharacterException();
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   120
                    }
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   121
                 } else {
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   122
                     // We have a malformed surrogate pair
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   123
                     badInputLength = 1;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   124
                     throw new MalformedInputException();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   125
                 }
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   126
            }
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   127
            // Is this an unaccompanied low surrogate?
3714
6a4eb8f53f91 6860431: Character.isSurrogate(char ch)
martin
parents: 2921
diff changeset
   128
            else if (Character.isLowSurrogate(inputChar)) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   129
                badInputLength = 1;
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   130
                throw new MalformedInputException();
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   131
            } else {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   132
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   133
                // We have a valid character, get the bytes for it
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   134
                theBytes = encodeChar(inputChar);
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   135
                if (theBytes == UNMAPPABLE_ENCODING) {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   136
                    // if there was no mapping - look for substitution characters
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   137
                    if (subMode) {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   138
                        if (subBytes.length == 1) {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   139
                            outputByte[0] = 0x00;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   140
                            outputByte[1] = subBytes[0];
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   141
                        } else {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   142
                            outputByte[0] = subBytes[0];
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   143
                            outputByte[1] = subBytes[1];
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   144
                        }
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   145
                    } else {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   146
                        badInputLength = 1;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   147
                        throw new UnknownCharacterException();
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   148
                    }
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   149
                } else {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   150
                    outputByte[0] = (byte)(theBytes >>8);
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   151
                    outputByte[1] = (byte)theBytes;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   152
                }
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   153
            }
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   154
            if (outputByte[0] == 0x00)
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   155
                spaceNeeded = 1;
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   156
            else
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   157
                spaceNeeded = 2;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   158
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   159
            if (byteOff + spaceNeeded > outEnd)
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   160
                throw new ConversionBufferFullException();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   161
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   162
            if (spaceNeeded == 1)
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   163
                output[byteOff++] = outputByte[1];
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   164
            else {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   165
                output[byteOff++] = outputByte[0];
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   166
                output[byteOff++] = outputByte[1];
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   167
            }
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   168
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   169
            charOff += inputSize;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   170
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   171
        return byteOff - outOff;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   172
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   173
90ce3da70b43 Initial load
duke
parents:
diff changeset
   174
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   175
     * Resets converter to its initial state.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   176
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   177
    public void reset() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   178
       charOff = byteOff = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   179
       highHalfZoneCode = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   180
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   181
90ce3da70b43 Initial load
duke
parents:
diff changeset
   182
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   183
     * Returns the maximum number of bytes needed to convert a char.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   184
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   185
    public int getMaxBytesPerChar() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   186
        return 2;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   187
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   188
90ce3da70b43 Initial load
duke
parents:
diff changeset
   189
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   190
     * Returns true if the given character can be converted to the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   191
     * target character encoding.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   192
     */
2921
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   193
    public boolean canConvert(char c) {
d9d491a5a169 6843578: Re-implement IBM doublebyte charsets
sherman
parents: 2
diff changeset
   194
        return encodeChar(c) != UNMAPPABLE_ENCODING;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   195
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   196
}