foray-commit Mailing List for FOray (Page 4)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 13803
          http://sourceforge.net/p/foray/code/13803
Author:   victormote
Date:     2025-06-02 16:22:57 +0000 (Mon, 02 Jun 2025)
Log Message:
-----------
Roll up PsInputFile into PsFile. Some temporary broken tests.

Modified Paths:
--------------
    trunk/foray/foray-ps/src/main/java/org/foray/ps/PsFile.java
    trunk/foray/foray-ps/src/main/java/org/foray/ps/PsServer4a.java
    trunk/foray/foray-ps/src/main/java/org/foray/ps/PsSystemDict4a.java
    trunk/foray/foray-ps/src/main/java/org/foray/ps/java2d/demo/DemoPanel.java

Removed Paths:
-------------
    trunk/foray/foray-ps/src/main/java/org/foray/ps/PsInputFile.java

Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/PsFile.java
===================================================================

--- trunk/foray/foray-ps/src/main/java/org/foray/ps/PsFile.java	2025-06-02 16:12:46 UTC (rev 13802)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/PsFile.java	2025-06-02 16:22:57 UTC (rev 13803)
@@ -33,6 +33,7 @@
 import org.axsl.primitive.sequence.ByteSequence;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 
 /**
@@ -41,11 +42,14 @@
  * source, like standard input, or 3) a filter that sits on top of another
  * PsFile instance.
  */
-public class PsFile implements PsObjectComposite {
+public class PsFile extends PsInputStream implements PsObjectComposite {
 
     /** The encapsulated file for this object, if any. */
     private File value;
 
+    /** The encapsulated input stream. */
+    private FileInputStream fis;
+
     /** The encapsulated input source for this object, if any. */
     private PsInputStream input;
 
@@ -216,4 +220,18 @@
         return this.value;
     }
 
+    @Override
+    public int read() throws IOException {
+        if (this.fis == null) {
+            this.fis = new FileInputStream(this.value);
+        }
+        return this.fis.read();
+    }
+
+    @Override
+    ByteSequence providePostScriptInput() throws IOException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

Deleted: trunk/foray/foray-ps/src/main/java/org/foray/ps/PsInputFile.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/PsInputFile.java	2025-06-02 16:12:46 UTC (rev 13802)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/PsInputFile.java	2025-06-02 16:22:57 UTC (rev 13803)
@@ -1,77 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- *      http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- *      Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-/* Known contributors:
- *     Jeremias Maerki
- */
-
-package org.foray.ps;
-
-import org.foray.primitive.sequence.ByteArray;
-
-import org.axsl.constants.MeasurementConstants;
-import org.axsl.primitive.sequence.ByteSequence;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * An implementation of PsInput that wraps a java.io.File instance.
- * @see PsInputStream
- */
-public class PsInputFile extends PsInputStream {
-
-    /** The encapsulated input stream. */
-    private InputStream in;
-
-    /**
-     * Basic constructor.
-     * @param input The File instance that should be used as standard input to the PsInterpreter.
-     */
-    public PsInputFile(final InputStream input) {
-        this.in = new java.io.BufferedInputStream(input);
-    }
-
-    @Override
-    public ByteSequence providePostScriptInput() throws IOException {
-        final byte[] buf = new byte[MeasurementConstants.BYTES_PER_KILOBYTE * 2];
-        final int bytesRead = this.in.read(buf);
-        if (bytesRead <= 0) {
-            return null;
-        }
-        final byte[] trimmed = new byte[bytesRead];
-        System.arraycopy(buf, 0, trimmed, 0, bytesRead);
-        return new ByteArray(trimmed);
-    }
-
-    @Override
-    public int read() throws IOException {
-        return this.in.read();
-    }
-
-}

Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/PsServer4a.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/PsServer4a.java	2025-06-02 16:12:46 UTC (rev 13802)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/PsServer4a.java	2025-06-02 16:22:57 UTC (rev 13803)
@@ -55,7 +55,7 @@
      * @throws IOException For errors opening the file.
      */
     public PsInputStream createPsInput(final InputStream input) throws IOException {
-        return new PsInputFile(input);
+        return new PsGenericInputStream(input);
     }
 
     @Override
@@ -80,7 +80,7 @@
         }
         final org.foray.ps.PsSystemDict4a foraySystemDict = (org.foray.ps.PsSystemDict4a) systemDict;
         try {
-            final PsInputStream psInput = new PsInputFile(input);
+            final PsInputStream psInput = new PsGenericInputStream(input);
             return new PsInterpreter4a(psInput, foraySystemDict);
         } catch (final PsInterpreterException4a e) {
             /* The reason for this exception is the possibility of a null key being added to the various dictionaries

Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/PsSystemDict4a.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/PsSystemDict4a.java	2025-06-02 16:12:46 UTC (rev 13802)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/PsSystemDict4a.java	2025-06-02 16:22:57 UTC (rev 13803)
@@ -1887,6 +1887,7 @@
         if (! (object instanceof PsFile)) {
             throw new PsOperatorException(PsError.TYPECHECK, PsOperator.READSTRING);
         }
+        @SuppressWarnings("resource")
         final PsFile file = (PsFile) object;
 
         final ByteArrayBuilder builder = new ByteArrayBuilder(string.getValue().length());

Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/java2d/demo/DemoPanel.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/java2d/demo/DemoPanel.java	2025-06-02 16:12:46 UTC (rev 13802)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/java2d/demo/DemoPanel.java	2025-06-02 16:22:57 UTC (rev 13803)
@@ -29,7 +29,8 @@
 package org.foray.ps.java2d.demo;
 
 
-import org.foray.ps.PsInputFile;
+import org.foray.ps.PsFile;
+import org.foray.ps.PsInputStream;
 import org.foray.ps.PsInterpreter4a;
 import org.foray.ps.PsInterpreterException4a;
 import org.foray.ps.java2d.Java2dSystemDict;
@@ -42,7 +43,6 @@
 import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 
 import javax.swing.JOptionPane;
@@ -115,10 +115,8 @@
             throws PsInterpreterException4a, IOException {
         final Dimension dim = rect.getSize();
         final Graphics2D g2d = (Graphics2D) graphics;
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                RenderingHints.VALUE_ANTIALIAS_ON);
-        g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
-                RenderingHints.VALUE_FRACTIONALMETRICS_ON);
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
 
         final AffineTransform baktrans = g2d.getTransform();
         g2d.translate(rect.getX(), rect.getY());
@@ -127,9 +125,7 @@
         g2d.scale(2, 2);
 
         final File file = new File(this.fileName);
-        final FileInputStream fis = new FileInputStream(file);
-        PsInputFile eps = null;
-        eps = new PsInputFile(fis);
+        final PsInputStream eps = new PsFile(file);
         final Java2dSystemDict j2dSystemDict = new Java2dSystemDict(g2d);
         final PsInterpreter4a interpreter = new PsInterpreter4a(eps, j2dSystemDict);
         interpreter.process();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2006	Jan	Feb	Mar (139)	Apr (98)	May (250)	Jun (394)	Jul (84)	Aug (13)	Sep (420)	Oct (186)	Nov (1)	Dec (3)
2007	Jan (108)	Feb (202)	Mar (291)	Apr (247)	May (374)	Jun (227)	Jul (231)	Aug (60)	Sep (31)	Oct (45)	Nov (18)	Dec
2008	Jan (38)	Feb (71)	Mar (142)	Apr	May (59)	Jun (6)	Jul (10)	Aug	Sep	Oct	Nov	Dec
2009	Jan (12)	Feb (4)	Mar (88)	Apr (121)	May (17)	Jun (30)	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec
2010	Jan (11)	Feb (76)	Mar (11)	Apr	May (11)	Jun	Jul	Aug (44)	Sep (14)	Oct (7)	Nov	Dec
2011	Jan	Feb	Mar	Apr	May (9)	Jun	Jul	Aug	Sep	Oct (10)	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (4)	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (168)
2017	Jan (77)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr (6)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb (88)	Mar (118)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (141)
2021	Jan (170)	Feb (20)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct (62)	Nov (189)	Dec (162)
2022	Jan (201)	Feb (118)	Mar (8)	Apr	May (2)	Jun (47)	Jul (19)	Aug (14)	Sep (3)	Oct	Nov (28)	Dec (235)
2023	Jan (112)	Feb (23)	Mar (2)	Apr (2)	May	Jun (1)	Jul	Aug (70)	Sep (92)	Oct (20)	Nov (1)	Dec (1)
2024	Jan	Feb	Mar (1)	Apr (1)	May (14)	Jun (11)	Jul (1)	Aug	Sep	Oct	Nov	Dec
2025	Jan (10)	Feb (29)	Mar	Apr (162)	May (245)	Jun (83)	Jul	Aug (1)	Sep	Oct	Nov	Dec

foray-commit Mailing List for FOray (Page 4)

Modular XSL-FO Implementation for Java.

foray-commit — FOray repository commit log messages