[FOray-commit] SF.net SVN: foray: [9913] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
|
From: <vic...@us...> - 2007-07-02 19:47:53
|
Revision: 9913
http://svn.sourceforge.net/foray/?rev=9913&view=rev
Author: victormote
Date: 2007-07-02 12:47:27 -0700 (Mon, 02 Jul 2007)
Log Message:
-----------
Conform to axsl method name changes.
Modified Paths:
--------------
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/Encoding.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java
trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -75,7 +75,7 @@
*/
@Override
public String pdfReference() {
- if (this.encoding.isPredefinedPDF()) {
+ if (this.encoding.isPredefinedPdf()) {
return "/" + this.getName();
}
if (! (this.encoding instanceof EncodingVector)) {
@@ -88,7 +88,7 @@
* {@inheritDoc}
*/
public String toPDF() {
- if (this.encoding.isPredefinedPDF()) {
+ if (this.encoding.isPredefinedPdf()) {
/* The predefined PDF encodings are present by name. They do not
* need to be written into the document. */
return new String();
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -204,7 +204,7 @@
* We're not sure why this is necessary, but it seems to be. */
if (this.fsFont.getFont().isPdfStandardFont()) {
final Encoding encoding = this.fsFont.getEncoding();
- if (encoding.isPredefinedPDF()) {
+ if (encoding.isPredefinedPdf()) {
return true;
}
if (encoding == this.fsFont.getFont().getInternalEncoding()) {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/Encoding.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/Encoding.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/Encoding.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -55,14 +55,14 @@
/**
* {@inheritDoc}
*/
- public boolean isPredefinedPS() {
+ public boolean isPredefinedPs() {
return false;
}
/**
* {@inheritDoc}
*/
- public boolean isPredefinedPDF() {
+ public boolean isPredefinedPdf() {
return false;
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -897,7 +897,7 @@
/**
* {@inheritDoc}
*/
- public boolean isPredefinedPS() {
+ public boolean isPredefinedPs() {
return true;
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -757,7 +757,7 @@
/**
* {@inheritDoc}
*/
- public boolean isPredefinedPDF() {
+ public boolean isPredefinedPdf() {
return true;
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -925,7 +925,7 @@
/**
* {@inheritDoc}
*/
- public boolean isPredefinedPDF() {
+ public boolean isPredefinedPdf() {
return true;
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -1013,7 +1013,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.psR.EncodingVector bestBaseEncodingPDF() {
+ public org.axsl.psR.EncodingVector bestBaseEncodingPdf() {
return EncodingVector.getPredefinedEncoding("WinAnsiEncoding");
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -696,7 +696,7 @@
/**
* {@inheritDoc}
*/
- public boolean isPredefinedPS() {
+ public boolean isPredefinedPs() {
return true;
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -86,9 +86,6 @@
public abstract class EncodingVector extends Encoding
implements org.axsl.psR.EncodingVector, Serializable {
- /** Constant needed for serialization. */
- public static final long serialVersionUID = -401311001482299007L;
-
/** The name of the undefined glyph. */
public static final String NOTDEF = ".notdef";
@@ -396,9 +393,9 @@
/**
* {@inheritDoc}
*/
- public org.axsl.psR.EncodingVector bestBaseEncodingPDF() {
+ public org.axsl.psR.EncodingVector bestBaseEncodingPdf() {
/* Predefined encodings do not need to be written at all. */
- if (this.isPredefinedPDF()) {
+ if (this.isPredefinedPdf()) {
return null;
}
/* TODO: Write a standard implementation of this that compares this
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -961,7 +961,7 @@
/**
* {@inheritDoc}
*/
- public boolean isPredefinedPDF() {
+ public boolean isPredefinedPdf() {
return true;
}
Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2007-07-02 19:36:43 UTC (rev 9912)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2007-07-02 19:47:27 UTC (rev 9913)
@@ -414,7 +414,7 @@
/* Except PostScript-native encodings, write each encoding vector. */
for (int i = 0; i < encodingsUsed.size(); i++) {
final EncodingVector vector = encodingsUsed.get(i);
- if (! vector.isPredefinedPS()) {
+ if (! vector.isPredefinedPs()) {
writeRaw(vector.asPostScript(null));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|