From 362dc2467ce8f8f241fb6eb3274923161305441c Mon Sep 17 00:00:00 2001 From: Glen Mazza Date: Sun, 19 Sep 2004 18:46:51 +0000 Subject: [PATCH] PR: Obtained from: Submitted by: Reviewed by: 1.) Removed unused getTitle() within AreaTreeModel; I believe can be obtained from fo.pagination.PageSequence object where needed. 2.) Combined AbstractCharIterator and CharIterator interface into single abstract CharIterator class. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197952 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/fop/area/AreaTreeModel.java | 7 -- .../org/apache/fop/area/StorePagesModel.java | 9 --- .../apache/fop/fo/AbstractCharIterator.java | 70 ------------------- src/java/org/apache/fop/fo/CharIterator.java | 46 +++++++++--- src/java/org/apache/fop/fo/FOText.java | 2 +- .../org/apache/fop/fo/OneCharIterator.java | 2 +- .../apache/fop/fo/RecursiveCharIterator.java | 2 +- 7 files changed, 40 insertions(+), 98 deletions(-) delete mode 100644 src/java/org/apache/fop/fo/AbstractCharIterator.java diff --git a/src/java/org/apache/fop/area/AreaTreeModel.java b/src/java/org/apache/fop/area/AreaTreeModel.java index d57d10d19..7a0cd0f17 100644 --- a/src/java/org/apache/fop/area/AreaTreeModel.java +++ b/src/java/org/apache/fop/area/AreaTreeModel.java @@ -60,13 +60,6 @@ public abstract class AreaTreeModel { */ public abstract int getPageSequenceCount(); - /** - * Get the title for a page sequence. - * @param count the page sequence count - * @return the title of the page sequence - */ - public abstract Title getTitle(int count); - /** * Get the page count. * @param seq the page sequence to count. diff --git a/src/java/org/apache/fop/area/StorePagesModel.java b/src/java/org/apache/fop/area/StorePagesModel.java index 23903ff5e..f3980e35b 100644 --- a/src/java/org/apache/fop/area/StorePagesModel.java +++ b/src/java/org/apache/fop/area/StorePagesModel.java @@ -72,15 +72,6 @@ public class StorePagesModel extends AreaTreeModel { return pageSequence.size(); } - /** - * Get the title for a page sequence. - * @param count the page sequence count - * @return the title of the page sequence - */ - public Title getTitle(int count) { - return (Title) titles.get(count); - } - /** * Get the page count. * @param seq the page sequence to count. diff --git a/src/java/org/apache/fop/fo/AbstractCharIterator.java b/src/java/org/apache/fop/fo/AbstractCharIterator.java deleted file mode 100644 index d2e05ab4e..000000000 --- a/src/java/org/apache/fop/fo/AbstractCharIterator.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 1999-2004 The Apache Software Foundation. - * - * 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. - */ - -/* $Id$ */ - -package org.apache.fop.fo; - -import java.util.NoSuchElementException; - -/** - * Abstract base class for character iterators. - */ -public abstract class AbstractCharIterator implements CharIterator, Cloneable { - - /** - * @see java.util.Iterator#hasNext() - */ - public abstract boolean hasNext(); - - /** - * @see org.apache.fop.fo.CharIterator#nextChar() - */ - public abstract char nextChar() throws NoSuchElementException; - - /** - * @see java.util.Iterator#next() - */ - public Object next() throws NoSuchElementException { - return new Character(nextChar()); - } - - /** - * @see java.util.Iterator#remove() - */ - public void remove() { - throw new UnsupportedOperationException(); - } - - - /** - * @see org.apache.fop.fo.CharIterator#replaceChar(char) - */ - public void replaceChar(char c) { - } - - /** - * @see java.lang.Object#clone() - */ - public Object clone() { - try { - return super.clone(); - } catch (CloneNotSupportedException ex) { - return null; - } - } -} - diff --git a/src/java/org/apache/fop/fo/CharIterator.java b/src/java/org/apache/fop/fo/CharIterator.java index 9e8738587..69dce0602 100644 --- a/src/java/org/apache/fop/fo/CharIterator.java +++ b/src/java/org/apache/fop/fo/CharIterator.java @@ -15,35 +15,63 @@ */ /* $Id$ */ - + package org.apache.fop.fo; import java.util.Iterator; import java.util.NoSuchElementException; /** - * Interface for iterators that should iterate through a series of characters. - * Extends the java.util.Iterator interface with some additional functions - * useful for FOP's management of text. + * Abstract base class for iterators that should iterate through a series + * of characters. Extends the java.util.Iterator interface with some + * additional functions useful for FOP's management of text. */ -public interface CharIterator extends Iterator { +public abstract class CharIterator implements Iterator, Cloneable { + + /** + * @see java.util.Iterator#hasNext() + */ + public abstract boolean hasNext(); /** * @return the character that is the next character in the collection * @throws NoSuchElementException if there are no more characters (test for * this condition with java.util.Iterator.hasNext()). */ - char nextChar() throws NoSuchElementException ; + public abstract char nextChar() throws NoSuchElementException; + + /** + * @see java.util.Iterator#next() + */ + public Object next() throws NoSuchElementException { + return new Character(nextChar()); + } + + /** + * @see java.util.Iterator#remove() + */ + public void remove() { + throw new UnsupportedOperationException(); + } + /** * Replace the current character managed by the iterator with a specified * character? * @param c character */ - void replaceChar(char c); + public void replaceChar(char c) { + } /** - * @return cloned Object + * @see java.lang.Object#clone() */ - Object clone(); + public Object clone() { + try { + return super.clone(); + } catch (CloneNotSupportedException ex) { + return null; + } + } } + diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java index c142cde0e..080ed72c6 100644 --- a/src/java/org/apache/fop/fo/FOText.java +++ b/src/java/org/apache/fop/fo/FOText.java @@ -432,7 +432,7 @@ public class FOText extends FObj { } } - private class TextCharIterator extends AbstractCharIterator { + private class TextCharIterator extends CharIterator { private int curIndex = 0; /* Current space removal process: just increment the startIndex diff --git a/src/java/org/apache/fop/fo/OneCharIterator.java b/src/java/org/apache/fop/fo/OneCharIterator.java index 4306a9ef5..c0e4bd16f 100644 --- a/src/java/org/apache/fop/fo/OneCharIterator.java +++ b/src/java/org/apache/fop/fo/OneCharIterator.java @@ -23,7 +23,7 @@ import java.util.NoSuchElementException; /** * Class providing an iterator for one character. */ -public class OneCharIterator extends AbstractCharIterator { +public class OneCharIterator extends CharIterator { private boolean bFirst = true; private char charCode; diff --git a/src/java/org/apache/fop/fo/RecursiveCharIterator.java b/src/java/org/apache/fop/fo/RecursiveCharIterator.java index 7757b101a..e317f9805 100644 --- a/src/java/org/apache/fop/fo/RecursiveCharIterator.java +++ b/src/java/org/apache/fop/fo/RecursiveCharIterator.java @@ -27,7 +27,7 @@ import java.util.NoSuchElementException; * class is itself a CharIterator, and manages a collection of CharIterators, it * is easy to get confused. */ -public class RecursiveCharIterator extends AbstractCharIterator { +public class RecursiveCharIterator extends CharIterator { /** parent node for whose child nodes this iterator iterates */ private FONode fobj; /** iterator for the child nodes */ -- 2.39.5