Revision 24265 branches/v2_0_0_prep/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/DefaultCADTool.java

View differences:

DefaultCADTool.java
46 46
import java.awt.event.MouseEvent;
47 47
import java.awt.geom.AffineTransform;
48 48
import java.awt.geom.Point2D;
49
import java.awt.geom.Rectangle2D;
50 49
import java.awt.image.BufferedImage;
51 50
import java.util.ArrayList;
52 51
import java.util.Iterator;
......
54 53
import org.apache.log4j.Logger;
55 54
import org.gvsig.fmap.data.exceptions.DataException;
56 55
import org.gvsig.fmap.data.exceptions.ReadException;
57
import org.gvsig.fmap.data.feature.AbstractFeature;
58 56
import org.gvsig.fmap.data.feature.CommandsRecord;
57
import org.gvsig.fmap.data.feature.EditableFeature;
59 58
import org.gvsig.fmap.data.feature.Feature;
60 59
import org.gvsig.fmap.data.feature.FeatureSet;
61 60
import org.gvsig.fmap.data.feature.FeatureStore;
......
299 298
	 * @param geometry
300 299
	 *            DOCUMENT ME!
301 300
	 */
302
	public void modifyFeature(Feature feature, Feature oldFeature) {
303
		try {
304
			CommandsRecord cr=((FLyrVect)getVLE().getLayer()).getFeatureStore().getCommandsRecord();
305
			cr.update(feature, oldFeature);
306
		} catch (ReadException e) {
307
			NotificationManager.addError(e.getMessage(),e);
308
		}
309
		draw(((Geometry)feature.getDefaultGeometry()).cloneGeometry());
310
	}
301
//	public void modifyFeature(Feature feature, Feature oldFeature) {
302
//		try {
303
//			CommandsRecord cr=((FLyrVect)getVLE().getLayer()).getFeatureStore().getCommandsRecord();
304
//			cr.update(feature, oldFeature);
305
//		} catch (ReadException e) {
306
//			NotificationManager.addError(e.getMessage(),e);
307
//		}
308
//		draw(((Geometry)feature.getDefaultGeometry()).cloneGeometry());
309
//	}
311 310

  
312 311
	/**
313 312
	 * DOCUMENT ME!
......
321 320
//		int index = 0;
322 321
		try {
323 322
		FeatureStore featureStore = ((FLyrVect)getVLE().getLayer()).getFeatureStore();
324
		Feature feature=featureStore.createNewFeature(true);
325
		feature.editing();
326
		feature.setGeometry(featureStore.getDefaultFeatureType().getDefaultGeometryAttributeName(),geometry);
323
		EditableFeature eFeature=featureStore.createNewFeature(true);
324
		eFeature.setGeometry(featureStore.getDefaultFeatureType().getDefaultGeometryAttributeName(),geometry);
327 325
		for (int i = 0; i < values.length; i++) {
328
			feature.setAttribute(i,values[i]);
326
			eFeature.set(i,values[i]);
329 327
		}
330
			featureStore.insert(feature);
331
			return feature;
328
			featureStore.insert(eFeature);
329
			return eFeature;
332 330
		} catch (DataException e) {
333 331
			// TODO Auto-generated catch block
334 332
			e.printStackTrace();
......
393 391
		FeatureSet selection=null;
394 392
		try {
395 393
			selection = (FeatureSet)((FLyrVect)getVLE().getLayer()).getFeatureStore().getSelection();
394

  
395
			Iterator iterator=selection.iterator();
396
			while (iterator.hasNext()) {
397
				Feature feature = (Feature) iterator.next();
398

  
399
//				}
400
//				for (int i = 0; i < selectedRows.size(); i++) {
401
//				IRowEdited edRow = (IRowEdited) selectedRows.get(i);
402
//				IFeature feat = (IFeature) edRow.getLinkedRow();
403
				// IFeature feat = (IFeature) selectedRows.get(i);
404
				Geometry ig = ((Geometry)feature.getDefaultGeometry()).cloneGeometry();
405
				if (ig == null)
406
					continue;
407
				Handler[] handlers = ig.getHandlers(Geometry.SELECTHANDLER);
408
				FGraphicUtilities.DrawHandlers((Graphics2D) g, at, handlers,DefaultCADTool.handlerSymbol);
409
			}
396 410
		} catch (ReadException e) {
397 411
			// TODO Auto-generated catch block
398 412
			e.printStackTrace();
413
		} catch (DataException e) {
414
			// TODO Auto-generated catch block
415
			e.printStackTrace();
399 416
		}
400
		Iterator iterator=selection.iterator();
401
		while (iterator.hasNext()) {
402
			Feature feature = (Feature) iterator.next();
403

  
404
//		}
405
//		for (int i = 0; i < selectedRows.size(); i++) {
406
//			IRowEdited edRow = (IRowEdited) selectedRows.get(i);
407
//			IFeature feat = (IFeature) edRow.getLinkedRow();
408
			// IFeature feat = (IFeature) selectedRows.get(i);
409
			Geometry ig = ((Geometry)feature.getDefaultGeometry()).cloneGeometry();
410
			if (ig == null)
411
				continue;
412
			Handler[] handlers = ig.getHandlers(Geometry.SELECTHANDLER);
413
			FGraphicUtilities.DrawHandlers((Graphics2D) g, at, handlers,DefaultCADTool.handlerSymbol);
414
		}
415 417
	}
416 418

  
417 419
	public void setDescription(String[] currentdescriptions) {
......
455 457

  
456 458
	public void clearSelection() throws ReadException {
457 459
		VectorialLayerEdited vle = getVLE();
458
		FeatureSet selection=(FeatureSet)((FLyrVect)vle.getLayer()).getFeatureStore().getSelection();
460
		FeatureSet selection=null;
461
		try {
462
			selection = (FeatureSet)((FLyrVect)vle.getLayer()).getFeatureStore().getSelection();
463
		} catch (DataException e) {
464
			// TODO Auto-generated catch block
465
			e.printStackTrace();
466
		}
459 467
//		ArrayList selectedRow = vle.getSelectedRow();
460 468
		ArrayList selectedHandlers = vle.getSelectedHandler();
461
		selection.clear();
469
		selection.dispose();
462 470
		selectedHandlers.clear();
463 471
//		VectorialEditableAdapter vea = vle.getVEA();
464 472
//		FBitSet selection = vea.getSelection();

Also available in: Unified diff