cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTRenderer.java
pbwest 2004/04/15 01:01:50
Modified:src/java/org/apache/fop/render/awt Tag:
FOP_0-20-0_Alt-Design AWTRenderer.java
Log:
Removed currently unused code from HEAD
Added generation of GraphicsEnvironment and getGraphicsEnvironment
Implements Runnable; added run method
Added thread termination condition
Revision ChangesPath
No revision
No revision
1.21.2.4 +50 -259 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -r1.21.2.3 -r1.21.2.4
--- AWTRenderer.java 16 Mar 2004 12:07:08 - 1.21.2.3
+++ AWTRenderer.java 15 Apr 2004 08:01:50 - 1.21.2.4
@@ -29,6 +29,7 @@
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
+import java.awt.GraphicsEnvironment;
import java.awt.Toolkit;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
@@ -38,11 +39,7 @@
import java.awt.print.Printable;
import java.io.IOException;
import java.util.Map;
-import java.util.Vector;
-
-import org.apache.fop.apps.Document;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.InputHandler;
import org.apache.fop.area.PageViewport;
import org.apache.fop.render.AbstractRenderer;
import org.apache.fop.render.awt.viewer.PreviewDialog;
@@ -50,29 +47,18 @@
/**
* This is FOP's AWT renderer.
+ * In alt-design, this renders Graphics2D objects.
*/
public class AWTRenderer
extends AbstractRenderer
-implements Printable, Pageable {
+implements Runnable, Printable, Pageable {
protected double scaleFactor = 100.0;
protected int pageNumber = 0;
-private int pageWidth = 0;
-private int pageHeight = 0;
-private Vector pageViewportList = new java.util.Vector();
-private Vector pageList = new java.util.Vector();
-private Vector bufferedImageList = new java.util.Vector();
private BufferedImage currentPageImage = null;
+private GraphicsEnvironment gEnv =
+GraphicsEnvironment.getLocalGraphicsEnvironment();
-/** Font configuration */
-protected Document fontInfo;
-
-/**
-The InputHandler associated with this Renderer.
-Sent to the PreviewDialog for document reloading.
-*/
-private InputHandler inputHandler;
-
/**
* The resource bundle used for AWT messages.
*/
@@ -89,15 +75,19 @@
*/
protected PreviewDialog frame;
-public AWTRenderer(InputHandler handler) {
-inputHandler = handler;
+public AWTRenderer() {
translator = new Translator();
-createPreviewDialog(inputHandler);
+createPreviewDialog();
}
-public AWTRenderer() {
-translator = new Translator();
-createPreviewDialog(null);
+/**
+ * Returns the graphics environment (including available font information)
+ * for this renderer.
+ *
+ * @return the graphics environment for this renderer
+ */
+public GraphicsEnvironment getGraphicsEnvironment() {
+return gEnv;
}
/**
@@ -119,14 +109,6 @@
//FontSetup.setup(fontInfo, fontImage.createGraphics());
//}
-public int getPageNumber() {
-return pageNumber;
-}
-
-public void setPageNumber(int aValue) {
-pageNumber = aValue;
-}
-
public void setScaleFactor(double newScaleFactor) {
scaleFactor = newScaleFactor;
}
@@ -135,20 +117,28 @@
return scaleFactor;
}
-//public void startRenderer(OutputStream out)
-//throws IOException {
-//// empty pageViewportList, in case of a reload from PreviewDialog
-//pageViewportList.removeAllElements();
-//pageList.removeAllElements();
-//bufferedImageList.removeAllElements();
-//System.out.println(\nRegion Types: 0-Before/Top, 1-Start/Left, 2-Body,
3-End/Right, 4-After/Bottom);
-//}
-//
-//public void stopRenderer()
-//throws IOException {
-//frame.setStatus(translator.getString(Status.Show));
-//frame.showPage();
-//}
+private boolean finished = false;
+
+public synchronized void finish() {
+if (finished) return;
+finished = true;
+notifyAll();
+}
+
+private synchronized void finishing() {
+while (! finished) {
+try {
+wait();
+} catch (InterruptedException e) {
+}
+}
+}
+
+public void run() {
+// Start the renderer
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTRenderer.java
pbwest 2004/04/15 04:33:47
Modified:src/java/org/apache/fop/render/awt Tag:
FOP_0-20-0_Alt-Design AWTRenderer.java
Log:
Disable PreviewDialog
Return from finishng() on InterruptedException
Revision ChangesPath
No revision
No revision
1.21.2.5 +4 -2 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -u -r1.21.2.4 -r1.21.2.5
--- AWTRenderer.java 15 Apr 2004 08:01:50 - 1.21.2.4
+++ AWTRenderer.java 15 Apr 2004 11:33:47 - 1.21.2.5
@@ -76,8 +76,8 @@
protected PreviewDialog frame;
public AWTRenderer() {
-translator = new Translator();
-createPreviewDialog();
+//translator = new Translator();
+//createPreviewDialog();
}
/**
@@ -130,6 +130,8 @@
try {
wait();
} catch (InterruptedException e) {
+// We can go now
+return;
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTRenderer.java AWTPrintRenderer.java
pbwest 2004/03/16 04:07:09
Modified:src/java/org/apache/fop/render/awt Tag:
FOP_0-20-0_Alt-Design AWTRenderer.java
AWTPrintRenderer.java
Log:
startRenderer and stopRenderer methods commented out
Revision ChangesPath
No revision
No revision
1.21.2.3 +17 -16xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -r1.21.2.2 -r1.21.2.3
--- AWTRenderer.java 13 Mar 2004 08:46:05 - 1.21.2.2
+++ AWTRenderer.java 16 Mar 2004 12:07:08 - 1.21.2.3
@@ -37,7 +37,6 @@
import java.awt.print.Pageable;
import java.awt.print.Printable;
import java.io.IOException;
-import java.io.OutputStream;
import java.util.Map;
import java.util.Vector;
@@ -52,7 +51,9 @@
/**
* This is FOP's AWT renderer.
*/
-public class AWTRenderer extends AbstractRenderer implements Printable, Pageable {
+public class AWTRenderer
+extends AbstractRenderer
+implements Printable, Pageable {
protected double scaleFactor = 100.0;
protected int pageNumber = 0;
@@ -134,20 +135,20 @@
return scaleFactor;
}
-public void startRenderer(OutputStream out)
-throws IOException {
-// empty pageViewportList, in case of a reload from PreviewDialog
-pageViewportList.removeAllElements();
-pageList.removeAllElements();
-bufferedImageList.removeAllElements();
-System.out.println(\nRegion Types: 0-Before/Top, 1-Start/Left, 2-Body,
3-End/Right, 4-After/Bottom);
-}
-
-public void stopRenderer()
-throws IOException {
-frame.setStatus(translator.getString(Status.Show));
-frame.showPage();
-}
+//public void startRenderer(OutputStream out)
+//throws IOException {
+//// empty pageViewportList, in case of a reload from PreviewDialog
+//pageViewportList.removeAllElements();
+//pageList.removeAllElements();
+//bufferedImageList.removeAllElements();
+//System.out.println(\nRegion Types: 0-Before/Top, 1-Start/Left, 2-Body,
3-End/Right, 4-After/Bottom);
+//}
+//
+//public void stopRenderer()
+//throws IOException {
+//frame.setStatus(translator.getString(Status.Show));
+//frame.showPage();
+//}
// Printable Interface
public PageFormat getPageFormat(int pos) {
1.7.2.2 +24 -24xml-fop/src/java/org/apache/fop/render/awt/AWTPrintRenderer.java
Index: AWTPrintRenderer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTPrintRenderer.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- AWTPrintRenderer.java 10 Mar 2004 06:24:28 - 1.7.2.1
+++ AWTPrintRenderer.java 16 Mar 2004 12:07:08 - 1.7.2.2
@@ -18,9 +18,9 @@
package org.apache.fop.render.awt;
-import java.awt.print.PrinterException;
+//import java.awt.print.PrinterException;
import java.awt.print.PrinterJob;
-import java.io.IOException;
+//import java.io.IOException;
import java.util.Vector;
public class AWTPrintRenderer extends AWTRenderer {
@@ -60,27 +60,27 @@
printerJob.setPageable(this);
}
-public void stopRenderer() throws IOException {
-super.stopRenderer();
-
-if (endNumber == -1) {
-endNumber = getNumberOfPages();
-}
-
-Vector numbers = getInvalidPageNumbers();
-for (int i = numbers.size() - 1; i -1; i--) {
-// removePage(Integer.parseInt((String)numbers.elementAt(i)));
-}
-
-try {
-printerJob.print();
-} catch (PrinterException e) {
-e.printStackTrace();
-throw new IOException(Unable to print:
-+ e.getClass().getName()
-+ : + e.getMessage());
-}
-}
+//public void stopRenderer() throws IOException {
+//super.stopRenderer();
+//
+//if (endNumber == -1) {
+//endNumber = getNumberOfPages();
+//}
+//
+//Vector numbers = getInvalidPageNumbers();
+//for (int i = numbers.size() - 1; i -1; i--) {
+//// removePage(Integer.parseInt((String)numbers.elementAt(i)));
+//}
+//
+//try {
+//printerJob.print();
+//} catch (PrinterException e) {
+//e.printStackTrace();
+//throw new IOException(Unable to print:
+//
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTRenderer.java
gmazza 2003/10/01 17:32:02
Modified:src/java/org/apache/fop/area BodyRegion.java
src/java/org/apache/fop/render/awt AWTRenderer.java
Log:
1. BodyRegion's clone() now including child areas (makes it a bona fide clone()
function, also AWTRenderer() needs it.)
2. Starting implementation of RenderWord() in AWTRenderer; also looking at an
alternate implementation (storing a series of BufferedImages instead of the area
tree elements); temporarily storing both strategies in this commit.
Revision ChangesPath
1.3 +3 -2 xml-fop/src/java/org/apache/fop/area/BodyRegion.java
Index: BodyRegion.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/BodyRegion.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BodyRegion.java 27 Aug 2003 18:14:45 - 1.2
+++ BodyRegion.java 2 Oct 2003 00:32:02 - 1.3
@@ -159,8 +159,6 @@
/**
* Clone this object.
- * This is only used to clone the current object, the child areas
- * are assumed to be null and are not cloned.
*
* @return a shallow copy of this object
*/
@@ -170,6 +168,9 @@
br.setIPD(getIPD());
br.columnGap = columnGap;
br.columnCount = columnCount;
+br.beforeFloat = beforeFloat;
+br.mainReference = mainReference;
+br.footnote = footnote;
return br;
}
}
1.15 +117 -38 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AWTRenderer.java 21 Sep 2003 20:56:23 - 1.14
+++ AWTRenderer.java 2 Oct 2003 00:32:02 - 1.15
@@ -85,12 +85,17 @@
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.RegionViewport;
import org.apache.fop.area.Trait;
+import org.apache.fop.area.inline.Word;
+import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.FOTreeControl;
import org.apache.fop.fo.properties.BackgroundRepeat;
+import org.apache.fop.fonts.Typeface;
+import org.apache.fop.fonts.FontMetrics;
import org.apache.fop.image.FopImage;
import org.apache.fop.image.ImageFactory;
import org.apache.fop.render.AbstractRenderer;
import org.apache.fop.traits.BorderProps;
+import org.apache.fop.render.awt.FontMetricsMapper;
import org.apache.fop.render.awt.viewer.PreviewDialog;
import org.apache.fop.render.awt.viewer.Translator;
@@ -101,10 +106,13 @@
protected double scaleFactor = 100.0;
protected int pageNumber = 0;
-protected Vector pageViewportList = new java.util.Vector();
-protected Vector pageList = new java.util.Vector();
-protected BufferedImage currentPageImage = null;
-
+private int pageWidth = 0;
+private int pageHeight = 0;
+private Vector pageViewportList = new java.util.Vector();
+private Vector pageList = new java.util.Vector();
+private Vector bufferedImageList = new java.util.Vector();
+private BufferedImage currentPageImage = null;
+
/** Font configuration */
protected Document fontInfo;
@@ -112,33 +120,16 @@
The InputHandler associated with this Renderer.
Sent to the PreviewDialog for document reloading.
*/
-protected InputHandler inputHandler;
+private InputHandler inputHandler;
/**
* The resource bundle used for AWT messages.
*/
protected Translator translator = null;
-protected Map fontNames = new java.util.Hashtable();
-protected Map fontStyles = new java.util.Hashtable();
-protected Color saveColor = null;
-
-/**
- * The current (internal) font name
-*/
-protected String currentFontName;
-
-/**
- * The current font size in millipoints
- */
-protected int currentFontSize;
-
-/**
- * The current colour's red, green and blue component
- */
-protected float currentRed = 0;
-protected float currentGreen = 0;
-protected float currentBlue = 0;
+private Map fontNames = new java.util.Hashtable();
+private Map fontStyles = new java.util.Hashtable();
+private Color saveColor = null;
/**
* The preview dialog frame used for display of the documents.
@@ -158,6 +149,13 @@
createPreviewDialog(null);
}
+/**
+ * @see org.apache.fop.render.Renderer
+ */
+public boolean supportsOutOfOrder() {
+return false;
+}
+
public Translator getTranslator() {
return translator;
}
cvs commit: xml-fop/src/java/org/apache/fop/render/awt AWTRenderer.java
gmazza 2003/08/08 13:43:25
Modified:src/java/org/apache/fop/render/awt AWTRenderer.java
Log:
Removed empty setProducer() from AWTRenderer; can rely on base class.
Revision ChangesPath
1.2 +0 -3 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AWTRenderer.java 11 Mar 2003 13:05:34 - 1.1
+++ AWTRenderer.java 8 Aug 2003 20:43:25 - 1.2
@@ -126,9 +126,6 @@
res = aRes;
}
-public void setProducer(String producer) {
-}
-
public int getPageCount() {
return 0;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
