/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 23934

+         *
          * @return the number of pages available
          */
         int getNumPages();
         long getNumPages();
         /**
          * Returns the number of the currently loaded page of Features (zero based).
+         *
          * @return the current page number
          */
         int getCurrentPage();
         long getCurrentPage();
         /**
          * Sets the current page number, and loads the Features for that page.
-...
          * @throws DataException
          *             if there is an error setting the current page
          */
         void setCurrentPage(int page) throws DataException;
         void setCurrentPage(long page) throws DataException;
         /**
          * Returns the number of elements of the entire Collection.

     import org.apache.log4j.Logger;
     import org.gvsig.fmap.data.exceptions.DataException;
     import org.gvsig.fmap.data.exceptions.ReadException;
     import org.gvsig.fmap.data.feature.*;
     /**
-...
         private FeatureQuery query;
         private FeatureSet featureCollection;
         private FeatureSet featureSet;
         private FeatureStore featureStore;
         private int maxPageSize;
         private int numPages;
         private long numPages;
         private int currentPage = -1;
         private long currentPage = -1;
         private Feature[] values;
         /**
          * Constructs a FeatureCollectionPagingHelper from a FeatureCollection.
          * Constructs a FeaturePagingHelperImpl from data of a FeatureStore.
+         *
          * @param featureCollection
          * @param featureStore
          *            to extract data from
          * @throws ReadException
          * @throws DataException
          *             if there is an error initializing the helper
          */
         public FeaturePagingHelperImpl(FeatureStore featureStore)
                 throws DataException {
-...
+        }
         /**
          * Constructs a FeatureCollectionPagingHelper from a FeatureCollection.
          * Constructs a FeaturePagingHelperImpl from data of a FeatureStore.
+         *
          * @param featureCollection
          * @param featureSet
          *            to extract data from
          * @param pageSize
          *            the number of elements per page data
          * @throws ReadException
          * @throws DataException
          *             if there is an error initializing the helper
          */
         public FeaturePagingHelperImpl(FeatureStore featureStore, int pageSize)
                 throws DataException {
-...
+        }
         /**
          * Constructs a FeatureCollectionPagingHelper from a FeatureCollection.
          * Constructs a FeaturePagingHelperImpl from data of a FeatureStore.
+         *
          * @param featureCollection
          * @param featureSet
          *            to extract data from
          * @throws ReadException
          * @throws DataException
          *             if there is an error initializing the helper
          */
         public FeaturePagingHelperImpl(FeatureStore featureStore,
                 FeatureQuery featureQuery) throws DataException {
-...
+        }
         /**
          * Constructs a FeatureCollectionPagingHelper from a FeatureCollection.
          * Constructs a FeaturePagingHelperImpl from data of a FeatureStore.
+         *
          * @param featureCollection
          * @param featureSet
          *            to extract data from
          * @param pageSize
          *            the number of elements per page data
          * @throws ReadException
          * @throws DataException
          *             if there is an error initializing the helper
          */
         public FeaturePagingHelperImpl(FeatureStore featureStore,
                 FeatureQuery featureQuery, int pageSize) throws DataException {
-...
             reloadCurrentPage();
+        }
         public int getNumPages() {
         public long getNumPages() {
             return numPages;
+        }
         /**
          * Sets the number of pages.
          */
         private void setNumPages(int numPages) {
         private void setNumPages(long numPages) {
             this.numPages = numPages;
+        }
         public int getCurrentPage() {
         public long getCurrentPage() {
             return currentPage;
+        }
         public void setCurrentPage(int page) throws DataException {
         public void setCurrentPage(long page) throws DataException {
             if (logger.isDebugEnabled()) {
                 logger.debug("Current page: " + page);
-...
         public Feature getFeatureAt(long index) throws DataException {
             // Check if we have currently loaded the viewed page data,
             // or we need to load a new one
             int pageForIndex = (int) Math.floor(index / getMaxPageSize());
             long pageForIndex = (long) Math.floor(index / getMaxPageSize());
             if (pageForIndex != getCurrentPage()) {
                 setCurrentPage(pageForIndex);
+            }
             long positionForIndex = index
                     - (long) (getCurrentPage() * getMaxPageSize());
                     - (getCurrentPage() * (long) getMaxPageSize());
             return values[(int) positionForIndex];
+        }
-...
+        }
         public FeatureSet getFeatureCollection() {
             return featureCollection;
             return featureSet;
+        }
         public void reloadCurrentPage() throws DataException {
-...
         /**
          * Calculates the number of pages.
          */
         private int calculateNumPages() throws DataException {
             return ((int) Math.floor(getTotalSize() / getMaxPageSize())) + 1;
         private long calculateNumPages() throws DataException {
             return ((long) Math.floor(getTotalSize() / getMaxPageSize())) + 1;
+        }
         /**
          * Loads all the Features of the current page.
          */
         private void loadCurrentPageData() throws DataException {
             int currentPage = getCurrentPage();
             long currentPage = getCurrentPage();
             int currentPageSize;
             if (currentPage < (numPages - 1)) {
                 currentPageSize = getMaxPageSize();
             } else {
                 currentPageSize = (int) (getTotalSize() - (long) (currentPage * getMaxPageSize()));
                 currentPageSize = (int) (getTotalSize() - (currentPage * (long) getMaxPageSize()));
+            }
             values = new Feature[currentPageSize];
-...
+        }
         private void loadFeatureCollection() throws DataException {
             if (featureCollection != null) {
                 featureCollection.dispose();
             if (featureSet != null) {
                 featureSet.dispose();
+            }
             featureCollection = getFeatureStore().getFeatureSet(query);
             featureSet = getFeatureStore().getFeatureSet(query);
+        }
+    }

Also available in: Unified diff