Revision 1839

View differences:

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/arcview/ArcJoin.java
29 29
		//Se establece el origen de datos para las expresiones
30 30
		((Adapter) values[0]).getInstructionContext().setDs(tables[0]);
31 31
		((Adapter) values[0]).getInstructionContext().setFromTable(tables[0]);
32
		((Adapter) values[1]).getInstructionContext().setDs(tables[0]);
33
		((Adapter) values[1]).getInstructionContext().setFromTable(tables[0]);
34 32
		
35 33
		String fieldName0 = values[0].getFieldName();
36 34
		if  (fieldName0 == null) throw new QueryException("El valor debe ser una referencia a columna:" + Utilities.getText(((Adapter)values[0]).getEntity()));
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/GDBMSHandler.java
1 1
package com.iver.cit.gvsig.fmap.layers;
2 2

  
3
import java.util.Stack;
3
import com.iver.utiles.XMLEntity;
4 4

  
5 5
import org.xml.sax.Attributes;
6 6
import org.xml.sax.ContentHandler;
7 7
import org.xml.sax.Locator;
8 8
import org.xml.sax.SAXException;
9 9

  
10
import com.iver.utiles.XMLEntity;
10
import java.util.Stack;
11 11

  
12

  
12 13
/**
14
 * Maneja los eventos de GDBMS para obtener un XMLEntity con la
15
 * informaci?n
16
 *
13 17
 * @author Fernando Gonz?lez Cort?s
14 18
 */
15
public class GDBMSHandler implements ContentHandler{
16

  
19
public class GDBMSHandler implements ContentHandler {
17 20
	private Stack entities = new Stack();
18 21
	private XMLEntity last;
19
	
22

  
20 23
	/**
21 24
	 * @see org.xml.sax.ContentHandler#endDocument()
22 25
	 */
23 26
	public void endDocument() throws SAXException {
24 27
		// TODO Auto-generated method stub
25
		
26 28
	}
27 29

  
28 30
	/**
......
30 32
	 */
31 33
	public void startDocument() throws SAXException {
32 34
		// TODO Auto-generated method stub
33
		
34 35
	}
35 36

  
36 37
	/**
37 38
	 * @see org.xml.sax.ContentHandler#characters(char[], int, int)
38 39
	 */
39
	public void characters(char[] ch, int start, int length) throws SAXException {
40
	public void characters(char[] ch, int start, int length)
41
		throws SAXException {
40 42
		// TODO Auto-generated method stub
41
		
42 43
	}
43 44

  
44 45
	/**
45 46
	 * @see org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int)
46 47
	 */
47
	public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
48
	public void ignorableWhitespace(char[] ch, int start, int length)
49
		throws SAXException {
48 50
		// TODO Auto-generated method stub
49
		
50 51
	}
51 52

  
52 53
	/**
......
54 55
	 */
55 56
	public void endPrefixMapping(String prefix) throws SAXException {
56 57
		// TODO Auto-generated method stub
57
		
58 58
	}
59 59

  
60 60
	/**
......
62 62
	 */
63 63
	public void skippedEntity(String name) throws SAXException {
64 64
		// TODO Auto-generated method stub
65
		
66 65
	}
67 66

  
68 67
	/**
......
70 69
	 */
71 70
	public void setDocumentLocator(Locator locator) {
72 71
		// TODO Auto-generated method stub
73
		
74 72
	}
75 73

  
76 74
	/**
77
	 * @see org.xml.sax.ContentHandler#processingInstruction(java.lang.String, java.lang.String)
75
	 * @see org.xml.sax.ContentHandler#processingInstruction(java.lang.String,
76
	 * 		java.lang.String)
78 77
	 */
79
	public void processingInstruction(String target, String data) throws SAXException {
78
	public void processingInstruction(String target, String data)
79
		throws SAXException {
80 80
		// TODO Auto-generated method stub
81
		
82 81
	}
83 82

  
84 83
	/**
85
	 * @see org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String, java.lang.String)
84
	 * @see org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String,
85
	 * 		java.lang.String)
86 86
	 */
87
	public void startPrefixMapping(String prefix, String uri) throws SAXException {
87
	public void startPrefixMapping(String prefix, String uri)
88
		throws SAXException {
88 89
		// TODO Auto-generated method stub
89
		
90 90
	}
91 91

  
92 92
	/**
93
	 * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
93
	 * @see org.xml.sax.ContentHandler#endElement(java.lang.String,
94
	 * 		java.lang.String, java.lang.String)
94 95
	 */
95
	public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
96
	public void endElement(String namespaceURI, String localName, String qName)
97
		throws SAXException {
96 98
		last = (XMLEntity) entities.pop();
97 99
	}
98 100

  
99 101
	/**
100
	 * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
102
	 * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
103
	 * 		java.lang.String, java.lang.String, org.xml.sax.Attributes)
101 104
	 */
102
	public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
105
	public void startElement(String namespaceURI, String localName,
106
		String qName, Attributes atts) throws SAXException {
103 107
		//Configuramos el xml entity
104 108
		XMLEntity xml = new XMLEntity();
105 109
		xml.setName(qName);
110

  
106 111
		for (int i = 0; i < atts.getLength(); i++) {
107 112
			String name = atts.getQName(i);
108 113
			String value = atts.getValue(i);
109 114
			xml.putProperty(name, value);
110 115
		}
111
		
112
		if (!entities.isEmpty()){
116

  
117
		if (!entities.isEmpty()) {
113 118
			XMLEntity parent = (XMLEntity) entities.peek();
114 119
			parent.addChild(xml);
115 120
		}
116
		
121

  
117 122
		entities.push(xml);
118 123
	}
119 124

  
125
	/**
126
	 * DOCUMENT ME!
127
	 *
128
	 * @return DOCUMENT ME!
129
	 */
120 130
	public XMLEntity getXMLEntity() {
121 131
		return last;
122 132
	}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/GDBMSParser.java
7 7
import com.iver.utiles.XMLEntity;
8 8

  
9 9
/**
10
 * Genera eventos SAX relacionados con un XMLEntity
11
 * 
10 12
 * @author Fernando Gonz?lez Cort?s
11 13
 */
12 14
public class GDBMSParser {
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/LayerFactory.java
368 368
	 * @return DriverManager.
369 369
	 */
370 370
	public static DriverManager getDM() {
371
		if (driverManager == null) {
372
			initializeDriverManager();
373
		}
371
		initializeDriverManager();
374 372

  
375 373
		return driverManager;
376 374
	}

Also available in: Unified diff