Revision 8487 trunk/extensions/extGraph_predes/src/com/iver/cit/gvsig/graph/NetworkExtension.java

View differences:

NetworkExtension.java
68 68
import com.iver.cit.gvsig.geoprocess.core.fmap.FeaturePersisterProcessor2;
69 69
import com.iver.cit.gvsig.graph.core.IGraph;
70 70
import com.iver.cit.gvsig.graph.core.Network;
71
import com.iver.cit.gvsig.graph.core.NetworkLoader;
72
import com.iver.cit.gvsig.graph.core.NetworkRedLoader;
73
import com.iver.cit.gvsig.graph.core.NetworkWriter;
71
import com.iver.cit.gvsig.graph.core.loaders.NetworkLoader;
72
import com.iver.cit.gvsig.graph.core.loaders.NetworkRedLoader;
73
import com.iver.cit.gvsig.graph.core.writers.NetworkFileRedWriter;
74
import com.iver.cit.gvsig.graph.core.writers.NetworkGvTableWriter;
74 75
import com.iver.cit.gvsig.graph.gui.wizard.NetWizard;
75 76
import com.iver.cit.gvsig.graph.preferences.RoutePage;
76 77
import com.iver.cit.gvsig.project.documents.table.ProjectTable;
......
200 201

  
201 202

  
202 203
	private void generateNetwork(FLyrVect lyr) {
203
		NetworkWriter netBuilder = new NetworkWriter();
204
		NetworkGvTableWriter netBuilder = new NetworkGvTableWriter();
204 205
		// Por ahora, a pelo, pero hay que sacar un cuadro
205 206
		// de di?logo para hecer el mapping.
206 207
		// Tambi?n un cuadro de di?logo para seleccionar
......
213 214
			netBuilder.setFieldType(fieldType);
214 215
			netBuilder.setFieldDist(fieldDist);
215 216
			netBuilder.setFieldSense(fieldSense);
217
			netBuilder.setFieldCost(fieldCost);
216 218
			DbfWriter nodeWriter = new DbfWriter();
217 219
			nodeWriter.setFile(new File("c:/nodes.dbf"));
218 220

  
......
222 224
			netBuilder.setEdgeWriter(edgeWriter);
223 225
			netBuilder.setNodeWriter(nodeWriter);
224 226

  
225
			netBuilder.writeNetwork(true);
227
			netBuilder.writeNetwork();
226 228
		} catch (DriverException e1) {
227 229
			// TODO Auto-generated catch block
228 230
			e1.printStackTrace();
......
237 239
	class GenerateRedNetworkTask extends AbstractMonitorableTask{
238 240
		FLyrVect layer;
239 241
		File redFile;
240
		NetworkWriter netBuilder;
242
		NetworkFileRedWriter netBuilder;
241 243
		/**
242 244
		 * Constructor
243 245
		 * */
244
		GenerateRedNetworkTask(FLyrVect layer, File redFile, NetworkWriter netBuilder){
246
		GenerateRedNetworkTask(FLyrVect layer, File redFile, NetworkFileRedWriter netBuilder){
245 247
			this.layer = layer;
246 248
			this.redFile = redFile;
247 249
			this.netBuilder = netBuilder;
......
261 263
		}
262 264
		
263 265
		public void run() throws Exception {
264
			netBuilder.createRedFile(layer, redFile,  this);
266
			netBuilder.setLayer(layer);
267
			netBuilder.setCancellableMonitorable(this);
268
			netBuilder.setRedFile(redFile);
269
			netBuilder.writeNetwork();
265 270
			JOptionPane.showMessageDialog(null, PluginServices.getText(this, "done"));
266 271
		}	
267 272
		
......
283 288
	
284 289
	private void generateRedNetwork(FLyrVect lyr) {
285 290
		lyr.createSpatialIndex();
286
		NetworkWriter netBuilder = new NetworkWriter();
291
		NetworkFileRedWriter netBuilder = new NetworkFileRedWriter();
287 292
		// Por ahora, a pelo, pero hay que sacar un cuadro
288 293
		// de di?logo para hecer el mapping.
289 294
		// Tambi?n un cuadro de di?logo para seleccionar

Also available in: Unified diff