Revision 8181

View differences:

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/shp/DbaseFileWriterNIO.java
353 353
      return buffer.toString();
354 354
    }
355 355
  }
356

  
357

  
358
public void setCharset(Charset charset) {
359
	this.charset = charset;
360
	
361
}
356 362
  
357 363
  
358 364
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/writers/shp/ShpWriter.java
6 6
import java.io.RandomAccessFile;
7 7
import java.nio.channels.FileChannel;
8 8
import java.nio.channels.WritableByteChannel;
9
import java.nio.charset.Charset;
9 10
import java.sql.Types;
10 11

  
11 12
import com.iver.cit.gvsig.fmap.DriverException;
......
57 58
											FShape.POLYGON,
58 59
											FShape.TEXT
59 60
											};
61
	private Charset charset = Charset.forName("ISO-8859-1");
60 62

  
61 63
	public void setFile(File f)
62 64
	{
......
220 222
				myHeader.setNumRecords(0);
221 223
				dbfWrite = new DbaseFileWriterNIO(myHeader,
222 224
					(FileChannel) getWriteChannel(dbfPath));
225
				
226
				dbfWrite.setCharset(charset);
223 227

  
224 228
				record = new Object[myHeader.getNumFields()];
225 229
				numRows = 0;
......
393 397
		}
394 398
		return false;
395 399
	}
400
	
401
	public void setCharsetForWriting(Charset charset) {
402
		this.charset = charset;
403
	}
396 404

  
405
	public Charset getCharsetForWriting() {
406
		return charset;
407
	}
408

  
397 409
}
trunk/extensions/extCAD/src/com/iver/cit/gvsig/ExportTo.java
1 1
package com.iver.cit.gvsig;
2 2

  
3 3
import java.awt.Component;
4
import java.awt.Cursor;
4 5
import java.awt.geom.Point2D;
5 6
import java.io.File;
6 7
import java.io.IOException;
8
import java.nio.charset.Charset;
7 9
import java.sql.Connection;
8 10
import java.sql.DriverManager;
9 11
import java.sql.SQLException;
......
620 622
					lyrDef.setShapeType(layer.getShapeType());
621 623
					writer.setFile(newFile);
622 624
					writer.initialize(lyrDef);
625
					// CODIGO PARA EXPORTAR UN SHP A UN CHARSET DETERMINADO
626
					// ES UTIL PARA QUE UN DBF SE VEA CORRECTAMENTE EN EXCEL, POR EJEMPLO
627
//					Charset resul = (Charset) JOptionPane.showInputDialog((Component)PluginServices.getMDIManager().getActiveWindow(), 
628
//								PluginServices.getText(ExportTo.class, "select_charset_for_writing"),
629
//								"Charset", JOptionPane.QUESTION_MESSAGE, null, 
630
//								Charset.availableCharsets().values().toArray(),
631
//								writer.getCharsetForWriting().displayName());
632
//					if (resul == null)
633
//						return;
634
//					Charset charset = resul;
635
//					writer.setCharsetForWriting(charset);
623 636
					writeFeatures(mapContext, layer, writer, drv);
624 637

  
625 638
				}
trunk/extensions/extCAD/src/com/iver/cit/gvsig/gui/preferences/EditionPreferencePage.java
41 41
package com.iver.cit.gvsig.gui.preferences;
42 42

  
43 43
import java.awt.BorderLayout;
44
import java.awt.GridBagConstraints;
45
import java.awt.GridBagLayout;
46
import java.awt.event.ActionEvent;
47
import java.awt.event.ActionListener;
48 44
import java.awt.event.KeyEvent;
49 45
import java.awt.event.KeyListener;
50 46
import java.util.ArrayList;
......
64 60
import com.iver.andami.preferences.StoreException;
65 61
import com.iver.cit.gvsig.CADExtension;
66 62
import com.iver.cit.gvsig.EditionManager;
63
import com.iver.cit.gvsig.fmap.MapContext;
64
import com.iver.cit.gvsig.fmap.MapControl;
67 65
import com.iver.cit.gvsig.fmap.layers.FLayer;
68 66
import com.iver.cit.gvsig.fmap.layers.FLayers;
69 67
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
70 68
import com.iver.cit.gvsig.fmap.layers.SingleLayerIterator;
71 69
import com.iver.cit.gvsig.gui.cad.tools.SelectionCADTool;
72
import com.iver.cit.gvsig.layers.ILayerEdited;
73 70
import com.iver.cit.gvsig.layers.VectorialLayerEdited;
74 71

  
75 72
public class EditionPreferencePage extends AbstractPreferencePage {
......
94 91

  
95 92
	private FLayers layers;
96 93

  
94
	private MapContext mapContext;
95

  
97 96
	private class MyRecord {
98 97
		public Boolean bSelec = new Boolean(false);
99 98

  
......
372 371
				}
373 372

  
374 373
		} // while
374
		mapContext.redraw();
375 375
		try{
376 376
			SelectionCADTool.tolerance = Integer.parseInt(getJTxtTolerance().getText());
377 377

  
......
398 398
		return null;
399 399
	}
400 400

  
401
	public void setLayers(FLayers layers) {
401
	public void setMapContext(MapContext mc) {
402 402
		// addLayer(layers);
403
		this.layers = layers;
403
		this.mapContext = mc;
404
		this.layers = mc.getLayers();
404 405
		MyTableModel tm = new MyTableModel(layers);
405 406
		getJTableSnapping().setModel(tm);
406 407
		getJTxtTolerance().setText(String.valueOf(SelectionCADTool.tolerance));
trunk/extensions/extCAD/src/com/iver/cit/gvsig/gui/preferences/DialogEditionPreferences.java
160 160

  
161 161
		EditionPreferencePage edPref = new EditionPreferencePage();
162 162
		//panel.addPreferencePage(edPref);
163
		edPref.setLayers(layers);
163
		// edPref.setLayers(layers);
164 164

  
165 165
		dlg.getContentPane().add(panel);
166 166
		dlg.pack();

Also available in: Unified diff