cvs commit: xml-fop/src/java/org/apache/fop/area AreaFrame.java

[pbwest]

pbwest  2004/07/24 09:54:30

  Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
AreaFrame.java
  Log:
  getContents() returns AreaGeometry instead of Rectangle2D
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.12  +4 -4  xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java
  
  Index: AreaFrame.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AreaFrame.java,v
  retrieving revision 1.1.2.11
  retrieving revision 1.1.2.12
  diff -u -r1.1.2.11 -r1.1.2.12
  --- AreaFrame.java8 Jul 2004 17:21:36 -   1.1.2.11
  +++ AreaFrame.java24 Jul 2004 16:54:30 -  1.1.2.12
  @@ -125,7 +125,7 @@
   this.contents = contents;
   }
   
  -public Rectangle2D getContents() {
  +public AreaGeometry getContents() {
   return contents;
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/area BorderRectangle.java

[pbwest]

pbwest  2004/07/24 09:56:00

  Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BorderRectangle.java
  Log:
  Override setContenst() to trigger update of spaces
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.7   +9 -2  xml-fop/src/java/org/apache/fop/area/Attic/BorderRectangle.java
  
  Index: BorderRectangle.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BorderRectangle.java,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- BorderRectangle.java  10 Jul 2004 16:34:15 -  1.1.2.6
  +++ BorderRectangle.java  24 Jul 2004 16:56:00 -  1.1.2.7
  @@ -22,6 +22,8 @@
   import java.awt.geom.Point2D;
   import java.awt.geom.Rectangle2D;
   
  +import org.apache.fop.area.Area.AreaGeometry;
  +
   /**
* @author pbw
* @version $Revision$ $Name$
  @@ -55,6 +57,11 @@
   
   public SpacesRectangle getSpaces() {
   return spaces;
  +}
  +
  +public void setContents(AreaGeometry contents) {
  +super.setContents(contents);
  +spaces.setContents(this);
   }
   
   /**
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/area SpacesRectangle.java

[pbwest]

pbwest  2004/07/24 10:01:50

  Modified:src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
SpacesRectangle.java
  Log:
  Added registerAreaListener() and notifyListeners to allow AllocationRectangle 
objects to register interest in size modifications to spaces
  Override setContents() to call notifyListeners() to update any dependent 
AllocationRectangles
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.6   +40 -2 xml-fop/src/java/org/apache/fop/area/Attic/SpacesRectangle.java
  
  Index: SpacesRectangle.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/SpacesRectangle.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- SpacesRectangle.java  14 Jun 2004 08:53:46 -  1.1.2.5
  +++ SpacesRectangle.java  24 Jul 2004 17:01:50 -  1.1.2.6
  @@ -21,6 +21,9 @@
   
   import java.awt.geom.Point2D;
   import java.awt.geom.Rectangle2D;
  +import java.util.ArrayList;
  +
  +import org.apache.fop.area.Area.AreaGeometry;
   
   /**
* @author pbw
  @@ -51,5 +54,40 @@
   BorderRectangle contents, Point2D contentOffset) {
super(area, rect, contents, contentOffset);
}
  +
  +public void setContents(AreaGeometry contents) {
  +super.setContents(contents);
  +notifyListeners(this);
  +}
  +
  +/** Initial size of the codelisteners/code array */
  +private static final int INITIAL_SPACES_LISTENER_SIZE = 1;
  +/** Array of registered codeAreaListener/codes */
  +private ArrayList listeners = null;
  +/**
  + * Registers a listener to be notified on any change of dimension in the
  + * codespaces/code codeAreaFrame/code. 
  + * @param listener to be notified
  + */
  +public void registerAreaListener(AreaListener listener) {
  +synchronized (this) {
  +if (listeners == null) {
  +listeners = new ArrayList(INITIAL_SPACES_LISTENER_SIZE);
  +}
  +listeners.add(listener);
  +}
  +}
  +
  +/**
  + * Notifies any registered listener of a change of dimensions in the
  + * codeRectangle2D/code content
  + */
  +protected void notifyListeners(Area.AreaGeometry geometry) {
  +for (int i = 0; i  listeners.size(); i++) {
  +synchronized (this) {
  +((AreaListener)(listeners.get(i))).setDimensions(geometry);
  +}
  +}
  +}
   
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/fo FObj.java

[gmazza]

gmazza  2004/07/24 18:14:25

  Modified:src/java/org/apache/fop/fo FObj.java
  Log:
  Bug fixed in previous renaming.
  
  Revision  ChangesPath
  1.52  +1 -1  xml-fop/src/java/org/apache/fop/fo/FObj.java
  
  Index: FObj.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- FObj.java 24 Jul 2004 22:56:30 -  1.51
  +++ FObj.java 25 Jul 2004 01:14:25 -  1.52
  @@ -351,7 +351,7 @@
* @return A ListIterator or null if childNode isn't a child of
* this FObj.
*/
  -public ListIterator getChildren(FONode childNode) {
  +public ListIterator getChildNodes(FONode childNode) {
   if (childNodes != null) {
   int i = childNodes.indexOf(childNode);
   if (i = 0) {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]