Bläddra i källkod

Oh well, let's remove the "enum" tokens entirely. Maybe Gump is happier this way.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain@379439 13f79535-47bb-0310-9956-ffa450edef68
fop-0_20_2-maintain
Jeremias Maerki 18 år sedan
förälder
incheckning
2f0d5f0a12

+ 1
- 0
build.xml Visa fil

bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved." bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."
overview="${build.src}/overview.html" overview="${build.src}/overview.html"
use="true" use="true"
source="${javac.source}"
failonerror="true"> failonerror="true">
<group title="Control and Startup"> <group title="Control and Startup">
<package name="org.apache.fop.apps"/> <package name="org.apache.fop.apps"/>

+ 2
- 2
src/org/apache/fop/fonts/apps/PFMReader.java Visa fil





// Get kerning // Get kerning
for (Iterator enum = pfm.getKerning().keySet().iterator(); enum.hasNext(); ) {
Integer kpx1 = (Integer)enum.next();
for (Iterator iter = pfm.getKerning().keySet().iterator(); iter.hasNext(); ) {
Integer kpx1 = (Integer)iter.next();
el = doc.createElement("kerning"); el = doc.createElement("kerning");
el.setAttribute("kpx1", kpx1.toString()); el.setAttribute("kpx1", kpx1.toString());
root.appendChild(el); root.appendChild(el);

+ 5
- 5
src/org/apache/fop/fonts/apps/TTFReader.java Visa fil

} }


// Get kerning // Get kerning
Iterator enum;
Iterator iter;
if (isCid) if (isCid)
enum = ttf.getKerning().keySet().iterator();
iter = ttf.getKerning().keySet().iterator();
else else
enum = ttf.getAnsiKerning().keySet().iterator();
iter = ttf.getAnsiKerning().keySet().iterator();


while (enum.hasNext()) {
Integer kpx1 = (Integer)enum.next();
while (iter.hasNext()) {
Integer kpx1 = (Integer)iter.next();


el = doc.createElement("kerning"); el = doc.createElement("kerning");
el.setAttribute("kpx1", kpx1.toString()); el.setAttribute("kpx1", kpx1.toString());

+ 6
- 6
src/org/apache/fop/messaging/MessageHandler.java Visa fil

break; break;
case EVENT: case EVENT:
setMessage(message); setMessage(message);
Enumeration enum = listeners.elements();
while (enum.hasMoreElements()) {
((MessageListener)enum.nextElement()).processMessage(new MessageEvent(getMessage()));
Enumeration en = listeners.elements();
while (en.hasMoreElements()) {
((MessageListener)en.nextElement()).processMessage(new MessageEvent(getMessage()));
} }
break; break;
case NONE: case NONE:
break; break;
case EVENT: case EVENT:
setMessage(message); setMessage(message);
Enumeration enum = listeners.elements();
while (enum.hasMoreElements()) {
Enumeration en = listeners.elements();
while (en.hasMoreElements()) {
MessageEvent messEv = new MessageEvent(getMessage()); MessageEvent messEv = new MessageEvent(getMessage());
messEv.setMessageType(MessageEvent.ERROR); messEv.setMessageType(MessageEvent.ERROR);
((MessageListener)enum.nextElement()).processMessage(messEv);
((MessageListener)en.nextElement()).processMessage(messEv);
} }
break; break;
case NONE: case NONE:

+ 6
- 6
src/org/apache/fop/render/ps/PSRenderer.java Visa fil

// write("/gfF1{/Helvetica findfont} bd"); // write("/gfF1{/Helvetica findfont} bd");
// write("/gfF3{/Helvetica-Bold findfont} bd"); // write("/gfF3{/Helvetica-Bold findfont} bd");
Map fonts = fontInfo.getFonts(); Map fonts = fontInfo.getFonts();
Iterator enum = fonts.keySet().iterator();
while (enum.hasNext()) {
String key = (String)enum.next();
Iterator iter = fonts.keySet().iterator();
while (iter.hasNext()) {
String key = (String)iter.next();
Font fm = (Font)fonts.get(key); Font fm = (Font)fonts.get(key);
write("/" + key + " /" + fm.fontName() + " def"); write("/" + key + " /" + fm.fontName() + " def");
} }
defineWinAnsiEncoding(); defineWinAnsiEncoding();


//Rewrite font encodings //Rewrite font encodings
enum = fonts.keySet().iterator();
while (enum.hasNext()) {
String key = (String)enum.next();
iter = fonts.keySet().iterator();
while (iter.hasNext()) {
String key = (String)iter.next();
Font fm = (Font)fonts.get(key); Font fm = (Font)fonts.get(key);
if (null == fm.encoding()) { if (null == fm.encoding()) {
//ignore (ZapfDingbats and Symbol run through here //ignore (ZapfDingbats and Symbol run through here

Laddar…
Avbryt
Spara