Gentoo Archives: gentoo-commits

From: "Johann Schmitz (ercpe)" <ercpe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/xp/files: 0.5-fix-jdk-1.7-enum.patch
Date: Sat, 21 Jun 2014 07:04:45
Message-Id: 20140621070440.A61842004E@flycatcher.gentoo.org
1 ercpe 14/06/21 07:04:40
2
3 Added: 0.5-fix-jdk-1.7-enum.patch
4 Log:
5 EAPI bump; ebuild QA; fixed compilation error with jdk 1.7 (#514070)
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
8
9 Revision Changes Path
10 1.1 dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xp/files/0.5-fix-jdk-1.7-enum.patch?rev=1.1&content-type=text/plain
14
15 Index: 0.5-fix-jdk-1.7-enum.patch
16 ===================================================================
17 diff --git a/com/jclark/xml/sax/Driver.java b/com/jclark/xml/sax/Driver.java
18 index 2b0d90a..d1efd3e 100644
19 --- a/com/jclark/xml/sax/Driver.java
20 +++ b/com/jclark/xml/sax/Driver.java
21 @@ -160,9 +160,9 @@ public class Driver extends ApplicationImpl
22
23 DTD dtd = event.getDTD();
24
25 - for (Enumeration enum = dtd.entityNames(DTD.NOTATION);
26 - enum.hasMoreElements(); ) {
27 - String name = (String)enum.nextElement();
28 + for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);
29 + enumx.hasMoreElements(); ) {
30 + String name = (String)enumx.nextElement();
31 Entity entity = dtd.getEntity(DTD.NOTATION, name);
32 String systemId = entity.getSystemId();
33 if (systemId != null) {
34 @@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
35 }
36 dtdHandler.notationDecl(name, entity.getPublicId(), systemId);
37 }
38 - for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);
39 - enum.hasMoreElements();) {
40 - String name = (String)enum.nextElement();
41 + for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);
42 + enumx.hasMoreElements();) {
43 + String name = (String)enumx.nextElement();
44 Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);
45 String notationName = entity.getNotationName();
46 if (notationName != null) {