Thread: [FOray-commit] SF.net SVN: foray: [7238] trunk/foray/foray-app/src/java/org/foray/app (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7238
Author:   victormote
Date:     2006-05-24 08:53:10 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7238&view=rev

Log Message:
-----------
Remove no-longer-needed classes that are redundant with AreaTree information.

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java

Removed Paths:
-------------
    trunk/foray/foray-app/src/java/org/foray/app/FormattingResults.java
    trunk/foray/foray-app/src/java/org/foray/app/PageSequenceResults.java
Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java
===================================================================

--- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java	2006-05-24 15:47:46 UTC (rev 7237)
+++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java	2006-05-24 15:53:10 UTC (rev 7238)
@@ -118,9 +118,6 @@
     /** The renderer being used. */
     private OutputTarget outputTarget;
 
-    /** The formatting results to be handed back to the caller. */
-    private FormattingResults results = new FormattingResults();
-
     /**
      * The list of pages waiting to be renderered. In general, pages waiting
      * to be rendered are doing so because they have unresolved "ref-id" items
@@ -200,10 +197,6 @@
         startRenderer();
     }
 
-    public FormattingResults getResults() {
-        return this.results;
-    }
-
     public void startRenderer() throws FOrayException {
         pageCount = 0;
 
@@ -290,8 +283,6 @@
             } catch (AreaWException e) {
                 throw new SAXException(e);
             }
-            this.results.haveFormattedPageSequence(pageSequence,
-                    pageCollection);
             try {
                 processQueue(false);
             } catch (AreaRException e1) {

Deleted: trunk/foray/foray-app/src/java/org/foray/app/FormattingResults.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/FormattingResults.java	2006-05-24 15:47:46 UTC (rev 7237)
+++ trunk/foray/foray-app/src/java/org/foray/app/FormattingResults.java	2006-05-24 15:53:10 UTC (rev 7238)
@@ -1,94 +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
- *
- */
-
-/* $Id$ */
-
-package org.foray.app;
-
-import org.axsl.areaW.PageCollection;
-
-import org.axsl.foR.fo.PageSequence;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Class for reporting back formatting results to the calling application.
- *
- * @author    Jeremias Maerki
- */
-public class FormattingResults {
-
-    private int pageCount = 0;
-    private List pageSequences = null;
-
-    /**
-     * Constructor for the FormattingResults object
-     */
-    public FormattingResults() {
-    }
-
-    /**
-     * Gets the number of pages rendered
-     *
-     * @return   The number of pages overall
-     */
-    public int getPageCount() {
-        return this.pageCount;
-    }
-
-    /**
-     * Gets the results for the individual page-sequences.
-     *
-     * @return   A List with PageSequenceResults objects
-     */
-    public List getPageSequences() {
-        return this.pageSequences;
-    }
-
-    /**
-     * Resets this object
-     */
-    public void reset() {
-        this.pageCount = 0;
-        if (this.pageSequences != null) {
-            this.pageSequences.clear();
-        }
-    }
-
-    /**
-     * Description of the Method
-     *
-     * @param pageSequence  Description of Parameter
-     */
-    public void haveFormattedPageSequence(PageSequence pageSequence,
-            PageCollection areaTree) {
-        this.pageCount += areaTree.getPageCount();
-        if (this.pageSequences == null) {
-            this.pageSequences = new ArrayList();
-        }
-        this.pageSequences.add(
-                new PageSequenceResults(pageSequence.traitId(),
-                                        areaTree.getPageCount()));
-    }
-}
-

Deleted: trunk/foray/foray-app/src/java/org/foray/app/PageSequenceResults.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/PageSequenceResults.java	2006-05-24 15:47:46 UTC (rev 7237)
+++ trunk/foray/foray-app/src/java/org/foray/app/PageSequenceResults.java	2006-05-24 15:53:10 UTC (rev 7238)
@@ -1,67 +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
- *
- */
-
-/* $Id$ */
- 
-package org.foray.app;
-
-/**
- * Class for reporting back formatting results to the calling application. This
- * particular class is used to report the results of a single page-sequence.
- *
- * @author    Jeremias Maerki
- */
-public class PageSequenceResults {
-
-    private String id;
-    private int pageCount;
-
-    /**
-     * Constructor for the PageSequenceResults object
-     *
-     * @param id         ID of the page-sequence, if available
-     * @param pageCount  The number of resulting pages
-     */
-    public PageSequenceResults(String id, int pageCount) {
-        this.id = id;
-        this.pageCount = pageCount;
-    }
-
-    /**
-     * Gets the ID of the page-sequence if one was specified.
-     *
-     * @return   The ID
-     */
-    public String getID() {
-        return this.id;
-    }
-
-    /**
-     * Gets the number of pages that resulted by processing the page-sequence.
-     *
-     * @return   The number of pages generated
-     */
-    public int getPageCount() {
-        return this.pageCount;
-    }
-}
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [FOray-commit] SF.net SVN: foray: [7238] trunk/foray/foray-app/src/java/org/foray/app (Page 2)

Modular XSL-FO Implementation for Java.

foray-commit