You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ma...@apache.org on 2009/09/15 15:53:09 UTC
svn commit: r815328 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java
Author: maxberger
Date: Tue Sep 15 13:53:09 2009
New Revision: 815328
URL: http://svn.apache.org/viewvc?rev=815328&view=rev
Log:
non-functional stylistic fixes
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java?rev=815328&r1=815327&r2=815328&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/apps/PFMReader.java Tue Sep 15 13:53:09 2009
@@ -171,7 +171,7 @@
* @param pfm The PFM file to preview.
*/
public void preview(PFMFile pfm) {
- if (log != null & log.isInfoEnabled()) {
+ if (log != null && log.isInfoEnabled()) {
log.info("Font: " + pfm.getWindowsName());
log.info("Name: " + pfm.getPostscriptName());
log.info("CharSet: " + pfm.getCharSetName());
@@ -219,14 +219,15 @@
root.appendChild(el);
el.appendChild(doc.createTextNode(pfm.getPostscriptName()));
- String s = pfm.getPostscriptName();
- int pos = s.indexOf("-");
- if (pos >= 0) {
- char[] sb = new char[s.length() - 1];
- s.getChars(0, pos, sb, 0);
- s.getChars(pos + 1, s.length(), sb, pos);
- s = new String(sb);
- }
+ // Currently unused.
+ // String s = pfm.getPostscriptName();
+ // int pos = s.indexOf("-");
+ // if (pos >= 0) {
+ // char[] sb = new char[s.length() - 1];
+ // s.getChars(0, pos, sb, 0);
+ // s.getChars(pos + 1, s.length(), sb, pos);
+ // s = new String(sb);
+ // }
el = doc.createElement("embed");
root.appendChild(el);
@@ -304,8 +305,7 @@
el = doc.createElement("char");
widths.appendChild(el);
el.setAttribute("idx", Integer.toString(i));
- el.setAttribute("wdt",
- new Integer(pfm.getCharWidth(i)).toString());
+ el.setAttribute("wdt", Integer.toString(pfm.getCharWidth(i)));
}
@@ -318,13 +318,14 @@
root.appendChild(el);
Element el2 = null;
- Map h2 = (Map)pfm.getKerning().get(kpx1);
- Iterator enum2 = h2.keySet().iterator();
+ Map h2 = (Map) pfm.getKerning().get(kpx1);
+ Iterator enum2 = h2.entrySet().iterator();
while (enum2.hasNext()) {
- Integer kpx2 = (Integer)enum2.next();
+ Map.Entry entry = (Map.Entry) enum2.next();
+ Integer kpx2 = (Integer) entry.getKey();
el2 = doc.createElement("pair");
el2.setAttribute("kpx2", kpx2.toString());
- Integer val = (Integer)h2.get(kpx2);
+ Integer val = (Integer) entry.getValue();
el2.setAttribute("kern", val.toString());
el.appendChild(el2);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org