/ - Diff - | gvSIG desktop 1 - gvSIG

     import junit.framework.TestCase;
     import org.gvsig.raster.RasterLibrary;
     import org.gvsig.raster.dataset.properties.DatasetStatistics;
     /**
+     *
      * @author Nacho Brodin (nachobrodin@gmail.com)

+    		}
     		HistogramRmfSerializer serial1 = new HistogramRmfSerializer(hist1);
     		String s = serial1.write();
     		System.out.println(s);
     		//System.out.println(s);
     		HistogramRmfSerializer serial2 = new HistogramRmfSerializer();
     		try {
-...
     		} catch (ParsingException e) {
     			e.printStackTrace();
+    		}
     		Histogram hist2 = serial2.getHistogram();
     		Histogram hist2 = (Histogram)serial2.getResult();
     		assertEquals(hist1.getNumBands(), hist2.getNumBands());
     		for (int iBand = 0; iBand < hist1.getNumBands(); iBand++) {

     /*
      * Created on 9-ago-2006
+     *
      * To change the template for this generated file go to
      * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
      */
     /* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
      */
     package org.gvsig.raster.dataset.io.rmf;
     import java.io.FileNotFoundException;
     import java.io.IOException;
     import junit.framework.TestCase;
     import org.gvsig.raster.RasterLibrary;
     import org.gvsig.raster.buffer.BufferFactory;
     import org.gvsig.raster.dataset.FileNotOpenException;
     import org.gvsig.raster.dataset.NotSupportedExtensionException;
     import org.gvsig.raster.dataset.RasterDataset;
     import org.gvsig.raster.dataset.RasterDriverException;
     import org.gvsig.raster.dataset.properties.HistogramRmfSerializer;
     import org.gvsig.raster.util.Histogram;
     /**
+     *
      * @author Nacho Brodin (nachobrodin@gmail.com)
+     *
      */
     public class TestRmfWrite extends TestCase {
     	private RmfBlocksManager manager = null;
     	private String baseDir = "./test-images/";
     	private String path = baseDir + "miniRaster25x24.tif";
     	private Histogram histogram = null;
     	static {
     		RasterLibrary.wakeUp();
+    	}
     	public void start() {
     		this.setUp();
     		this.testStack();
+    	}
     	public void setUp() {
     		System.err.println("TestRmfWrite running...");
     		RasterDataset f = null;
     		try {
     			f = RasterDataset.open(null, path);
     		} catch (NotSupportedExtensionException e) {
     			return;
     		} catch (RasterDriverException e) {
     			return;
+    		}
     		BufferFactory ds = new BufferFactory(f);
     		ds.setAreaOfInterest();
     		try {
     			histogram = f.getHistogram().getHistogram();
     		} catch (FileNotOpenException e) {
     			e.printStackTrace();
     		} catch (RasterDriverException e) {
     			e.printStackTrace();
+    		}
+    	}
     	public void testStack(){
     		manager = new RmfBlocksManager("/tmp/p1.rmf");
     		HistogramRmfSerializer ser = new HistogramRmfSerializer(histogram);
     		manager.addClient(ser);
     		try {
     			manager.write();
     		} catch (FileNotFoundException e) {
     			e.printStackTrace();
     		} catch (IOException e) {
     			e.printStackTrace();
+    		}
+    	}
+    }

     /*
      * Created on 9-ago-2006
+     *
      * To change the template for this generated file go to
      * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
      */
     /* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
+     *
      * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
      */
     package org.gvsig.raster.dataset.io.rmf;
     import java.io.FileNotFoundException;
     import java.io.IOException;
     import junit.framework.TestCase;
     import org.gvsig.raster.RasterLibrary;
     import org.gvsig.raster.buffer.BufferFactory;
     import org.gvsig.raster.dataset.FileNotOpenException;
     import org.gvsig.raster.dataset.NotSupportedExtensionException;
     import org.gvsig.raster.dataset.RasterDataset;
     import org.gvsig.raster.dataset.RasterDriverException;
     import org.gvsig.raster.dataset.properties.HistogramRmfSerializer;
     import org.gvsig.raster.util.Histogram;
     /**
+     *
      * @author Nacho Brodin (nachobrodin@gmail.com)
+     *
      */
     public class TestRmfRead extends TestCase {
     	private RmfBlocksManager manager = null;
     	private Histogram histogram = null;
     	static {
     		RasterLibrary.wakeUp();
+    	}
     	public void start() {
     		this.setUp();
     		this.testStack();
+    	}
     	public void setUp() {
     		System.err.println("TestRmfRead running...");
+    	}
     	public void testStack(){
     		manager = new RmfBlocksManager("/tmp/p.rmf");
     		HistogramRmfSerializer ser = new HistogramRmfSerializer();
     		manager.addClient(ser);
     		try {
     			manager.read(null);
     			histogram = (Histogram)manager.getResult();
     		} catch (ParsingException e) {
     			e.printStackTrace();
+    		}
+    	}
+    }

      */
     package org.gvsig.raster.dataset.properties;
     import java.io.FileNotFoundException;
     import java.io.IOException;
     import java.io.Reader;
     import java.io.StringReader;
-...
     			b.append("</" + VALUES + ">\n");
     			b.append("\t</" + BAND + ">\n");
+    		}
     		b.append("</" + MAIN_TAG + ">\n");
     		b.append("</" + MAIN_TAG + ">");
     		return b.toString();
