/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 9564

     package com.iver.cit.gvsig.gui.filter;
     import junit.framework.TestCase;
     /* 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.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /**
      * @author Pablo Piqueras Bartolom? (p_queras@hotmail.com)
      */
     public class TestFilterExpressionFromWhereIsEmpty_Method extends TestCase {
     	/*
     	 *  (non-Javadoc)
     	 * @see junit.framework.TestCase#setUp()
     	 */
     	protected void setUp() throws Exception {
     		super.setUp();
+    	}
     	/*
     	 *  (non-Javadoc)
     	 * @see junit.framework.TestCase#tearDown()
     	 */
     	protected void tearDown() throws Exception {
     		super.tearDown();
+    	}
     	/**
     	 * Test 1 (valid)
     	 */
     	public void test1() {
     		String expression = new String("select * from 'gdbms144426c_10fc90fa1aa__7c18' where ;");
     		System.out.println("? Es vac?o el filtro en: " + expression + " ? ");
     		if (this.filterExpressionFromWhereIsEmpty(expression))
     			System.out.println("Si.");
     		else
     			System.out.println("No.");
+    	}
     	/**
     	 * Test 2 (invalid)
     	 */
     	public void test2() {
     		String expression = new String("select * from 'gdbms158fd70_10fc92ee61e__7c18' where layer < '61';");
     		System.out.println("? Es vac?o el filtro en: " + expression + " ? ");
     		if (this.filterExpressionFromWhereIsEmpty(expression))
     			System.out.println("Si.");
     		else
     			System.out.println("No.");
+    	}
     	/**
     	 * Returns true if the WHERE subconsultation of the filterExpression is empty ("")
+    	 *
     	 * @param expression An string
     	 * @return A boolean value
     	 */
     	private boolean filterExpressionFromWhereIsEmpty(String expression) {
     		String subExpression = expression.trim();
     		int pos;
     		// Remove last ';' if exists
     		if (subExpression.charAt(subExpression.length() -1) == ';')
     			subExpression = subExpression.substring(0, subExpression.length() -1).trim();
     		// If there is no 'where' clause
     		if ((pos = subExpression.indexOf("where")) == -1)
     			return false;
     		// If there is no subexpression in the WHERE clause -> true
     		subExpression = subExpression.substring(pos + 5, subExpression.length()).trim(); // + 5 is the length of 'where'
     		if ( subExpression.length() == 0 )
     			return true;
     		else
     			return false;
+    	}
+    }

     package com.iver.utiles.stringNumberUtilities;
     import junit.framework.TestCase;
     /* 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.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /**
      * Tests the methods of the class StringNumberUtilities
+     *
      * @author Pablo Piqueras Bartolom? (p_queras@hotmail.com)
      */
     public class TestStringNumberUtilities extends TestCase{
     	private String word;
     	/*
     	 *  (non-Javadoc)
     	 * @see junit.framework.TestCase#setUp()
     	 */
     	protected void setUp() throws Exception {
     		super.setUp();
     		word = new String();
+    	}
     	/*
     	 *  (non-Javadoc)
     	 * @see junit.framework.TestCase#tearDown()
     	 */
     	protected void tearDown() throws Exception {
     		super.tearDown();
+    	}
     	/**
     	 * A test
     	 */
     	public void test1() {
     		word = "2.3";
     		ShowText.showIsNumberText(word);
     		if (StringNumberUtilities.isNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test2() {
     		word = "a as wz rwa";
     		ShowText.showIsNumberText(word);
     		if (StringNumberUtilities.isNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test3() {
     		word = "2";
     		ShowText.showIsNumberText(word);
     		if (StringNumberUtilities.isNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test4() {
     		word = "";
     		ShowText.showIsNumberText(word);
     		if (StringNumberUtilities.isNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test5() {
     		word = "-2.3";
     		ShowText.showIsNumberText(word);
     		if (StringNumberUtilities.isNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test6() {
     		word = "-300";
     		ShowText.showIsNumberText(word);
     		if (StringNumberUtilities.isNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test7() {
     		word = "2.3";
     		ShowText.showIsNaturalText(word);
     		if (StringNumberUtilities.isNaturalNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test8() {
     		word = "334";
     		ShowText.showIsNaturalText(word);
     		if (StringNumberUtilities.isNaturalNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test9() {
     		word = "-2a3";
     		ShowText.showIsIntegerText(word);
     		if (StringNumberUtilities.isIntegerNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test10() {
     		word = "-23";
     		ShowText.showIsIntegerText(word);
     		if (StringNumberUtilities.isIntegerNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test11() {
     		word = "7";
     		ShowText.showIsIntegerText(word);
     		if (StringNumberUtilities.isIntegerNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test12() {
     		word = "2.3";
     		ShowText.showIsIntegerText(word);
     		if (StringNumberUtilities.isIntegerNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test13() {
     		word = "2.3";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test14() {
     		word = "37";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test15() {
     		word = "-4.6";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test16() {
     		word = "-8000";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test17() {
     		word = "-80k00";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test18() {
     		word = ".6";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test19() {
     		word = "-.6";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test20() {
     		word = "b-.6";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test21() {
     		word = "-c.6";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test22() {
     		word = "-.d6";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test23() {
     		word = "-.6e";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * A test
     	 */
     	public void test24() {
     		word = "+.6";
     		ShowText.showIsRealText(word);
     		if (StringNumberUtilities.isRealNumber(word)) {
     			ShowText.showYes();
+    		}
     		else {
     			ShowText.showNo();
     			fail();
+    		}
+    	}
     	/**
     	 * Shows a text sentence
+    	 *
     	 * @author Pablo Piqueras Bartolom? (p_queras@hotmail.com)
     	 */
     	private static class ShowText {
     		/**
     		 * Shows the text: Is number?
+    		 *
     		 * @param word An String
     		 */
     		public static void showIsNumberText(String word) {
     			System.out.print("? Es n?mero \'" + word + "\' ? ");
+    		}
     		/**
     		 * Shows the text: Is natural number?
+    		 *
     		 * @param word An String
     		 */
     		public static void showIsNaturalText(String word) {
     			System.out.print("? Es n?mero natural \'" + word + "\' ? ");
+    		}
     		/**
     		 * Shows the text: Is integer number?
+    		 *
     		 * @param word An String
     		 */
     		public static void showIsIntegerText(String word) {
     			System.out.print("? Es n?mero entero \'" + word + "\' ? ");
+    		}
     		/**
     		 * Shows the text: Is rational number?
+    		 *
     		 * @param word An String
     		 */
     		public static void showIsRealText(String word) {
     			System.out.print("? Es n?mero real \'" + word + "\' ? ");
+    		}
     		/**
     		 * Shows the text: Yes
+    		 *
     		 * @param word An String
     		 */
     		public static void showYes() {
     			System.out.println("Si.");
+    		}
     		/**
     		 * Shows the text: No
+    		 *
     		 * @param word An String
     		 */
     		public static void showNo() {
     			System.out.println("No.");
+    		}
+    	}
+    }

     package org.gvsig.remoteClient.gml.types;
     import java.util.Iterator;
     import java.util.LinkedHashMap;
     import java.util.Map;
     import java.util.Set;
     import java.util.Vector;
     import org.gvsig.remoteClient.gml.schemas.XMLElement;
     /* 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.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+     *
      * $Id$
      * $Log$
      * Revision 1.3  2006-12-29 18:05:20  jorpiell
      * Se tienen en cuenta los simpleTypes y los choices, adem?s de los atributos multiples
+     *
      * Revision 1.1  2006/12/22 11:25:04  csanchez
      * Nuevo parser GML 2.x para gml's sin esquema
+     *
      * Revision 1.7  2006/10/31 13:52:37  ppiqueras
      * Mejoras para uso de features complejas
+     *
      * Revision 1.6  2006/10/31 12:24:33  jorpiell
      * En caso de que el elemento forme parte de un tipo complejo tiene que tener un enlace al tipo del objeto padre
+     *
      * Revision 1.5  2006/10/10 12:52:28  jorpiell
      * Soporte para features complejas.
+     *
      * Revision 1.4  2006/10/02 08:33:49  jorpiell
      * Cambios del 10 copiados al head
+     *
      * Revision 1.2.2.1  2006/09/19 12:23:15  jorpiell
      * Ya no se depende de geotools
+     *
      * Revision 1.3  2006/09/18 12:08:55  jorpiell
      * Se han hecho algunas modificaciones que necesitaba el WFS
+     *
      * Revision 1.2  2006/08/29 08:43:13  jorpiell
      * Dos peque?os cambios para tener en cuenta las referencias
+     *
      * Revision 1.1  2006/08/10 12:00:49  jorpiell
      * Primer commit del driver de Gml
+     *
+     *
      */
     /**
      * This class implements an XSD complex type
+     *
      * @author Jorge Piera Llodr? (piera_jor@gva.es)
      * @author Carlos S?nchez Peri??n (sanchez_carper@gva.es)
+     *
      */
     public class XMLComplexType implements IXMLType {
     	public static int SEQUENCE_TYPE = 0;
     	public static int CHOICE_TYPE = 1;
     	private String type = null;
     	private LinkedHashMap attributes = null;
     	private int attributesType = 0;
     	public XMLComplexType(String type) {
     		super();
     		this.type = type;
     		attributes = new LinkedHashMap();
+    	}
     	/*
     	 *  (non-Javadoc)
     	 * @see org.gvsig.remoteClient.gml.schemas.IXMLType#getType()
     	 */
     	public int getType() {
     		return IXMLType.COMPLEX;
+    	}
     	/*
     	 *  (non-Javadoc)
     	 * @see org.gvsig.remoteClient.gml.schemas.IXMLType#getName()
     	 */
     	public String getName() {
     		return type;
+    	}
     	/**
     	 * @return Returns the subtypes.
     	 */
     	public Map getSubtypes() {
     		return attributes;
+    	}
     	/**
     	 * @param subtypes The subtypes to set.
     	 */
     	public void addSubtypes(XMLElement element) {
     		if (element.getName() != null){
     			this.attributes.put(element.getName(),element);
+    		}
+    	}
     	/**
+    	 *
     	 * @param name
     	 * @return
     	 */
     	public XMLElement getAttribute(String name){
     		return (XMLElement)attributes.get(name);
+    	}
     	/**
     	 * @return Returns the vElements.
     	 */
     	public Vector getAttributes() {
     		Set keys = attributes.keySet();
     		Iterator it = keys.iterator();
     		Vector vector = new Vector();
     		while(it.hasNext()){
     			vector.add(attributes.get((String)it.next()));
+    		}
     		return vector;
+    	}
     	public int getAttributesType() {
     		return attributesType;
+    	}
     	public void setAttributesType(int attributesType) {
     		this.attributesType = attributesType;
+    	}
+    }

     package com.iver.cit.gvsig.gui.panels.sqlQueryValidation;
     import junit.framework.TestCase;
     /* 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.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /**
      * Tests the methods of the class SQLQueryValidation
      *    (This class is made without inner static methods for don't create problems to Zql, in this way,
      *     it's possible to add more tests, with or without long queries.)
+     *
      * @author Pablo Piqueras Bartolom? (p_queras@hotmail.com)
      */
      public class TestSQLQueryValidation extends TestCase{
     	/*
     	 *  (non-Javadoc)
     	 * @see junit.framework.TestCase#setUp()
     	 */
     	protected void setUp() throws Exception {
     		super.setUp();
+    	}
     	/*
     	 *  (non-Javadoc)
     	 * @see junit.framework.TestCase#tearDown()
     	 */
     	protected void tearDown() throws Exception {
     		super.tearDown();
+    	}
     	/**
     	 * A test (Correct)
     	 */
     	public void test1() {
     		String query = "SELECT r.name, f.id FROM room r, flat f WHERE (r.user_name LIKE 'P%') AND (r.flat = f.id) AND (r.color_wall LIKE 'white') AND (r.height < 2.20);";
     		System.out.println("?Es v?lida '" + query + "' ?");
     		SQLQueryValidation sqlQueryValidation = new SQLQueryValidation(query, false);
     		if (sqlQueryValidation.validateQuery()) {
     			System.out.println("Yes.");
+    		}
     		else {
     			System.out.println("No.");
     			System.out.println(sqlQueryValidation.getErrorPositionAsMessage());
     			System.out.println(sqlQueryValidation.getErrorMessage());
     			fail();
+    		}
+    	}
     	/**
     	 * A test (Correct)
     	 */
     	public void test2() {
     		String query = "SELECT * FROM House;";
     		System.out.println("?Es v?lida '" + query + "' ?");
     		SQLQueryValidation sqlQueryValidation = new SQLQueryValidation(query, false);
     		if (sqlQueryValidation.validateQuery()) {
     			System.out.println("Yes.");
+    		}
     		else {
     			System.out.println("No.");
     			System.out.println(sqlQueryValidation.getErrorPositionAsMessage());
     			System.out.println(sqlQueryValidation.getErrorMessage());
     			fail();
+    		}
+    	}
     	/**
     	 * A test (Incorrect)
     	 */
     	public void test3() {
     		String query = "SELECT a* FROM House;";
     		System.out.println("?Es v?lida '" + query + "' ?");
     		SQLQueryValidation sqlQueryValidation = new SQLQueryValidation(query, false);
     		if (sqlQueryValidation.validateQuery()) {
     			System.out.println("Yes.");
+    		}
     		else {
     			System.out.println("No.");
     			System.out.println(sqlQueryValidation.getErrorPositionAsMessage());
     			System.out.println(sqlQueryValidation.getErrorMessage());
     			fail();
+    		}
+    	}
     	/**
     	 * A test (Correct)
     	 */
     	public void test4() {
     		String query = "SELECT * FROM House;";
     		System.out.println("?Es v?lida '" + query + "' ?");
     		SQLQueryValidation sqlQueryValidation = new SQLQueryValidation(query, false);
     		if (sqlQueryValidation.validateQuery()) {
     			System.out.println("Yes.");
+    		}
     		else {
     			System.out.println("No.");
     			System.out.println(sqlQueryValidation.getErrorPositionAsMessage());
     			System.out.println(sqlQueryValidation.getErrorMessage());
     			fail();
+    		}
+    	}
     	/**
     	 * A test (Correct)
     	 */
     	public void test5() {
     		String query = "r.level = f.level AND r.user_name LIKE \'P%\';";
     		System.out.println("?Es v?lida '" + query + "' ?");
     		SQLQueryValidation sqlQueryValidation = new SQLQueryValidation(query, true);
     		if (sqlQueryValidation.validateQuery()) {
     			System.out.println("Yes.");
+    		}
     		else {
     			System.out.println("No.");
     			System.out.println(sqlQueryValidation.getErrorPositionAsMessage());
     			System.out.println(sqlQueryValidation.getErrorMessage());
     			fail();
+    		}
+    	}
     	/**
     	 * A test (Incorrect)
     	 */
     	public void test6() {
     		String query = "r.level = f.level a e3 w 	q3 	 ?32	9'}97AND r.user_name LIKE \'P%\';";
     		System.out.println("?Es v?lida '" + query + "' ?");
     		SQLQueryValidation sqlQueryValidation = new SQLQueryValidation(query, true);
     		if (sqlQueryValidation.validateQuery()) {
     			System.out.println("Yes.");
+    		}
     		else {
     			System.out.println("No.");
     			System.out.println(sqlQueryValidation.getErrorPositionAsMessage());
     			System.out.println(sqlQueryValidation.getErrorMessage());
     			fail();
+    		}
+    	}
+     }

     package com.iver.cit.gvsig.gui.panels.sqlQueryValidation;
     import java.io.ByteArrayInputStream;
     import Zql.ZqlParser;
     import com.iver.andami.PluginServices;
     /* 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.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /**
      * Class for validate a complete query or the sentence of a query from WHERE
+     *
      * @author Pablo Piqueras Bartolom? (p_queras@hotmail.com)
      */
     public class SQLQueryValidation {
     	private String query;
     	private boolean onlyWhereStatement;
     	private int[] errorPosition; //[0] -> line, [1] -> column        ( (-1, -1) -> no error ) ( (-2, -2) -> error: query = null)
     	private String errorMessage;
     	private String errorPositionAsMessage;
     	private final String preQuery = "SELECT a FROM b WHERE ";
     	private final int preQueryLenght = preQuery.length();
     	/**
     	 * Default constructor with a parameter
+    	 *
     	 * @param _query The query to validate
     	 * @param _onlyWhereStatement If the query is only the part of WHERE ... in a query
     	 */
     	public SQLQueryValidation(String _query, boolean _onlyWhereStatement) {
     		query = new String(_query);
     		onlyWhereStatement = _onlyWhereStatement;
     		// By default no error position
     		errorPosition = new int[2];
     		errorPosition[0] = -1;
     		errorPosition[1] = -1;
     		errorPositionAsMessage = null;
     		// By default no error message
     		errorMessage = null;
+    	}
     	/**
     	 * Validates a query
+    	 *
     	 * Returns 'null' if there has been some error
     	 */
     	public boolean validateQuery() {
     		String completeQuery = new String();
     		// If the query is null -> error
     		if (query == null)	{
     			errorPosition[0] = -2;
     			errorPosition[1] = -2;
     			defineErrorPositionAsMessageAttribute(errorPosition);
     			errorMessage = new String( PluginServices.getText(null, "queryIsNull"));
     			return false;
+    		}
     		// If no query itsn't considered as a error
     		if ((query.compareTo("")) == 0) {
     			errorPosition[0] = -1;
     			errorPosition[1] = -1;
     			defineErrorPositionAsMessageAttribute(errorPosition);
     			errorMessage = null;
     			return true;
+    		}
     		if (onlyWhereStatement)
     			completeQuery = preQuery + query.trim().replaceAll("\"", "");
     		else
     			completeQuery = query.trim().replaceAll("\"", "");
     		if ((completeQuery.length() > 0) && (completeQuery.charAt(completeQuery.length() - 1) != ';'))
     			completeQuery += ";";
     		try {
     			// Starts the parser
     			ZqlParser p = new ZqlParser();
     			p.initParser(new ByteArrayInputStream(completeQuery.getBytes()));
     			// Analyzes the query
     			p.readStatement();
     			// If arrives here -> there has been no errors
     			errorPosition[0] = -1;
     			errorPosition[1] = -1;
     			defineErrorPositionAsMessageAttribute(errorPosition);
     			errorMessage = null;
     			return true;
     		} catch (Exception e) {
     			// Get the line an column where the syntax error starts
     			String line = new String(e.getMessage().substring(e.getMessage().indexOf("line"), e.getMessage().indexOf(',')));
     			line = line.substring(line.indexOf(' ')+1, line.length());
     			String column = new String(e.getMessage().substring(e.getMessage().indexOf("column"), e.getMessage().indexOf('.')));
     			column = column.substring(column.indexOf(' ')+1, column.length());
     			// Get the line an column of the error
     			errorPosition[0] = Integer.valueOf(line.trim()).intValue();
     			errorPosition[1] = Integer.valueOf(column.trim()).intValue();
     			if (onlyWhereStatement) {
     				this.errorPosition[1] -= this.preQueryLenght; // Substract the lenght of the pre-query added
+    			}
     			defineErrorPositionAsMessageAttribute(this.errorPosition);
     			// Defines the error message
     			errorMessage = e.getMessage();
     			return false;
+    		}
+    	}
     	/**
     	 * Returns an string with an error message if there has been an error, or 'null' if there hasn't been
+    	 *
     	 * @return An string or null
     	 */
     	public String getErrorMessage() {
     		return this.errorMessage;
+    	}
     	/**
     	 * Returns an string with a text describing the (first) position of the error
+    	 *
     	 * @return An string or null
     	 */
     	public String getErrorPositionAsMessage() {
     		return this.errorPositionAsMessage;
+    	}
     	/**
     	 * Returns the error position (line, column) or (-1, -1) if there hasn't been any error
+    	 *
     	 * @return An array of 2 integer values (first: line, second: column)
     	 */
     	public int[] getErrorPosition() {
     		return errorPosition;
+    	}
     	/**
     	 * Creates a message with information about the message
+    	 *
     	 * @param position An array with 2 elements: (row, column)
     	 */
     	private void defineErrorPositionAsMessageAttribute(int position[]) {
     		// Defines the error message
     		errorPositionAsMessage = new String( PluginServices.getText(null, "line") + ": " + errorPosition[0] + ", " + PluginServices.getText(null, "column") + ": " + errorPosition[1] );
+    	}
+    }

Also available in: Unified diff