From b0fa81eea9a270f23d6ad67ca7a6d25c18d20da1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 16 Jul 2005 01:27:14 +0000 Subject: Major merge with Classpath. Removed many duplicate files. * HACKING: Updated.x * classpath: Imported new directory. * standard.omit: New file. * Makefile.in, aclocal.m4, configure: Rebuilt. * sources.am: New file. * configure.ac: Run Classpath configure script. Moved code around to support. Disable xlib AWT peers (temporarily). * Makefile.am (SUBDIRS): Added 'classpath' (JAVAC): Removed. (AM_CPPFLAGS): Added more -I options. (BOOTCLASSPATH): Simplified. Completely redid how sources are built. Include sources.am. * include/Makefile.am (tool_include__HEADERS): Removed jni.h. * include/jni.h: Removed (in Classpath). * scripts/classes.pl: Updated to look at built classes. * scripts/makemake.tcl: New file. * testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added -I options. (gcj_jni_invocation_compile_c_to_binary): Likewise. From-SVN: r102082 --- libjava/javax/xml/namespace/NamespaceContext.java | 66 --------- libjava/javax/xml/namespace/QName.java | 160 ---------------------- 2 files changed, 226 deletions(-) delete mode 100644 libjava/javax/xml/namespace/NamespaceContext.java delete mode 100644 libjava/javax/xml/namespace/QName.java (limited to 'libjava/javax/xml/namespace') diff --git a/libjava/javax/xml/namespace/NamespaceContext.java b/libjava/javax/xml/namespace/NamespaceContext.java deleted file mode 100644 index 1bcb850..0000000 --- a/libjava/javax/xml/namespace/NamespaceContext.java +++ /dev/null @@ -1,66 +0,0 @@ -/* NamespaceContext.java -- - Copyright (C) 2004, 2005 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath 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 for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package javax.xml.namespace; - -import java.util.Iterator; - -/** - * Interface by which namespace properties are made available. - * - * @author (a href='mailto:dog@gnu.org'>Chris Burdessqualified name. - * - * @author (a href='mailto:dog@gnu.org'>Chris Burdess 0) - { - buf.append('{'); - buf.append(namespaceURI); - buf.append('}'); - } - if (prefix != null && prefix.length() > 0) - { - buf.append(prefix); - buf.append(':'); - } - buf.append(localPart); - qName = buf.toString(); - } - - public QName(String localPart) - { - this(null, localPart, null); - } - - public String getNamespaceURI() - { - return namespaceURI; - } - - public String getLocalPart() - { - return localPart; - } - - public String getPrefix() - { - return prefix; - } - - public boolean equals(Object obj) - { - if (obj instanceof QName) - { - QName qname = (QName) obj; - return qname.getLocalPart().equals(localPart) && - qname.getNamespaceURI().equals(namespaceURI); - } - return false; - } - - public final int hashCode() - { - return qName.hashCode(); - } - - public String toString() - { - return qName; - } - - public static QName valueOf(String qNameAsString) - { - String namespaceUri = "", prefix = null; - int start = qNameAsString.indexOf('{'); - int end = qNameAsString.indexOf('}'); - if (start != -1) - { - if (end < start) - { - throw new IllegalArgumentException(qNameAsString); - } - namespaceUri = qNameAsString.substring(start + 1, end); - qNameAsString = qNameAsString.substring(end + 1); - } - start = qNameAsString.indexOf(':'); - if (start != -1) - { - prefix = qNameAsString.substring(0, start); - qNameAsString = qNameAsString.substring(start + 1); - } - return new QName(namespaceUri, qNameAsString, prefix); - } - -} -- cgit v1.1