+    	}
     	/**
     	 * Obtiene el histograma
     	 * @return Histogram
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.raster.dataset.io.rmf.IRmfBlock#getResult()
     	 */
     	public Histogram getHistogram() {
     		return histogram;
     	public Object getResult() {
     		return (Histogram)histogram;
+    	}
     	/*

      */
     package org.gvsig.raster.dataset.io.rmf;
     import java.io.FileNotFoundException;
     import java.io.IOException;
     /**
      * Interfaz que deben implementar las clases que escriben bloques XML en ficheros RMF.
      * Contiene m?todos para escribir y leer un bloque de informaci?n del fichero RMF. La clase
-...
     	 * serializar.
     	 * @return Texto XML que representa el objeto.
     	 */
     	public String write();
     	public String write() throws IOException;
     	/**
     	 * Obtiene el tag principal del bloque
     	 * @return Tag principal
     	 */
     	public String getMainTag();
     	/**
     	 * Obtiene el objeto resultante de haber aplicado un read.
     	 * @return Object del tipo correspondiente al bloque implementado.
     	 */
     	public Object getResult();
+    }

      */
     package org.gvsig.raster.dataset.io.rmf;
     import java.io.BufferedReader;
     import java.io.File;
     import java.io.FileInputStream;
     import java.io.FileNotFoundException;
     import java.io.FileWriter;
     import java.io.IOException;
     import java.io.InputStreamReader;
     import java.util.ArrayList;
     /**
      * Gestor para la escritura de bloques XML en el fichero RMF. Cada cliente que quiere
-...
     	 *  (non-Javadoc)
     	 * @see org.gvsig.raster.dataset.io.rmf.IRmfBlock#read(java.lang.String)
     	 */
     	public void read(String xml) {
     	public void read(String xml) throws ParsingException {
     		File file = new File(path);
     		ArrayList lines = new ArrayList();
     		BufferedReader inGrf = null;
     		try {
     			inGrf = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
     			String str = inGrf.readLine();
     			while(str != null) {
     				for (int i = 0; i < clients.size(); i++) {
     					IRmfBlock block = ((IRmfBlock)clients.get(i));
     					String main = block.getMainTag();
     					if(str.startsWith("<" + main)) {
     						lines.clear();
     						while(str.compareTo("</" + main + ">") != 0) {
     							lines.add(str);
     							str = inGrf.readLine();
+    						}
     						lines.add(str);
     						StringBuffer buf = new StringBuffer();
     						for (int j = 0; j < lines.size(); j++)
     							buf.append((String)lines.get(j));
     						block.read(buf.toString());
     						break;
+    					}
+    				}
     				str = inGrf.readLine();
+    			}
     		} catch (FileNotFoundException e) {
     			throw new ParsingException("File Input error: creating BufferedReader");
     		} catch (IOException ex) {
     			throw new ParsingException("File Input error: reading lines");
+    		}
+    	}
     	/**
     	 * Creaci?n de nuevo fichero RMF. A?ade la cabecera y vuelca el contenido de
     	 * todos los IRmfBlock.
     	 * @param file Fichero
     	 * @return true si el fichero no existia y se ha creado nuevo
     	 * @throws IOException
     	 */
     	private boolean create(File file) throws IOException {
     		if(!file.exists()) {
     			file.createNewFile();
     			FileWriter writer = new FileWriter(file);
     			writer.write("<?xml version=\"1.0\" encoding=\"ISO-8859-15\"?>\n");
     			writer.write("<RasterMetaFile>\n");
     			for (int i = 0; i < clients.size(); i++) {
     				IRmfBlock block = ((IRmfBlock)clients.get(i));
     				writer.write(block.write());
+    			}
     			writer.write("\n</RasterMetaFile>\n");
     			writer.close();
     			return true;
+    		}
     		return false;
+    	}
     	/*
     	 *  (non-Javadoc)
     	 * @see org.gvsig.raster.dataset.io.rmf.IRmfBlock#write()
     	 */
     	public String write() {
     	public String write() throws IOException {
     		File file = new File(path);
     		if(!file.exists())
     		ArrayList lines = new ArrayList();
     		if(create(file))
     			return null;
     		//A?adir bloques al fichero.
     		BufferedReader inGrf = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
     		String str = inGrf.readLine();
     		while(str != null) {
     			lines.add(str);
     			str = inGrf.readLine();
+    		}
     		for (int i = 0; i < clients.size(); i++) {
     			IRmfBlock block = ((IRmfBlock)clients.get(i));
     			String tag = block.getMainTag();
     			String s = ((IRmfBlock)clients.get(i)).write();
     			for (int line = 0; line < lines.size(); line++) {
     				str = (String)lines.get(line);
     				if(str.compareTo("</" + getMainTag() + ">") == 0 || str.startsWith("<" + tag )) {
     					String xmlBlock = block.write();
     					if(line != 0)
     						lines.add(line, xmlBlock);
     					if(str.startsWith("<" + tag)) {
     						while(((String)lines.get(line + 1)).compareTo("</" + tag + ">") != 0)
     							lines.remove(line + 1);
     						lines.remove(line + 1);
+    					}
     					break;
+    				}
+    			}
+    		}
     		//Escribir fichero de salida.
     		file.delete();
     		file.createNewFile();
     		FileWriter writer = new FileWriter(file);
     		for (int i = 0; i < lines.size(); i++)
     			writer.write((String)lines.get(i) + "\n");
     		writer.close();
     		return null;
+    	}
-...
     	public String getMainTag() {
     		return MAIN_TAG;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.raster.dataset.io.rmf.IRmfBlock#getResult()
     	 */
     	public Object getResult() {
     		return null;
+    	}
+    }

| gvSIG desktop 1

Revision 11336