/ - Diff - gvSIG raster - gvSIG

      */
     package org.gvsig.fmap.dal.raster.impl;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
     import java.util.Map.Entry;
     import java.util.Set;
     import org.gvsig.fmap.dal.raster.api.BandQuery;
     import org.gvsig.fmap.dal.raster.api.RasterQuery;
     import org.gvsig.fmap.geom.primitive.Envelope;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.persistence.PersistenceManager;
     import org.gvsig.tools.persistence.PersistentState;
     import org.gvsig.tools.persistence.exception.PersistenceException;
     /**
      * Implements RasterQuery
+     *
      * @author dmartinezizquierdo
+     *
      */
     public class DefaultRasterQuery implements RasterQuery{
     public class DefaultRasterQuery implements RasterQuery {
         double scale;
         Map<String,Object> queryParameters= new HashMap<String, Object>();;
         int[] bands;
         Envelope clip;
         private static final String PERSISTENCE_NAME = "RasterQuery";
         private static final String PERSISTENCE_DESCRIPTION = "";
         private static final String SCALE_FIELD_NAME = "scale";
         private static final String PARAMETERS_FIELD_NAME = "queryParameters";
         private static final String BAND_QUERIES_FIELD_NAME = "bandQueries";
         private static final String CLIP_FIELD_NAME = "clip";
         @Override
         public void setScale(double scale) {
             this.scale=scale;
         private double scale;
         private Map<String, Object> queryParameters;
         private List<BandQuery> bandQueries;
         private Envelope clip;
         /**
          * @param store
+         *
          */
         public DefaultRasterQuery() {
             this.queryParameters = new HashMap<String, Object>();
             this.bandQueries = new ArrayList<BandQuery>();
+        }
         @Override
         public double getScale() {
             return scale;
         public List<BandQuery> getBands() {
             return Collections.unmodifiableList(this.bandQueries);
+        }
         @Override
         public Object getQueryParameter(String name) {
             return queryParameters.get(name);
         public void addBand(BandQuery query) {
             this.bandQueries.add(query);
+        }
         @Override
         public void setQueryParameter(String name, Object value) {
             queryParameters.put(name, value);
         public void clearBands() {
             this.bandQueries.clear();
+        }
         @Override
         public void saveToState(PersistentState state) throws PersistenceException {
             state.set("queryParameters", this.queryParameters);
             state.set("scale", this.scale);
             state.set("bands", this.bands);
             state.set("clip", this.clip);
         public void setScale(double scale) {
             this.scale = scale;
+        }
         @Override
         public void loadFromState(PersistentState state)
             throws PersistenceException {
             this.queryParameters = (Map<String, Object>) state.get("queryParameters");
             this.scale = state.getDouble("scale");
             this.bands = (int[])state.get("bands");
             this.clip = (Envelope) state.get("clip");
         public double getScale() {
             return scale;
+        }
         @Override
         public int[] getBands() {
             return bands;
         public Object getQueryParameter(String name) {
             return queryParameters.get(name);
+        }
         @Override
         public RasterQuery setBands(int[] bands) {
             this.bands=bands;
             return this;
         public void setQueryParameter(String name, Object value) {
             queryParameters.put(name, value);
+        }
         @Override
-...
         @Override
         public RasterQuery setClip(Envelope clip) {
             this.clip=clip;
             this.clip = clip;
             return this;
+        }
         public static void registerPersistenceDefinition() {
             PersistenceManager persistenceManager = ToolsLocator.getPersistenceManager();
             DynStruct definition = persistenceManager.getDefinition(PERSISTENCE_NAME);
             if (definition == null) {
                 definition =
                     persistenceManager.addDefinition(RasterQuery.class, PERSISTENCE_NAME,
                         PERSISTENCE_DESCRIPTION, null, null);
                 definition.addDynFieldDouble(SCALE_FIELD_NAME);
                 definition.addDynFieldMap(PARAMETERS_FIELD_NAME);
                 definition.addDynFieldList(BAND_QUERIES_FIELD_NAME).setClassOfItems(BandQuery.class);
                 definition.addDynField(CLIP_FIELD_NAME).setClassOfValue(Envelope.class);
+            }
+        }
         @Override
         public DefaultRasterQuery clone() throws CloneNotSupportedException{
             DefaultRasterQuery rq=new DefaultRasterQuery();
         public void saveToState(PersistentState state) throws PersistenceException {
             state.set("scale", this.scale);
             state.set("queryParameters", this.queryParameters);
             state.set("bands", this.bandQueries);
             state.set("clip", this.clip);
+        }
             rq.setBands(this.getBands().clone());
             rq.setClip((Envelope)this.getClip().clone());
         @Override
         public void loadFromState(PersistentState state) throws PersistenceException {
             this.queryParameters =
                 new HashMap<String, Object>((Map<String, Object>) state.get("queryParameters"));
             this.scale = state.getDouble("scale");
             this.bandQueries = new ArrayList<BandQuery>((List<BandQuery>) state.get("bands"));
             this.clip = (Envelope) state.get("clip");
+        }
         @Override
         public Object clone() throws CloneNotSupportedException {
             RasterQuery rq = new DefaultRasterQuery();
             for (BandQuery bandQuery : this.getBands()) {
                 rq.addBand((BandQuery) bandQuery.clone());
+            }
             rq.setClip((Envelope) this.getClip().clone());
             Set<Entry<String, Object>> entries = queryParameters.entrySet();
             for (Entry<String, Object> entry : entries){
             for (Entry<String, Object> entry : entries) {
                 rq.setQueryParameter(entry.getKey(), entry.getValue());
+            }
             rq.setScale(scale);
             return rq;
+        }
+    }

     /* gvSIG. Desktop Geographic Information System.
+     *
      * Copyright ? 2007-2016 gvSIG Association
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
      */
     package org.gvsig.fmap.dal.raster.impl;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.List;
     import org.gvsig.fmap.dal.raster.api.BandAttributeDescriptor;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.lang.Cloneable;
     import org.gvsig.tools.persistence.PersistenceManager;
     import org.gvsig.tools.persistence.PersistentState;
     import org.gvsig.tools.persistence.exception.PersistenceException;
     /**
      * Default implementation of {@link BandAttributeDescriptor}.
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
     public class DefaultBandAttributeDescriptor implements BandAttributeDescriptor {
         private static final String PERSISTENCE_NAME = "BandAttributeDescriptor";
         private static final String PERSISTENCE_DESCRIPTION = "";
         private static final String BAND_FIELD_NAME = "band";
         private static final String NAME_FIELD_NAME = "name";
         private static final String DESCRIPTION_FIELD_NAME = "description";
         private static final String VALUES_FIELD_NAME = "values";
         private int band;
         private String name;
         private String description;
         private List<Object> values;
         /**
+         *
          * @param band
          * @param name
          * @param description
          * @param values
          */
         public DefaultBandAttributeDescriptor(int band, String name, String description,
             List<Object> values) {
             super();
             this.band = band;
             this.name = name;
             this.values = values;
             this.description = description;
+        }
         @Override
         public int getBand() {
             return this.band;
+        }
         @Override
         public String getName() {
             return this.name;
+        }
         @Override
         public String getDescription() {
             return this.description;
+        }
         @Override
         public List<Object> getValues() {
             return Collections.unmodifiableList(this.values);
+        }
         public static void registerPersitenceDefinition() {
             PersistenceManager persistenceManager = ToolsLocator.getPersistenceManager();
             DynStruct definition = persistenceManager.getDefinition(PERSISTENCE_NAME);
             if (definition == null) {
                 definition =
                     persistenceManager.addDefinition(BandAttributeDescriptor.class, PERSISTENCE_NAME,
                         PERSISTENCE_DESCRIPTION, null, null);
                 definition.addDynFieldInt(BAND_FIELD_NAME);
                 definition.addDynFieldString(NAME_FIELD_NAME);
                 definition.addDynFieldString(DESCRIPTION_FIELD_NAME);
                 definition.addDynFieldList(VALUES_FIELD_NAME).setClassOfItems(Object.class);
+            }
+        }
         @Override
         public void saveToState(PersistentState state) throws PersistenceException {
             state.set(BAND_FIELD_NAME, this.getBand());
             state.set(NAME_FIELD_NAME, this.getName());
             state.set(DESCRIPTION_FIELD_NAME, this.getDescription());
             state.set(VALUES_FIELD_NAME, this.getValues());
+        }
         @Override
         public void loadFromState(PersistentState state) throws PersistenceException {
             this.band = state.getInt(BAND_FIELD_NAME);
             this.name = state.getString(NAME_FIELD_NAME);
             this.description = state.getString(DESCRIPTION_FIELD_NAME);
             this.values = new ArrayList<Object>(state.getList(VALUES_FIELD_NAME));
+        }
         @Override
         public Object clone() throws CloneNotSupportedException {
             List<Object> newValues = new ArrayList<Object>();
             for (Object object : values) {
                 if( object instanceof Cloneable){
                     newValues.add(((Cloneable) object).clone());
                 } else {
                     newValues.add(object);
+                }
+            }
             return new DefaultBandAttributeDescriptor(this.band, this.name, this.description, newValues);
+        }
+    }

     /* gvSIG. Desktop Geographic Information System.
+     *
      * Copyright ? 2007-2016 gvSIG Association
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
      */
     package org.gvsig.fmap.dal.raster.impl;
     import java.util.HashMap;
     import java.util.Map;
     import org.gvsig.fmap.dal.raster.api.BandDescriptor;
     import org.gvsig.fmap.dal.raster.api.BandQuery;
     import org.gvsig.raster.lib.buffer.api.BufferLocator;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.persistence.PersistenceManager;
     import org.gvsig.tools.persistence.PersistentState;
     import org.gvsig.tools.persistence.exception.PersistenceException;
     /**
      * Default implementation of {@link BandQuery}.
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
     public class DefaultBandQuery implements BandQuery {
         private static final String PERSISTENCE_NAME = "BandQuery";
         private static final String PERSISTENCE_DESCRIPTION = "";
         private static final String BAND_FIELD_NAME = "band";
         private static final String BAND_DESCRIPTOR_FIELD_NAME = "bandDescriptor";
         private static final String VALUES_FIELD_NAME = "values";
         private int band;
         private BandDescriptor bandDescriptor;
         private Map<String, Object> values;
         /**
          * Empty constructor
          */
         public DefaultBandQuery() {
+        }
         /**
          * Default constructor
+         *
          * @param band
          *            Band of this BandQuery
          * @param bandDescriptor
          *            Descriptor of band
          */
         public DefaultBandQuery(int band, BandDescriptor bandDescriptor) {
             super();
             this.band = band;
             this.bandDescriptor = bandDescriptor;
             this.values = new HashMap<String, Object>();
+        }
         @Override
         public int getBand() {
             return this.band;
+        }
         @Override
         public BandDescriptor getDescriptor() {
             return this.bandDescriptor;
+        }
         @Override
         public void setValue(String name, Object value) {
             // TODO Validate name and value
             this.values.put(name, value);
+        }
         @Override
         public Object getValue(String name) {
             return this.values.get(name);
+        }
         public static void registerPersistenceDefinition(){
             PersistenceManager persistenceManager = ToolsLocator.getPersistenceManager();
             DynStruct definition = persistenceManager.getDefinition(PERSISTENCE_NAME);
             if(definition == null){
                 definition = persistenceManager.addDefinition(BandQuery.class, PERSISTENCE_NAME,
                     PERSISTENCE_DESCRIPTION, null, null);
                 definition.addDynFieldInt(BAND_FIELD_NAME);
                 definition.addDynField(BAND_DESCRIPTOR_FIELD_NAME).setClassOfValue(BandDescriptor.class);
                 definition.addDynFieldMap(VALUES_FIELD_NAME);
+            }
+        }
         @Override
         public void saveToState(PersistentState state) throws PersistenceException {
             state.set(BAND_FIELD_NAME, this.getBand());
             state.set(BAND_DESCRIPTOR_FIELD_NAME, this.getDescriptor());
             state.set(VALUES_FIELD_NAME, this.values);
+        }
         @Override
         public void loadFromState(PersistentState state) throws PersistenceException {
             this.band = state.getInt(BAND_FIELD_NAME);
             this.bandDescriptor = (BandDescriptor) state.get(BAND_DESCRIPTOR_FIELD_NAME);
             this.values = new HashMap<String, Object>(state.getMap(VALUES_FIELD_NAME));
+        }
         @Override
         public Object clone() throws CloneNotSupportedException {
             return new DefaultBandQuery(this.band, (BandDescriptor) this.getDescriptor().clone());
+        }
+    }

     /**
      * Implements RasterSet
+     *
      * @author dmartinezizquierdo
+     *
      */
     public class DefaultRasterSet extends AbstractIndexedVisitable
      implements RasterSet, Observer{
     public class DefaultRasterSet extends AbstractIndexedVisitable implements RasterSet, Observer {
         private DefaultRasterStore store;
         protected RasterQuery query;
         protected Buffer buffer;
         /**
          * Creates a RasterSet with the raster filtered by the query
+         *
          * @param store
          * @param query
          * @throws DataException
          */
         public DefaultRasterSet(RasterStore store, RasterQuery query)
             throws DataException {
         public DefaultRasterSet(RasterStore store, RasterQuery query) throws DataException {
             this.store = (DefaultRasterStore)store;
             this.store = (DefaultRasterStore) store;
             this.query = query;
             RasterStoreProvider provider = this.store.getProvider();
             try {
                 buffer=provider.createBuffer(query);
                 //Filter buffer by raster query
                 if (query!=null){
                     if (query.getClip()!=null){
                 buffer = provider.createBuffer(query);
                 // Filter buffer by raster query
                 if (query != null) {
                     if (query.getClip() != null) {
                         buffer = buffer.clip(query.getClip());
+                    }
                     if (query.getBands()!=null){
                         buffer = orderBands(buffer,query.getBands());
+                    }
+                }
             } catch (BufferException e) {
                 throw new RasterSetInitializeException(e);
-...
             this.store.addObserver(this);
+        }
         private Buffer orderBands(Buffer buffer,int[]bandsOrder){
             Band[] originalBands = buffer.getBands();
             int bandCount=buffer.getBandCount();
             for (int i=0;i<bandCount;i++){
                 buffer.removeBand(i);
+            }
             for (int bandIndex:bandsOrder){
                 buffer.addBand(originalBands[bandIndex]);
+            }
             return buffer;
+        }
         @Override
         public void filter(FilterList filterList) {
             this.buffer.filter(filterList);
-...
+        }
         @Override
         public Buffer createInterpolated(int rows, int columns,
             int interpolationMode, SimpleTaskStatus status)
             throws LocatorException, BufferException {
         public Buffer createInterpolated(int rows, int columns, int interpolationMode,
             SimpleTaskStatus status) throws LocatorException, BufferException {
             return this.buffer.createInterpolated(rows, columns, interpolationMode, status);
+        }
         @Override
         public Buffer convert(ICoordTrans ct, SimpleTaskStatus status)
             throws BufferException {
         public Buffer convert(ICoordTrans ct, SimpleTaskStatus status) throws BufferException {
             return this.buffer.convert(ct, status);
+        }
-...
         @Override
         public void update(Observable observable, Object notification) {
             //Do nothing
             // Do nothing
+        }
         @Override
         protected void doAccept(Visitor visitor, long firstValueIndex)
             throws VisitCanceledException, BaseException {
         protected void doAccept(Visitor visitor, long firstValueIndex) throws VisitCanceledException,
             BaseException {
             DefaultRasterKernel kernel = new DefaultRasterKernel(this.buffer);
             for( int row=0; row<this.buffer.getRows(); row++ ) {
                 for( int column=0; column<this.buffer.getColumns(); column++ ) {
                     kernel.set(row,column);
             for (int row = 0; row < this.buffer.getRows(); row++) {
                 for (int column = 0; column < this.buffer.getColumns(); column++) {
                     kernel.set(row, column);
                     visitor.visit(kernel);
+                }
+            }

     import java.util.Collection;
     import java.util.Iterator;
     import java.util.List;
     import java.util.Set;
     import org.gvsig.fmap.dal.DALLocator;
-...
     import org.gvsig.fmap.dal.exception.ValidateDataParametersException;
     import org.gvsig.fmap.dal.feature.exception.PersistenceStoreAlreadyLoadedException;
     import org.gvsig.fmap.dal.impl.DefaultDataManager;
     import org.gvsig.fmap.dal.raster.api.BandAttributeDescriptor;
     import org.gvsig.fmap.dal.raster.api.BandDescriptor;
     import org.gvsig.fmap.dal.raster.api.BandQuery;
     import org.gvsig.fmap.dal.raster.api.RasterQuery;
     import org.gvsig.fmap.dal.raster.api.RasterSet;
     import org.gvsig.fmap.dal.raster.api.RasterStore;
-...
     import org.gvsig.metadata.MetadataLocator;
     import org.gvsig.metadata.MetadataManager;
     import org.gvsig.metadata.exceptions.MetadataException;
     import org.gvsig.raster.lib.buffer.api.BandInfo;
     import org.gvsig.timesupport.Interval;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dispose.impl.AbstractDisposable;
-...
         @Override
         public String getFullName() {
             try {
                 return this.provider.getFullName();
             } catch(Throwable th) {
                 return null;
+            }
             return this.provider.getFullName();
+        }
         @Override
-...
         @Override
         public Object invokeDynMethod(int code, Object[] args)
             throws DynMethodException {
             return this.metadata.invokeDynMethod(this, code, args);
+        }
-...
+        }
         //
         // ====================================================================
         // Gestion de notificaciones
         //
         /**
          * Notifies change
          * @param notification
-...
         public Envelope getEnvelope() throws DataException {
             return this.getRasterSet().getEnvelope();
+        }
         @Override
         public BandInfo getBandInfo(int band) {
             return this.provider.getBandInfo(band);
+        }
         @Override
         public BandDescriptor getBandDescriptor(int band) {
             return this.provider.getBandDescriptor(band);
+        }
         @Override
         public BandQuery createBandQuery(int band) {
             return new DefaultBandQuery(band, getBandDescriptor(band));
+        }
         @Override
         public int getBands() {
             return this.provider.getBands();
+        }
         @Override
         public BandDescriptor createBandDescriptor(int band, List<BandAttributeDescriptor> attributes) {
             return new DefaultBandDescriptor(band, attributes);
+        }
         @Override
         public BandAttributeDescriptor createBandAttributeDescriptor(int band, String name,
             String description, List<Object> values) {
             return new DefaultBandAttributeDescriptor(band, name, description, values);
+        }
         @Override
         public void notifyChange(String notification, Resource resource) {
             notifyChange(new DefaultRasterStoreNotification(this,
                 DataStoreNotification.RESOURCE_CHANGED));
+        }
         @Override

     	@Override
     	protected void doInitialize() throws LibraryException {
     	    //Register persistence definition
     	    DefaultRasterQuery.registerPersistenceDefinition();
     	    DefaultBandQuery.registerPersistenceDefinition();
     	    DefaultBandDescriptor.registerPersitenceDefinition();
     	    DefaultBandAttributeDescriptor.registerPersitenceDefinition();
+    	}
     	@Override

     /* gvSIG. Desktop Geographic Information System.
+     *
      * Copyright ? 2007-2016 gvSIG Association
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
      */
     package org.gvsig.fmap.dal.raster.impl;
     import java.util.ArrayList;
     import java.util.Iterator;
     import java.util.List;
     import org.gvsig.fmap.dal.raster.api.BandAttributeDescriptor;
     import org.gvsig.fmap.dal.raster.api.BandDescriptor;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.persistence.PersistenceManager;
     import org.gvsig.tools.persistence.PersistentState;
     import org.gvsig.tools.persistence.exception.PersistenceException;
     /**
      * Default implementation of {@link BandDescriptor}.
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
     public class DefaultBandDescriptor implements BandDescriptor {
         private static final String PERSISTENCE_NAME = "BandDescriptor";
         private static final String PERSISTENCE_DESCRIPTION = "";
         private static final String BAND_FIELD_NAME = "band";
         private static final String BAND_ATTRIBUTE_DESCRIPTORS_FIELD_NAME = "bandAttributeDescriptors";
         private List<BandAttributeDescriptor> bandAttributeDescriptors;
         private int band;
         /**
+         *
          * @param band
          * @param attributeDescriptors
          */
         public DefaultBandDescriptor(int band, List<BandAttributeDescriptor> attributeDescriptors) {
             this.band = band;
             this.bandAttributeDescriptors = attributeDescriptors;
+        }
         @Override
         public int getBand() {
             return this.band;
+        }
         @Override
         public BandAttributeDescriptor get(int index) {
             if (index >= 0 && index < bandAttributeDescriptors.size()) {
                 return bandAttributeDescriptors.get(index);
+            }
             return null;
+        }
         @Override
         public BandAttributeDescriptor get(String name) {
             for (BandAttributeDescriptor bandAttributeDescriptor : bandAttributeDescriptors) {
                 if (bandAttributeDescriptor.getName().equals(name)) {
                     return bandAttributeDescriptor;
+                }
+            }
             return null;
+        }
         @Override
         public int size() {
             return bandAttributeDescriptors.size();
+        }
         @Override
         public Iterator<BandAttributeDescriptor> iterator() {
             return bandAttributeDescriptors.iterator();
+        }
         public static void registerPersitenceDefinition() {
             PersistenceManager persistenceManager = ToolsLocator.getPersistenceManager();
             DynStruct definition = persistenceManager.getDefinition(PERSISTENCE_NAME);
             if (definition == null) {
                 definition =
                     persistenceManager.addDefinition(BandDescriptor.class, PERSISTENCE_NAME,
                         PERSISTENCE_DESCRIPTION, null, null);
                 definition.addDynFieldInt(BAND_FIELD_NAME);
                 definition.addDynFieldList(BAND_ATTRIBUTE_DESCRIPTORS_FIELD_NAME).setClassOfItems(
                     BandAttributeDescriptor.class);
+            }
+        }
         @Override
         public void saveToState(PersistentState state) throws PersistenceException {
             state.set(BAND_FIELD_NAME, this.getBand());
             state.set(BAND_ATTRIBUTE_DESCRIPTORS_FIELD_NAME, this.bandAttributeDescriptors);
+        }
         @Override
         public void loadFromState(PersistentState state) throws PersistenceException {
             this.band = state.getInt(BAND_FIELD_NAME);
             this.bandAttributeDescriptors =
                 new ArrayList<BandAttributeDescriptor>(
                     state.getList(BAND_ATTRIBUTE_DESCRIPTORS_FIELD_NAME));
+        }
         @Override
         public Object clone() throws CloneNotSupportedException {
             List<BandAttributeDescriptor> newAttributeDescriptors =
                 new ArrayList<BandAttributeDescriptor>();
             for (BandAttributeDescriptor bandAttributeDescriptor : this.bandAttributeDescriptors) {
                 newAttributeDescriptors.add((BandAttributeDescriptor) bandAttributeDescriptor.clone());
+            }
             return new DefaultBandDescriptor(this.band, newAttributeDescriptors);
+        }
+    }

     /* gvSIG. Desktop Geographic Information System.
+     *
      * Copyright ? 2007-2016 gvSIG Association
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
      */
     package org.gvsig.fmap.dal.raster.api;
     import org.gvsig.tools.lang.Cloneable;
     import org.gvsig.tools.persistence.Persistent;
     /**
      * Band query to filter raster band values by {@link BandAttributeDescriptor}
      * values described by the {@link BandDescriptor}.
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
     public interface BandQuery extends Persistent, Cloneable {
         /**
          * Band of this query band.
+         *
          * @return Band Band of this query band
          */
         public int getBand();
         /**
          * Gets {@link BandDescriptor} of this query.
+         *
          * @return descriptor Descriptor of this band
          */
         public BandDescriptor getDescriptor();
         /**
          * Sets filter raster band value. This value has to be accepted by the
          * {@link BandAttributeDescriptor} with the name received as parameter.
+         *
          * @param name
          *            Name of {@link BandAttributeDescriptor} to check if value is
          *            accepted by it.
          * @param value
          *            Value to apply filter.
          */
         public void setValue(String name, Object value);
         /**
          * Gets the defined filter value of {@link BandAttributeDescriptor} with the
          * name received as parameter.
+         *
          * @param name
          *            Name of {@link BandAttributeDescriptor}
          * @return value Value defined
          */
         public Object getValue(String name);
+    }

     import org.gvsig.fmap.dal.DataStoreParameters;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.geom.primitive.Envelope;
     import org.gvsig.raster.lib.buffer.api.BandInfo;
     import org.gvsig.tools.lang.Cloneable;
     /**
-...
          * @return RasterQuery
          */
         RasterQuery createRasterQuery();
         /**
          * Returns the envelope associated to this store buffer
          * @return Envelope
          * @throws DataException
          */
         Envelope getEnvelope() throws DataException;
         /**
          * Creates a {@link BandQuery} from band received as parameter.
+         *
          * @param band
          *            Band to create BandQuery
          * @return BandQuery
          */
         public BandQuery createBandQuery(int band);
         /**
          * Gets information about the specified band. If band does not have
          * information, it will return <code>null</code>
+         *
          * @param band
          *            The specified band
          * @return Returns information about specified band.
          */
         public BandInfo getBandInfo(int band);
         /**
          * Gets {@link BandDescriptor} of band received as parameter. If band does
          * not have {@link BandAttributeDescriptor}, this method will return an
          * empty {@link BandDescriptor}.
+         *
          * @param band
          *            Band to get its {@link BandDescriptor}
          * @return BandDescriptor
          */
         public BandDescriptor getBandDescriptor(int band);
         /**
          * Gets number of total bands
+         *
          * @return Number of bands
          */
         public int getBands();
+    }

     /* gvSIG. Desktop Geographic Information System.
+     *
      * Copyright ? 2007-2016 gvSIG Association
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
      */
     package org.gvsig.fmap.dal.raster.api;
     import java.util.Iterator;
     import org.gvsig.tools.lang.Cloneable;
     import org.gvsig.tools.persistence.Persistent;
     /**
      * This class describes the available {@link BandAttributeDescriptor} of a band.
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
     public interface BandDescriptor extends Iterable<BandAttributeDescriptor>, Persistent, Cloneable {
         /**
          * Gets band of this descriptor.
+         *
          * @return Band
          */
         public int getBand();
         /**
          * Gets the {@link BandAttributeDescriptor} by index.
+         *
          * @param index
          *            Index of {@link BandAttributeDescriptor}
          * @return BandAttributeDescriptor The {@link BandAttributeDescriptor}
          *         located at index. If there are not
          *         {@link BandAttributeDescriptor} at index, null will be returned.
          */
         public BandAttributeDescriptor get(int index);
         /**
          * Gets the {@link BandAttributeDescriptor} by name.
+         *
          * @param name
          *            Name of {@link BandAttributeDescriptor}
          * @return BandAttributeDescriptor The {@link BandAttributeDescriptor}
          *         located at index. If there are not
          *         {@link BandAttributeDescriptor} whit the name, null will be returned.
          */
         public BandAttributeDescriptor get(String name);
         /**
          * Number of {@link BandAttributeDescriptor}.
+         *
          * @return size Number of band attribute descriptor.
          */
         public int size();
         /**
          * @return Returns an iterator over the elements in this list in proper
          *         sequence.
          */
         public Iterator<BandAttributeDescriptor> iterator();
+    }

     package org.gvsig.fmap.dal.raster.api;
     import java.util.List;
     import org.gvsig.fmap.dal.DataQuery;
     import org.gvsig.fmap.geom.primitive.Envelope;
     import org.gvsig.tools.lang.Cloneable;
-...
      * @author dmartinezizquierdo
+     *
      */
     public interface RasterQuery extends DataQuery,Cloneable {
     public interface RasterQuery extends DataQuery, Cloneable {
     //TODO:
     //    /**
     //     * Bands to be queried and their order
     //     * @return int[]
     //     */
     //    List<BandQuery> getBands();
     //
     //    /**
     //     * Sets the bands to be queried and their order
     //     * @param bands
     //     * @return RasterQuery
     //     */
     //    RasterQuery addBand(int band);
     //
     //    RasterQuery addBand(BandQuery query);
     //
     //    RasterQuery clearBands();
     //... and remove this band methods:
         public int[] getBands();
         public RasterQuery setBands(int[] bands);
         /**
          * Get added band queries to this {@link RasterQuery}
+         *
          * @return A unmodifiable list with added band queries.
          */
         public List<BandQuery> getBands();
         /**
          * Adds {@link BandQuery} to this raster query
+         *
          * @param query
          *            Query to be added
          */
         public void addBand(BandQuery query);
         /**
          * Clears all add band queries
          */
         public void clearBands();
         /**
          * Returns a clip from the raster
          * @return Envelope
          */
         Envelope getClip();
         public Envelope getClip();
         /**
          * Sets the envelope to clip from the raster
          * @param clip
          * @return RasterQuery
          */
         RasterQuery setClip(Envelope clip);
         public RasterQuery setClip(Envelope clip);
+    }

     /* gvSIG. Desktop Geographic Information System.
+     *
      * Copyright ? 2007-2016 gvSIG Association
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
      */
     package org.gvsig.fmap.dal.raster.api;
     import java.util.List;
     import org.gvsig.tools.lang.Cloneable;
     import org.gvsig.tools.persistence.Persistent;
     /**
      * This class describes an attribute of band. This attribute is defined by a
      * name, description and a list with the available values.
+     *
      * @author <a href="mailto:lmarques@disid.com">Lluis Marques</a>
+     *
      */
     public interface BandAttributeDescriptor extends Persistent, Cloneable {
         /**
          * Gets band of this attribute descriptor
+         *
          * @return band Attribute descriptor band
          */
         public int getBand();
         /**
          * Name of attribute
+         *
          * @return Attribute name
          */
         public String getName();
         /**
          * Description of attribute
+         *
          * @return Attribute description
          */
         public String getDescription();
         /**
          * Available values of this attribute band
+         *
          * @return values A list with attribute band values
          */
         public List<Object> getValues();
+    }

      */
     package org.gvsig.fmap.dal.raster.spi;
     import org.gvsig.fmap.dal.raster.api.BandAttributeDescriptor;
     import org.gvsig.fmap.dal.raster.api.BandDescriptor;
     import org.gvsig.fmap.dal.raster.api.RasterQuery;
     import org.gvsig.fmap.dal.spi.DataStoreProvider;
     import org.gvsig.raster.lib.buffer.api.BandInfo;
     import org.gvsig.raster.lib.buffer.api.Buffer;
     import org.gvsig.raster.lib.buffer.api.exceptions.BufferException;
-...
          * @throws BufferException
          */
         Buffer createBuffer(RasterQuery rasterQuery) throws BufferException;
         /**
          * Gets information about the specified band. If band does not have
          * information, it will return <code>null</code>
+         *
          * @param band
          *            The specified band
          * @return Returns information about specified band.
          */
         public BandInfo getBandInfo(int band);
         /**
          * Gets {@link BandDescriptor} of band received as parameter. If band does
          * not have {@link BandAttributeDescriptor}, this method will return an
          * empty {@link BandDescriptor}.
+         *
          * @param band
          *            Band to get its {@link BandDescriptor}
          * @return BandDescriptor
          */
         public BandDescriptor getBandDescriptor(int band);
         /**
          * Gets bands of raster provider source
+         *
          * @return Number of available bands from source
          */
         public int getBands();
+    }

      */
     package org.gvsig.fmap.dal.raster.spi;
     import java.util.List;
     import org.gvsig.fmap.dal.DataManager;
     import org.gvsig.fmap.dal.raster.api.BandAttributeDescriptor;
     import org.gvsig.fmap.dal.raster.api.BandDescriptor;
     import org.gvsig.fmap.dal.raster.api.RasterStore;
     import org.gvsig.fmap.dal.resource.Resource;
     import org.gvsig.fmap.dal.resource.spi.ResourceProvider;
-...
          * @param data
          */
         public void notifyChange(String notification, ResourceProvider data);
         /**
          * Call this to send a notification to observers of this store relative to
          * Resources
+         *
          * @param notification
          * @param resource
          */
         public void notifyChange(String notification, Resource resource);
         /**
          * Reaturn {@link DataManager} instance.
+         *
          * @return
          * @return Returns {@link DataManager} instance.
          */
         public DataManager getManager();
         /**
          * Return the instance of {@link RasterStoreProvider} for this store.
+         *
          * @return
          * @return Returns the instance of {@link RasterStoreProvider} for this store.
          */
         public RasterStoreProvider getProvider();
         /**
          * Return current RasterStore
+         *
          * @return
          * @return Returns current RasterStore
          */
         public RasterStore getRasterStore();
         /**
          * Return current FeatureStore name.
+         *
          * @return
          * @return Returns current FeatureStore name.
          */
         public String getName();
         /**
          * Creates a {@link BandDescriptor} object.
+         *
          * @param band
          *            BandDescriptor band
          * @param attributes
          *            A list with available {@link BandAttributeDescriptor}.
          * @return New instance of band descriptor
          */
         public BandDescriptor createBandDescriptor(int band, List<BandAttributeDescriptor> attributes);
         /**
          * Creates a {@link BandAttributeDescriptor}.
+         *
          * @param band
          *            Band of attribute descriptor.
          * @param name
          *            Name of attribute
          * @param description
          *            Descriptor of attribute
          * @param values
          *            Values of band attribute descriptor
          * @return A new {@link BandAttributeDescriptor}
          */
         public BandAttributeDescriptor createBandAttributeDescriptor(int band, String name,
             String description, List<Object> values);
+    }

     import java.awt.image.IndexColorModel;
     import java.util.ArrayList;
     import java.util.List;
     import java.util.Map.Entry;
     import java.util.Observable;
     import java.util.Observer;
     import java.util.Set;
-...
     import org.gvsig.fmap.dal.file.jimi.JimiRasterStoreProvider;
     import org.gvsig.fmap.dal.file.jimi.MemoryImage;
     import org.gvsig.fmap.dal.raster.api.RasterQuery;
     import org.gvsig.fmap.dal.raster.api.RasterSet;
     import org.gvsig.fmap.dal.raster.api.RasterStore;
     import org.gvsig.fmap.dal.raster.api.RasterStoreNotification;
     import org.gvsig.fmap.dal.raster.impl.DefaultRasterStore;
-...
     import org.gvsig.fmap.mapcontext.raster.api.RasterLayer;
     import org.gvsig.fmap.mapcontext.raster.api.RasterLegendChangedListener;
     import org.gvsig.metadata.exceptions.MetadataException;
     import org.gvsig.raster.lib.legend.api.ColorInterpretation;
     import org.gvsig.raster.lib.buffer.api.Band;
     import org.gvsig.raster.lib.buffer.api.BandInfo;
     import org.gvsig.raster.lib.legend.api.ColorTable;
     import org.gvsig.raster.lib.legend.api.ColorTableClass;
     import org.gvsig.raster.lib.legend.api.RasterLegend;
     import org.gvsig.raster.lib.legend.api.RasterLegendLocator;
     import org.gvsig.raster.lib.legend.api.RasterLegendManager;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dynobject.exception.DynMethodException;
     import org.gvsig.tools.dynobject.exception.DynMethodNotSupportedException;
-...
         /**
          * Creates a new DefaultRasterLayer
          * @param store
          * @param legend
          * @throws
          * @throws LoadLayerException
          */
         public DefaultRasterLayer() throws LoadLayerException{
             super();
-...
                 //Should be moved to mapContextManager when RasterLegend implements ILegend
                 if (legend == null) {
                     try {
                 try {
                         legend = (RasterLegend) store.invokeDynMethod(RasterStore.DYNMETHOD_GETLEGEND_NAME, null);
                     } catch (DynMethodNotSupportedException e) {
                         logger.debug("This store {} does not provide a legend.",
                             store.getName());
                     } catch (DynMethodException e) {
                         logger.error(
                                 "Can't load the specific legend provided for the store {}.",
                                 store.getName(), e);
+                    }
                 } catch (DynMethodNotSupportedException e) {
                     logger.debug("This store {} does not provide a legend.",
                         store.getName());
                 } catch (DynMethodException e) {
                     logger.error(
                             "Can't load the specific legend provided for the store {}.",
                             store.getName(), e);
+                }
+                }
                 if (legend == null) {
-...
                 SimpleTaskStatus taskStatus = manager.createDefaultSimpleTaskStatus("Draw "+getDataStore().getName());
                 ((RasterLegend) legend).draw(g, getRasterStore().getRasterSet(rasterQuery), viewPort, taskStatus);
                 logger.debug("Layer " + this.getName() + " drawn in "
                         + (System.currentTimeMillis() - tini) + " milliseconds.");

     package org.gvsig.raster.lib.buffer.impl;
     import org.gvsig.raster.lib.buffer.api.Band;
     import org.gvsig.raster.lib.buffer.api.BandInfo;
     import org.gvsig.raster.lib.buffer.api.BandNotification;
     import org.gvsig.raster.lib.buffer.api.NoData;
     import org.gvsig.raster.lib.buffer.api.exceptions.BandException;
-...
         int rows;
         int columns;
         NoData noData;
         BandInfo bandInfo;
         @Override
         public int getColumns() {
-...
         public NoData getNoData() {
             return this.noData;
+        }
         @Override
         public BandInfo getBandInfo(){
             return this.bandInfo;
+        }
         public Object clone() throws CloneNotSupportedException {
             AbstractBand cloned = (AbstractBand) super.clone();
-...
+        }
         protected abstract void doPutRow(int row, Object rowBuffer);
+    }

org.gvsig.raster/branches/org.gvsig.raster.2.4/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.buffer/org.gvsig.raster.lib.buffer.impl/src/main/java/org/gvsig/raster/lib/buffer/impl/AbstractPaginatedBand.java
2	2
3	3	import java.io.IOException;

Application: gvSIG desktop » gvSIG raster

Revision 6302