Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 66390 Details for
Bug 79206
[METABUG] packages which won't work with jdk 1.5 (yet)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
xerces-2.3.0-java5.patch
xerces-2.3.0-java5.patch (text/plain), 7.29 KB, created by
Christoph Brill (egore) (RESIGNED)
on 2005-08-20 05:03:46 UTC
(
hide
)
Description:
xerces-2.3.0-java5.patch
Filename:
MIME Type:
Creator:
Christoph Brill (egore) (RESIGNED)
Created:
2005-08-20 05:03:46 UTC
Size:
7.29 KB
patch
obsolete
>--- src/org/apache/xerces/impl/XMLDTDScannerImpl.java.orig 2003-01-27 20:18:06.000000000 +0100 >+++ src/org/apache/xerces/impl/XMLDTDScannerImpl.java 2005-08-20 13:37:07.000000000 +0200 >@@ -1198,21 +1198,21 @@ > > // call handler > if (fDTDHandler != null) { >- String[] enum = null; >+ String[] enum1 = null; > if (fEnumerationCount != 0) { >- enum = new String[fEnumerationCount]; >- System.arraycopy(fEnumeration, 0, enum, >+ enum1 = new String[fEnumerationCount]; >+ System.arraycopy(fEnumeration, 0, enum1, > 0, fEnumerationCount); > } > // Determine whether the default value to be passed should be null. > // REVISIT: should probably check whether fLiteral.ch is null instead. LM. > if (defaultType!=null && (defaultType.equals("#REQUIRED") || > defaultType.equals("#IMPLIED"))) { >- fDTDHandler.attributeDecl(elName, name, type, enum, >+ fDTDHandler.attributeDecl(elName, name, type, enum1, > defaultType, null, null, null); > } > else { >- fDTDHandler.attributeDecl(elName, name, type, enum, >+ fDTDHandler.attributeDecl(elName, name, type, enum1, > defaultType, fLiteral, fLiteral2, null); > } > } >--- src/org/apache/xerces/impl/xs/XSGrammarBucket.java.orig 2003-01-27 20:18:08.000000000 +0100 >+++ src/org/apache/xerces/impl/xs/XSGrammarBucket.java 2005-08-20 13:38:10.000000000 +0200 >@@ -180,10 +180,10 @@ > int count = fGrammarRegistry.size() + (fNoNSGrammar==null ? 0 : 1); > SchemaGrammar[] grammars = new SchemaGrammar[count]; > // get grammars with target namespace >- Enumeration enum = fGrammarRegistry.elements(); >+ Enumeration enum1 = fGrammarRegistry.elements(); > int i = 0; >- while (enum.hasMoreElements()) >- grammars[i++] = (SchemaGrammar)enum.nextElement(); >+ while (enum1.hasMoreElements()) >+ grammars[i++] = (SchemaGrammar)enum1.nextElement(); > // add the grammar without target namespace, if any > if (fNoNSGrammar != null) > grammars[count-1] = fNoNSGrammar; >--- src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java.orig 2003-01-27 20:18:02.000000000 +0100 >+++ src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java 2005-08-20 13:39:17.000000000 +0200 >@@ -1537,11 +1537,11 @@ > // REVISIT: pass the proper element node to reportSchemaError > public void checkNonSchemaAttributes(XSGrammarBucket grammarBucket) { > // for all attributes >- Enumeration enum = fNonSchemaAttrs.keys(); >+ Enumeration enum1 = fNonSchemaAttrs.keys(); > XSAttributeDecl attrDecl; >- while (enum.hasMoreElements()) { >+ while (enum1.hasMoreElements()) { > // get name, uri, localpart >- String attrRName = (String)enum.nextElement(); >+ String attrRName = (String)enum1.nextElement(); > String attrURI = attrRName.substring(0,attrRName.indexOf(',')); > String attrLocal = attrRName.substring(attrRName.indexOf(',')+1); > // find associated grammar >--- src/org/apache/xerces/util/AugmentationsImpl.java.orig 2003-01-27 20:18:09.000000000 +0100 >+++ src/org/apache/xerces/util/AugmentationsImpl.java 2005-08-20 13:41:47.000000000 +0200 >@@ -311,10 +311,10 @@ > public String toString() { > StringBuffer buff = new StringBuffer(); > buff.append("LargeContainer"); >- Enumeration enum = fAugmentations.keys(); >+ Enumeration enum1 = fAugmentations.keys(); > >- while (enum.hasMoreElements()) { >- Object key = enum.nextElement(); >+ while (enum1.hasMoreElements()) { >+ Object key = enum1.nextElement(); > buff.append("\nkey == "); > buff.append(key); > buff.append("; value == "); >--- src/org/apache/xerces/util/NamespaceSupport.java.orig 2003-01-27 20:18:06.000000000 +0100 >+++ src/org/apache/xerces/util/NamespaceSupport.java 2005-08-20 13:42:58.000000000 +0200 >@@ -125,9 +125,9 @@ > public NamespaceSupport(NamespaceContext context) { > pushContext(); > // copy declaration in the context >- Enumeration enum = context.getAllPrefixes(); >- while (enum.hasMoreElements()){ >- String prefix = (String)enum.nextElement(); >+ Enumeration enum1 = context.getAllPrefixes(); >+ while (enum1.hasMoreElements()){ >+ String prefix = (String)enum1.nextElement(); > String uri = context.getURI(prefix); > declarePrefix(prefix, uri); > } >--- src/org/apache/xml/serialize/HTMLSerializer.java.orig 2003-01-27 20:18:09.000000000 +0100 >+++ src/org/apache/xml/serialize/HTMLSerializer.java 2005-08-20 13:46:19.000000000 +0200 >@@ -346,12 +346,12 @@ > preserveSpace = true; > > if ( addNSAttr ) { >- Enumeration enum; >+ Enumeration enum1; > >- enum = _prefixes.keys(); >- while ( enum.hasMoreElements() ) { >+ enum1 = _prefixes.keys(); >+ while ( enum1.hasMoreElements() ) { > _printer.printSpace(); >- value = (String) enum.nextElement(); >+ value = (String) enum1.nextElement(); > name = (String) _prefixes.get( value ); > if ( name.length() == 0 ) { > _printer.printText( "xmlns=\"" ); >--- src/org/apache/xml/serialize/XMLSerializer.java.orig 2003-01-27 20:18:02.000000000 +0100 >+++ src/org/apache/xml/serialize/XMLSerializer.java 2005-08-20 13:50:16.000000000 +0200 >@@ -374,12 +374,12 @@ > } > > if (_prefixes != null) { >- Enumeration enum; >+ Enumeration enum1; > >- enum = _prefixes.keys(); >- while (enum.hasMoreElements()) { >+ enum1 = _prefixes.keys(); >+ while (enum1.hasMoreElements()) { > _printer.printSpace(); >- value = (String) enum.nextElement(); >+ value = (String) enum1.nextElement(); > name = (String) _prefixes.get( value ); > if (name.length() == 0) { > _printer.printText( "xmlns=\"" ); >--- samples/xni/PSVIWriter.java.orig 2003-01-27 20:18:10.000000000 +0100 >+++ samples/xni/PSVIWriter.java 2005-08-20 13:59:48.000000000 +0200 >@@ -1147,11 +1147,11 @@ > printElement("prefix", "xml"); > printElement("namespaceName", NamespaceContext.XML_URI); > printUnIndentTag("</namespace>"); >- Enumeration enum = fNamespaceContext.getAllPrefixes(); >- while (enum.hasMoreElements()) { >+ Enumeration enum1 = fNamespaceContext.getAllPrefixes(); >+ while (enum1.hasMoreElements()) { > printIndentTag("<namespace>"); > >- String prefix = (String) enum.nextElement(); >+ String prefix = (String) enum1.nextElement(); > String uri = fNamespaceContext.getURI(prefix); > printElement("prefix", prefix); > printElement("namespaceName", uri);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 79206
:
60835
|
65887
|
66376
|
66388
| 66390 |
66395
|
67322
|
79137
|
79138
|
82246
|
82247
|
82248
|
82249
|
82250
|
82251