import java.util.Iterator;
import java.util.ListIterator;
-import java.util.Vector;
-import java.util.Hashtable;
+import java.util.ArrayList;
+import java.util.HashMap;
/**
* base class for representation of formatting objects and their processing
*/
protected int marker = START;
- protected Vector children = new Vector(); // made public for searching for id's
+ protected ArrayList children = new ArrayList(); // made public for searching for id's
protected boolean isInTableCell = false;
public int areasGenerated = 0;
// markers
- protected Hashtable markers;
+ protected HashMap markers;
public FObj(FONode parent) {
super(parent);
- markers = new Hashtable();
+ markers = new HashMap();
if (parent instanceof FObj)
this.areaClass = ((FObj)parent).areaClass;
}
}
protected void addChild(FONode child) {
- children.addElement(child);
+ children.add(child);
}
/**
idReferences.removeID(((FObj)this).properties.get("id").getString());
int numChildren = this.children.size();
for (int i = 0; i < numChildren; i++) {
- FONode child = (FONode)children.elementAt(i);
+ FONode child = (FONode)children.get(i);
if ((child instanceof FObj)) {
((FObj)child).removeID(idReferences);
}
this.isInTableCell = true;
// made recursive by Eric Schaeffer
for (int i = 0; i < this.children.size(); i++) {
- Object obj = this.children.elementAt(i);
+ Object obj = this.children.get(i);
if(obj instanceof FObj) {
FObj child = (FObj)obj;
child.setIsInTableCell();
this.forcedStartOffset = offset;
// made recursive by Eric Schaeffer
for (int i = 0; i < this.children.size(); i++) {
- Object obj = this.children.elementAt(i);
+ Object obj = this.children.get(i);
if(obj instanceof FObj) {
FObj child = (FObj)obj;
child.forceStartOffset(offset);
this.forcedWidth = width;
// made recursive by Eric Schaeffer
for (int i = 0; i < this.children.size(); i++) {
- Object obj = this.children.elementAt(i);
+ Object obj = this.children.get(i);
if(obj instanceof FObj) {
FObj child = (FObj)obj;
child.forceWidth(width);
this.marker = START;
int numChildren = this.children.size();
for (int i = 0; i < numChildren; i++) {
- Object obj = this.children.elementAt(i);
+ Object obj = this.children.get(i);
if(obj instanceof FObj) {
FObj child = (FObj)obj;
child.resetMarker();
public void setLinkSet(LinkSet linkSet) {
this.linkSet = linkSet;
for (int i = 0; i < this.children.size(); i++) {
- Object obj = this.children.elementAt(i);
+ Object obj = this.children.get(i);
if(obj instanceof FObj) {
FObj child = (FObj)obj;
child.setLinkSet(linkSet);
* At the start of a new span area layout may be partway through a
* nested FO, and balancing requires rollback to this known point.
* The snapshot records exactly where layout is at.
- * @param snapshot a Vector of markers (Integer)
- * @returns the updated Vector of markers (Integers)
+ * @param snapshot a ArrayList of markers (Integer)
+ * @returns the updated ArrayList of markers (Integers)
*/
- public Vector getMarkerSnapshot(Vector snapshot) {
- snapshot.addElement(new Integer(this.marker));
+ public ArrayList getMarkerSnapshot(ArrayList snapshot) {
+ snapshot.add(new Integer(this.marker));
// terminate if no kids or child not yet accessed
if (this.marker < 0)
else if (children.isEmpty())
return snapshot;
else
- return ((FObj)children.elementAt(this.marker)).getMarkerSnapshot(snapshot);
+ return ((FObj)children.get(this.marker)).getMarkerSnapshot(snapshot);
}
/**
* When balancing occurs, the flow layout() method restarts at the
* point specified by the current marker snapshot, which is retrieved
* and restored using this method.
- * @param snapshot the Vector of saved markers (Integers)
+ * @param snapshot the ArrayList of saved markers (Integers)
*/
- public void rollback(Vector snapshot) {
- this.marker = ((Integer)snapshot.elementAt(0)).intValue();
- snapshot.removeElementAt(0);
+ public void rollback(ArrayList snapshot) {
+ this.marker = ((Integer)snapshot.get(0)).intValue();
+ snapshot.remove(0);
if (this.marker == START) {
// make sure all the children of this FO are also reset
}
for (int i = this.marker + 1; i < numChildren; i++) {
- Object obj = this.children.elementAt(i);
+ Object obj = this.children.get(i);
if(obj instanceof FObj) {
FObj child = (FObj)obj;
child.resetMarker();
}
}
- ((FObj)children.elementAt(this.marker)).rollback(snapshot);
+ ((FObj)children.get(this.marker)).rollback(snapshot);
}
return !markers.isEmpty();
}
- public Vector getMarkers() {
- return new Vector(markers.values());
+ public ArrayList getMarkers() {
+ return new ArrayList(markers.values());
}
}
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
- FONode fo = (FONode)children.elementAt(i);
+ FONode fo = (FONode)children.get(i);
Status status;
if ((status = fo.layout(area)).isIncomplete()) {
this.marker = i;
package org.apache.fop.fo;
-import java.util.Hashtable;
+import java.util.HashMap;
import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.properties.WritingMode;
import org.apache.fop.apps.FOPException;
-public class PropertyList extends Hashtable {
+public class PropertyList extends HashMap {
private byte[] wmtable = null; // writing-mode values
public static final int LEFT = 0;
"inline-progression-dimension"
};
- static private final Hashtable wmtables = new Hashtable(4);
+ static private final HashMap wmtables = new HashMap(4);
{
wmtables.put(new Integer(WritingMode.LR_TB), /* lr-tb */
new byte[] {
import org.apache.fop.fo.ColorTypeProperty;
import org.apache.fop.datatypes.*;
-import java.util.Hashtable;
+import java.util.HashMap;
/**
* Class to parse XSL FO property expression.
static private final String RELUNIT = "em";
static private final Numeric negOne = new Numeric(new Double(-1.0));
- static final private Hashtable functionTable = new Hashtable();
+ static final private HashMap functionTable = new HashMap();
static {
- // Initialize the Hashtable of XSL-defined functions
+ // Initialize the HashMap of XSL-defined functions
functionTable.put("ceiling", new CeilingFunction());
functionTable.put("floor", new FloorFunction());
functionTable.put("round", new RoundFunction());
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
- FONode fo = (FONode)children.elementAt(i);
+ FONode fo = (FONode)children.get(i);
if(fo instanceof FObj)
((FObj)fo).setLinkSet(ls);
int numChildren = this.children.size();
for (int i = 0; i < numChildren; i++) {
- FONode fo = (FONode)children.elementAt(i);
+ FONode fo = (FONode)children.get(i);
if (fo instanceof FOText) {
if (((FOText)fo).willCreateArea()) {
//fo.setWidows(blockWidows);
break;
} else {
- children.removeElementAt(i);
+ children.remove(i);
numChildren = this.children.size();
i--;
}
}
for (int i = numChildren - 1; i >= 0; i--) {
- FONode fo = (FONode)children.elementAt(i);
+ FONode fo = (FONode)children.get(i);
if (fo instanceof FOText) {
if (((FOText)fo).willCreateArea()) {
//fo.setOrphans(blockOrphans);
blockArea.addLineagePair(this, this.areasGenerated);
// markers
- if (this.hasMarkers())
- blockArea.addMarkers(this.getMarkers());
+ //if (this.hasMarkers())
+ //blockArea.addMarkers(this.getMarkers());
blockArea.setParent(area); // BasicLink needs it
blockArea.setPage(area.getPage());
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
- FONode fo = (FONode)children.elementAt(i);
+ FONode fo = (FONode)children.get(i);
Status status;
if ((status = fo.layout(blockArea)).isIncomplete()) {
this.marker = i;
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.*;
-// Java
-import java.util.Hashtable;
-import java.util.Enumeration;
import org.xml.sax.Attributes;
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
- FObj fo = (FObj)children.elementAt(i);
+ FObj fo = (FObj)children.get(i);
Status status;
if ((status = fo.layout(areaContainer)).isIncomplete()) {
/*
import org.apache.fop.image.*;
// Java
-import java.util.Enumeration;
-import java.util.Hashtable;
import java.net.URL;
import java.net.MalformedURLException;
import org.apache.fop.layoutmgr.FlowLayoutManager;
// Java
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.util.Vector;
+import java.util.ArrayList;
import org.xml.sax.Attributes;
private Area area;
/**
- * Vector to store snapshot
+ * ArrayList to store snapshot
*/
- private Vector markerSnapshot;
+ private ArrayList markerSnapshot;
/**
* flow-name attribute
BodyAreaContainer bac = (BodyAreaContainer)area;
boolean prevChildMustKeepWithNext = false;
- Vector pageMarker = this.getMarkerSnapshot(new Vector());
+ ArrayList pageMarker = this.getMarkerSnapshot(new ArrayList());
int numChildren = this.children.size();
if (numChildren == 0) {
throw new FOPException("fo:flow must contain block-level children");
}
for (int i = this.marker; i < numChildren; i++) {
- FObj fo = (FObj)children.elementAt(i);
+ FObj fo = (FObj)children.get(i);
if (bac.isBalancingRequired(fo)) {
// reset the the just-done span area in preparation
currentArea.setIDReferences(bac.getIDReferences());
if (bac.isNewSpanArea()) {
this.marker = i;
- markerSnapshot = this.getMarkerSnapshot(new Vector());
+ markerSnapshot = this.getMarkerSnapshot(new ArrayList());
}
// Set current content width for percent-based lengths in children
setContentWidth(currentArea.getContentWidth());
if (_status.isIncomplete()) {
if ((prevChildMustKeepWithNext) && (_status.laidOutNone())) {
this.marker = i - 1;
- FObj prevChild = (FObj)children.elementAt(this.marker);
+ FObj prevChild = (FObj)children.get(this.marker);
prevChild.removeAreas();
prevChild.resetMarker();
prevChild.removeID(area.getIDReferences());
import org.apache.fop.messaging.*;
// Java
-import java.util.Enumeration;
-import java.util.Vector;
+import java.util.ArrayList;
public class Footnote extends FObj {
}
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
- FONode fo = (FONode)children.elementAt(i);
+ FONode fo = (FONode)children.get(i);
if (fo instanceof Inline) {
inline = fo;
Status status = fo.layout(area);
// bac.setMaxHeight(bac.getMaxHeight() - footArea.getHeight() + oldHeight);
if (bac.getFootnoteState() == 0) {
Area ar = bac.getMainReferenceArea();
- decreaseMaxHeight(ar, footArea.getHeight() - oldHeight);
+ //decreaseMaxHeight(ar, footArea.getHeight() - oldHeight);
footArea.setYPosition(basePos + footArea.getHeight());
}
}
return true;
}
- protected static void decreaseMaxHeight(Area ar, int change) {
+/* protected static void decreaseMaxHeight(Area ar, int change) {
ar.setMaxHeight(ar.getMaxHeight() - change);
- Vector childs = ar.getChildren();
- for (Enumeration en = childs.elements(); en.hasMoreElements(); ) {
- Object obj = en.nextElement();
+ ArrayList childs = ar.getChildren();
+ for (Iterator en = childs.iterator(); en.hasNext(); ) {
+ Object obj = en.next();
if (obj instanceof Area) {
Area childArea = (Area)obj;
decreaseMaxHeight(childArea, change);
}
}
}
-
+*/
}
import org.apache.fop.layout.*;
// Java
-import java.util.Enumeration;
+import java.util.Iterator;
public class FootnoteBody extends FObj {
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
- FONode fo = (FONode)children.elementAt(i);
+ FONode fo = (FONode)children.get(i);
Status status;
if ((status = fo.layout(blockArea)).isIncomplete()) {
this.resetMarker();
}
/* layout foreign object */
if (this.children.size() > 0) {
- FONode fo = (FONode)children.elementAt(0);
+ FONode fo = (FONode)children.get(0);
Status status;
if ((status =
fo.layout(this.areaCurrent)).isIncomplete()) {
import org.apache.fop.apps.FOPException;
// Java
-import java.util.Enumeration;
+import java.util.Iterator;
public class ListBlock extends FObj {
blockArea.addLineagePair(this, this.areasGenerated);
// markers
- if (this.hasMarkers())
- blockArea.addMarkers(this.getMarkers());
+ //if (this.hasMarkers())
+ //blockArea.addMarkers(this.getMarkers());
blockArea.setPage(area.getPage());
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
- if (!(children.elementAt(i) instanceof ListItem)) {
+ if (!(children.get(i) instanceof ListItem)) {
log.error("children of list-blocks must be list-items");
return new Status(Status.OK);
}
- ListItem listItem = (ListItem)children.elementAt(i);
+ ListItem listItem = (ListItem)children.get(i);
Status status;
if ((status = listItem.layout(blockArea)).isIncomplete()) {
if (status.getCode() == Status.AREA_FULL_NONE && i > 0) {
import org.apache.fop.apps.FOPException;
// Java
-import java.util.Enumeration;
+import java.util.Iterator;
public class ListItem extends FObj {
this.blockArea.addLineagePair(this, this.areasGenerated);
// markers
- if (this.hasMarkers())
- this.blockArea.addMarkers(this.getMarkers());
+ //if (this.hasMarkers())
+ //this.blockArea.addMarkers(this.getMarkers());
blockArea.setPage(area.getPage());
blockArea.start();
if (numChildren != 2) {
throw new FOPException("list-item must have exactly two children");
}
- ListItemLabel label = (ListItemLabel)children.elementAt(0);
- ListItemBody body = (ListItemBody)children.elementAt(1);
+ ListItemLabel label = (ListItemLabel)children.get(0);
+ ListItemBody body = (ListItemBody)children.get(1);
Status status;
import org.apache.fop.apps.FOPException;
// Java
-import java.util.Enumeration;
+import java.util.Iterator;
public class ListItemBody extends FObj {
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
- FObj fo = (FObj)children.elementAt(i);
+ FObj fo = (FObj)children.get(i);
Status status;
if ((status = fo.layout(area)).isIncomplete()) {
String id = this.properties.get("id").getString();
area.getIDReferences().initializeID(id, area);
- Block block = (Block)children.elementAt(0);
+ Block block = (Block)children.get(0);
/*
* For calculating the lineage - The fo:list-item-label formatting object
int numChildren = this.children.size();
for (int i = this.marker; i < numChildren; i++) {
- FONode fo = (FONode)children.elementAt(i);
+ FONode fo = (FONode)children.get(i);
Status status;
if ((status = fo.layout(area)).isIncomplete()) {
import org.apache.fop.apps.FOPException;
// Java
-import java.util.Vector;
-import java.util.Enumeration;
+import java.util.ArrayList;
+import java.util.Iterator;
public class Table extends FObj {
boolean omitHeaderAtBreak = false;
boolean omitFooterAtBreak = false;
- Vector columns = new Vector();
+ ArrayList columns = new ArrayList();
int bodyCount = 0;
private boolean bAutoLayout=false;
private int contentWidth = 0; // Sum of column widths
layoutColumns(areaContainer);
for (int i = this.marker; i < numChildren; i++) {
- FONode fo = (FONode)children.elementAt(i);
+ FONode fo = (FONode)children.get(i);
if (fo instanceof TableHeader) {
if (columns.size() == 0) {
log.warn("current implementation of tables requires a table-column for each column, indicating column-width");
}
protected void setupColumnHeights() {
- Enumeration eCol = columns.elements();
- while (eCol.hasMoreElements()) {
- TableColumn c = (TableColumn)eCol.nextElement();
+ Iterator eCol = columns.iterator();
+ while (eCol.hasNext()) {
+ TableColumn c = (TableColumn)eCol.next();
if ( c != null) {
c.setHeight(areaContainer.getContentHeight());
}
private void findColumns(Area areaContainer) throws FOPException {
int nextColumnNumber = 1;
- Enumeration e = children.elements();
- while (e.hasMoreElements()) {
- FONode fo = (FONode)e.nextElement();
+ Iterator e = children.iterator();
+ while (e.hasNext()) {
+ FONode fo = (FONode)e.next();
if (fo instanceof TableColumn) {
TableColumn c = (TableColumn)fo;
c.doSetup(areaContainer);
for (int j = 0; j < numColumnsRepeated; j++) {
if (currentColumnNumber > columns.size()) {
- columns.setSize(currentColumnNumber);
+ columns.ensureCapacity(currentColumnNumber);
}
- if (columns.elementAt(currentColumnNumber - 1) != null) {
+ if (columns.get(currentColumnNumber - 1) != null) {
log.warn("More than one column object assigned " +
"to column " +
currentColumnNumber);
}
- columns.setElementAt(c, currentColumnNumber - 1);
+ columns.set(currentColumnNumber - 1, c);
currentColumnNumber++;
}
nextColumnNumber = currentColumnNumber;
double dWidthFactor = 0.0;
double dUnitLength = 0.0;
double tuMin = 100000.0 ; // Minimum number of proportional units
- Enumeration eCol = columns.elements();
- while (eCol.hasMoreElements()) {
- TableColumn c = (TableColumn)eCol.nextElement();
+ Iterator eCol = columns.iterator();
+ while (eCol.hasNext()) {
+ TableColumn c = (TableColumn)eCol.next();
if (c == null) {
log.warn("No table-column specification for column " +
nextColumnNumber);
}
// Now distribute the extra units onto each column and set offsets
int offset = 0;
- eCol = columns.elements();
- while (eCol.hasMoreElements()) {
- TableColumn c = (TableColumn)eCol.nextElement();
+ eCol = columns.iterator();
+ while (eCol.hasNext()) {
+ TableColumn c = (TableColumn)eCol.next();
if (c != null) {
c.setColumnOffset(offset);
Length l = c.getColumnWidthAsLength();
}
private void layoutColumns(Area tableArea) throws FOPException {
- Enumeration eCol = columns.elements();
- while (eCol.hasMoreElements()) {
- TableColumn c = (TableColumn)eCol.nextElement();
+ Iterator eCol = columns.iterator();
+ while (eCol.hasNext()) {
+ TableColumn c = (TableColumn)eCol.next();
if (c != null) {
c.layout(tableArea);
}
// * ATTENTION: for now we assume columns are in order in the array!
// */
// BorderInfo getColumnBorder(BorderInfo.Side side, int iColNumber) {
- // TableColumn col = (TableColumn)columns.elementAt(iColNumber);
+ // TableColumn col = (TableColumn)columns.get(iColNumber);
// return col.getBorderInfo(side);
// }
}
import org.apache.fop.apps.FOPException;
// Java
-import java.util.Vector;
-import java.util.Enumeration;
+import java.util.ArrayList;
+import java.util.Iterator;
public class TableBody extends FObj {
ColorType backgroundColor;
String id;
- Vector columns;
+ ArrayList columns;
RowSpanMgr rowSpanMgr; // manage information about spanning rows
AreaContainer areaContainer;
this.name = "fo:table-body";
}
- public void setColumns(Vector columns) {
+ public void setColumns(ArrayList columns) {
this.columns = columns;
}
areaContainer.setAbsoluteHeight(area.getAbsoluteHeight());
areaContainer.setIDReferences(area.getIDReferences());
- Vector keepWith = new Vector();
+ ArrayList keepWith = new ArrayList();
int numChildren = this.children.size();
TableRow lastRow = null;
boolean endKeepGroup = true;
for (int i = this.marker; i < numChildren; i++) {
- Object child = children.elementAt(i);
+ Object child = children.get(i);
if (!(child instanceof TableRow)) {
throw new FOPException("Currently only Table Rows are supported in table body, header and footer");
}
!= KeepValue.KEEP_WITH_AUTO && lastRow != null
&& keepWith.indexOf(lastRow)
== -1) {
- keepWith.addElement(lastRow);
+ keepWith.add(lastRow);
} else {
if (endKeepGroup && keepWith.size() > 0) {
- keepWith = new Vector();
+ keepWith = new ArrayList();
}
}
> 0) { // && status.getCode() == Status.AREA_FULL_NONE
// FIXME!!! Handle rows spans!!!
row.removeLayout(areaContainer);
- for (Enumeration e = keepWith.elements();
- e.hasMoreElements(); ) {
- TableRow tr = (TableRow)e.nextElement();
+ for (Iterator e = keepWith.iterator();
+ e.hasNext(); ) {
+ TableRow tr = (TableRow)e.next();
tr.removeLayout(areaContainer);
i--;
}
return status;
} else if (status.getCode() == Status.KEEP_WITH_NEXT
|| rowSpanMgr.hasUnfinishedSpans()) {
- keepWith.addElement(row);
+ keepWith.add(row);
endKeepGroup = false;
} else {
endKeepGroup = true;
int numChildren = this.children.size();
for (int i = this.marker; bDone==false && i < numChildren; i++) {
- FObj fo = (FObj)children.elementAt(i);
+ FObj fo = (FObj)children.get(i);
fo.setIsInTableCell();
fo.forceWidth(width); // ???
import org.apache.fop.apps.FOPException;
// Java
-import java.util.Vector;
-import java.util.Enumeration;
+import java.util.ArrayList;
+import java.util.Iterator;
public class TableRow extends FObj {
int widthOfCellsSoFar = 0;
int largestCellHeight = 0;
int minHeight = 0; // force row height
- Vector columns;
+ ArrayList columns;
AreaContainer areaContainer;
super(parent);
}
- public void setColumns(Vector columns) {
+ public void setColumns(ArrayList columns) {
this.columns = columns;
}
*/
int offset = 0; // Offset of each cell from table start edge
int iColIndex = 0; // 1-based column index
- Enumeration eCols = columns.elements();
+ Iterator eCols = columns.iterator();
/*
* Ideas: set offset on each column when they are initialized
* no need to calculate for each row.
* info if borders are "collapsed".
*/
- while (eCols.hasMoreElements()) {
+ while (eCols.hasNext()) {
TableCell cell;
++iColIndex;
- TableColumn tcol = (TableColumn)eCols.nextElement();
+ TableColumn tcol = (TableColumn)eCols.next();
int colWidth = tcol.getColumnWidth();
if (cellArray.getCellType(iColIndex) == CellArray.CELLSTART) {
cell = cellArray.getCell(iColIndex);
private void initCellArray() {
cellArray = new CellArray(rowSpanMgr, columns.size());
int colNum = 1;
- Enumeration eCells = children.elements();
- while (eCells.hasMoreElements()) {
+ Iterator eCells = children.iterator();
+ while (eCells.hasNext()) {
colNum = cellArray.getNextFreeCell(colNum);
// If off the end, the rest of the cells had better be
// explicitly positioned!!! (returns -1)
- TableCell cell = (TableCell)eCells.nextElement();
+ TableCell cell = (TableCell)eCells.next();
int numCols = cell.getNumColumnsSpanned();
int numRows = cell.getNumRowsSpanned();
int cellColNum = cell.getColumnNumber();
private int getCellWidth(int startCol, int numCols) {
int width = 0;
for (int count = 0; count < numCols; count++) {
- width += ((TableColumn)columns.elementAt(startCol + count
+ width += ((TableColumn)columns.get(startCol + count
- 1)).getColumnWidth();
}
return width;
import org.apache.fop.layout.PageMaster;
// Java
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
import org.xml.sax.Attributes;
public class LayoutMasterSet extends FObj {
- private Hashtable simplePageMasters;
- private Hashtable pageSequenceMasters;
- private Hashtable allRegions;
+ private HashMap simplePageMasters;
+ private HashMap pageSequenceMasters;
+ private HashMap allRegions;
private Root root;
public void handleAttrs(Attributes attlist) throws FOPException {
super.handleAttrs(attlist);
- this.simplePageMasters = new Hashtable();
- this.pageSequenceMasters = new Hashtable();
+ this.simplePageMasters = new HashMap();
+ this.pageSequenceMasters = new HashMap();
if (parent.getName().equals("fo:root")) {
this.root = (Root)parent;
throw new FOPException("fo:layout-master-set must be child of fo:root, not "
+ parent.getName());
}
- allRegions = new Hashtable();
+ allRegions = new HashMap();
}
}
protected void resetPageMasters() {
- for (Enumeration e = pageSequenceMasters.elements();
- e.hasMoreElements(); ) {
- ((PageSequenceMaster)e.nextElement()).reset();
+ for (Iterator e = pageSequenceMasters.values().iterator();
+ e.hasNext(); ) {
+ ((PageSequenceMaster)e.next()).reset();
}
-
}
protected void checkRegionNames() throws FOPException {
// Section 7.33.15 check to see that if a region-name is a
// duplicate, that it maps to the same region-class.
- for (Enumeration spm = simplePageMasters.elements();
- spm.hasMoreElements(); ) {
+ for (Iterator spm = simplePageMasters.values().iterator();
+ spm.hasNext(); ) {
SimplePageMaster simplePageMaster =
- (SimplePageMaster)spm.nextElement();
- Hashtable spmRegions = simplePageMaster.getRegions();
- for (Enumeration e = spmRegions.elements();
- e.hasMoreElements(); ) {
- Region region = (Region)e.nextElement();
+ (SimplePageMaster)spm.next();
+ HashMap spmRegions = simplePageMaster.getRegions();
+ for (Iterator e = spmRegions.values().iterator();
+ e.hasNext(); ) {
+ Region region = (Region)e.next();
if (allRegions.containsKey(region.getRegionName())) {
String localClass =
(String)allRegions.get(region.getRegionName());
*/
protected boolean regionNameExists(String regionName) {
boolean result = false;
- for (Enumeration e = simplePageMasters.elements();
- e.hasMoreElements(); ) {
+ for (Iterator e = simplePageMasters.values().iterator();
+ e.hasNext(); ) {
result =
- ((SimplePageMaster)e.nextElement()).regionNameExists(regionName);
+ ((SimplePageMaster)e.next()).regionNameExists(regionName);
if (result) {
return result;
}
}
return result;
}
-
-
}
+
// There doesn't seem to be anything in the spec requiring flows
// to be in the order given, only that they map to the regions
- // defined in the page sequence, so all we need is this one hashtable
+ // defined in the page sequence, so all we need is this one hashmap
// the set of flows includes StaticContent flows also
/**
* Map of flows to their flow name (flow-name, Flow)
*/
- private Hashtable _flowMap;
+ private HashMap _flowMap;
/**
* the "master-reference" attribute
// best time to run some checks on LayoutMasterSet
layoutMasterSet.checkRegionNames();
- _flowMap = new Hashtable();
+ _flowMap = new HashMap();
thisIsFirstPage =
true; // we are now on the first page of the page sequence
// private boolean flowsAreIncomplete() {
// boolean isIncomplete = false;
-// for (Enumeration e = _flowMap.elements(); e.hasMoreElements(); ) {
-// Flow flow = (Flow)e.nextElement();
+// for (Iterator e = _flowMap.values().iterator(); e.hasNext(); ) {
+// Flow flow = (Flow)e.next();
// if (flow instanceof StaticContent) {
// continue;
// }
import org.apache.fop.extensions.ExtensionObj;
// Java
-import java.util.Vector;
-import java.util.Enumeration;
+import java.util.ArrayList;
/**
* The fo:root formatting object. Contains page masters, root extensions,
public class Root extends FObj {
LayoutMasterSet layoutMasterSet;
- Vector pageSequences;
+ ArrayList pageSequences;
/**
* keeps count of page number from over PageSequence instances
// this.properties.get("media-usage");
- pageSequences = new Vector();
+ pageSequences = new ArrayList();
if (parent != null) {
//throw new FOPException("root must be root element");
if (currentIndex == -1)
return null;
if (currentIndex < (pageSequences.size() - 1)) {
- return (PageSequence)pageSequences.elementAt(currentIndex + 1);
+ return (PageSequence)pageSequences.get(currentIndex + 1);
} else {
return null;
}
import org.apache.fop.apps.FOPException;
import java.awt.Rectangle;
-import java.util.Hashtable;
-import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
import org.xml.sax.Attributes;
/**
* Page regions (regionClass, Region)
*/
- private Hashtable _regions;
+ private HashMap _regions;
LayoutMasterSet layoutMasterSet;
PageMaster pageMaster;
+ "of fo:layout-master-set, not "
+ parent.getName());
}
- _regions = new Hashtable();
+ _regions = new HashMap();
}
boolean bHasBody=false;
- for (Enumeration regenum = _regions.elements();
- regenum.hasMoreElements(); ) {
- Region r = (Region)regenum.nextElement();
+ for (Iterator regenum = _regions.values().iterator();
+ regenum.hasNext(); ) {
+ Region r = (Region)regenum.next();
RegionViewport rvp = r.makeRegionViewport(pageRefRect);
rvp.setRegion(r.makeRegionReferenceArea());
page.setRegion(r.getRegionAreaClass(), rvp);
return (Region)_regions.get(regionClass);
}
- protected Hashtable getRegions() {
+ protected HashMap getRegions() {
return _regions;
}
protected boolean regionNameExists(String regionName) {
- for (Enumeration regenum = _regions.elements();
- regenum.hasMoreElements(); ) {
- Region r = (Region)regenum.nextElement();
+ for (Iterator regenum = _regions.values().iterator();
+ regenum.hasNext(); ) {
+ Region r = (Region)regenum.next();
if (r.getRegionName().equals(regionName)) {
return true;
}
package org.apache.fop.fonts;
import java.io.*;
-import java.util.Hashtable;
+import java.util.HashMap;
/**
* This class represents a PFM file (or parts of it) as a Java object.
// Extent table
private int[] extentTable;
- private Hashtable kerningTab;
+ private HashMap kerningTab;
public PFMFile() {
- kerningTab = new Hashtable();
+ kerningTab = new HashMap();
}
/**
String glyph1 = Glyphs.tex8r[g1];
String glyph2 = Glyphs.tex8r[g2];
- Hashtable adjTab = (Hashtable)kerningTab.get(new Integer(g1));
+ HashMap adjTab = (HashMap)kerningTab.get(new Integer(g1));
if (adjTab == null)
- adjTab = new Hashtable();
+ adjTab = new HashMap();
adjTab.put(new Integer(g2), new Integer(adj));
kerningTab.put(new Integer(g1), adjTab);
}
* strings with glyphnames as keys, containing hashtables as value.
* The value hashtable contain a glyph name string key and an Integer value
*/
- public Hashtable getKerning() {
+ public HashMap getKerning() {
return kerningTab;
}
package org.apache.fop.fonts;
import java.io.*;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
+import java.util.Iterator;
+import java.util.HashMap;
+import java.util.ArrayList;
/**
* Reads a TrueType file or a TrueType Collection.
short firstChar = 0;
boolean is_embeddable = true;
boolean hasSerifs = true;
- Hashtable dirTabs; // Table directory
- Hashtable kerningTab; // for CIDs
- Hashtable ansiKerningTab; // For winAnsiEncoding
- Vector cmaps;
- Vector unicodeMapping; //
+ HashMap dirTabs; // Table directory
+ HashMap kerningTab; // for CIDs
+ HashMap ansiKerningTab; // For winAnsiEncoding
+ ArrayList cmaps;
+ ArrayList unicodeMapping; //
int upem; // unitsPerEm from "head" table
int nhmtx; // Number of horizontal metrics
short lastChar = 0;
int ansiWidth[];
- Hashtable ansiIndex;
+ HashMap ansiIndex;
/**
* Position inputstream to position indicated
*/
private boolean readCMAP(FontFileReader in) throws IOException {
- unicodeMapping = new Vector();
+ unicodeMapping = new ArrayList();
/**
* Read CMAP table and correct mtx_tab.index
int glyphIdArrayOffset = in.getCurrentPos();
// Insert the unicode id for the glyphs in mtx_tab
- // and fill in the cmaps Vector
+ // and fill in the cmaps ArrayList
for (int i = 0; i < cmap_startCounts.length; i++) {
/*
glyphIdx = (in.readTTFUShort() + cmap_deltas[i])
& 0xffff;
- unicodeMapping.addElement(new UnicodeMapping(glyphIdx,
+ unicodeMapping.add(new UnicodeMapping(glyphIdx,
j));
- mtx_tab[glyphIdx].unicodeIndex.addElement(new Integer(j));
+ mtx_tab[glyphIdx].unicodeIndex.add(new Integer(j));
// Also add winAnsiWidth
if (d < ansiWidth.length)
ansiWidth[d] = mtx_tab[glyphIdx].wx;
} else {
- Vector v =
- (Vector)ansiIndex.get(new Integer(j));
+ ArrayList v =
+ (ArrayList)ansiIndex.get(new Integer(j));
if (v != null) {
- for (Enumeration e = v.elements();
- e.hasMoreElements(); ) {
+ for (Iterator e = v.listIterator();
+ e.hasNext(); ) {
Integer aIdx =
- (Integer)e.nextElement();
+ (Integer)e.next();
ansiWidth[aIdx.intValue()] =
mtx_tab[glyphIdx].wx;
/*
glyphIdx = (j + cmap_deltas[i]) & 0xffff;
if (glyphIdx < mtx_tab.length)
- mtx_tab[glyphIdx].unicodeIndex.addElement(new Integer(j));
+ mtx_tab[glyphIdx].unicodeIndex.add(new Integer(j));
else
System.out.println("Glyph " + glyphIdx
+ " out of range: "
+ mtx_tab.length);
- unicodeMapping.addElement(new UnicodeMapping(glyphIdx,
+ unicodeMapping.add(new UnicodeMapping(glyphIdx,
j));
if (glyphIdx < mtx_tab.length)
- mtx_tab[glyphIdx].unicodeIndex.addElement(new Integer(j));
+ mtx_tab[glyphIdx].unicodeIndex.add(new Integer(j));
else
System.out.println("Glyph " + glyphIdx
+ " out of range: "
if (d < ansiWidth.length)
ansiWidth[d] = mtx_tab[glyphIdx].wx;
} else {
- Vector v =
- (Vector)ansiIndex.get(new Integer(j));
+ ArrayList v =
+ (ArrayList)ansiIndex.get(new Integer(j));
if (v != null) {
- for (Enumeration e = v.elements();
- e.hasMoreElements(); ) {
+ for (Iterator e = v.listIterator();
+ e.hasNext(); ) {
Integer aIdx =
- (Integer)e.nextElement();
+ (Integer)e.next();
ansiWidth[aIdx.intValue()] =
mtx_tab[glyphIdx].wx;
}
// Create an index hash to the ansiWidth
// Can't just index the winAnsiEncoding when inserting widths
// same char (eg bullet) is repeated more than one place
- ansiIndex = new Hashtable();
+ ansiIndex = new HashMap();
for (int i = 32; i < Glyphs.winAnsiEncoding.length; i++) {
Integer ansi = new Integer(i);
Integer uni = new Integer((int)Glyphs.winAnsiEncoding[i]);
- Vector v = (Vector)ansiIndex.get(uni);
+ ArrayList v = (ArrayList)ansiIndex.get(uni);
if (v == null) {
- v = new Vector();
+ v = new ArrayList();
ansiIndex.put(uni, v);
}
- v.addElement(ansi);
+ v.add(ansi);
}
}
}
private void createCMaps() {
- cmaps = new Vector();
+ cmaps = new ArrayList();
TTFCmapEntry tce = new TTFCmapEntry();
- Enumeration e = unicodeMapping.elements();
- UnicodeMapping um = (UnicodeMapping)e.nextElement();
+ Iterator e = unicodeMapping.listIterator();
+ UnicodeMapping um = (UnicodeMapping)e.next();
UnicodeMapping lastMapping = um;
tce.unicodeStart = um.uIdx;
tce.glyphStartIndex = um.gIdx;
- while (e.hasMoreElements()) {
- um = (UnicodeMapping)e.nextElement();
+ while (e.hasNext()) {
+ um = (UnicodeMapping)e.next();
if (((lastMapping.uIdx + 1) != um.uIdx)
|| ((lastMapping.gIdx + 1) != um.gIdx)) {
tce.unicodeEnd = lastMapping.uIdx;
- cmaps.addElement(tce);
+ cmaps.add(tce);
tce = new TTFCmapEntry();
tce.unicodeStart = um.uIdx;
}
tce.unicodeEnd = um.uIdx;
- cmaps.addElement(tce);
+ cmaps.add(tce);
}
public void printStuff() {
return (int)get_ttf_funit(ansiWidth[idx]);
}
- public Hashtable getKerning() {
+ public HashMap getKerning() {
return kerningTab;
}
- public Hashtable getAnsiKerning() {
+ public HashMap getAnsiKerning() {
return ansiKerningTab;
}
/**
* Read Table Directory from the current position in the
- * FontFileReader and fill the global Hashtable dirTabs
+ * FontFileReader and fill the global HashMap dirTabs
* with the table name (String) as key and a TTFDirTabEntry
* as value.
*/
int ntabs = in.readTTFUShort();
in.skip(6); // 3xTTF_USHORT_SIZE
- dirTabs = new Hashtable();
+ dirTabs = new HashMap();
TTFDirTabEntry[] pd = new TTFDirTabEntry[ntabs];
// System.out.println("Reading " + ntabs + " dir tables");
for (int i = 0; i < ntabs; i++) {
*/
private final void readKerning(FontFileReader in) throws IOException {
// Read kerning
- kerningTab = new Hashtable();
- ansiKerningTab = new Hashtable();
+ kerningTab = new HashMap();
+ ansiKerningTab = new HashMap();
TTFDirTabEntry dirTab = (TTFDirTabEntry)dirTabs.get("kern");
if (dirTab != null) {
seek_tab(in, "kern", 2);
if (kpx != 0) {
// CID table
Integer iObj = new Integer(i);
- Hashtable adjTab = (Hashtable)kerningTab.get(iObj);
+ HashMap adjTab = (HashMap)kerningTab.get(iObj);
if (adjTab == null)
- adjTab = new java.util.Hashtable();
+ adjTab = new HashMap();
adjTab.put(new Integer(j),
new Integer((int)get_ttf_funit(kpx)));
kerningTab.put(iObj, adjTab);
// Create winAnsiEncoded kerning table
- for (Enumeration ae = kerningTab.keys(); ae.hasMoreElements(); ) {
- Integer cidKey = (Integer)ae.nextElement();
- Hashtable akpx = new Hashtable();
- Hashtable ckpx = (Hashtable)kerningTab.get(cidKey);
+ for (Iterator ae = kerningTab.keySet().iterator(); ae.hasNext(); ) {
+ Integer cidKey = (Integer)ae.next();
+ HashMap akpx = new HashMap();
+ HashMap ckpx = (HashMap)kerningTab.get(cidKey);
- for (Enumeration aee = ckpx.keys(); aee.hasMoreElements(); ) {
- Integer cidKey2 = (Integer)aee.nextElement();
+ for (Iterator aee = ckpx.keySet().iterator(); aee.hasNext(); ) {
+ Integer cidKey2 = (Integer)aee.next();
Integer kern = (Integer)ckpx.get(cidKey2);
- for (Enumeration uniMap = mtx_tab[cidKey2.intValue()].unicodeIndex.elements();
- uniMap.hasMoreElements(); ) {
- Integer unicodeKey = (Integer)uniMap.nextElement();
+ for (Iterator uniMap = mtx_tab[cidKey2.intValue()].unicodeIndex.listIterator();
+ uniMap.hasNext(); ) {
+ Integer unicodeKey = (Integer)uniMap.next();
Integer[] ansiKeys =
unicodeToWinAnsi(unicodeKey.intValue());
for (int u = 0; u < ansiKeys.length; u++) {
}
if (akpx.size() > 0)
- for (Enumeration uniMap = mtx_tab[cidKey.intValue()].unicodeIndex.elements();
- uniMap.hasMoreElements(); ) {
- Integer unicodeKey = (Integer)uniMap.nextElement();
+ for (Iterator uniMap = mtx_tab[cidKey.intValue()].unicodeIndex.listIterator();
+ uniMap.hasNext(); ) {
+ Integer unicodeKey = (Integer)uniMap.next();
Integer[] ansiKeys =
unicodeToWinAnsi(unicodeKey.intValue());
for (int u = 0; u < ansiKeys.length; u++) {
/**
* Return a vector with TTFCmapEntry
*/
- public Vector getCMaps() {
+ public ArrayList getCMaps() {
return cmaps;
}
* doesn't matter...
*/
private Integer[] unicodeToWinAnsi(int unicode) {
- Vector ret = new Vector();
+ ArrayList ret = new ArrayList();
for (int i = 32; i < Glyphs.winAnsiEncoding.length; i++)
if (unicode == Glyphs.winAnsiEncoding[i])
- ret.addElement(new Integer(i));
- Integer[] itg = new Integer[ret.size()];
- ret.copyInto(itg);
- return itg;
+ ret.add(new Integer(i));
+ return (Integer[])ret.toArray(new Integer[0]);
}
}
package org.apache.fop.fonts;
import java.io.*;
-import java.util.Vector;
+import java.util.ArrayList;
class TTFMtxEntry {
int wx;
int lsb;
String name;
int index;
- Vector unicodeIndex;
+ ArrayList unicodeIndex;
int[] bbox;
long offset;
byte found;
TTFMtxEntry() {
name = "";
found = 0;
- unicodeIndex = new Vector();
+ unicodeIndex = new ArrayList();
bbox = new int[4];
}
import org.apache.xml.serialize.*;
import org.apache.xalan.xslt.*;
import org.apache.fop.fonts.*;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Iterator;
/**
* A tool which reads PFM files from Adobe Type 1 fonts and creates
/**
- * Parse commandline arguments. put options in the Hashtable and return
+ * Parse commandline arguments. put options in the HashMap and return
* arguments in the String array
* the arguments: -fn Perpetua,Bold -cn PerpetuaBold per.ttf Perpetua.xml
* returns a String[] with the per.ttf and Perpetua.xml. The hash
* will have the (key, value) pairs: (-fn, Perpetua) and (-cn, PerpetuaBold)
*/
- private static String[] parseArguments(Hashtable options, String[] args) {
- Vector arguments = new Vector();
+ private static String[] parseArguments(HashMap options, String[] args) {
+ ArrayList arguments = new ArrayList();
for (int i = 0; i < args.length; i++) {
if (args[i].startsWith("-")) {
if ((i + 1) < args.length &&!args[i + 1].startsWith("-")) {
options.put(args[i], "");
}
} else {
- arguments.addElement(args[i]);
+ arguments.add(args[i]);
}
}
- String[] argStrings = new String[arguments.size()];
- arguments.copyInto(argStrings);
- return argStrings;
+ return (String[])arguments.toArray(new String[0]);
}
private final static void displayUsage() {
String className = null;
String fontName = null;
- Hashtable options = new Hashtable();
+ HashMap options = new HashMap();
String[] arguments = parseArguments(options, args);
PFMReader app = new PFMReader();
// Get kerning
- for (Enumeration enum = pfm.getKerning().keys();
- enum.hasMoreElements(); ) {
- Integer kpx1 = (Integer)enum.nextElement();
+ for (Iterator enum = pfm.getKerning().keySet().iterator();
+ enum.hasNext(); ) {
+ Integer kpx1 = (Integer)enum.next();
el = doc.createElement("kerning");
el.setAttribute("kpx1", kpx1.toString());
root.appendChild(el);
Element el2 = null;
- Hashtable h2 = (Hashtable)pfm.getKerning().get(kpx1);
- for (Enumeration enum2 = h2.keys(); enum2.hasMoreElements(); ) {
- Integer kpx2 = (Integer)enum2.nextElement();
+ HashMap h2 = (HashMap)pfm.getKerning().get(kpx1);
+ for (Iterator enum2 = h2.keySet().iterator(); enum2.hasNext(); ) {
+ Integer kpx2 = (Integer)enum2.next();
el2 = doc.createElement("pair");
el2.setAttribute("kpx2", kpx2.toString());
Integer val = (Integer)h2.get(kpx2);
import org.apache.xml.serialize.*;
import org.apache.xalan.xslt.*;
import org.apache.fop.fonts.*;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Iterator;
/**
* A tool which reads TTF files and generates
/**
- * Parse commandline arguments. put options in the Hashtable and return
+ * Parse commandline arguments. put options in the HashMap and return
* arguments in the String array
* the arguments: -fn Perpetua,Bold -cn PerpetuaBold per.ttf Perpetua.xml
* returns a String[] with the per.ttf and Perpetua.xml. The hash
* will have the (key, value) pairs: (-fn, Perpetua) and (-cn, PerpetuaBold)
*/
- private static String[] parseArguments(Hashtable options, String[] args) {
- Vector arguments = new Vector();
+ private static String[] parseArguments(HashMap options, String[] args) {
+ ArrayList arguments = new ArrayList();
for (int i = 0; i < args.length; i++) {
if (args[i].startsWith("-")) {
if ((i + 1) < args.length &&!args[i + 1].startsWith("-")) {
options.put(args[i], "");
}
} else {
- arguments.addElement(args[i]);
+ arguments.add(args[i]);
}
}
- String[] argStrings = new String[arguments.size()];
- arguments.copyInto(argStrings);
- return argStrings;
+ return (String[])arguments.toArray(new String[0]);;
}
String ttcName = null;
boolean isCid = true;
- Hashtable options = new Hashtable();
+ HashMap options = new HashMap();
String[] arguments = parseArguments(options, args);
TTFReader app = new TTFReader();
el = doc.createElement("bfranges");
mel.appendChild(el);
- for (Enumeration e = ttf.getCMaps().elements();
- e.hasMoreElements(); ) {
- TTFCmapEntry ce = (TTFCmapEntry)e.nextElement();
+ for (Iterator e = ttf.getCMaps().listIterator();
+ e.hasNext(); ) {
+ TTFCmapEntry ce = (TTFCmapEntry)e.next();
Element el2 = doc.createElement("bf");
el.appendChild(el2);
el2.setAttribute("us", String.valueOf(ce.unicodeStart));
}
// Get kerning
- Enumeration enum;
+ Iterator enum;
if (isCid)
- enum = ttf.getKerning().keys();
+ enum = ttf.getKerning().keySet().iterator();
else
- enum = ttf.getAnsiKerning().keys();
+ enum = ttf.getAnsiKerning().keySet().iterator();
- while (enum.hasMoreElements()) {
- Integer kpx1 = (Integer)enum.nextElement();
+ while (enum.hasNext()) {
+ Integer kpx1 = (Integer)enum.next();
el = doc.createElement("kerning");
el.setAttribute("kpx1", kpx1.toString());
root.appendChild(el);
Element el2 = null;
- Hashtable h2;
+ HashMap h2;
if (isCid)
- h2 = (Hashtable)ttf.getKerning().get(kpx1);
+ h2 = (HashMap)ttf.getKerning().get(kpx1);
else
- h2 = (Hashtable)ttf.getAnsiKerning().get(kpx1);
+ h2 = (HashMap)ttf.getAnsiKerning().get(kpx1);
- for (Enumeration enum2 = h2.keys(); enum2.hasMoreElements(); ) {
- Integer kpx2 = (Integer)enum2.nextElement();
+ for (Iterator enum2 = h2.keySet().iterator(); enum2.hasNext(); ) {
+ Integer kpx2 = (Integer)enum2.next();
if (isCid || kpx2.intValue() < 256) {
el2 = doc.createElement("pair");
el2.setAttribute("kpx2", kpx2.toString());
projects / xmlgraphics-fop.git / commitdiff