[multiple changes]
2005-02-06 Jerry Quinn <jlquinn@optonline.net>
* javax/imageio/metadata/IIOMetadataNode.java:
Implemented.
* javax/imageio/metadata/IIOAttr.java,
javax/imageio/metadata/IIONamedNodeMap.java,
javax/imageio/metadata/IIONodeList.java:
New files
2005-02-06 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/ClasspathToolkit.java
(registerImageIOSpis): New method.
* javax/imageio/ImageIO.java
(WriterFormatFilter.filter): Fix copy-and-paste typos.
(WriterMIMETypeFilter.filter): Likewise.
(ImageReaderIterator): Pass extension argument through to SPI.
(getReadersByFilter): Likewise.
(getWritersByFilter): Likewise.
(getImageReadersByFormatName): Likewise.
(getImageReadersByMIMEType): Likewise.
(getImageReadersBySuffix): Likewise.
(getImageWritersByFormatName): Likewise.
(getImageWritersByMIMEType): Likewise.
(getImageWritersBySuffix): Likewise.
(read): Implement.
(write): Implement.
* javax/imageio/ImageReader.java
(progressListeners): Initialize.
(setInput): Implement.
* javax/imageio/ImageWriter.java
(progressListeners): Initialize.
(warningListeners): Likewise.
(warningLocales): Likewise.
(setOutput): Test "isInstance" rather than class equality.
* javax/imageio/spi/IIORegistry.java
(static): Add reader and writer SPIs.
(IIORegistry): Call ClasspathToolkit.registerImageIOSpis.
2004-02-06 Michael Koch <konqueror@gmx.de>
* javax/imageio/metadata/IIOInvalidTreeException.java
(IIOInvalidTreeException): Reformatted.
* javax/imageio/spi/IIORegistry.java
(static): Register ImageReaderSpi.class and ImageWriterSpi.class.
* javax/imageio/stream/MemoryCacheImageInputStream.java:
Reworked import statements.
2004-02-06 Michael Koch <konqueror@gmx.de>
* javax/imageio/stream/FileImageOutputStream.java:
Implemented.
2004-02-06 Michael Koch <konqueror@gmx.de>
* javax/imageio/stream/FileCacheImageInputStream.java,
javax/imageio/stream/FileCacheImageOutputStream.java,
javax/imageio/stream/FileImageInputStream.java,
javax/imageio/stream/ImageInputStreamImpl.java,
javax/imageio/stream/ImageOutputStreamImpl.java,
javax/imageio/stream/MemoryCacheImageInputStream.java,
javax/imageio/stream/MemoryCacheImageOutputStream.java:
Added all missing methods in javax.imageio.stream.
From-SVN: r94698
This commit is contained in:
Anthony Green
parent
c866976a42
commit
7372d214af
20 changed files with 2162 additions and 40 deletions
|
|
@ -38,6 +38,555 @@ exception statement from your version. */
|
|||
|
||||
package javax.imageio.metadata;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import org.w3c.dom.Attr;
|
||||
import org.w3c.dom.DOMException;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import org.w3c.dom.NamedNodeMap;
|
||||
import org.w3c.dom.Node;
|
||||
import org.w3c.dom.NodeList;
|
||||
import org.w3c.dom.TypeInfo;
|
||||
import org.w3c.dom.UserDataHandler;
|
||||
|
||||
public class IIOMetadataNode
|
||||
implements Element, NodeList
|
||||
{
|
||||
private String name;
|
||||
private HashMap attrs = new HashMap();
|
||||
private List children = new ArrayList();
|
||||
private IIOMetadataNode parent;
|
||||
private Object obj;
|
||||
|
||||
public IIOMetadataNode()
|
||||
{
|
||||
// Do nothing here.
|
||||
}
|
||||
|
||||
public IIOMetadataNode(String nodename)
|
||||
{
|
||||
name = nodename;
|
||||
}
|
||||
|
||||
public Object getUserObject()
|
||||
{
|
||||
return obj;
|
||||
}
|
||||
|
||||
public void setUserObject(Object o)
|
||||
{
|
||||
obj = o;
|
||||
}
|
||||
|
||||
public short compareDocumentPosition(Node other)
|
||||
throws DOMException
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#getAttribute(java.lang.String)
|
||||
*/
|
||||
public String getAttribute(String name)
|
||||
{
|
||||
Attr anode = (Attr) attrs.get(name);
|
||||
return anode != null ? anode.getValue() : null;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#getAttributeNode(java.lang.String)
|
||||
*/
|
||||
public Attr getAttributeNode(String name)
|
||||
{
|
||||
String val = getAttribute(name);
|
||||
if (val != null)
|
||||
return new IIOAttr(name, val, this);
|
||||
return null;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#getAttributeNodeNS(java.lang.String, java.lang.String)
|
||||
*/
|
||||
public Attr getAttributeNodeNS(String namespaceURI, String localName)
|
||||
{
|
||||
return getAttributeNode(localName);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#getAttributeNS(java.lang.String, java.lang.String)
|
||||
*/
|
||||
public String getAttributeNS(String namespaceURI, String localName)
|
||||
{
|
||||
return getAttribute(localName);
|
||||
}
|
||||
|
||||
public String getBaseURI()
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
// Recursive function for assembling a node list.
|
||||
private void getElementsRecurse(IIONodeList list, String name)
|
||||
{
|
||||
for (int i=0; i < children.size(); i++)
|
||||
{
|
||||
if (((Node)children.get(i)).getNodeName().equals(name))
|
||||
list.children.add(children.get(i));
|
||||
getElementsRecurse(list, name);
|
||||
}
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#getElementsByTagName(java.lang.String)
|
||||
*/
|
||||
public NodeList getElementsByTagName(String name)
|
||||
{
|
||||
IIONodeList list = new IIONodeList();
|
||||
getElementsRecurse(list, name);
|
||||
return list;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#getElementsByTagNameNS(java.lang.String, java.lang.String)
|
||||
*/
|
||||
public NodeList getElementsByTagNameNS(String namespaceURI, String localName)
|
||||
{
|
||||
IIONodeList list = new IIONodeList();
|
||||
getElementsRecurse(list, name);
|
||||
return list;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#getTagName()
|
||||
*/
|
||||
public String getTagName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#hasAttribute(java.lang.String)
|
||||
*/
|
||||
public boolean hasAttribute(String name)
|
||||
{
|
||||
return attrs.containsKey(name);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#hasAttributeNS(java.lang.String, java.lang.String)
|
||||
*/
|
||||
public boolean hasAttributeNS(String namespaceURI, String localName)
|
||||
{
|
||||
return attrs.containsKey(localName);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#removeAttribute(java.lang.String)
|
||||
*/
|
||||
public void removeAttribute(String name)
|
||||
{
|
||||
attrs.remove(name);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#removeAttributeNode(org.w3c.dom.Attr)
|
||||
*/
|
||||
public Attr removeAttributeNode(Attr oldAttr)
|
||||
{
|
||||
return (Attr)attrs.remove(oldAttr.getName());
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#removeAttributeNS(java.lang.String, java.lang.String)
|
||||
*/
|
||||
public void removeAttributeNS(String namespaceURI, String localName)
|
||||
{
|
||||
removeAttribute(localName);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#setAttribute(java.lang.String, java.lang.String)
|
||||
*/
|
||||
public void setAttribute(String name, String value)
|
||||
{
|
||||
Attr attr = (Attr) getAttributeNode(name);
|
||||
if (attr != null)
|
||||
attr.setValue(value);
|
||||
else
|
||||
attrs.put(name, new IIOAttr(name, value, this));
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#setAttributeNode(org.w3c.dom.Attr)
|
||||
*/
|
||||
public Attr setAttributeNode(Attr newAttr)
|
||||
{
|
||||
return (Attr)attrs.put(newAttr.getName(), newAttr);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#setAttributeNodeNS(org.w3c.dom.Attr)
|
||||
*/
|
||||
public Attr setAttributeNodeNS(Attr newAttr)
|
||||
{
|
||||
return (Attr)attrs.put(newAttr.getName(), newAttr);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Element#setAttributeNS(java.lang.String, java.lang.String, java.lang.String)
|
||||
*/
|
||||
public void setAttributeNS(String namespaceURI, String qualifiedName, String value)
|
||||
{
|
||||
setAttribute(qualifiedName, value);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.NodeList#getLength()
|
||||
*/
|
||||
public int getLength()
|
||||
{
|
||||
return children.size();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.NodeList#item(int)
|
||||
*/
|
||||
public Node item(int index)
|
||||
{
|
||||
if (index < children.size())
|
||||
return (Node)children.get(index);
|
||||
else
|
||||
return null;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#appendChild(org.w3c.dom.Node)
|
||||
*/
|
||||
public Node appendChild(Node newChild)
|
||||
{
|
||||
if (newChild == null)
|
||||
throw new IllegalArgumentException("Child node is null");
|
||||
|
||||
IIOMetadataNode child = (IIOMetadataNode) newChild;
|
||||
|
||||
children.add(child);
|
||||
child.parent = this;
|
||||
return this;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#cloneNode(boolean)
|
||||
*/
|
||||
public Node cloneNode(boolean deep)
|
||||
{
|
||||
IIOMetadataNode newnode = new IIOMetadataNode(name);
|
||||
newnode.parent = null;
|
||||
newnode.obj = obj;
|
||||
if (deep)
|
||||
{
|
||||
for (int i=0; i < children.size(); i++)
|
||||
newnode.children.add(((Node)children.get(i)).cloneNode(deep));
|
||||
}
|
||||
|
||||
// clone attrs
|
||||
for (Iterator it = attrs.values().iterator(); it.hasNext();)
|
||||
{
|
||||
IIOAttr attr = (IIOAttr)it.next();
|
||||
newnode.attrs.put(attr.name, attr.cloneNode(deep));
|
||||
attr.owner = newnode;
|
||||
}
|
||||
|
||||
return newnode;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getAttributes()
|
||||
*/
|
||||
public NamedNodeMap getAttributes()
|
||||
{
|
||||
return new IIONamedNodeMap(attrs);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getChildNodes()
|
||||
*/
|
||||
public NodeList getChildNodes()
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
public Object getFeature(String feature, String version)
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getFirstChild()
|
||||
*/
|
||||
public Node getFirstChild()
|
||||
{
|
||||
return (children.size() > 0) ? (Node)children.get(0) : null;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getLastChild()
|
||||
*/
|
||||
public Node getLastChild()
|
||||
{
|
||||
return (children.size() > 0) ? (Node)children.get(children.size() - 1)
|
||||
: null;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getLocalName()
|
||||
*/
|
||||
public String getLocalName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getNamespaceURI()
|
||||
*/
|
||||
public String getNamespaceURI()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getNextSibling()
|
||||
*/
|
||||
public Node getNextSibling()
|
||||
{
|
||||
// If this op needs to be faster, add links to prev and next nodes.
|
||||
if (parent == null) return null;
|
||||
int idx = parent.children.indexOf(this);
|
||||
return (idx == parent.children.size() - 1) ? null
|
||||
: (Node)parent.children.get(idx + 1);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getNodeName()
|
||||
*/
|
||||
public String getNodeName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getNodeType()
|
||||
*/
|
||||
public short getNodeType()
|
||||
{
|
||||
return ELEMENT_NODE;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getNodeValue()
|
||||
*/
|
||||
public String getNodeValue()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getOwnerDocument()
|
||||
*/
|
||||
public Document getOwnerDocument()
|
||||
{
|
||||
// IOMetadataNodes have no owner
|
||||
return null;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getParentNode()
|
||||
*/
|
||||
public Node getParentNode()
|
||||
{
|
||||
return parent;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getPrefix()
|
||||
*/
|
||||
public String getPrefix()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#getPreviousSibling()
|
||||
*/
|
||||
public Node getPreviousSibling()
|
||||
{
|
||||
// If this op needs to be faster, add links to prev and next nodes.
|
||||
if (parent == null) return null;
|
||||
int idx = parent.children.indexOf(this);
|
||||
return (idx == 0) ? null
|
||||
: (Node)parent.children.get(idx - 1);
|
||||
}
|
||||
|
||||
public TypeInfo getSchemaTypeInfo()
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
public String getTextContent()
|
||||
throws DOMException
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
public Object getUserData(String key)
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#hasAttributes()
|
||||
*/
|
||||
public boolean hasAttributes()
|
||||
{
|
||||
return !attrs.isEmpty();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#hasChildNodes()
|
||||
*/
|
||||
public boolean hasChildNodes()
|
||||
{
|
||||
return !children.isEmpty();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#insertBefore(org.w3c.dom.Node, org.w3c.dom.Node)
|
||||
*/
|
||||
public Node insertBefore(Node newChild, Node refChild)
|
||||
{
|
||||
if (newChild == null)
|
||||
throw new IllegalArgumentException();
|
||||
|
||||
int idx = children.indexOf(refChild);
|
||||
if (idx == -1)
|
||||
children.add(newChild);
|
||||
else
|
||||
children.add(idx, newChild);
|
||||
((IIOMetadataNode)newChild).parent = this;
|
||||
|
||||
return newChild;
|
||||
}
|
||||
|
||||
public boolean isDefaultNamespace(String namespaceURI)
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
public boolean isEqualNode(Node arg)
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
public boolean isSameNode(Node other)
|
||||
{
|
||||
return this == other;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#isSupported(java.lang.String, java.lang.String)
|
||||
*/
|
||||
public boolean isSupported(String feature, String version)
|
||||
{
|
||||
// No DOM features are supported
|
||||
return false;
|
||||
}
|
||||
|
||||
public String lookupNamespaceURI(String prefix)
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
public String lookupPrefix(String namespaceURI)
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#normalize()
|
||||
*/
|
||||
public void normalize()
|
||||
{
|
||||
// No text nodes so no action
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#removeChild(org.w3c.dom.Node)
|
||||
*/
|
||||
public Node removeChild(Node oldChild)
|
||||
{
|
||||
if (oldChild == null)
|
||||
throw new IllegalArgumentException();
|
||||
children.remove(oldChild);
|
||||
((IIOMetadataNode)oldChild).parent = null;
|
||||
|
||||
return oldChild;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#replaceChild(org.w3c.dom.Node, org.w3c.dom.Node)
|
||||
*/
|
||||
public Node replaceChild(Node newChild, Node oldChild)
|
||||
{
|
||||
if (newChild == null)
|
||||
throw new IllegalArgumentException();
|
||||
children.set(children.indexOf(oldChild), newChild);
|
||||
((IIOMetadataNode)oldChild).parent = null;
|
||||
return oldChild;
|
||||
}
|
||||
|
||||
public void setIdAttribute(String name, boolean isId)
|
||||
throws DOMException
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
public void setIdAttributeNode(Attr idAttr, boolean isId)
|
||||
throws DOMException
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
public void setIdAttributeNS(String namespaceURI, String localName, boolean isId)
|
||||
throws DOMException
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#setNodeValue(java.lang.String)
|
||||
*/
|
||||
public void setNodeValue(String nodeValue) throws DOMException
|
||||
{
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.w3c.dom.Node#setPrefix(java.lang.String)
|
||||
*/
|
||||
public void setPrefix(String prefix)
|
||||
{
|
||||
}
|
||||
|
||||
public void setTextContent(String textContent)
|
||||
throws DOMException
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
|
||||
public Object setUserData(String key, Object data, UserDataHandler handler)
|
||||
{
|
||||
throw new Error("not implemented");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue