[FOray-commit] SF.net SVN: foray:[10768] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray:[10768] trunk/foray
|
From: <vic...@us...> - 2009-04-25 15:06:39
|
Revision: 10768
http://foray.svn.sourceforge.net/foray/?rev=10768&view=rev
Author: victormote
Date: 2009-04-25 15:06:30 +0000 (Sat, 25 Apr 2009)
Log Message:
-----------
Rename exception class for clarity.
Modified Paths:
--------------
trunk/foray/foray-font/src/java/org/foray/font/format/Type1File.java
trunk/foray/foray-ps/src/java/org/foray/ps/PsDictionary.java
trunk/foray/foray-ps/src/java/org/foray/ps/PsInterpreter.java
trunk/foray/foray-ps/src/java/org/foray/ps/PsMatrix.java
trunk/foray/foray-ps/src/java/org/foray/ps/PsObjectComposite.java
trunk/foray/foray-ps/src/java/org/foray/ps/PsOperandStack.java
trunk/foray/foray-ps/src/java/org/foray/ps/PsServer4a.java
trunk/foray/foray-ps/src/java/org/foray/ps/PsSystemDict.java
trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoPanel.java
trunk/foray/foray-ps/src/javatest/org/foray/ps/TestPsSystemDict.java
Added Paths:
-----------
trunk/foray/foray-ps/src/java/org/foray/ps/PsInterpreterException4a.java
Removed Paths:
-------------
trunk/foray/foray-ps/src/java/org/foray/ps/PsException.java
Modified: trunk/foray/foray-font/src/java/org/foray/font/format/Type1File.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/Type1File.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/Type1File.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -30,7 +30,7 @@
import org.foray.common.WKConstants;
import org.foray.ps.PsDictionary;
-import org.foray.ps.PsException;
+import org.foray.ps.PsInterpreterException4a;
import org.foray.ps.PsInterpreter;
import org.foray.ps.PsObject;
import org.foray.ps.filter.PSFilter;
@@ -137,13 +137,13 @@
PsInterpreter interpreter = null;
try {
interpreter = new PsInterpreter(this, null);
- } catch (final PsException e) {
+ } catch (final PsInterpreterException4a e) {
getLogger().error(e.getMessage());
}
startNewSegment();
try {
interpreter.process();
- } catch (final PsException e1) {
+ } catch (final PsInterpreterException4a e1) {
this.getLogger().error(e1.getMessage()
+ "\n " + this.getReader().getDescription().toString());
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PsDictionary.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PsDictionary.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PsDictionary.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -67,10 +67,10 @@
* @param nameObject The PsName instance that should be executed.
* @return True if the operation was found and executed, otherwise, false.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
protected boolean execute(final PsInterpreter interpreter, final PsName nameObject)
- throws PsOperatorException, PsException {
+ throws PsOperatorException, PsInterpreterException4a {
final PsObject value = getItem(nameObject);
// If the item is not in this dictionary, exit
if (value == null) {
@@ -98,10 +98,10 @@
* be executed
* @return True if the operator is found and executed, otherwise, false.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
protected boolean executeOperator(final PsOperator operatorEnum) throws PsOperatorException,
- PsException {
+ PsInterpreterException4a {
return false;
}
@@ -124,13 +124,13 @@
* @param interpreter The parent interpreter.
* @param key The key to the dictionary entry.
* @param value The value of the dictionary entry.
- * @throws PsException A typecheck error if the object is null.
+ * @throws PsInterpreterException4a A typecheck error if the object is null.
*/
public void addItem(final PsInterpreter interpreter, final PsObject key, final PsObject value)
- throws PsException {
+ throws PsInterpreterException4a {
// Per PLRM2, Sec 3.3.9, a key can be any PS object except null.
if (key instanceof PsNull) {
- throw new PsException(interpreter, PsError.TYPECHECK, PsOperator.INVALID);
+ throw new PsInterpreterException4a(interpreter, PsError.TYPECHECK, PsOperator.INVALID);
}
/*
* We are relying here on proper equals() methods, primarily in the
Deleted: trunk/foray/foray-ps/src/java/org/foray/ps/PsException.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PsException.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PsException.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -1,131 +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$
- */
-
-package org.foray.ps;
-
-import org.axsl.ps.PsInterpreterException;
-
-/**
- * Handles PostScript Exceptions.
- */
-public class PsException extends PsInterpreterException {
-
- /** Constant needed for serialization. */
- static final long serialVersionUID = 7211537297214545L;
-
- /** The PostScript error code that triggered this Exception. */
- private PsError errorCode;
-
- /** The PostScript operator code that triggered this Exception. */
- private PsOperator offendingOperator;
-
- /** The input line number at which the Exception was noted. */
- private int lineNumber;
-
- /** The input column number at which the Exception was noted. */
- private int columnNumber;
-
- /** An image of the stack as it existed when the Exception was thrown.
- * This image can be useful during debugging. */
- private String operandStackImage;
-
- /**
- * Constructor.
- * @param interpreter The PS interpreter.
- * @param errorCode The PS error code for this exception.
- * @param offendingOperator The PS operator that triggered the request
- * that threw the exception.
- * @param message The user message.
- */
- public PsException(final PsInterpreter interpreter, final PsError errorCode,
- final PsOperator offendingOperator, final String message) {
- super(message);
- if (errorCode == null) {
- throw new NullPointerException("PostScript error code is required.");
- }
- this.lineNumber = interpreter.getCurrentLine();
- this.columnNumber = interpreter.getCurrentColumn();
- this.errorCode = errorCode;
- this.offendingOperator = offendingOperator;
- final StringBuilder buffer = new StringBuilder();
- buffer.append("Operand Stack:\n");
- final PsStack<PsObject> operandStack = interpreter.getOperandStack();
- if (operandStack.size() == 0) {
- buffer.append(" (empty)");
- }
- for (int i = 0; i < operandStack.size(); i++) {
- final PsObject object = operandStack.peek(i);
- buffer.append(" " + object.toString() + "\n");
- }
- this.operandStackImage = buffer.toString();
- }
-
- /**
- * Constructor.
- * @param interpreter The PS interpreter.
- * @param errorCode The PS error code for this exception.
- */
- public PsException(final PsInterpreter interpreter, final PsError errorCode) {
- this(interpreter, errorCode, PsOperator.INVALID, null);
- }
-
- /**
- * Constructor.
- * @param interpreter The PS interpreter.
- * @param errorCode The PS error code for this exception.
- * @param offendingOperator The PS operator that triggered the request
- * that threw the exception.
- */
- public PsException(final PsInterpreter interpreter, final PsError errorCode,
- final PsOperator offendingOperator) {
- this(interpreter, errorCode, offendingOperator, null);
- }
-
- /**
- * {@inheritDoc}
- */
- public String getMessage() {
- final String detailMessage = super.getMessage();
- final StringBuilder sb = new StringBuilder();
- sb.append("PostScript error: ");
- sb.append(this.errorCode.getName());
- sb.append(" (operator: ");
- sb.append(this.offendingOperator.getName());
- sb.append(") ");
- if (detailMessage != null) {
- sb.append(" (");
- sb.append(detailMessage);
- sb.append(")");
- }
- sb.append("\n Line " + this.lineNumber + ", Column "
- + this.columnNumber);
- sb.append("\n" + this.operandStackImage);
- return sb.toString();
- }
-
-}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PsInterpreter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PsInterpreter.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PsInterpreter.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -229,9 +229,9 @@
* @param input The PsInput instance that should be used as standard input
* to the interpreter.
* @param systemDict The dictionary that should be used.
- * @throws PsException For invalid parameters.
+ * @throws PsInterpreterException4a For invalid parameters.
*/
- public PsInterpreter(final PsInput input, final PsSystemDict systemDict) throws PsException {
+ public PsInterpreter(final PsInput input, final PsSystemDict systemDict) throws PsInterpreterException4a {
if (input == null) {
throw new NullPointerException("PostScript Error: No standard input.");
}
@@ -300,13 +300,13 @@
/**
* {@inheritDoc}
*/
- public void process() throws PsException {
+ public void process() throws PsInterpreterException4a {
while (this.executionStack.size() != 0) {
final PsObject currentExecution = this.executionStack.peek();
try {
processItem(currentExecution);
} catch (final PsOperatorException e) {
- throw new PsException(this, e.getErrorCode(), e.getOffendingOperator());
+ throw new PsInterpreterException4a(this, e.getErrorCode(), e.getOffendingOperator());
}
}
}
@@ -314,9 +314,9 @@
/**
* Processes the top item on the execution stack.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
- public void processItem() throws PsOperatorException, PsException {
+ public void processItem() throws PsOperatorException, PsInterpreterException4a {
final int executionStackSize = this.executionStack.size();
while (this.executionStack.size() >= executionStackSize) {
final PsObject currentExecution = this.executionStack.peek();
@@ -328,10 +328,10 @@
* Processes a specific item.
* @param currentExecution The item to process.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
private void processItem(final PsObject currentExecution)
- throws PsOperatorException, PsException {
+ throws PsOperatorException, PsInterpreterException4a {
if (currentExecution instanceof PsFile) {
executePSFile((PsFile) currentExecution);
return;
@@ -371,13 +371,13 @@
this.executionStack.pop(PsOperator.INTERPRETER);
final boolean completed = this.getSystemDict().executeOperator(operator);
if (! completed) {
- throw new PsException(this, PsError.UNDEFINED, PsOperator.INTERPRETER,
+ throw new PsInterpreterException4a(this, PsError.UNDEFINED, PsOperator.INTERPRETER,
"Unsupported operator: " + operator.getName());
}
return;
}
/* Anything else is illegal. */
- throw new PsException(this, PsError.UNDEFINED, PsOperator.INTERPRETER,
+ throw new PsInterpreterException4a(this, PsError.UNDEFINED, PsOperator.INTERPRETER,
"Invalid item on execution stack: " + currentExecution.toString());
}
@@ -385,9 +385,9 @@
* Execute a PostScript file.
* @param file The file to execute.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For errors during execution.
+ * @throws PsInterpreterException4a For errors during execution.
*/
- private void executePSFile(final PsFile file) throws PsOperatorException, PsException {
+ private void executePSFile(final PsFile file) throws PsOperatorException, PsInterpreterException4a {
if (! file.isOpen()) {
this.executionStack.pop(PsOperator.INTERPRETER);
return;
@@ -409,10 +409,10 @@
* Execute a PostScript array.
* @param array The array to execute.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For errors during execution.
+ * @throws PsInterpreterException4a For errors during execution.
*/
private void executePSArray(final PsArrayExecuting array) throws PsOperatorException,
- PsException {
+ PsInterpreterException4a {
if (array.qtyUnexecutedItems() < 1) {
this.executionStack.pop(PsOperator.INTERPRETER);
return;
@@ -438,10 +438,10 @@
* Executes an array item.
* @param arrayItem The array item to execute.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
private void executePSArrayItem(final PsObject arrayItem) throws PsOperatorException,
- PsException {
+ PsInterpreterException4a {
if (arrayItem == null) {
this.executionStack.pop(PsOperator.INTERPRETER);
return;
@@ -484,9 +484,9 @@
* See PSLRM2 3.2.2, where such characters are listed as self-delimiting.
* @param inputByte The byte to be tested.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
- private void autoDelimitByte(final byte inputByte) throws PsOperatorException, PsException {
+ private void autoDelimitByte(final byte inputByte) throws PsOperatorException, PsInterpreterException4a {
if (this.inCommentLine) {
return;
}
@@ -529,9 +529,9 @@
* Consume one byte of PostScript input.
* @param inputByte The byte to be consumed.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
- private void consumeByte(final byte inputByte) throws PsOperatorException, PsException {
+ private void consumeByte(final byte inputByte) throws PsOperatorException, PsInterpreterException4a {
/*
* Uncomment the following line to have the input font sent to std out.
* This is useful for debugging filtered or encrypted PostScript input.
@@ -639,9 +639,9 @@
* Consumes a byte in a string.
* @param inputByte The byte to be consumed.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
- private void consumeByteInString(final byte inputByte) throws PsOperatorException, PsException {
+ private void consumeByteInString(final byte inputByte) throws PsOperatorException, PsInterpreterException4a {
switch (inputByte) {
case PsInterpreter.LEFT_PAREN:
this.qtyNestedParentheses ++;
@@ -689,9 +689,9 @@
/**
* Consume the current token.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
- private void consumeToken() throws PsOperatorException, PsException {
+ private void consumeToken() throws PsOperatorException, PsInterpreterException4a {
if (this.tokenBeingBuiltSize < 1) {
return;
}
@@ -725,9 +725,9 @@
* Process a given token.
* @param object The token to be processed.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
- private void processToken(final PsObject object) throws PsOperatorException, PsException {
+ private void processToken(final PsObject object) throws PsOperatorException, PsInterpreterException4a {
if (this.inProcedure) {
this.procedureBeingBuilt.add(object);
return;
@@ -749,9 +749,9 @@
* Process a name token.
* @param nameObject The name token to be processed.
* @throws PsOperatorException For errors executing operators.
- * @throws PsException For any PostScript error.
+ * @throws PsInterpreterException4a For any PostScript error.
*/
- private void processName(final PsName nameObject) throws PsOperatorException, PsException {
+ private void processName(final PsName nameObject) throws PsOperatorException, PsInterpreterException4a {
// If the name is not executable, just push it onto the stack.
if (! nameObject.isExecutable()) {
this.operandStack.push(nameObject);
@@ -766,7 +766,7 @@
doneExecuting = currentDict.execute(this, nameObject);
}
if (! doneExecuting) {
- throw new PsException(this, PsError.UNDEFINED, PsOperator.INTERPRETER,
+ throw new PsInterpreterException4a(this, PsError.UNDEFINED, PsOperator.INTERPRETER,
"PostScript name '" + nameObject.getValue() + "' not found.");
}
}
Copied: trunk/foray/foray-ps/src/java/org/foray/ps/PsInterpreterException4a.java (from rev 10764, trunk/foray/foray-ps/src/java/org/foray/ps/PsException.java)
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PsInterpreterException4a.java (rev 0)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PsInterpreterException4a.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -0,0 +1,131 @@
+/*
+ * 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$
+ */
+
+package org.foray.ps;
+
+import org.axsl.ps.PsInterpreterException;
+
+/**
+ * Handles PostScript Exceptions.
+ */
+public class PsInterpreterException4a extends PsInterpreterException {
+
+ /** Constant needed for serialization. */
+ static final long serialVersionUID = 7211537297214545L;
+
+ /** The PostScript error code that triggered this Exception. */
+ private PsError errorCode;
+
+ /** The PostScript operator code that triggered this Exception. */
+ private PsOperator offendingOperator;
+
+ /** The input line number at which the Exception was noted. */
+ private int lineNumber;
+
+ /** The input column number at which the Exception was noted. */
+ private int columnNumber;
+
+ /** An image of the stack as it existed when the Exception was thrown.
+ * This image can be useful during debugging. */
+ private String operandStackImage;
+
+ /**
+ * Constructor.
+ * @param interpreter The PS interpreter.
+ * @param errorCode The PS error code for this exception.
+ * @param offendingOperator The PS operator that triggered the request
+ * that threw the exception.
+ * @param message The user message.
+ */
+ public PsInterpreterException4a(final PsInterpreter interpreter, final PsError errorCode,
+ final PsOperator offendingOperator, final String message) {
+ super(message);
+ if (errorCode == null) {
+ throw new NullPointerException("PostScript error code is required.");
+ }
+ this.lineNumber = interpreter.getCurrentLine();
+ this.columnNumber = interpreter.getCurrentColumn();
+ this.errorCode = errorCode;
+ this.offendingOperator = offendingOperator;
+ final StringBuilder buffer = new StringBuilder();
+ buffer.append("Operand Stack:\n");
+ final PsStack<PsObject> operandStack = interpreter.getOperandStack();
+ if (operandStack.size() == 0) {
+ buffer.append(" (empty)");
+ }
+ for (int i = 0; i < operandStack.size(); i++) {
+ final PsObject object = operandStack.peek(i);
+ buffer.append(" " + object.toString() + "\n");
+ }
+ this.operandStackImage = buffer.toString();
+ }
+
+ /**
+ * Constructor.
+ * @param interpreter The PS interpreter.
+ * @param errorCode The PS error code for this exception.
+ */
+ public PsInterpreterException4a(final PsInterpreter interpreter, final PsError errorCode) {
+ this(interpreter, errorCode, PsOperator.INVALID, null);
+ }
+
+ /**
+ * Constructor.
+ * @param interpreter The PS interpreter.
+ * @param errorCode The PS error code for this exception.
+ * @param offendingOperator The PS operator that triggered the request
+ * that threw the exception.
+ */
+ public PsInterpreterException4a(final PsInterpreter interpreter, final PsError errorCode,
+ final PsOperator offendingOperator) {
+ this(interpreter, errorCode, offendingOperator, null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getMessage() {
+ final String detailMessage = super.getMessage();
+ final StringBuilder sb = new StringBuilder();
+ sb.append("PostScript error: ");
+ sb.append(this.errorCode.getName());
+ sb.append(" (operator: ");
+ sb.append(this.offendingOperator.getName());
+ sb.append(") ");
+ if (detailMessage != null) {
+ sb.append(" (");
+ sb.append(detailMessage);
+ sb.append(")");
+ }
+ sb.append("\n Line " + this.lineNumber + ", Column "
+ + this.columnNumber);
+ sb.append("\n" + this.operandStackImage);
+ return sb.toString();
+ }
+
+}
Property changes on: trunk/foray/foray-ps/src/java/org/foray/ps/PsInterpreterException4a.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PsMatrix.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PsMatrix.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PsMatrix.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -135,14 +135,14 @@
* @param matrix1 The first matrix.
* @param matrix2 The second matrix.
* @return The product matrix.
- * @throws PsException If either matrix1 or matrix2 are not exactly 6
+ * @throws PsInterpreterException4a If either matrix1 or matrix2 are not exactly 6
* elements long.
*/
public static PsMatrix concatMatrices(final PsInterpreter interpreter,
final PsMatrix matrix1, final PsMatrix matrix2)
- throws PsException {
+ throws PsInterpreterException4a {
if (matrix1.size() != PsUtil.MATRIX_QTY_ELEMENTS) {
- throw new PsException(interpreter, PsError.RANGECHECK);
+ throw new PsInterpreterException4a(interpreter, PsError.RANGECHECK);
}
// double[] productArray = new double[6];
/* TODO: Complete the matrix multiplication logic. For now, just
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PsObjectComposite.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PsObjectComposite.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PsObjectComposite.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -40,11 +40,11 @@
* Sets the access level for this object.
* @param interpreter The parent interpreter.
* @param accessLevel The new access level.
- * @throws PsException If a PostScript typecheck error is thrown because
+ * @throws PsInterpreterException4a If a PostScript typecheck error is thrown because
* the access level cannot be changed on this object.
*/
public void setAccess(final PsInterpreter interpreter, final PsAccess accessLevel)
- throws PsException {
+ throws PsInterpreterException4a {
if (accessLevel == null) {
throw new NullPointerException("Access level cannot be null on PostScript composite "
+ "object");
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PsOperandStack.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PsOperandStack.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PsOperandStack.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -71,14 +71,14 @@
* bottom of the stack.
* @param operatorCode The PS operator code requesting the roll.
* This is used in user messages.
- * @throws PsException For PS stackunderflow errors.
+ * @throws PsInterpreterException4a For PS stackunderflow errors.
*/
protected void roll(final int n, final int j, final PsOperator operatorCode)
- throws PsException {
+ throws PsInterpreterException4a {
final List<PsObject> list = this.getList();
if (list.size() < n) {
final PsInterpreter interpreter = this.getInterpreter();
- throw new PsException(interpreter, this.getUnderflowError(),
+ throw new PsInterpreterException4a(interpreter, this.getUnderflowError(),
operatorCode, "attempted to roll " + n
+ " additional operands, stack has only "
+ list.size() + ".");
@@ -138,14 +138,14 @@
* down to, but not including, the first mark object.
* @param operator The PostScript operator requesting the counttomark.
* This is used in user messages.
- * @throws PsException For PS unmatchedmark error.
+ * @throws PsInterpreterException4a For PS unmatchedmark error.
*/
- int countToMark(final PsOperator operator) throws PsException {
+ int countToMark(final PsOperator operator) throws PsInterpreterException4a {
final int markIndex = markIndex();
final List<PsObject> list = this.getList();
if (markIndex < 0) {
final PsInterpreter interpreter = this.getInterpreter();
- throw new PsException(interpreter, PsError.UNMATCHEDMARK, operator);
+ throw new PsInterpreterException4a(interpreter, PsError.UNMATCHEDMARK, operator);
}
return list.size() - 1 - markIndex;
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PsServer4a.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PsServer4a.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PsServer4a.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -171,7 +171,7 @@
final org.foray.ps.PsSystemDict foraySystemDict = (org.foray.ps.PsSystemDict) systemDict;
try {
return new PsInterpreter(psInput, foraySystemDict);
- } catch (final PsException e) {
+ } catch (final PsInterpreterException4a e) {
throw new org.axsl.ps.PsException(e.getMessage());
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PsSystemDict.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PsSystemDict.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PsSystemDict.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -69,9 +69,9 @@
/**
* Sets the parent interpreter.
* @param interpreter The new interpreter.
- * @throws PsException For errors initializing the interpreter.
+ * @throws PsInterpreterException4a For errors initializing the interpreter.
*/
- void setPSInterpreter(final PsInterpreter interpreter) throws PsException {
+ void setPSInterpreter(final PsInterpreter interpreter) throws PsInterpreterException4a {
this.interpreter = interpreter;
for (short i = 1; i < PsOperator.OPERATOR_NAMES.length; i++) {
final PsOperator operator = PsOperator.OPERATOR_NAMES[i];
@@ -89,9 +89,9 @@
* @param nameObject The PsName instance that should be executed.
* @return True if the operation was found and executed, otherwise, false.
* @throws PsOperatorException For errors during execution.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- protected boolean execute(final PsName nameObject) throws PsOperatorException, PsException {
+ protected boolean execute(final PsName nameObject) throws PsOperatorException, PsInterpreterException4a {
if (!nameObject.isExecutable()) {
return false;
}
@@ -110,10 +110,10 @@
* @param operatorEnum The enumerated value of the operator to be executed.
* @return True iff this dictionary contains the given operator.
* @throws PsOperatorException For PostScript errors during execution.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
protected boolean executeOperator(final PsOperator operatorEnum) throws PsOperatorException,
- PsException {
+ PsInterpreterException4a {
/*
* Performance note: If the operators are contiguous, the compiler can
* treat the switch() statement as an array, and the bytecode can jump
@@ -1213,9 +1213,9 @@
/**
* Executes the "readonly" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void readonly() throws PsOperatorException, PsException {
+ private void readonly() throws PsOperatorException, PsInterpreterException4a {
final PsObjectComposite compositeObject = peekPsObjectComposite(PsOperator.READONLY);
compositeObject.setAccess(getInterpreter(), PsAccess.READ_ONLY);
}
@@ -1223,9 +1223,9 @@
/**
* Executes the "executeonly" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void executeonly() throws PsOperatorException, PsException {
+ private void executeonly() throws PsOperatorException, PsInterpreterException4a {
final PsObjectComposite compositeObject = peekPsObjectComposite(
PsOperator.EXECUTEONLY);
compositeObject.setAccess(getInterpreter(), PsAccess.EXECUTE_ONLY);
@@ -1234,9 +1234,9 @@
/**
* Executes the "noaccess" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void noaccess() throws PsOperatorException, PsException {
+ private void noaccess() throws PsOperatorException, PsInterpreterException4a {
final PsObjectComposite compositeObject = peekPsObjectComposite(
PsOperator.NOACCESS);
compositeObject.setAccess(getInterpreter(), PsAccess.NONE);
@@ -1245,9 +1245,9 @@
/**
* Executes the "def" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void def() throws PsOperatorException, PsException {
+ private void def() throws PsOperatorException, PsInterpreterException4a {
final PsObject value = popOperand(PsOperator.DEF);
final PsObject key = popOperand(PsOperator.DEF);
final PsDictionary dict = getInterpreter().getDictionaryStack().peek();
@@ -1257,9 +1257,9 @@
/**
* Executes the "end" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void end() throws PsOperatorException, PsException {
+ private void end() throws PsOperatorException, PsInterpreterException4a {
getInterpreter().getDictionaryStack().pop(PsOperator.END);
}
@@ -1275,9 +1275,9 @@
/**
* Executes the "createarray" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void createArray() throws PsOperatorException, PsException {
+ private void createArray() throws PsOperatorException, PsInterpreterException4a {
final int arraySize = getInterpreter().getOperandStack().countToMark(PsOperator.INVALID);
final PsObject[] insideArray = new PsObject[arraySize];
for (int i = arraySize - 1; i >= 0; i--) {
@@ -1312,9 +1312,9 @@
/**
* Executes the "counttomark" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void counttomark() throws PsOperatorException, PsException {
+ private void counttomark() throws PsOperatorException, PsInterpreterException4a {
final PsInteger count = new PsInteger(getInterpreter().getOperandStack().countToMark(
PsOperator.COUNTTOMARK));
pushOperand(count);
@@ -1381,9 +1381,9 @@
/**
* Executes the "readstring" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void readstring() throws PsOperatorException, PsException {
+ private void readstring() throws PsOperatorException, PsInterpreterException4a {
PsObject object = popOperand(PsOperator.READSTRING);
if (! (object instanceof PsString)) {
throw new PsOperatorException(PsError.TYPECHECK, PsOperator.READSTRING);
@@ -1414,9 +1414,9 @@
/**
* Executes the "roll" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void roll() throws PsOperatorException, PsException {
+ private void roll() throws PsOperatorException, PsInterpreterException4a {
try {
final int j = ((PsInteger) popOperand(PsOperator.ROLL)).intValue();
final int n = ((PsInteger) popOperand(PsOperator.ROLL)).intValue();
@@ -1484,9 +1484,9 @@
/**
* Executes the "put" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void put() throws PsOperatorException, PsException {
+ private void put() throws PsOperatorException, PsInterpreterException4a {
final PsObject what = popOperand(PsOperator.PUT);
final PsObject where = popOperand(PsOperator.PUT);
final PsObject container = popOperand(PsOperator.PUT);
@@ -1533,10 +1533,10 @@
* be placed.
* @param what The object to be "put" into the dictionary.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
private void putDictionary(final PsDictionary dict, final PsObject where,
- final PsObject what) throws PsOperatorException, PsException {
+ final PsObject what) throws PsOperatorException, PsInterpreterException4a {
dict.addItem(getInterpreter(), where, what);
}
@@ -1697,9 +1697,9 @@
/**
* Executes the "definefont" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void definefont() throws PsOperatorException, PsException {
+ private void definefont() throws PsOperatorException, PsInterpreterException4a {
// Get and validate the Font Dictionary
PsObject object = popOperand(PsOperator.DEFINEFONT);
if (! (object instanceof PsDictionary)) {
@@ -1886,9 +1886,9 @@
/**
* Executes the "exec" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void exec() throws PsOperatorException, PsException {
+ private void exec() throws PsOperatorException, PsInterpreterException4a {
final PsObject object = popOperand(PsOperator.EXEC);
getInterpreter().getExecutionStack().push(object);
getInterpreter().processItem();
@@ -1910,9 +1910,9 @@
/**
* Executes the "bind" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void bind() throws PsOperatorException, PsException {
+ private void bind() throws PsOperatorException, PsInterpreterException4a {
final PsObject object = getInterpreter().getOperandStack().peek();
if (! (object instanceof PsArray)) {
throw new PsOperatorException(PsError.TYPECHECK, PsOperator.BIND);
@@ -2126,9 +2126,9 @@
/**
* Executes the "grestore" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void grestore() throws PsOperatorException, PsException {
+ private void grestore() throws PsOperatorException, PsInterpreterException4a {
/* TODO: The doc for the grestore operator indicates that grestore must
* be matched with a gsave, or else the stack peeked instead of
* popped.*/
@@ -2382,9 +2382,9 @@
/**
* Executes the "concat" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void concat() throws PsOperatorException, PsException {
+ private void concat() throws PsOperatorException, PsInterpreterException4a {
final PsMatrix stackMatrix = popPSMatrix(PsOperator.CONCAT);
final PsMatrix ctm = this.currentGS().getCTM();
final PsMatrix newMatrix = PsMatrix.concatMatrices(this.getInterpreter(), stackMatrix, ctm);
@@ -2394,9 +2394,9 @@
/**
* Executes the "concatmatrix" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void concatmatrix() throws PsOperatorException, PsException {
+ private void concatmatrix() throws PsOperatorException, PsInterpreterException4a {
final PsMatrix matrix3 = popPSMatrix(PsOperator.CONCATMATRIX);
final PsMatrix matrix2 = popPSMatrix(PsOperator.CONCATMATRIX);
final PsMatrix matrix1 = popPSMatrix(PsOperator.CONCATMATRIX);
@@ -2408,9 +2408,9 @@
/**
* Executes the "stopped" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void stopped() throws PsOperatorException, PsException {
+ private void stopped() throws PsOperatorException, PsInterpreterException4a {
final PsObject object = popOperand(PsOperator.EXEC);
getInterpreter().getExecutionStack().push(object);
getInterpreter().processItem();
@@ -2608,9 +2608,9 @@
/**
* Executes the "translate" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- private void translate() throws PsOperatorException, PsException {
+ private void translate() throws PsOperatorException, PsInterpreterException4a {
boolean matrixOnStack = false;
PsMatrix matrix = currentGS().getCTM();
final PsObject object = peekOperand(PsOperator.TRANSLATE);
@@ -2635,9 +2635,9 @@
* Note that the name of this method does not conform to the naming convention in this class,
* because "for" is a reserved word in Java.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For errors during execution of the contained procedure.
+ * @throws PsInterpreterException4a For errors during execution of the contained procedure.
*/
- private void forOperator() throws PsOperatorException, PsException {
+ private void forOperator() throws PsOperatorException, PsInterpreterException4a {
final PsArray proc = popPSProcedure(PsOperator.FOR);
final PsNumber limit = this.popPSNumber(PsOperator.FOR);
final PsNumber increment = this.popPSNumber(PsOperator.FOR);
@@ -2666,9 +2666,9 @@
/**
* Executes the "forall" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For errors during execution of the contained procedure.
+ * @throws PsInterpreterException4a For errors during execution of the contained procedure.
*/
- private void forall() throws PsOperatorException, PsException {
+ private void forall() throws PsOperatorException, PsInterpreterException4a {
final PsArray proc = popPSProcedure(PsOperator.FORALL);
final PsObject stackObject = popOperand(PsOperator.FORALL);
if (stackObject instanceof PsArray) {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoPanel.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoPanel.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoPanel.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -29,7 +29,7 @@
package org.foray.ps.java2d.demo;
-import org.foray.ps.PsException;
+import org.foray.ps.PsInterpreterException4a;
import org.foray.ps.PsInputFile;
import org.foray.ps.PsInterpreter;
import org.foray.ps.java2d.Java2DSystemDict;
@@ -88,7 +88,7 @@
getHeight() - DemoPanel.MARGIN - DemoPanel.MARGIN);
try {
paintPostScript(graphics, rect);
- } catch (final PsException e) {
+ } catch (final PsInterpreterException4a e) {
JOptionPane.showMessageDialog(this, e.getMessage(), "PsInterpreter Error",
JOptionPane.ERROR_MESSAGE);
this.isDisplayable = false;
@@ -110,11 +110,11 @@
* @param graphics The AWT graphics.
* @param rect The rectangle into which the PostScript content should be
* displayed.
- * @throws PsException For PostScript errors during processing of the input.
+ * @throws PsInterpreterException4a For PostScript errors during processing of the input.
* @throws IOException For errors reading the input file.
*/
protected void paintPostScript(final Graphics graphics, final Rectangle rect)
- throws PsException, IOException {
+ throws PsInterpreterException4a, IOException {
final Dimension dim = rect.getSize();
final Graphics2D g2d = (Graphics2D) graphics;
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
Modified: trunk/foray/foray-ps/src/javatest/org/foray/ps/TestPsSystemDict.java
===================================================================
--- trunk/foray/foray-ps/src/javatest/org/foray/ps/TestPsSystemDict.java 2009-04-25 00:00:15 UTC (rev 10767)
+++ trunk/foray/foray-ps/src/javatest/org/foray/ps/TestPsSystemDict.java 2009-04-25 15:06:30 UTC (rev 10768)
@@ -41,10 +41,10 @@
/**
* Test of the "dict" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testDict01() throws PsException, PsOperatorException {
+ public void testDict01() throws PsInterpreterException4a, PsOperatorException {
final PsInput input = new PsStringInput("3 dict");
final PsInterpreter interpreter = new PsInterpreter(input, null);
interpreter.process();
@@ -56,10 +56,10 @@
/**
* Test of the "pop" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testPop01() throws PsException, PsOperatorException {
+ public void testPop01() throws PsInterpreterException4a, PsOperatorException {
/* First example from the PSLRM, 2nd ed. */
PsInput input = new PsStringInput("1 2 3 pop");
PsInterpreter interpreter = new PsInterpreter(input, null);
@@ -92,10 +92,10 @@
/**
* Test of the "begin" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testBegin01() throws PsException, PsOperatorException {
+ public void testBegin01() throws PsInterpreterException4a, PsOperatorException {
final PsInput input = new PsStringInput("17 dict begin");
final PsInterpreter interpreter = new PsInterpreter(input, null);
interpreter.process();
@@ -106,10 +106,10 @@
/**
* Test of the "div" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testDiv01() throws PsException, PsOperatorException {
+ public void testDiv01() throws PsInterpreterException4a, PsOperatorException {
/* First example from the PSLRM, 2nd ed. */
PsInput input = new PsStringInput("3 2 div");
PsInterpreter interpreter = new PsInterpreter(input, null);
@@ -133,10 +133,10 @@
/**
* Test of the "idiv" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testIdiv01() throws PsException, PsOperatorException {
+ public void testIdiv01() throws PsInterpreterException4a, PsOperatorException {
/* First example from the PSLRM, 2nd ed. */
PsInput input = new PsStringInput("3 2 idiv");
PsInterpreter interpreter = new PsInterpreter(input, null);
@@ -170,10 +170,10 @@
/**
* Test of the "add" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testAdd01() throws PsException, PsOperatorException {
+ public void testAdd01() throws PsInterpreterException4a, PsOperatorException {
/* First example from the PSLRM, 2nd ed. */
PsInput input = new PsStringInput("3 4 add");
PsInterpreter interpreter = new PsInterpreter(input, null);
@@ -195,10 +195,10 @@
/**
* Test of the "sub" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testSub01() throws PsException, PsOperatorException {
+ public void testSub01() throws PsInterpreterException4a, PsOperatorException {
/* Inverse of the first example for "add" from the PSLRM, 2nd ed. */
PsInput input = new PsStringInput("7 3 sub");
PsInterpreter interpreter = new PsInterpreter(input, null);
@@ -220,10 +220,10 @@
/**
* Test of the "mul" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testMul01() throws PsException, PsOperatorException {
+ public void testMul01() throws PsInterpreterException4a, PsOperatorException {
/* Use the same operands as for the "add" operator tests. */
PsInput input = new PsStringInput("3 4 mul");
PsInterpreter interpreter = new PsInterpreter(input, null);
@@ -245,19 +245,19 @@
/**
* Test of the "dup" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testDup01() throws PsException, PsOperatorException {
+ public void testDup01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
/**
* Test of the "true" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testTrueOperator01() throws PsException, PsOperatorException {
+ public void testTrueOperator01() throws PsInterpreterException4a, PsOperatorException {
final PsInput input = new PsStringInput("true");
final PsInterpreter interpreter = new PsInterpreter(input, null);
interpreter.process();
@@ -270,10 +270,10 @@
/**
* Test of the "false" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testFalseOperator01() throws PsException, PsOperatorException {
+ public void testFalseOperator01() throws PsInterpreterException4a, PsOperatorException {
final PsInput input = new PsStringInput("false");
final PsInterpreter interpreter = new PsInterpreter(input, null);
interpreter.process();
@@ -287,225 +287,225 @@
/**
* Test of the "readonly" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- public void testReadonly01() throws PsOperatorException, PsException {
+ public void testReadonly01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
/**
* Test of the "executeonly" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- public void testExecuteonly01() throws PsOperatorException, PsException {
+ public void testExecuteonly01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
/**
* Test of the "noaccess" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- public void testNoaccess01() throws PsOperatorException, PsException {
+ public void testNoaccess01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
/**
* Test of the "def" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- public void testDef01() throws PsOperatorException, PsException {
+ public void testDef01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
/**
* Test of the "end" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- public void testEnd01() throws PsOperatorException, PsException {
+ public void testEnd01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
/**
* Test of the "mark" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testMark01() throws PsException, PsOperatorException {
+ public void testMark01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
/**
* Test of the "createarray" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- public void testCreateArray01() throws PsOperatorException, PsException {
+ public void testCreateArray01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
/**
* Test of the "currentdict" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testCurrentdict01() throws PsException, PsOperatorException {
+ public void testCurrentdict01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
/**
* Test of the "currentfile" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testCurrentfile01() throws PsException, PsOperatorException {
+ public void testCurrentfile01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
/**
* Test of the "counttomark" operator.
* @throws PsOperatorException For any PostScript error.
- * @throws PsException For PostScript errors during execution.
+ * @throws PsInterpreterException4a For PostScript errors during execution.
*/
- public void testCounttomark01() throws PsOperatorException, PsException {
+ public void testCounttomark01() throws PsOperatorException, PsInterpreterException4a {
/* TODO: Add appropriate test. */
}
/**
* Test of the "eexec" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testEexec01() throws PsException, PsOperatorException {
+ public void testEexec01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
/**
* Test of the "string" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testString01() throws PsException, PsOperatorException {
+ public void testString01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
/**
* Test of the "exch" operator.
- * @throws PsException For PostScript errors.
+ * @throws PsInterpreterException4a For PostScript errors.
* @throws PsOperatorException For PostScript operator errors.
*/
- public void testExch01() throws PsException, PsOperatorException {
+ public void testExch01() throws PsInterpreterException4a, PsOperatorException {
/* TODO: Add appropriate test. */
}
...
[truncated message content] |
