Revision 9394

View differences:

branches/v10/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/writers/shp/ShpWriter.java
222 222
				myHeader.setNumRecords(0);
223 223
				dbfWrite = new DbaseFileWriterNIO(myHeader,
224 224
					(FileChannel) getWriteChannel(dbfPath));
225
				
225

  
226 226
				dbfWrite.setCharset(charset);
227 227

  
228 228
				record = new Object[myHeader.getNumFields()];
......
251 251
			// Revisamos que podemos escribir esa entidad
252 252
			// En un shpFile, podemos meter pol?gonos, pero que sean como
253 253
			// lineas. En cambio, en uno de puntos solo se pueden meter puntos
254
			if (canWriteGeometry(theGeom.getGeometryType()))
254
			if (canWriteGeometry(theGeom.getGeometryType()) || canWriteGeometry(gvSIG_geometryType))
255 255
			{
256 256
				for (int i=0; i < record.length; i++)
257 257
					record[i] = feat.getAttribute(i);
......
397 397
		}
398 398
		return false;
399 399
	}
400
	
400

  
401 401
	public void setCharsetForWriting(Charset charset) {
402 402
		this.charset = charset;
403 403
	}
branches/v10/extensions/extCAD/src/com/iver/cit/gvsig/StopEditing.java
21 21
import com.iver.cit.gvsig.fmap.edition.VectorialEditableAdapter;
22 22
import com.iver.cit.gvsig.fmap.layers.FLayer;
23 23
import com.iver.cit.gvsig.fmap.layers.FLayers;
24
import com.iver.cit.gvsig.fmap.layers.FLyrAnnotation;
24 25
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
25 26
import com.iver.cit.gvsig.fmap.rendering.VectorialLegend;
26 27
import com.iver.cit.gvsig.layers.VectorialLayerEdited;
......
70 71
					lyrEd.clearSelection();
71 72
					isStop=stopEditing(lv, mapControl);
72 73
					if (isStop){
73
						lv.removeLayerListener(edMan);						
74
						lv.removeLayerListener(edMan);
75
						if (lv instanceof FLyrAnnotation){
76
							FLyrAnnotation lva=(FLyrAnnotation)lv;
77
				            lva.setMapping(lva.getMapping());
78
						}
74 79
					}
75

  
76
					// return;
77 80
				}
78 81
			}
79 82
			if (isStop) {
......
81 84
				vista.hideConsole();
82 85
				vista.repaintMap();
83 86
				CADExtension.clearView();
84
				
87

  
85 88
			}
86 89
		}
87 90
		PluginServices.getMainFrame().enableControls();

Also available in: Unified diff