summaryrefslogtreecommitdiffstats
path: root/libjava/classpath/javax/xml/stream/events
diff options
context:
space:
mode:
authormark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2006-03-10 21:46:48 +0000
committermark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>2006-03-10 21:46:48 +0000
commitce57ab760f69de6db452def7ffbf5b114a2d8694 (patch)
treeea38c56431c5d4528fb54254c3f8e50f517bede3 /libjava/classpath/javax/xml/stream/events
parent50996fe55769882de3f410896032c887f0ff0d04 (diff)
downloadppe42-gcc-ce57ab760f69de6db452def7ffbf5b114a2d8694.tar.gz
ppe42-gcc-ce57ab760f69de6db452def7ffbf5b114a2d8694.zip
Imported GNU Classpath 0.90
* scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore. * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant. * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5. * java/lang/Math.java: New override file. * java/lang/Character.java: Merged from Classpath. (start, end): Now 'int's. (canonicalName): New field. (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants. (UnicodeBlock): Added argument. (of): New overload. (forName): New method. Updated unicode blocks. (sets): Updated. * sources.am: Regenerated. * Makefile.in: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111942 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/javax/xml/stream/events')
-rw-r--r--libjava/classpath/javax/xml/stream/events/EndEntity.java53
-rw-r--r--libjava/classpath/javax/xml/stream/events/EntityDeclaration.java6
-rw-r--r--libjava/classpath/javax/xml/stream/events/EntityReference.java24
-rw-r--r--libjava/classpath/javax/xml/stream/events/StartEntity.java53
-rw-r--r--libjava/classpath/javax/xml/stream/events/XMLEvent.java12
5 files changed, 6 insertions, 142 deletions
diff --git a/libjava/classpath/javax/xml/stream/events/EndEntity.java b/libjava/classpath/javax/xml/stream/events/EndEntity.java
deleted file mode 100644
index b5c32d716f2..00000000000
--- a/libjava/classpath/javax/xml/stream/events/EndEntity.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* EndEntity.java --
- Copyright (C) 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.stream.events;
-
-/**
- * An end-entity event.
- */
-public interface EndEntity
- extends XMLEvent
-{
-
- /**
- * Returns the entity name.
- */
- String getName();
-
-}
-
diff --git a/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java b/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java
index a319f098cc4..a0120ddb0de 100644
--- a/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java
+++ b/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java
@@ -1,5 +1,5 @@
/* EntityDeclaration.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005,2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -67,12 +67,12 @@ public interface EntityDeclaration
/**
* Returns the replacement text for the entity.
*/
- //String getReplacementText();
+ String getReplacementText();
/**
* Returns the base URI for the entity.
*/
- //String getBaseURI();
+ String getBaseURI();
}
diff --git a/libjava/classpath/javax/xml/stream/events/EntityReference.java b/libjava/classpath/javax/xml/stream/events/EntityReference.java
index 72447096b68..460433c1690 100644
--- a/libjava/classpath/javax/xml/stream/events/EntityReference.java
+++ b/libjava/classpath/javax/xml/stream/events/EntityReference.java
@@ -1,5 +1,5 @@
/* EntityReference.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005,2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -45,34 +45,14 @@ public interface EntityReference
{
/**
- * Returns the base URI for the entity.
- */
- String getBaseUri();
-
- /**
- * Returns the public identifier for the entity.
- */
- String getPublicId();
-
- /**
- * Returns the system identifierfor the entity.
- */
- String getSystemId();
-
- /**
* Returns the declaration of this reference.
*/
- //EntityDeclaration getDeclaration();
+ EntityDeclaration getDeclaration();
/**
* Returns the entity name.
*/
String getName();
- /**
- * Returns the replacement text for the entity.
- */
- String getReplacementText();
-
}
diff --git a/libjava/classpath/javax/xml/stream/events/StartEntity.java b/libjava/classpath/javax/xml/stream/events/StartEntity.java
deleted file mode 100644
index d41e0db7a72..00000000000
--- a/libjava/classpath/javax/xml/stream/events/StartEntity.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* StartEntity.java --
- Copyright (C) 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.stream.events;
-
-/**
- * An start-entity event.
- */
-public interface StartEntity
- extends XMLEvent
-{
-
- /**
- * Returns the entity name.
- */
- String getName();
-
-}
-
diff --git a/libjava/classpath/javax/xml/stream/events/XMLEvent.java b/libjava/classpath/javax/xml/stream/events/XMLEvent.java
index 54e9516f62b..7c427da87d2 100644
--- a/libjava/classpath/javax/xml/stream/events/XMLEvent.java
+++ b/libjava/classpath/javax/xml/stream/events/XMLEvent.java
@@ -1,5 +1,5 @@
/* XMLEvent.java --
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005,2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -106,16 +106,6 @@ public interface XMLEvent
boolean isEndDocument();
/**
- * Indicates whether this event is a start-entity event.
- */
- boolean isStartEntity();
-
- /**
- * Indicates whether this event is an end-entity event.
- */
- boolean isEndEntity();
-
- /**
* Returns this event as a start-element event.
*/
StartElement asStartElement();
OpenPOWER on IntegriCloud