Revision 162 org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.lib/org.gvsig.raster.lib.impl/src/main/java/org/gvsig/raster/impl/provider/DefaultRasterProvider.java

View differences:

DefaultRasterProvider.java
69 69
import org.gvsig.raster.impl.datastruct.serializer.ColorTableRmfSerializer;
70 70
import org.gvsig.raster.impl.datastruct.serializer.NoDataRmfSerializer;
71 71
import org.gvsig.raster.impl.store.AbstractRasterStoreParameters;
72
import org.gvsig.raster.impl.store.properties.DatasetColorInterpretation;
73
import org.gvsig.raster.impl.store.properties.DatasetHistogram;
74
import org.gvsig.raster.impl.store.properties.DatasetMetadata;
75
import org.gvsig.raster.impl.store.properties.DatasetStatistics;
72
import org.gvsig.raster.impl.store.properties.DataStoreColorInterpretation;
73
import org.gvsig.raster.impl.store.properties.DataStoreHistogram;
74
import org.gvsig.raster.impl.store.properties.DataStoreMetadata;
75
import org.gvsig.raster.impl.store.properties.DataStoreStatistics;
76 76
import org.gvsig.raster.impl.store.rmf.ClassSerializer;
77 77
import org.gvsig.raster.impl.store.rmf.RmfBlocksManager;
78 78
import org.gvsig.raster.impl.store.serializer.ColorInterpretationRmfSerializer;
......
111 111
	protected double                        noData                 = 0;
112 112
	protected String                        wktProjection          = "";
113 113

  
114
	protected DatasetStatistics             stats                  = new DatasetStatistics(this);
115
	protected DatasetHistogram              histogram              = null;
114
	protected DataStoreStatistics             stats                  = new DataStoreStatistics(this);
115
	protected DataStoreHistogram              histogram              = null;
116 116
	protected AbstractRasterStoreParameters param                  = null;
117 117
	protected RmfBlocksManager              rmfBlocksManager       = null;
118 118
	protected ColorTable                    colorTable             = null;
119
	protected DatasetColorInterpretation    colorInterpretation    = null;
119
	protected DataStoreColorInterpretation    colorInterpretation    = null;
120 120

  
121 121
	/**
122 122
	 * Indica si el valor NoData esta activo
......
494 494
		}
495 495

  
496 496
		if (colorInterpSerializer.getResult() != null) {
497
			DatasetColorInterpretation ci = (DatasetColorInterpretation) colorInterpSerializer.getResult();
497
			DataStoreColorInterpretation ci = (DataStoreColorInterpretation) colorInterpSerializer.getResult();
498 498
			setColorInterpretation(ci);
499
			if (ci.getBand(DatasetColorInterpretation.ALPHA_BAND) != -1)
500
				getTransparency().setTransparencyBand(ci.getBand(DatasetColorInterpretation.ALPHA_BAND));
499
			if (ci.getBand(DataStoreColorInterpretation.ALPHA_BAND) != -1)
500
				getTransparency().setTransparencyBand(ci.getBand(DataStoreColorInterpretation.ALPHA_BAND));
501 501
		}
502 502

  
503 503
		if (projectionRmfSerializer.getResult() != null)
......
923 923
	 * (non-Javadoc)
924 924
	 * @see org.gvsig.raster.impl.provider.RasterProvider#getMetadata()
925 925
	 */
926
	public DatasetMetadata getMetadata() {
926
	public DataStoreMetadata getMetadata() {
927 927
		return null;
928 928
	}
929 929
	
......
938 938
	/**
939 939
	 * Asigna el objeto que contiene que contiene la interpretaci?n de
940 940
	 * color por banda
941
	 * @param DatasetColorInterpretation
941
	 * @param DataStoreColorInterpretation
942 942
	 */
943
	public void setColorInterpretation(DatasetColorInterpretation colorInterpretation){
943
	public void setColorInterpretation(DataStoreColorInterpretation colorInterpretation){
944 944
		this.colorInterpretation = colorInterpretation;
945 945
	}
946 946
	
......
948 948
	 * (non-Javadoc)
949 949
	 * @see org.gvsig.raster.impl.dataset.RasterProvider#getStatistics()
950 950
	 */
951
	public DatasetStatistics getStatistics() {
951
	public DataStoreStatistics getStatistics() {
952 952
		return stats;
953 953
	}
954 954
	
......
958 958
	 */
959 959
	public Histogram getHistogram() {
960 960
		if (histogram == null)
961
			histogram = new DatasetHistogram(this);
961
			histogram = new DataStoreHistogram(this);
962 962
		return histogram;
963 963
	}
964 964
	

Also available in: Unified diff