You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by vh...@apache.org on 2001/05/15 01:18:25 UTC
cvs commit: xml-batik/sources/org/apache/batik/transcoder/print PrintTranscoder.java
vhardy 01/05/14 16:18:23
Modified: sources/org/apache/batik/ext/swing
JAffineTransformChooser.java
sources/org/apache/batik/swing/gvt JGVTComponent.java
sources/org/apache/batik/transcoder TranscoderSupport.java
sources/org/apache/batik/transcoder/image
ImageTranscoder.java
sources/org/apache/batik/transcoder/print
PrintTranscoder.java
Log:
Removed some 1.2.2 dependancies. Down to 15 compile errors on 1.2.2.
Revision Changes Path
1.4 +10 -22 xml-batik/sources/org/apache/batik/ext/swing/JAffineTransformChooser.java
Index: JAffineTransformChooser.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/swing/JAffineTransformChooser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JAffineTransformChooser.java 2001/05/14 22:27:39 1.3
+++ JAffineTransformChooser.java 2001/05/14 23:18:01 1.4
@@ -18,6 +18,7 @@
import java.awt.event.ActionListener;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
+import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
@@ -27,9 +28,7 @@
import javax.swing.AbstractAction;
import javax.swing.AbstractButton;
import javax.swing.Action;
-import javax.swing.ActionMap;
import javax.swing.BorderFactory;
-import javax.swing.InputMap;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JDialog;
@@ -48,7 +47,7 @@
* make up an <tt>AffineTransform</tt>
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: JAffineTransformChooser.java,v 1.3 2001/05/14 22:27:39 vhardy Exp $
+ * @version $Id: JAffineTransformChooser.java,v 1.4 2001/05/14 23:18:01 vhardy Exp $
*/
public class JAffineTransformChooser extends JGridBagPanel{
public static final String LABEL_ANGLE
@@ -445,31 +444,20 @@
JButton cancelButton = new JButton(cancelString);
- // The following few lines are used to register esc to close the dialog
- Action cancelKeyAction = new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
- hide();
+ addKeyListener(new KeyAdapter(){
+ public void keyPressed(KeyEvent evt){
+ if(evt.getKeyCode() == KeyEvent.VK_ESCAPE){
+ hide();
+ }
}
- };
- KeyStroke cancelKeyStroke = KeyStroke.getKeyStroke((char)KeyEvent.VK_ESCAPE);
- InputMap inputMap = cancelButton.getInputMap(JComponent.
- WHEN_IN_FOCUSED_WINDOW);
- ActionMap actionMap = cancelButton.getActionMap();
- if (inputMap != null && actionMap != null) {
- inputMap.put(cancelKeyStroke, ACTION_COMMAND_CANCEL);
- actionMap.put(ACTION_COMMAND_CANCEL, cancelKeyAction);
- }
- // end esc handling
-
- cancelButton.setActionCommand(ACTION_COMMAND_CANCEL);
- if (cancelListener != null) {
- cancelButton.addActionListener(cancelListener);
- }
+ });
+
cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
hide();
}
});
+
buttonPane.add(cancelButton);
JButton resetButton = new JButton(resetString);
1.14 +2 -2 xml-batik/sources/org/apache/batik/swing/gvt/JGVTComponent.java
Index: JGVTComponent.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/gvt/JGVTComponent.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JGVTComponent.java 2001/05/04 17:04:27 1.13
+++ JGVTComponent.java 2001/05/14 23:18:07 1.14
@@ -53,7 +53,7 @@
* This class represents a component which can display a GVT tree.
*
* @author <a href="mailto:stephane@hillion.org">Stephane Hillion</a>
- * @version $Id: JGVTComponent.java,v 1.13 2001/05/04 17:04:27 tkormann Exp $
+ * @version $Id: JGVTComponent.java,v 1.14 2001/05/14 23:18:07 vhardy Exp $
*/
public class JGVTComponent extends JComponent {
@@ -593,7 +593,7 @@
});
sleep(200);
}
- } catch (Exception e) {
+ } catch (Exception ex) {
}
}
};
1.5 +15 -1 xml-batik/sources/org/apache/batik/transcoder/TranscoderSupport.java
Index: TranscoderSupport.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/transcoder/TranscoderSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TranscoderSupport.java 2001/01/31 04:18:17 1.4
+++ TranscoderSupport.java 2001/05/14 23:18:12 1.5
@@ -15,7 +15,7 @@
* support transcoding hints and/or error handler.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
- * @version $Id: TranscoderSupport.java,v 1.4 2001/01/31 04:18:17 tkormann Exp $
+ * @version $Id: TranscoderSupport.java,v 1.5 2001/05/14 23:18:12 vhardy Exp $
*/
public class TranscoderSupport {
@@ -25,6 +25,20 @@
protected TranscodingHints hints = new TranscodingHints();
/** The error handler used to report warnings and errors. */
protected ErrorHandler handler = defaultErrorHandler;
+
+ /**
+ * Access to ErrorHandler
+ */
+ public ErrorHandler getHandler(){
+ return handler;
+ }
+
+ /**
+ * Access to hints
+ */
+ public TranscodingHints getHints(){
+ return hints;
+ }
/**
* Constructs a new <tt>TranscoderSupport</tt>.
1.23 +23 -23 xml-batik/sources/org/apache/batik/transcoder/image/ImageTranscoder.java
Index: ImageTranscoder.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/transcoder/image/ImageTranscoder.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ImageTranscoder.java 2001/05/07 23:49:52 1.22
+++ ImageTranscoder.java 2001/05/14 23:18:16 1.23
@@ -100,7 +100,7 @@
* millimeter conversion factor.
*
* @author <a href="mailto:Thierry.Kormann@sophia.inria.fr">Thierry Kormann</a>
- * @version $Id: ImageTranscoder.java,v 1.22 2001/05/07 23:49:52 tkormann Exp $
+ * @version $Id: ImageTranscoder.java,v 1.23 2001/05/14 23:18:16 vhardy Exp $
*/
public abstract class ImageTranscoder extends XMLAbstractTranscoder {
@@ -111,11 +111,11 @@
* Constructs a new <tt>ImageTranscoder</tt>.
*/
protected ImageTranscoder() {
- hints.put(KEY_DOCUMENT_ELEMENT_NAMESPACE_URI,
+ getHints().put(KEY_DOCUMENT_ELEMENT_NAMESPACE_URI,
SVGConstants.SVG_NAMESPACE_URI);
- hints.put(KEY_DOCUMENT_ELEMENT,
+ getHints().put(KEY_DOCUMENT_ELEMENT,
SVGConstants.SVG_SVG_TAG);
- hints.put(KEY_DOM_IMPLEMENTATION,
+ getHints().put(KEY_DOM_IMPLEMENTATION,
SVGDOMImplementation.getDOMImplementation());
}
@@ -162,12 +162,12 @@
// compute the image's width and height according the hints
float imgWidth = -1;
- if (hints.containsKey(KEY_WIDTH)) {
- imgWidth = ((Float)hints.get(KEY_WIDTH)).floatValue();
+ if (getHints().containsKey(KEY_WIDTH)) {
+ imgWidth = ((Float)getHints().get(KEY_WIDTH)).floatValue();
}
float imgHeight = -1;
- if (hints.containsKey(KEY_HEIGHT)) {
- imgHeight = ((Float)hints.get(KEY_HEIGHT)).floatValue();
+ if (getHints().containsKey(KEY_HEIGHT)) {
+ imgHeight = ((Float)getHints().get(KEY_HEIGHT)).floatValue();
}
float width, height;
if (imgWidth > 0 && imgHeight > 0) {
@@ -207,8 +207,8 @@
Px = AffineTransform.getScaleInstance(scale, scale);
}
// take the AOI into account if any
- if (hints.containsKey(KEY_AOI)) {
- Rectangle2D aoi = (Rectangle2D)hints.get(KEY_AOI);
+ if (getHints().containsKey(KEY_AOI)) {
+ Rectangle2D aoi = (Rectangle2D)getHints().get(KEY_AOI);
// transform the AOI into the image's coordinate system
aoi = Px.createTransformedShape(aoi).getBounds2D();
AffineTransform Mx = new AffineTransform();
@@ -245,8 +245,8 @@
BufferedImage dest = createImage(w, h);
Graphics2D g2d = GraphicsUtil.createGraphics(dest);
- if (hints.containsKey(KEY_BACKGROUND_COLOR)) {
- Paint bgcolor = (Paint)hints.get(KEY_BACKGROUND_COLOR);
+ if (getHints().containsKey(KEY_BACKGROUND_COLOR)) {
+ Paint bgcolor = (Paint)getHints().get(KEY_BACKGROUND_COLOR);
g2d.setComposite(AlphaComposite.SrcOver);
g2d.setPaint(bgcolor);
g2d.fillRect(0, 0, w, h);
@@ -311,7 +311,7 @@
*/
public void displayError(String message) {
try {
- handler.error(new TranscoderException(message));
+ getHandler().error(new TranscoderException(message));
} catch (TranscoderException ex) {
throw new RuntimeException();
}
@@ -322,7 +322,7 @@
*/
public void displayError(Exception e) {
try {
- handler.error(new TranscoderException(e));
+ getHandler().error(new TranscoderException(e));
} catch (TranscoderException ex) {
throw new RuntimeException();
}
@@ -333,7 +333,7 @@
*/
public void displayMessage(String message) {
try {
- handler.warning(new TranscoderException(message));
+ getHandler().warning(new TranscoderException(message));
} catch (TranscoderException ex) {
throw new RuntimeException();
}
@@ -344,8 +344,8 @@
* <tt>TranscodingHints</tt> or 0.3528 if any.
*/
public float getPixelToMM() {
- if (hints.containsKey(KEY_PIXEL_TO_MM)) {
- return ((Float)hints.get(KEY_PIXEL_TO_MM)).floatValue();
+ if (getHints().containsKey(KEY_PIXEL_TO_MM)) {
+ return ((Float)getHints().get(KEY_PIXEL_TO_MM)).floatValue();
} else {
// return 0.3528f; // 72 dpi
return 0.26458333333333333333333333333333f; // 96dpi
@@ -357,8 +357,8 @@
* <tt>TranscodingHints</tt> or "en" (english) if any.
*/
public String getLanguages() {
- if (hints.containsKey(KEY_LANGUAGE)) {
- return (String)hints.get(KEY_LANGUAGE);
+ if (getHints().containsKey(KEY_LANGUAGE)) {
+ return (String)getHints().get(KEY_LANGUAGE);
} else {
return "en";
}
@@ -369,15 +369,15 @@
* <tt>TranscodingHints</tt> or null if any.
*/
public String getUserStyleSheetURI() {
- return (String)hints.get(KEY_USER_STYLESHEET_URI);
+ return (String)getHints().get(KEY_USER_STYLESHEET_URI);
}
/**
- * Returns the XML parser to use from the TranscodingHints.
+ * Returns the XML parser to use from the TranscodingGetHints().
*/
public String getXMLParserClassName() {
- if (hints.containsKey(KEY_XML_PARSER_CLASSNAME)) {
- return (String)hints.get(KEY_XML_PARSER_CLASSNAME);
+ if (getHints().containsKey(KEY_XML_PARSER_CLASSNAME)) {
+ return (String)getHints().get(KEY_XML_PARSER_CLASSNAME);
} else {
return XMLResourceDescriptor.getXMLParserClassName();
}
1.8 +33 -33 xml-batik/sources/org/apache/batik/transcoder/print/PrintTranscoder.java
Index: PrintTranscoder.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/transcoder/print/PrintTranscoder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PrintTranscoder.java 2001/05/07 23:49:53 1.7
+++ PrintTranscoder.java 2001/05/14 23:18:21 1.8
@@ -108,7 +108,7 @@
* </ul>
*
* @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
- * @version $Id: PrintTranscoder.java,v 1.7 2001/05/07 23:49:53 tkormann Exp $
+ * @version $Id: PrintTranscoder.java,v 1.8 2001/05/14 23:18:21 vhardy Exp $
*/
public class PrintTranscoder extends XMLAbstractTranscoder
implements Printable {
@@ -195,11 +195,11 @@
* Constructs a new transcoder that prints images.
*/
public PrintTranscoder() {
- hints.put(KEY_DOCUMENT_ELEMENT_NAMESPACE_URI,
+ getHints().put(KEY_DOCUMENT_ELEMENT_NAMESPACE_URI,
SVGConstants.SVG_NAMESPACE_URI);
- hints.put(KEY_DOCUMENT_ELEMENT,
+ getHints().put(KEY_DOCUMENT_ELEMENT,
SVGConstants.SVG_SVG_TAG);
- hints.put(KEY_DOM_IMPLEMENTATION,
+ getHints().put(KEY_DOM_IMPLEMENTATION,
SVGDOMImplementation.getDOMImplementation());
}
@@ -229,8 +229,8 @@
//
Paper paper = pageFormat.getPaper();
- Float pageWidth = (Float)hints.get(KEY_PAGE_WIDTH);
- Float pageHeight = (Float)hints.get(KEY_PAGE_HEIGHT);
+ Float pageWidth = (Float)getHints().get(KEY_PAGE_WIDTH);
+ Float pageHeight = (Float)getHints().get(KEY_PAGE_HEIGHT);
if(pageWidth != null){
paper.setSize(pageWidth.floatValue(),
paper.getHeight());
@@ -242,10 +242,10 @@
float x=0, y=0, width=(float)paper.getWidth(), height=(float)paper.getHeight();
- Float leftMargin = (Float)hints.get(KEY_MARGIN_LEFT);
- Float topMargin = (Float)hints.get(KEY_MARGIN_TOP);
- Float rightMargin = (Float)hints.get(KEY_MARGIN_RIGHT);
- Float bottomMargin = (Float)hints.get(KEY_MARGIN_BOTTOM);
+ Float leftMargin = (Float)getHints().get(KEY_MARGIN_LEFT);
+ Float topMargin = (Float)getHints().get(KEY_MARGIN_TOP);
+ Float rightMargin = (Float)getHints().get(KEY_MARGIN_RIGHT);
+ Float bottomMargin = (Float)getHints().get(KEY_MARGIN_BOTTOM);
if(leftMargin != null){
x = leftMargin.floatValue();
@@ -264,7 +264,7 @@
paper.setImageableArea(x, y, width, height);
- String pageOrientation = (String)hints.get(KEY_PAGE_ORIENTATION);
+ String pageOrientation = (String)getHints().get(KEY_PAGE_ORIENTATION);
if(VALUE_PAGE_ORIENTATION_PORTRAIT.equalsIgnoreCase(pageOrientation)){
pageFormat.setOrientation(pageFormat.PORTRAIT);
}
@@ -281,7 +281,7 @@
//
// If required, pop up a dialog to adjust the page format
//
- Boolean showPageFormat = (Boolean)hints.get(KEY_SHOW_PAGE_DIALOG);
+ Boolean showPageFormat = (Boolean)getHints().get(KEY_SHOW_PAGE_DIALOG);
if(showPageFormat != null && showPageFormat.booleanValue()){
PageFormat tmpPageFormat = printerJob.pageDialog(pageFormat);
if(tmpPageFormat == pageFormat){
@@ -296,7 +296,7 @@
//
// If required, pop up a dialog to select the printer
//
- Boolean showPrinterDialog = (Boolean)hints.get(KEY_SHOW_PRINTER_DIALOG);
+ Boolean showPrinterDialog = (Boolean)getHints().get(KEY_SHOW_PRINTER_DIALOG);
if(showPrinterDialog != null && showPrinterDialog.booleanValue()){
if(!printerJob.printDialog()){
// Dialog was cancelled, meaning that the print process
@@ -367,7 +367,7 @@
double scale = scaleX < scaleY ? scaleX : scaleY;
// Check hint to know if scaling is really needed
- Boolean scaleToPage = (Boolean)hints.get(KEY_SCALE_TO_PAGE);
+ Boolean scaleToPage = (Boolean)getHints().get(KEY_SCALE_TO_PAGE);
if(scaleToPage != null && !scaleToPage.booleanValue()){
scale = 1;
}
@@ -445,7 +445,7 @@
//
// Initialize the SVG document with the appropriate context
//
- String parserClassname = (String)hints.get(KEY_XML_PARSER_CLASSNAME);
+ String parserClassname = (String)getHints().get(KEY_XML_PARSER_CLASSNAME);
DefaultSVGContext svgCtx = new DefaultSVGContext();
svgCtx.setPixelToMM(userAgent.getPixelToMM());
((SVGOMDocument)document).setSVGContext(svgCtx);
@@ -460,12 +460,12 @@
// Compute the image's width and height according the hints
//
float imgWidth = -1;
- if (hints.containsKey(KEY_WIDTH)) {
- imgWidth = ((Float)hints.get(KEY_WIDTH)).floatValue();
+ if (getHints().containsKey(KEY_WIDTH)) {
+ imgWidth = ((Float)getHints().get(KEY_WIDTH)).floatValue();
}
float imgHeight = -1;
- if (hints.containsKey(KEY_HEIGHT)) {
- imgHeight = ((Float)hints.get(KEY_HEIGHT)).floatValue();
+ if (getHints().containsKey(KEY_HEIGHT)) {
+ imgHeight = ((Float)getHints().get(KEY_HEIGHT)).floatValue();
}
float width, height;
if (imgWidth > 0 && imgHeight > 0) {
@@ -499,8 +499,8 @@
//
// Take the AOI into account if any
//
- if (hints.containsKey(KEY_AOI)) {
- Rectangle2D aoi = (Rectangle2D)hints.get(KEY_AOI);
+ if (getHints().containsKey(KEY_AOI)) {
+ Rectangle2D aoi = (Rectangle2D)getHints().get(KEY_AOI);
// transform the AOI into the image's coordinate system
aoi = Px.createTransformedShape(aoi).getBounds2D();
AffineTransform Mx = new AffineTransform();
@@ -537,10 +537,10 @@
public GraphicsNodeRenderContext getRenderContext() {
if (nodeRenderContext == null) {
RenderingHints hints = new RenderingHints(null);
- hints.put(RenderingHints.KEY_ANTIALIASING,
+ getHints().put(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- hints.put(RenderingHints.KEY_INTERPOLATION,
+ getHints().put(RenderingHints.KEY_INTERPOLATION,
RenderingHints.VALUE_INTERPOLATION_BILINEAR);
FontRenderContext fontRenderContext =
@@ -775,7 +775,7 @@
*/
public void displayError(String message) {
try {
- handler.error(new TranscoderException(message));
+ getHandler().error(new TranscoderException(message));
} catch (TranscoderException ex) {
throw new RuntimeException();
}
@@ -786,7 +786,7 @@
*/
public void displayError(Exception e) {
try {
- handler.error(new TranscoderException(e));
+ getHandler().error(new TranscoderException(e));
} catch (TranscoderException ex) {
throw new RuntimeException();
}
@@ -797,7 +797,7 @@
*/
public void displayMessage(String message) {
try {
- handler.warning(new TranscoderException(message));
+ getHandler().warning(new TranscoderException(message));
} catch (TranscoderException ex) {
throw new RuntimeException();
}
@@ -808,8 +808,8 @@
* <tt>TranscodingHints</tt> or 0.3528 if any.
*/
public float getPixelToMM() {
- if (hints.containsKey(KEY_PIXEL_TO_MM)) {
- return ((Float)hints.get(KEY_PIXEL_TO_MM)).floatValue();
+ if (getHints().containsKey(KEY_PIXEL_TO_MM)) {
+ return ((Float)getHints().get(KEY_PIXEL_TO_MM)).floatValue();
} else {
// return 0.3528f; // 72 dpi
return 0.26458333333333333333333333333333f; // 96dpi
@@ -821,8 +821,8 @@
* <tt>TranscodingHints</tt> or "en" (english) if any.
*/
public String getLanguages() {
- if (hints.containsKey(KEY_LANGUAGE)) {
- return (String)hints.get(KEY_LANGUAGE);
+ if (getHints().containsKey(KEY_LANGUAGE)) {
+ return (String)getHints().get(KEY_LANGUAGE);
} else {
return "en";
}
@@ -833,8 +833,8 @@
* <tt>TranscodingHints</tt> or null if any.
*/
public String getUserStyleSheetURI() {
- if (hints.containsKey(KEY_XML_PARSER_CLASSNAME)) {
- return (String)hints.get(KEY_XML_PARSER_CLASSNAME);
+ if (getHints().containsKey(KEY_XML_PARSER_CLASSNAME)) {
+ return (String)getHints().get(KEY_XML_PARSER_CLASSNAME);
} else {
return XMLResourceDescriptor.getXMLParserClassName();
}
@@ -844,7 +844,7 @@
* Returns the XML parser to use from the TranscodingHints.
*/
public String getXMLParserClassName() {
- return (String)hints.get(KEY_XML_PARSER_CLASSNAME);
+ return (String)getHints().get(KEY_XML_PARSER_CLASSNAME);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org
Re: cvs commit: xml-batik/sources/org/apache/batik/transcoder/print
PrintTranscoder.java
Posted by Bill Haneman <bi...@sun.com>.
vhardy@apache.org wrote:
> Log:
> Removed some 1.2.2 dependancies. Down to 15 compile errors on 1.2.2.
Thanks a lot Vincent!
Apologies to everyone for not having had time to address any of these
dependencies myself. Personally I'd love to see Batik build and run
on 1.2.2 with no errors, but in the meantime if we can just think of
these as bugs to be fixed when and where feasible I am hopeful that we
will achieve that goal eventually.
Having a 1.2.2-clean 1.0 release would be ideal but I am aware that
not everyone sees it as a top priority.
-Bill
--------------
Bill Haneman
Gnome Accessibility / Batik SVG Toolkit
Sun Microsystems Ireland
---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org