--- old/src/share/classes/sun/text/resources/CollationData_no.java Fri Jul 20 12:02:19 2012 +++ /dev/null Fri Jul 20 12:02:19 2012 @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - */ - -/* - * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved - * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved - * - * The original version of this source code and documentation - * is copyrighted and owned by Taligent, Inc., a wholly-owned - * subsidiary of IBM. These materials are provided under terms - * of a License Agreement between Taligent and Sun. This technology - * is protected by multiple US and International patents. - * - * This notice and attribution to Taligent may not be removed. - * Taligent is a registered trademark of Taligent, Inc. - * - */ - -package sun.text.resources; - -import java.util.ListResourceBundle; - -public class CollationData_no extends ListResourceBundle { - - protected final Object[][] getContents() { - return new Object[][] { - { "Rule", - "& D <\u00D0,\u00F0" + // eth - "& ss,\u00DF" + // s-zet - "& y , u\u0308" + // u-umlaut is eq. to y. - "& y ; U\u0308" + // u-umlaut is eq. to y. - "& Z < \u00e6, \u00c6 " + // z < z-caron - " < a\u0308, A\u0308" + // nt : a-umlaut - "< \u00f8, \u00d8 < o\u0308, O\u0308" + // nt : o-stroke < o-umlaut - "< o\u030b, O\u030b " + // nt : o-double-acute - "< a\u030a, A\u030a" + // nt : a-ring - ", aa , aA , Aa , AA " + // tal : aa ligature sorts after a-ring - " & V < w, W " - } - }; - } -} --- /dev/null Fri Jul 20 12:02:19 2012 +++ new/src/share/classes/sun/text/resources/no/CollationData_no.java Fri Jul 20 12:02:17 2012 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + */ + +/* + * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved + * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved + * + * The original version of this source code and documentation + * is copyrighted and owned by Taligent, Inc., a wholly-owned + * subsidiary of IBM. These materials are provided under terms + * of a License Agreement between Taligent and Sun. This technology + * is protected by multiple US and International patents. + * + * This notice and attribution to Taligent may not be removed. + * Taligent is a registered trademark of Taligent, Inc. + * + */ + +package sun.text.resources.no; + +import java.util.ListResourceBundle; + +public class CollationData_no extends ListResourceBundle { + + protected final Object[][] getContents() { + return new Object[][] { + { "Rule", + "& D <\u00D0,\u00F0" + // eth + "& ss,\u00DF" + // s-zet + "& y , u\u0308" + // u-umlaut is eq. to y. + "& y ; U\u0308" + // u-umlaut is eq. to y. + "& Z < \u00e6, \u00c6 " + // z < z-caron + " < a\u0308, A\u0308" + // nt : a-umlaut + "< \u00f8, \u00d8 < o\u0308, O\u0308" + // nt : o-stroke < o-umlaut + "< o\u030b, O\u030b " + // nt : o-double-acute + "< a\u030a, A\u030a" + // nt : a-ring + ", aa , aA , Aa , AA " + // tal : aa ligature sorts after a-ring + " & V < w, W " + } + }; + } +}