← Back to branch summary

~ubuntu-branches/ubuntu/saucy/fop/saucy-proposed

« back to all changes in this revision

Viewing changes to src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-05-21 12:21:26 UTC
  • mfrom: (15.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130521122126-3c9r5fo6ountjg6r
Tags: 1:1.1.dfsg-2ubuntu1
* Merge from Debian unstable.  Remaining changes:
  -  Transition libservlet2.5-java -> libservlet3.0-java.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
15
15
 * limitations under the License.
16
16
 */
17
17
 
18
 
/* $Id: AbstractRetrieveMarker.java 781944 2009-06-05 08:43:10Z adelmelle $ */
 
18
/* $Id: AbstractRetrieveMarker.java 1325016 2012-04-11 21:29:51Z gadams $ */
19
19
 
20
20
package org.apache.fop.fo.flow;
21
21
 
103
103
                        pList,
104
104
                        newPropertyList);
105
105
                addChildTo(newChild, newParent);
106
 
                if (newChild.getNameId() == FO_TABLE) {
 
106
                switch ( newChild.getNameId() ) {
 
107
                case FO_TABLE:
107
108
                    Table t = (Table) child;
108
109
                    cloneSubtree(t.getColumns().iterator(),
109
 
                            newChild, marker, newPropertyList);
 
110
                                 newChild, marker, newPropertyList);
110
111
                    cloneSingleNode(t.getTableHeader(),
111
 
                            newChild, marker, newPropertyList);
 
112
                                    newChild, marker, newPropertyList);
112
113
                    cloneSingleNode(t.getTableFooter(),
113
 
                            newChild, marker, newPropertyList);
 
114
                                    newChild, marker, newPropertyList);
 
115
                    cloneSubtree(child.getChildNodes(),
 
116
                                    newChild, marker, newPropertyList);
 
117
                    break;
 
118
                case FO_LIST_ITEM:
 
119
                    ListItem li = (ListItem) child;
 
120
                    cloneSingleNode(li.getLabel(),
 
121
                                    newChild, marker, newPropertyList);
 
122
                    cloneSingleNode(li.getBody(),
 
123
                                    newChild, marker, newPropertyList);
 
124
                    break;
 
125
                default:
 
126
                    cloneSubtree(child.getChildNodes(),
 
127
                                    newChild, marker, newPropertyList);
 
128
                    break;
114
129
                }
115
 
                cloneSubtree(child.getChildNodes(), newChild,
116
 
                        marker, newPropertyList);
117
130
            } else if (child instanceof FOText) {
118
131
                FOText ft = (FOText) newChild;
119
132
                ft.bind(parentPropertyList);