Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Patrice Clement (monsieurp)" <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/jext/files: jext-5.0-enum-as-keyword.patch
Date: Fri, 03 Jul 2015 17:12:14
Message-Id: 20150703171209.386D974C@oystercatcher.gentoo.org
1 monsieurp 15/07/03 17:12:09
2
3 Added: jext-5.0-enum-as-keyword.patch
4 Log:
5 Add patch to get the package to compile with jdk-1.8. Update dev-java/jython dependency to :2.7. Fix bug 552452.
6
7 Signed-off-by: Patrice Clement <monsieurp@g.o>
8 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
9
10 Revision Changes Path
11 1.1 app-editors/jext/files/jext-5.0-enum-as-keyword.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/jext/files/jext-5.0-enum-as-keyword.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/jext/files/jext-5.0-enum-as-keyword.patch?rev=1.1&content-type=text/plain
15
16 Index: jext-5.0-enum-as-keyword.patch
17 ===================================================================
18 --- src/lib/org/gjt/sp/jedit/textarea/InputHandler.java.orig 2015-07-03 17:52:13.843000000 +0000
19 +++ src/lib/org/gjt/sp/jedit/textarea/InputHandler.java 2015-07-03 17:52:59.746000000 +0000
20 @@ -141,10 +141,10 @@
21 */
22 public static String getActionName(ActionListener listener)
23 {
24 - Enumeration enum = getActions();
25 - while(enum.hasMoreElements())
26 + Enumeration myEnum = getActions();
27 + while(myEnum.hasMoreElements())
28 {
29 - String name = (String)enum.nextElement();
30 + String name = (String)myEnum.nextElement();
31 ActionListener _listener = getAction(name);
32 if(_listener == listener)
33 return name;
34 --- src/lib/org/jext/options/OptionsDialog.java.orig 2015-07-03 17:54:19.179000000 +0000
35 +++ src/lib/org/jext/options/OptionsDialog.java 2015-07-03 17:54:33.377000000 +0000
36 @@ -297,11 +297,11 @@
37
38 private void addOptionGroup(OptionGroup child, OptionGroup parent)
39 {
40 - ArrayList enum = child.getMembers();
41 + ArrayList myEnum = child.getMembers();
42
43 - for (int i = 0; i < enum.size(); i++)
44 + for (int i = 0; i < myEnum.size(); i++)
45 {
46 - Object elem = enum.get(i);
47 + Object elem = myEnum.get(i);
48
49 if (elem instanceof OptionPane)
50 {
51 @@ -669,4 +669,4 @@
52
53 }
54
55 -// End of OptionsDialog.java
56 \ No newline at end of file
57 +// End of OptionsDialog.java
58 --- src/lib/org/jext/misc/VirtualFolders.java.orig 2015-07-03 17:49:57.731000000 +0000
59 +++ src/lib/org/jext/misc/VirtualFolders.java 2015-07-03 17:51:11.418000000 +0000
60 @@ -233,10 +233,10 @@
61 ret.append(crlf).append("<folderlist>");
62 }
63
64 - Enumeration enum = parent.children();
65 - while (enum.hasMoreElements())
66 + Enumeration myEnum = parent.children();
67 + while (myEnum.hasMoreElements())
68 {
69 - VirtualFolderNode child = (VirtualFolderNode) enum.nextElement();
70 + VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement();
71 ret.append(toXML(child, depth + 1));
72 }
73
74 @@ -317,20 +317,20 @@
75
76 private void fixVisible()
77 {
78 - Enumeration enum = root.depthFirstEnumeration();
79 + Enumeration myEnum = root.depthFirstEnumeration();
80 VirtualFolderNode node = null;
81 - while (enum.hasMoreElements())
82 + while (myEnum.hasMoreElements())
83 {
84
85 - node = (VirtualFolderNode)enum.nextElement();
86 + node = (VirtualFolderNode)myEnum.nextElement();
87 TreePath path = new TreePath(node.getPath());
88 tree.collapsePath(path);
89 }
90
91 - enum = root.depthFirstEnumeration();
92 - while (enum.hasMoreElements())
93 + myEnum = root.depthFirstEnumeration();
94 + while (myEnum.hasMoreElements())
95 {
96 - node = (VirtualFolderNode)enum.nextElement();
97 + node = (VirtualFolderNode)myEnum.nextElement();
98 if (node.shouldBeVisible())
99 {
100 TreePath path = new TreePath(((VirtualFolderNode)node.getParent()).getPath());
101 @@ -392,10 +392,10 @@
102 public static boolean folderExists(VirtualFolderNode parent, String name)
103 {
104 boolean exists = false;
105 - Enumeration enum = parent.children();
106 - while ((enum.hasMoreElements()) && !exists)
107 + Enumeration myEnum = parent.children();
108 + while ((myEnum.hasMoreElements()) && !exists)
109 {
110 - VirtualFolderNode child = (VirtualFolderNode) enum.nextElement();
111 + VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement();
112 exists = child.toString().equals(name);
113 }
114 return exists;
115 @@ -526,10 +526,10 @@
116 } else {
117 if (fromMenu)
118 {
119 - Enumeration enum = node.children();
120 - while (enum.hasMoreElements())
121 + Enumeration myEnum = node.children();
122 + while (myEnum.hasMoreElements())
123 {
124 - VirtualFolderNode child = (VirtualFolderNode) enum.nextElement();
125 + VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement();
126 openNode(child, fromMenu);
127 }
128 }
129 --- src/lib/com/microstar/xml/XmlParser.java.orig 2015-07-03 17:41:23.209000000 +0000
130 +++ src/lib/com/microstar/xml/XmlParser.java 2015-07-03 17:46:30.296000000 +0000
131 @@ -1346,7 +1346,7 @@
132 {
133 String name;
134 int type;
135 - String enum = null;
136 + String myEnum = null;
137
138 // Read the attribute name.
139 name = readNmtoken(true);
140 @@ -1358,12 +1358,12 @@
141 // Get the string of enumerated values
142 // if necessary.
143 if (type == ATTRIBUTE_ENUMERATED || type == ATTRIBUTE_NOTATION) {
144 - enum = dataBufferToString();
145 + myEnum = dataBufferToString();
146 }
147
148 // Read the default value.
149 requireWhitespace();
150 - parseDefault(elementName, name, type, enum);
151 + parseDefault(elementName, name, type, myEnum);
152 }
153
154
155 @@ -1451,7 +1451,7 @@
156 * Parse the default value for an attribute.
157 * [62] Default ::= '#REQUIRED' | '#IMPLIED' | ((%'#FIXED' S)? %AttValue
158 */
159 - void parseDefault (String elementName, String name, int type, String enum)
160 + void parseDefault (String elementName, String name, int type, String myEnum)
161 throws java.lang.Exception
162 {
163 int valueType = ATTRIBUTE_DEFAULT_SPECIFIED;
164 @@ -1477,7 +1477,7 @@
165 value = readLiteral(LIT_CHAR_REF);
166 context = CONTEXT_DTD;
167 }
168 - setAttribute(elementName, name, type, enum, value, valueType);
169 + setAttribute(elementName, name, type, myEnum, value, valueType);
170 }
171
172
173 @@ -2714,7 +2714,7 @@
174 * - int value type
175 * *TODO: do something with attribute types.
176 */
177 - void setAttribute (String elName, String name, int type, String enumeration,
178 + void setAttribute (String elName, String name, int type, String myEnum,
179 String value, int valueType)
180 throws java.lang.Exception
181 {
182 @@ -2736,7 +2736,7 @@
183 attribute[0] = new Integer(type);
184 attribute[1] = value;
185 attribute[2] = new Integer(valueType);
186 - attribute[3] = enumeration;
187 + attribute[3] = myEnum;
188 attribute[4] = null;
189 attlist.put(name.intern(), attribute);
Report Message
Find on MARC Find on Google Groups