--- old/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java 2013-08-13 18:17:21.830215492 +0200 +++ new/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java 2013-08-13 18:17:21.778213190 +0200 @@ -22,27 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* - * Copyright (C) 2004-2011 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ + package com.sun.xml.internal.rngom.binary; import com.sun.xml.internal.rngom.nc.NameClass; @@ -53,11 +33,9 @@ private boolean idTypes; private final Pattern unexpandedNotAllowed = new NotAllowedPattern() { - @Override boolean isNotAllowed() { return false; } - @Override Pattern expand(SchemaPatternBuilder b) { return b.makeNotAllowed(); } @@ -106,7 +84,6 @@ return text; } - @Override Pattern makeOneOrMore(Pattern p) { if (p == text) return p; @@ -122,7 +99,6 @@ return schemaInterner.intern(p); } - @Override Pattern makeChoice(Pattern p1, Pattern p2) { if (p1 == notAllowed || p1 == p2) return p2;