/ - Diff - | gvSIG desktop 1 - gvSIG

+     *
      * $Id$
      * $Log$
      * Revision 1.3  2007-04-17 06:27:20  jorpiell
      * Revision 1.4  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.3  2007/04/17 06:27:20  jorpiell
      * Changed the default filename
+     *
      * Revision 1.2  2007/04/14 16:06:35  jorpiell
-...
      */
     public abstract class GPEWriterBaseTest extends TestCase{
     	private String filename = "testdata/FILETEMP";
     	private GPEWriterHandler handler = null;
     	private GPEWriterHandler writerHandler = null;
     	private GPEContentHandler contenHandler = null;
     	private GPEErrorHandler errorHandler = null;
     	private GPEParser parser = null;
-...
     	 */
     	public void setUp() throws Exception{
     		GPEDefaults.setProperty(GPEDefaults.DEFAULT_FILE_NAME, filename);
     		GPERegister.addGpeDriver(getGPEParserName(),
     				new GPEContentHandlerTest(),
     				new GPEErrorHandlerTest());
     		handler = GPERegister.getWriter(getFormat());
     		//Register the parser
     		GPERegister.addGpeParser(getGPEParserName(),
     				getGPEParserDescription(),
     				getGPEParserClass());
     		//Register the writer
     		GPERegister.addGpeWriterHandler(getGPEWriterHandlerName(),
     				getGPEWriterHandlerDescription(),
     				getGPEWriterHandlerClass());
+    	}
     	/**
-...
     	 */
     	public void testWriter() throws Exception{
     		writeObjects();
     		File outputFile = handler.getFile();
     		parser = GPERegister.getParser(outputFile);
     		parser.parse(outputFile);
     		File outputFile = writerHandler.getOutputFile();
     		//The file must exist
     		parser = GPERegister.createParser(outputFile);
     		parser.parse(getContenHandler(),getErrorHandler() ,outputFile);
     		readObjects();
+    	}
     	/**
     	 * Gets the file format
     	 * @return
     	 */
     	public abstract String getFormat();
     	/**
     	 * This method write somo objects into the writer handler
     	 */
     	public abstract void writeObjects();
-...
     	 * to register it before to start the parsing
     	 * process
     	 */
     	public abstract String getGPEParserName();
     	public String getGPEWriterHandlerName(){
     		return "FORMAT VERSION";
+    	}
     	/**
     	 * Each test must to return its parser description
     	 * to register it before to start the parsing
     	 * process
     	 */
     	public String getGPEWriterHandlerDescription(){
     		return "default writer handler description";
+    	}
     	/**
     	 * Each test must to return its parser class
     	 * that will be used to create new parsers.
     	 */
     	public abstract Class getGPEWriterHandlerClass();
     	/**
     	 * Each test must to return its parser name
     	 * to register it before to start the parsing
     	 * process
     	 */
     	public String getGPEParserName(){
     		return "FORMAT VERSION";
+    	}
     	/**
     	 * Each test must to return its parser description
     	 * to register it before to start the parsing
     	 * process
     	 */
     	public String getGPEParserDescription(){
     		return "default parser description";
+    	}
     	/**
     	 * Each test must to return its parser class
     	 * that will be used to create new parsers.
     	 */
     	public abstract Class getGPEParserClass();
     	/**
     	 * Gets the file format. The deafult writer
     	 * format will be used by default
     	 * @return
     	 */
     	public String getFormat(){
     		return null;
+    	}
     	/**
     	 * Gets the file format. The deafult writer
     	 * version will be used by default
     	 * @return
     	 */
     	public String getVersion(){
     		return null;
+    	}
     	/**
     	 * It creates a Random bbox coordinates. It return
     	 * 10 coordinates
     	 * @return
-...
     	 * @return the handler
     	 */
     	public GPEWriterHandler getWriterHandler() {
     		return handler;
     		if (writerHandler == null){
     			try {
     				writerHandler = GPERegister.createWriter(getGPEWriterHandlerName());
     				writerHandler.setFormat(getFormat());
     				writerHandler.setVersion(getVersion());
     				writerHandler.setErrorHandler(getErrorHandler());
     			} catch (Exception e) {
     				//never throwed
     				e.printStackTrace();
+    			}
+    		}
     		return writerHandler;
+    	}
     	/**

     import java.io.File;
     import org.gvsig.gpe.GPEErrorHandler;
     import org.gvsig.gpe.containers.Element;
     import org.gvsig.gpe.containers.Feature;
     import org.gvsig.gpe.containers.Layer;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
-...
+     *
      * $Id$
      * $Log$
      * Revision 1.2  2007-04-14 16:06:35  jorpiell
      * Revision 1.3  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.2  2007/04/14 16:06:35  jorpiell
      * Add the container classes
+     *
      * Revision 1.1  2007/04/13 07:17:54  jorpiell
-...
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public abstract class GPEPointsLayerTest extends GPEWriterBaseTest {
     	private String layerId = "l1";
     	private String layerName = "Points Layer";
     	private String layerDescription = "This is a test of a points layer";
     	private double[] bboxX = generateRandomBBox();
     	private double[] bboxY = generateRandomBBox();
     	private double[] bboxZ = generateRandomBBox();
     	private String feature1Name = "New York";
     	private String feature1Id = "f1";
     	private String element1 = "POPULATION";
     	/*
     	 * (non-Javadoc)
-...
     		Layer layer = layers[0];
     		assertEquals(layer.getName(),layerName);
     		assertEquals(layer.getDescription(),layerDescription);
     //		assertEquals(layer.getId(),layerId);
     //		assertEquals(layer.getBbox().getX(),bboxX);
     //		assertEquals(layer.getBbox().getY(),bboxY);
     //		assertEquals(layer.getBbox().getZ(),bboxZ);
     		assertEquals(layer.getFeatures().size(), 2);
     		Feature feature1 = (Feature)layer.getFeatures().get(0);
     //		assertEquals(feature1.getId(), feature1Id);
     		assertEquals(feature1.getName(), feature1Name);
     		Element element11 = (Element)feature1.getElements().get(0);
+    	}
     	/*
-...
     	 */
     	public void writeObjects() {
     		getWriterHandler().initialize();
     		getWriterHandler().startLayer("1", layerName, layerDescription, "23030");
     		getWriterHandler().startBbox("bbox", generateRandomBBox(),
     				generateRandomBBox(),
     				generateRandomBBox(),
     		getWriterHandler().startLayer(layerId, layerName, layerDescription, "23030");
     		getWriterHandler().startBbox("bbox", bboxX,
     				bboxY,
     				bboxZ,
     				"23030");
     		getWriterHandler().endBbox();
     		getWriterHandler().startFeature("New York","1");
     		getWriterHandler().startFeature(feature1Name,feature1Id);
     		getWriterHandler().startElement("POPULATION", new Integer("300000"), Integer.class);
     		getWriterHandler().endElement();
     		getWriterHandler().startPoint("p1", 2, 2, 2, "EPSG:23030");

+     *
      * $Id$
      * $Log$
      * Revision 1.3  2007-04-17 07:53:55  jorpiell
      * Revision 1.4  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.3  2007/04/17 07:53:55  jorpiell
      * Before to start a new parsing process, the initialize method of the content handlers is throwed
+     *
      * Revision 1.2  2007/04/13 13:14:55  jorpiell
-...
      * @author Jorge Piera LLodr? (jorge.piera@iver.es)
      */
     public class GPEErrorHandlerTest extends GPEErrorHandler{
     	public Object badLayer(String error, Object layer) {
     		// TODO Ap?ndice de m?todo generado autom?ticamente
     		return null;
+    	}
     	public Object badElement(String error, Object element) {
     		// TODO Ap?ndice de m?todo generado autom?ticamente
     		return null;
+    	}
     	public Object badArea(String error, Object bBox) {
     		// TODO Ap?ndice de m?todo generado autom?ticamente
     		return null;
+    	}
     	public Object badGeometry(String error, Object geometry) {
     		// TODO Ap?ndice de m?todo generado autom?ticamente
     		return null;
+    	}
     	public Object badFeature(String error, Object feature) {
     		// TODO Ap?ndice de m?todo generado autom?ticamente
     		return null;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.gpe.IGPEErrorHandler#addError(java.lang.Throwable)
     	 */
     	public void addError(Throwable e) {
     		e.printStackTrace();
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.gpe.GPEContentHandler#initialize()
     	 * @see org.gvsig.gpe.IGPEErrorHandler#addWarning(java.lang.Throwable)
     	 */
     	public void initialize(){
     	public void addWarning(Throwable e) {
     		// TODO Auto-generated method stub
+    	}
+    }

     import org.gvsig.gpe.containers.Feature;
     import org.gvsig.gpe.containers.Bbox;
     import org.gvsig.gpe.containers.Element;
     import org.gvsig.gpe.containers.Geometry;
     import org.gvsig.gpe.containers.Layer;
     import org.gvsig.gpe.containers.LineString;
     import org.gvsig.gpe.containers.Point;
-...
+     *
      * $Id$
      * $Log$
      * Revision 1.4  2007-04-17 07:53:55  jorpiell
      * Revision 1.5  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.4  2007/04/17 07:53:55  jorpiell
      * Before to start a new parsing process, the initialize method of the content handlers is throwed
+     *
      * Revision 1.3  2007/04/14 16:06:35  jorpiell
-...
      */
     public class GPEContentHandlerTest extends GPEContentHandler{
     	private String tab = "";
     	private Layer currentLayer = null;
     	private Feature currentFeature = null;
     	private ArrayList layers = new ArrayList();
     	public Object startLayer(Object parent, Object bBox, String id,
     			String name, String description,String srs) {
     		System.out.print(tab + "Start Layer: " + name + "\n");
     		tab = tab + "\t";
     		Layer layer = new Layer();
     		layer.setParentLayer(parent);
     		layer.setBbox(bBox);
     		layer.setId(id);
     		layer.setName(name);
     		layer.setDescription(description);
     		layer.setSrs(srs);
     		currentLayer = layer;
     		return layer;
     	/**
     	 * @return the layers
     	 */
     	public ArrayList getLayers() {
     		return layers;
+    	}
     	public void endLayer(Object layer) {
     		tab = tab.substring(0, tab.length()-1);
     		System.out.print(tab + "End Layer\n");
     		if (currentLayer != null){
     			if (currentLayer.getParentLayer() == null){
     				layers.add(currentLayer);
+    			}
     			currentLayer = currentLayer.getParentLayer();
+    		}
     	public Object startFeature(String name, String id) {
     		System.out.print(tab + "Start Feature: " + name + "\n");
     		Feature feature = new Feature();
     		feature.setName(name);
     		feature.setId(id);
     		return feature;
+    	}
     	public void addNameToLayer(Object layer,String name){
     		System.out.print(tab + "Layer name changed: " + name + "\n");
     		((Layer)layer).setName(name);
     	public void addNameToFeature(Object feature, String name){
     		System.out.print(tab + "Feature name changed: " + name + "\n");
     		((Feature)feature).setName(name);
+    	}
     	public void addDescriptionToLayer(Object layer,String description){
     	public void endFeature(Object feature) {
     		System.out.print(tab + "End Feature\n");
+    	}
     	public void initialize(){
     		layers = new ArrayList();
+    	}
     	public void addBboxToGeometry(Object bbox, Object geometry) {
     		((Geometry)geometry).setBbox(bbox);
+    	}
     	public void addBboxToLayer(Object bbox, Object layer) {
     		((Layer)layer).setBbox(bbox);
+    	}
     	public void addDescriptionToLayer(String description, Object layer) {
     		System.out.print(tab + "Layer description changed: " + description + "\n");
     		((Layer)layer).setDescription(description);
+    	}
     	public Object startElement(Object parent, String name, Object value,
     			Object type) {
     		Element element = new Element();
     		element.setParentElement(parent);
     		element.setName(name);
     		element.setValue(value);
     		element.setType(type);
     		if (parent == null){
     			currentFeature.addElement(element);
+    		}
     		return element;
+    	}
     	public void endElement(Object element) {
     		// TODO Ap?ndice de m?todo generado autom?ticamente
     	public void addElementToFeature(Object element, Object feature) {
     		((Feature)feature).addElement(element);
+    	}
     	public void addFeatureToLayer(Object feature, Object layer) {
     		((Layer)layer).addFeature(feature);
+    	}
     	public Object startBbox(double[] x, double[] y, double[] z, String id,
     			String srs) {
     	public void addGeometryToFeature(Object geometry, Object feature) {
     		((Feature)feature).setGeometry(geometry);
+    	}
     	public void addInnerPolygonToPolygon(Object innerPolygon, Object polygon) {
     		((Polygon)polygon).addInnerBoundary(innerPolygon);
+    	}
     	public void addNameToFeature(String name, Object feature) {
     		((Feature)feature).setName(name);
+    	}
     	public void addNameToLayer(String name, Object layer) {
     		System.out.print(tab + "Layer name changed: " + name + "\n");
     		((Layer)layer).setName(name);
+    	}
     	public void addParentElementToElement(Object parent, Object element) {
     		((Element)element).setParentElement(parent);
+    	}
     	public void addParentLayerToLayer(Object parent, Object layer) {
     		((Layer)layer).setParentLayer(parent);
+    	}
     	public void addSrsToLayer(String srs, Object layer) {
     		((Layer)layer).setSrs(srs);
+    	}
     	public Object startBbox(String id, double[] x, double[] y, double[] z, String srs) {
     		Bbox bbox = new Bbox();
     		bbox.setX(x);
     		bbox.setY(y);
-...
     	public void endBbox(Object bbox) {
     		// TODO Ap?ndice de m?todo generado autom?ticamente
+    	}
     	public Object startElement(String name, Object value, Object type, Object parentElement) {
     		Element element = new Element();
     		element.setParentElement(parentElement);
     		element.setName(name);
     		element.setValue(value);
     		element.setType(type);
     		return element;
+    	}
     	public Object startPoint(double x, double y, double z, String id, String srs) {
     		System.out.print(tab + "Start Point, SRS:" + srs + "\n");
     	public void endElement(Object element) {
     		// TODO Ap?ndice de m?todo generado autom?ticamente
+    	}
     	public Object startFeature(String id, String name, Object layer) {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	public Object startInnerPolygon(String id, double[] x, double[] y, double[] z, String srs) {
     		tab = tab + "\t";
     		System.out.print(tab + x + "," + y + "," + z + "\n");
     		System.out.print(tab + "Start InnerPolygon, SRS:" + srs + "\n");
     		tab = tab + "\t";
     		for (int i=0 ; i<x.length ; i++){
     			System.out.print(tab + x[i] + "," + y[i] + "," + z[i] + "\n");
+    		}
     		tab = tab.substring(0, tab.length()-2);
     		Polygon inner = new Polygon();
     		inner.setX(x);
     		inner.setY(y);
     		inner.setZ(z);
     		inner.setId(id);
     		inner.setSrs(srs);
     		return inner;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.gpe.IGPEContentHandler#endInnerPolygon(java.lang.Object)
     	 */
     	public void endInnerPolygon(Object polygon){
     		tab = tab + "\t";
     		System.out.print(tab + "End InnerPolygon\n");
     		tab = tab.substring(0, tab.length()-1);
     		Point point = new Point();
     		point.setX(x);
     		point.setY(y);
     		point.setZ(z);
     		point.setId(id);
     		point.setSrs(srs);
     		currentFeature.setGeometry(point);
     		return point;
+    	}
     	public void endPoint(Object point) {
     		System.out.print(tab + "End Point\n");
     	public Object startLayer(String id, String name, String description, String srs, Object parentLayer, Object bBox) {
     		System.out.print(tab + "Start Layer: " + name + "\n");
     		tab = tab + "\t";
     		Layer layer = new Layer();
     		layer.setId(id);
     		layer.setName(name);
     		layer.setDescription(description);
     		layer.setSrs(srs);
     		layer.setParentLayer(parentLayer);
     		layer.setBbox(bBox);
     		layers.add(layer);
     		return layer;
+    	}
     	public void endLayer(Object layer) {
     		tab = tab.substring(0, tab.length()-1);
     		System.out.print(tab + "End Layer\n");
+    	}
     	public Object startLineString(double[] x, double[] y, double[] z, String id,
     			String srs) {
     	public Object startLineString(String id, double[] x, double[] y, double[] z, String srs) {
     		System.out.print(tab + "Start LineString, SRS:" + srs + "\n");
     		tab = tab + "\t";
     		for (int i=0 ; i<x.length ; i++){
-...
     		lineString.setZ(z);
     		lineString.setId(id);
     		lineString.setSrs(srs);
     		currentFeature.setGeometry(lineString);
     		return lineString;
+    	}
-...
     		System.out.print(tab + "End LineString:\n");
+    	}
     	public Object startPolygon(double[] x, double[] y, double[] z, String id,
     			String srs) {
     	public Object startPoint(String id, double x, double y, double z, String srs) {
     		System.out.print(tab + "Start Point, SRS:" + srs + "\n");
     		tab = tab + "\t";
     		System.out.print(tab + x + "," + y + "," + z + "\n");
     		tab = tab.substring(0, tab.length()-1);
     		Point point = new Point();
     		point.setX(x);
     		point.setY(y);
     		point.setZ(z);
     		point.setId(id);
     		point.setSrs(srs);
     		return point;
+    	}
     	public void endPoint(Object point) {
     		System.out.print(tab + "End Point\n");
+    	}
     	public Object startPolygon(String id, double[] x, double[] y, double[] z, String srs) {
     		System.out.print(tab + "Start Polygon, SRS:" + srs + "\n");
     		tab = tab + "\t";
     		for (int i=0 ; i<x.length ; i++){
-...
     		polygon.setZ(z);
     		polygon.setId(id);
     		polygon.setSrs(srs);
     		currentFeature.setGeometry(polygon);
     		return polygon;
+    	}
     	public void endPolygon(Object polygon) {
     		System.out.print(tab + "End Polygon\n");
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.gpe.IGPEContentHandler#startInnerPolygon(java.lang.Object, double[], double[], double[], java.lang.String, java.lang.String)
     	 */
     	public Object startInnerPolygon(Object polygon, double[] x, double[] y, double[] z, String id, String srs){
     		tab = tab + "\t";
     		System.out.print(tab + "Start InnerPolygon, SRS:" + srs + "\n");
     		tab = tab + "\t";
     		for (int i=0 ; i<x.length ; i++){
     			System.out.print(tab + x[i] + "," + y[i] + "," + z[i] + "\n");
+    		}
     		tab = tab.substring(0, tab.length()-2);
     		Polygon inner = new Polygon();
     		inner.setX(x);
     		inner.setY(y);
     		inner.setZ(z);
     		inner.setId(id);
     		inner.setSrs(srs);
     		((Polygon)polygon).addInnerBoundary(inner);
     		return polygon;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.gpe.IGPEContentHandler#endInnerPolygon(java.lang.Object)
     	 */
     	public void endInnerPolygon(Object polygon){
     		tab = tab + "\t";
     		System.out.print(tab + "End InnerPolygon\n");
     		tab = tab.substring(0, tab.length()-1);
+    	}
     	public boolean isViewInBox(Object bbox, Object view) {
     		// TODO Ap?ndice de m?todo generado autom?ticamente
     		return false;
     	public Object startLinearRing(String id, double[] x, double[] y, double[] z, String srs) {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	public boolean isGeometryInBox(Object bbox, Object geometry) {
     		// TODO Ap?ndice de m?todo generado autom?ticamente
     		return false;
+    	}
     	public Object startFeature(String name, String id) {
     		System.out.print(tab + "Start Feature: " + name + "\n");
     		Feature feature = new Feature();
     		feature.setName(name);
     		feature.setId(id);
     		currentLayer.addFeature(feature);
     		currentFeature = feature;
     		return feature;
+    	}
     	public void addNameToFeature(Object feature, String name){
     		System.out.print(tab + "Feature name changed: " + name + "\n");
     		((Feature)feature).setName(name);
+    	}
     	public void endFeature(Object feature) {
     		System.out.print(tab + "End Feature\n");
+    	}
     	public void endLinearRing(Object linearRing) {
     		// TODO Auto-generated method stub
     	/**
     	 * @return the layers
     	 */
     	public ArrayList getLayers() {
     		return layers;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.gpe.GPEContentHandler#initialize()
     	 */
     	public void initialize(){
     	    layers = new ArrayList();
     	    currentFeature = null;
+    	}
+    }

+     *
      * $Id$
      * $Log$
      * Revision 1.1  2007-04-14 16:06:35  jorpiell
      * Revision 1.2  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.1  2007/04/14 16:06:35  jorpiell
      * Add the container classes
+     *
+     *
-...
     	public void setGeometry(Geometry geometry) {
     		this.geometry = geometry;
+    	}
     	/**
     	 * @param geometry the geometry to set
     	 */
     	public void setGeometry(Object geometry) {
     		if (geometry instanceof Geometry){
     			this.geometry = (Geometry)geometry;
+    		}
+    	}
     	/**
     	 * @return the id
     	 */
     	public String getId() {
-...
     		elements.add(element);
+    	}
     	/**
     	 * Adds a new element
     	 * @param layer
     	 */
     	public void addElement(Object element){
     		if (element instanceof Element){
     			elements.add(element);
+    		}
+    	}
+    }

+     *
      * $Id$
      * $Log$
      * Revision 1.1  2007-04-14 16:06:35  jorpiell
      * Revision 1.2  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.1  2007/04/14 16:06:35  jorpiell
      * Add the container classes
+     *
+     *
-...
      */
     public class Geometry {
     	private String id = null;
     	private Bbox bbox = null;
     	/**
     	 * @return the bbox
     	 */
     	public Bbox getBbox() {
     		return bbox;
+    	}
     	/**
     	 * @param bbox the bbox to set
     	 */
     	public void setBbox(Bbox bbox) {
     		this.bbox = bbox;
+    	}
     	/**
     	 * @param bbox the bbox to set
     	 */
     	public void setBbox(Object bbox) {
     		if (bbox instanceof Bbox){
     			this.bbox = (Bbox)bbox;
+    		}
+    	}
     	/**
     	 * @return the id
     	 */
     	public String getId() {

+     *
      * $Id$
      * $Log$
      * Revision 1.1  2007-04-14 16:06:35  jorpiell
      * Revision 1.2  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.1  2007/04/14 16:06:35  jorpiell
      * Add the container classes
+     *
+     *
-...
     	public void addFeature(Feature feature){
     		features.add(feature);
+    	}
     	/**
     	 * Adds a new layer
     	 * @param layer
     	 */
     	public void addFeature(Object feature){
     		if (feature instanceof Feature){
     			features.add(feature);
+    		}
+    	}
     	/**
     	 * @return the parentLayer

+     *
      * $Id$
      * $Log$
      * Revision 1.1  2007-04-14 16:06:35  jorpiell
      * Revision 1.2  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.1  2007/04/14 16:06:35  jorpiell
      * Add the container classes
+     *
+     *
-...
+    	}
     	/**
     	 * Adds a new layer
     	 * @param layer
     	 */
     	public void addInnerBoundary(Object polygon){
     		if (polygon instanceof Polygon){
     			innerBoundary.add(polygon);
+    		}
+    	}
     	/**
     	 * @return the srs
     	 */
     	public String getSrs() {

     import java.lang.reflect.InvocationTargetException;
     import java.util.ArrayList;
     import org.gvsig.gpe.GPEContentHandler;
     import org.gvsig.gpe.GPEContentHandlerTest;
     import org.gvsig.gpe.GPEErrorHandler;
     import org.gvsig.gpe.GPEErrorHandlerTest;
     import org.gvsig.gpe.GPEParser;
     import org.gvsig.gpe.GPERegister;
-...
+     *
      * $Id$
      * $Log$
      * Revision 1.3  2007-04-14 16:06:35  jorpiell
      * Revision 1.4  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.3  2007/04/14 16:06:35  jorpiell
      * Add the container classes
+     *
      * Revision 1.2  2007/04/13 13:14:55  jorpiell
-...
     public abstract class GPEReaderBaseTest extends TestCase {
     	private File file = null;
     	private GPEParser parser = null;
     	private GPEContentHandler contenHandler = null;
     	private GPEErrorHandler errorHandler = null;
     	public void setUp() throws Exception{
     		GPERegister.addGpeDriver(getGPEParserName(),
     				new GPEContentHandlerTest(),
     				new GPEErrorHandlerTest());
     		//Register the parser
     		GPERegister.addGpeParser(getGPEParserName(),
     				getGPEParserDescription(),
     				getGPEParserClass());
     		file = new File(getFile());
     		assertEquals(GPERegister.accept(file),true);
     		parser = GPERegister.getParser(file);
     		parser = GPERegister.createParser(getGPEParserName());
     		assertNotNull(parser);
+    	}
-...
     	 * @throws Exception
     	 */
     	public void testParse() throws Exception{
     		parser.parse(file);
     		parser.parse(getContenHandler() , getErrorHandler(), file);
     		makeAsserts();
+    	}
-...
     	 * to register it before to start the parsing
     	 * process
     	 */
     	public abstract String getGPEParserName();
     	public String getGPEParserName(){
     		return "FORMAT VERSION";
+    	}
     	/**
     	 * Each test must to return its parser description
     	 * to register it before to start the parsing
     	 * process
     	 */
     	public String getGPEParserDescription(){
     		return "default parser description";
+    	}
     	/**
     	 * Each test must to return its parser class
     	 * that will be used to create new parsers.
     	 */
     	public abstract Class getGPEParserClass();
     	/**
     	 * Gets the GML file to open
     	 * @return
     	 */
-...
     		return aLayers;
+    	}
     	/**
     	 * @return the contenHandler
     	 */
     	public GPEContentHandler getContenHandler() {
     		if (contenHandler == null){
     			contenHandler = new GPEContentHandlerTest();
+    		}
     		return contenHandler;
+    	}
     	/**
     	 * @return the errorHandler
     	 */
     	public GPEErrorHandler getErrorHandler() {
     		if (errorHandler == null){
     			errorHandler = new GPEErrorHandlerTest();
+    		}
     		return errorHandler;
+    	}
+    }

+     *
      * $Id$
      * $Log$
      * Revision 1.9  2007-04-18 12:48:16  jorpiell
      * Revision 1.10  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.9  2007/04/18 12:48:16  jorpiell
      * The ID attribute is always on the first position
+     *
      * Revision 1.8  2007/04/18 10:46:23  jorpiell
-...
      */
     public abstract class GPEContentHandler implements IGPEContentHandler {
     	/**
     	 * It initializes the ContentHandler. It thas to
     	 * init the object attributes values before to
     	 * start a new parsing process.
     	 */
     	abstract public void initialize();
     	public void addBboxToGeometry(Object bbox, Object geometry) {
     		// TODO Auto-generated method stub
+    	}
     	public void addDescriptionToLayer(String description) {
     	public void addBboxToLayer(Object bbox, Object layer) {
     		// TODO Auto-generated method stub
+    	}
     	public void addNameToFeature(String name) {
     	public void addDescriptionToLayer(String description, Object layer) {
     		// TODO Auto-generated method stub
+    	}
     	public void addNameToLayer(String name) {
     	public void addElementToFeature(Object element, Object feature) {
     		// TODO Auto-generated method stub
+    	}
     	public void addFeatureToLayer(Object feature, Object layer) {
     		// TODO Auto-generated method stub
+    	}
     	public void addGeometryToFeature(Object geometry, Object feature) {
     		// TODO Auto-generated method stub
+    	}
     	public void addInnerPolygonToPolygon(Object innerPolygon, Object Polygon) {
     		// TODO Auto-generated method stub
+    	}
     	public void addNameToFeature(String name, Object feature) {
     		// TODO Auto-generated method stub
+    	}
     	public void addNameToLayer(String name, Object layer) {
     		// TODO Auto-generated method stub
+    	}
     	public void addParentElementToElement(Object parent, Object element) {
     		// TODO Auto-generated method stub
+    	}
     	public void addParentLayerToLayer(Object parent, Object layer) {
     		// TODO Auto-generated method stub
+    	}
     	public void addSrsToLayer(String srs, Object Layer) {
     		// TODO Auto-generated method stub
+    	}
     	public void endBbox(Object bbox) {
     		// TODO Auto-generated method stub
+    	}
     	public void endElement() {
     	public void endElement(Object element) {
     		// TODO Auto-generated method stub
+    	}
     	public void endFeature() {
     	public void endFeature(Object feature) {
     		// TODO Auto-generated method stub
+    	}
     	public void endInnerPolygon() {
     	public void endInnerPolygon(Object innerPolygon) {
     		// TODO Auto-generated method stub
+    	}
     	public void endLayer() {
     	public void endLayer(Object layer) {
     		// TODO Auto-generated method stub
+    	}
     	public void endLineString() {
     	public void endLineString(Object lineString) {
     		// TODO Auto-generated method stub
+    	}
     	public void endLinearRing() {
     	public void endLinearRing(Object linearRing) {
     		// TODO Auto-generated method stub
+    	}
     	public void endPoint() {
     	public void endPoint(Object point) {
     		// TODO Auto-generated method stub
+    	}
     	public void endPolygon() {
     	public void endPolygon(Object Polygon) {
     		// TODO Auto-generated method stub
+    	}
-...
     		return null;
+    	}
     	public Object startElement(String name, Object value, Object type) {
     	public Object startElement(String name, Object value, Object type, Object parentElement) {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	public Object startFeature(String id, String name) {
     	public Object startFeature(String id, String name, Object layer) {
     		// TODO Auto-generated method stub
     		return null;
+    	}
-...
     		return null;
+    	}
     	public Object startLayer(String id, String name, String description, String srs) {
     	public Object startLayer(String id, String name, String description, String srs, Object parentLayer, Object bBox) {
     		// TODO Auto-generated method stub
     		return null;
+    	}
-...
     		return null;
+    	}

+     *
      * $Id$
      * $Log$
      * Revision 1.7  2007-04-14 16:06:13  jorpiell
      * Revision 1.8  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.7  2007/04/14 16:06:13  jorpiell
      * The writer handler has been updated
+     *
      * Revision 1.6  2007/04/13 07:17:54  jorpiell
-...
     public abstract class GPEParser {
     	private GPEErrorHandler errorHandler;
     	private GPEContentHandler contentHandler;
     	private File parserFile = null;
     	private Object prueba;
     	/**
+    	 *
     	 * AQUI SE IMPLEMENTA LA BASE PARA PODER PARSEAR CUALQUIER FICHERO:
     	 * -COMPROBAR SI EXISTE
     	 * -COMPROBAR CODIFICACI?N DEL XML
     	 * -ABRIR EN MODO LECTURA CON LA CODIFICACI?N CORRECTA
     	 * -CREAR EL PARSER DE XML ?"XSOM"?
     	 * -DETECTAR FORMATO FICHERO Y VERSI?N ?"EST? REGISTRADO"?
     	 * -SI EXISTE, LLAMADA AL PARSER DEL FORMATO CONCRETO
+    	 *
     	 * All the GPE parser must implement a constructor without
     	 * arguments.
     	 **/
     	public GPEParser(GPEContentHandler contents, GPEErrorHandler errors){
     		this.contentHandler = contents;
     		this.errorHandler=errors;
     	public GPEParser(){
+    	}
     	public void parse(File file) throws Exception{
     //		/***** para lectura en modo texto ****/
     //		GPEXMLReader.open();
     //		FileReader reader = null;
     //		try {
     //			reader = new FileReader(this.parserFile);
     //		} catch (FileNotFoundException e) {
     //			// TODO llamada a ??GPEErrorHandler?? para tratar la excepci?n o lanzamos desde aqu?
     //			// Fichero no existe.
     //		}
     //		BufferedReader br = new BufferedReader(reader);
     //		char[] buffer = new char[100];
     //		try {
     //			br.read(buffer);
     //		} catch (IOException e) {
     //			// TODO llamada a ??GPEErrorHandler?? para tratar la excepci?n o lanzamos desde aqu?
     //			// Error de lectura del buffer
     //		}
     //		StringBuffer st = new StringBuffer(new String(buffer));
     //
     //		// We find the encoding at the begining of the file
     //
     //		String searchText = "encoding=\"";
     //		int index = st.indexOf(searchText);
     //
     //		// If it find the encoding, it takes the new encoding, else it takes the default encoding "UTF-8"
     //		if (index>-1) {
     //			st.delete(0, index+searchText.length());
     //			encoding = st.substring(0, st.indexOf("\""));
     //		}
     //
     //		// make GML parser with the good enconding
     //		XMLSchemaParser parser = new XMLSchemaParser();
     //
     //		// setImput(file,encoding): it sets the encoding to read with the KXML parser
     //		try {
     //			parser.setInput(new FileInputStream(m_File), encoding);
     //		} catch (FileNotFoundException e) {
     //			// TODO Auto-generated catch block
     //			throw new GMLException(m_File.getName(),e);
     //		} catch (XmlPullParserException e) {
     //			// TODO Auto-generated catch block
     //			throw new GMLException(m_File.getName(),e);
     //		}
     //		return parser;
     	/**
     	 * Method to parse a file. It have to be implemented by all
     	 * the GPE Parsers. It cannot to throw any exception and it
     	 * cannot to return any value. In a future it could be
     	 * implemented like a independent thread
     	 * @param contents
     	 * Application ContentHandler
     	 * @param errors
     	 * Application ErrorsHandler
     	 * @param file
     	 * File to open
     	 * @throws Exception
     	 */
     	public void parse(GPEContentHandler contents, GPEErrorHandler errors, File file) {
     		this.contentHandler = contents;
     		this.errorHandler = errors;
+    	}
     	/**
-...
     	 * @return
     	 */
     	public abstract String[] getFormats();
     	/**
     	 * Gets the writer that will be used for the consumer
     	 * application to create the outputformat
     	 * @param format
     	 * Format to create the file
     	 * @throws FileNotFoundException
     	 * If the file doesn't exist
     	 * Return an array with all the versions that the driver
     	 * is able to read/write
     	 * @return
     	 */
     	public abstract GPEWriterHandler getWriter(String format);
     	public abstract String[] getVersions();
     	/**
     	 * @return the contentHandler

+     *
      * $Id$
      * $Log$
      * Revision 1.2  2007-04-12 17:06:42  jorpiell
      * Revision 1.3  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.2  2007/04/12 17:06:42  jorpiell
      * First GML writing tests
+     *
      * Revision 1.1  2007/04/11 08:46:21  csanchez
-...
      */
     public interface IGPEErrorHandler {
     	public Object badLayer(String error, Object layer);
     	public Object badElement(String error, Object element);
     	public Object badArea(String error, Object bBox);
     	public Object badGeometry(String error, Object geometry);
     	public Object badFeature(String error, Object feature);
     	public void addError(Throwable e);
     	public void addWarning(Throwable e);
+    }

      */
     public interface IGPEContentHandler {
     	//Bbox
     	public Object startBbox(String id, double[] x, double[] y, double[] z, String srs);
     	public void endBbox(Object bbox);
     	//Layer
     	public Object startLayer(String id, String name, String description, String srs);
     	public Object startLayer(String id, String name, String description,
     			String srs, Object parentLayer, Object bBox);
     	public void endLayer();
     	public void endLayer(Object layer);
     	public void addNameToLayer(String name);
     	public void addNameToLayer(String name, Object layer);
     	public void addDescriptionToLayer(String description);
     	public void addDescriptionToLayer(String description, Object layer);
     	public void addSrsToLayer(String srs, Object Layer);
     	public void addParentLayerToLayer(Object parent, Object layer);
     	public void addBboxToLayer(Object bbox, Object layer);
     	//Feature
     	public Object startFeature(String id, String name);
     	public Object startFeature(String id, String name, Object layer);
     	public void endFeature();
     	public void endFeature(Object feature);
     	public void addNameToFeature(String name);
     	public void addNameToFeature(String name, Object feature);
     	public void addFeatureToLayer(Object feature, Object layer);
     	//Element
     	public Object startElement(String name, Object value, Object type);
     	public Object startElement(String name, Object value, Object type, Object parentElement);
     	public void endElement();
     	public void endElement(Object element);
     	//Bbox
     	public Object startBbox(String id, double[] x, double[] y, double[] z, String srs);
     	public void addParentElementToElement(Object parent, Object element);
     	public void endBbox(Object bbox);
     	public void addElementToFeature(Object element, Object feature);
     	//Geometries
     	public Object startPoint(String id, double x, double y, double z, String srs);
     	public void endPoint();
     	public void endPoint(Object point);
     	public Object startLineString( String id, double[] x, double[] y, double[] z, String srs);
     	public void endLineString();
     	public void endLineString(Object lineString);
     	public Object startLinearRing(String id, double[] x, double[] y, double[] z, String srs);
     	public void endLinearRing();
     	public void endLinearRing(Object linearRing);
     	public Object startPolygon(String id, double[] x, double[] y, double[] z, String srs);
     	public void endPolygon();
     	public void endPolygon(Object Polygon);
     	public Object startInnerPolygon( String id, double[] x, double[] y, double[] z, String srs);
     	public void addInnerPolygonToPolygon(Object innerPolygon, Object Polygon);
     	public void endInnerPolygon();
     	public Object startInnerPolygon(String id, double[] x, double[] y, double[] z, String srs);
     	public void endInnerPolygon(Object innerPolygon);
     	public void addBboxToGeometry(Object bbox, Object geometry);
     	public void addGeometryToFeature(Object geometry, Object feature);
+    }

+     *
      * $Id$
      * $Log$
      * Revision 1.3  2007-04-14 16:06:13  jorpiell
      * Revision 1.4  2007-04-19 07:23:20  jorpiell
      * Add the add methods to teh contenhandler and change the register mode
+     *
      * Revision 1.3  2007/04/14 16:06:13  jorpiell
      * The writer handler has been updated
+     *
      * Revision 1.2  2007/04/13 13:14:55  jorpiell
-...
      */
     public abstract class GPEWriterHandler implements IGPEWriterHandler{
     	private String format = null;
     	private String version = null;
     	private String fileName = null;
     	private File file = null;
     	private File outputFile = null;
     	private GPEErrorHandler errorHandler = null;
     	public GPEWriterHandler(String format, GPEErrorHandler errorHandler){
     		this.format = format;
     		this.errorHandler = errorHandler;
     	public GPEWriterHandler(){
+    	}
     	/**
     	 * Gets the deafult writting version
     	 * @return
     	 */
     	public abstract String getDefaultVersion();
     	/**
     	 * Gets the deafult format
     	 * @return
     	 */
     	public abstract String getDefaultFormat();
     	/**
     	 * Creates the output file and
     	 * @return the file
     	 */
     	public File getOutputFile() {
     		if (outputFile == null){
     			if (fileName == null){
     				fileName = GPEDefaults.getProperty(GPEDefaults.DEFAULT_FILE_NAME);
+    			}
     			//TODO If the file ends with the format...
     			outputFile = new File(fileName + "." + getFormat().toLowerCase());
+    		}
     		return outputFile;
+    	}
     	/**
     	 * @return the errorHandler
     	 */
     	public GPEErrorHandler getErrorHandler() {
     		return errorHandler;
+    	}
     	/**
     	 * @param errorHandler the errorHandler to set
     	 */
     	public void setErrorHandler(GPEErrorHandler errorHandler) {
     		this.errorHandler = errorHandler;
+    	}
     	/**
     	 * @return the fileName
     	 */
     	public String getFileName() {
     		return fileName;
+    	}
     	/**
     	 * @param fileName the fileName to set
     	 */
     	public void setFileName(String fileName) {
     		this.fileName = fileName;
+    	}
     	/**
     	 * @return the format
     	 */
     	public String getFormat() {

| gvSIG desktop 1

Revision 11247