Revision 29326 branches/v2_0_0_prep/extensions/extGPE-gvSIG/src/org/gvsig/fmap/dal/store/gpe/GPEStoreProvider.java

View differences:

GPEStoreProvider.java
29 29

  
30 30
import java.io.File;
31 31

  
32
import org.gvsig.fmap.dal.DataParameters;
32
import org.gvsig.fmap.dal.DataStoreParameters;
33 33
import org.gvsig.fmap.dal.DataTypes;
34 34
import org.gvsig.fmap.dal.exception.DataException;
35 35
import org.gvsig.fmap.dal.exception.InitializeException;
......
42 42
import org.gvsig.fmap.dal.feature.spi.FeatureProvider;
43 43
import org.gvsig.fmap.dal.feature.spi.FeatureReferenceProviderServices;
44 44
import org.gvsig.fmap.dal.feature.spi.FeatureSetProvider;
45
import org.gvsig.fmap.dal.feature.spi.FeatureStoreProvider;
46
import org.gvsig.fmap.dal.feature.spi.FeatureStoreProviderServices;
47 45
import org.gvsig.fmap.dal.resource.file.FileResource;
48 46
import org.gvsig.fmap.dal.resource.spi.ResourceConsumer;
49 47
import org.gvsig.fmap.dal.resource.spi.ResourceProvider;
48
import org.gvsig.fmap.dal.spi.DataStoreProviderServices;
50 49
import org.gvsig.fmap.dal.store.gpe.handlers.FmapContentHandler;
51 50
import org.gvsig.fmap.dal.store.gpe.handlers.FmapErrorHandler;
52 51
import org.gvsig.fmap.geom.primitive.Envelope;
......
54 53
import org.gvsig.gpe.parser.GPEErrorHandler;
55 54
import org.gvsig.gpe.parser.GPEParser;
56 55
import org.gvsig.tools.ToolsLocator;
57
import org.gvsig.tools.dynobject.DelegatedDynObject;
58 56
import org.gvsig.tools.dynobject.DynClass;
59 57
import org.gvsig.tools.dynobject.DynField;
58
import org.gvsig.tools.dynobject.DynObject;
60 59
import org.gvsig.tools.dynobject.DynObjectManager;
61 60

  
62 61
/**
......
74 73
	private boolean isOpen = false;
75 74
	private GPEParser parser = null;
76 75

  
77
	public GPEStoreProvider() {
78
		super();
76
	public GPEStoreProvider(DataStoreParameters params,
77
			DataStoreProviderServices storeServices)
78
	throws InitializeException {
79
		this(params,storeServices,ToolsLocator.getDynObjectManager()
80
				.createDynObject(DYNCLASS));
79 81
	}
80 82

  
81
	public GPEStoreProvider(DataParameters params)
82
	throws InitializeException {
83
		this();
84
		this.gpeParams = (GPEStoreParameters) params;
85
		this.metadata = (DelegatedDynObject) ToolsLocator
86
		.getDynObjectManager().createDynObject(DYNCLASS);
83
	protected GPEStoreProvider(DataStoreParameters params,
84
			DataStoreProviderServices storeServices, DynObject metadata)
85
			throws InitializeException {
87 86

  
88
		this.metadata.setDynValue("Envelope", null);
87
		super(params, storeServices, metadata);
89 88

  
89
		this.setDynValue("Envelope", null);
90

  
90 91
		m_Fich = getGPEParameters().getFile();
91 92
		gpeResource = this.createResource(FileResource.NAME,
92 93
				new Object[] { m_Fich.getAbsolutePath() });
93 94
		gpeResource.addConsumer(this);
94
	}
95

  
96
	/*
97
	 * (non-Javadoc)
98
	 * @see org.gvsig.fmap.dal.feature.spi.AbstractFeatureStoreProvider#initialize(org.gvsig.fmap.dal.feature.spi.FeatureStoreProviderServices)
99
	 */
100
	public FeatureStoreProvider initialize(FeatureStoreProviderServices store) throws InitializeException{
101
		super.initialize(store);
102 95
		this.initFeatureType();
103
		return this;
104 96
	}
105 97

  
106 98
	protected void initFeatureType() throws InitializeException {
......
112 104
	}
113 105

  
114 106
	private GPEStoreParameters getGPEParameters() {
115
		return this.gpeParams;
107
		return (GPEStoreParameters) this.getParameters();
116 108
	}
117 109

  
118 110
	/* (non-Javadoc)
......
157 149

  
158 150
	/*
159 151
	 * (non-Javadoc)
160
	 * 
152
	 *
161 153
	 * @see org.gvsig.fmap.dal.feature.spi.FeatureStoreProvider#getFeatureProviderByReference(org.gvsig.fmap.dal.feature.spi.FeatureReferenceProviderServices)
162 154
	 */
163 155
	public FeatureProvider getFeatureProviderByReference(
164 156
			FeatureReferenceProviderServices reference) throws DataException {
165
		return this.getFeatureProviderByReference(reference, this.store
157
		return this.getFeatureProviderByReference(reference, this
158
				.getFeatureStore()
166 159
				.getDefaultFeatureType());
167 160
	}
168 161

  
......
216 209
			//parser = GPERegister.createParser(m_Fich.toURI());
217 210
			parser = new  GPEGmlSFP0Parser();
218 211
			GPEErrorHandler errorHandler = new FmapErrorHandler();
219
			parser.parse(new FmapContentHandler(errorHandler, store, this, m_Fich) ,
212
			parser.parse(new FmapContentHandler(errorHandler,
213
					getStoreServices(), this, m_Fich),
220 214
					errorHandler,
221 215
					m_Fich.toURI());
222 216
		} catch (Exception e) {
......
265 259
	 */
266 260
	public Envelope getEnvelope() throws DataException {
267 261
		this.open();
268
		return (Envelope) this.metadata.getDynValue("Envelope");
262
		return (Envelope) this.getDynValue("Envelope");
269 263
	}
270 264

  
271 265
	public void setEnvelope(Envelope envelope) {
272
		this.metadata.setDynValue("Envelope", envelope);
266
		this.setDynValue("Envelope", envelope);
273 267
	}
274 268

  
275 269

  

Also available in: Unified diff