Revision 31169

View differences:

trunk/applications/appgvSIG/config/text.properties
372 372
En_pixels=En pixels
373 373
en_unidades=en unidades
374 374
enable_labeling=Habilitar etiquetado
375
Encoding=codificaci\u00f3n de caracteres
375
Encoding=Codificaci\u00f3n de caracteres
376 376
Encuadre=Encuadre
377 377
Encuadre_Vista=Encuadre sobre la vista
378 378
end_style=Estilo del extremo
trunk/applications/appgvSIG/config/text_en.properties
364 364
En_pixels=In pixels
365 365
en_unidades=in units
366 366
enable_labeling=Enable labeling
367
Encoding=encoding
367
Encoding=Encoding
368 368
Encuadre=Zoom Manager
369 369
Encuadre_Vista=View frame pan
370 370
end_style=End style
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/table/gui/TableProperties.java
49 49

  
50 50
import org.gvsig.gui.beans.AcceptCancelPanel;
51 51

  
52
import com.hardcode.driverManager.Driver;
52 53
import com.hardcode.gdbms.engine.data.driver.DriverException;
53 54
import com.iver.andami.PluginServices;
54 55
import com.iver.andami.ui.mdiManager.SingletonWindow;
55 56
import com.iver.andami.ui.mdiManager.WindowInfo;
57
import com.iver.cit.gvsig.fmap.drivers.dbf.DBFDriver;
58
import com.iver.cit.gvsig.fmap.drivers.shp.IndexedShpDriver;
56 59
import com.iver.cit.gvsig.project.documents.table.ProjectTable;
60
import javax.swing.JLabel;
61
import java.awt.Dimension;
57 62

  
58 63
/**
59 64
 * Dialogo de propiedades de la tabla
......
76 81
    private AcceptCancelPanel okCancelPanel = null;
77 82
    private javax.swing.JPanel jPanel = null;
78 83
    private javax.swing.JPanel jPanel1 = null;
84
	private JLabel jLabel4 = null;
85
	private JLabel lEncoding = null;
79 86
    /**
80 87
     * This is the default constructor
81 88
     *
......
316 323
     */
317 324
    private javax.swing.JPanel getJPanel() {
318 325
        if (jPanel == null) {
326
            jLabel4 = new JLabel();
327
            jLabel4.setText(PluginServices.getText(this,"Encoding")+": ");
319 328
            jPanel = new javax.swing.JPanel();
320 329

  
321 330
            /*
......
328 337

  
329 338
            GridLayout layout = new GridLayout(3,1);
330 339
            layout.setVgap(5);
340
            layout.setRows(4);
331 341
            jPanel.setLayout(layout);
332 342

  
333 343

  
334 344
            jPanel.add(getJLabel(), null);
335 345
            jPanel.add(getJLabel1(), null);
336 346
            jPanel.add(getJLabel2(), null);
337
            jPanel.setPreferredSize(new java.awt.Dimension(130, 80));
347
            jPanel.setPreferredSize(new Dimension(140, 100));
348
            jPanel.add(jLabel4, null);
338 349
        }
339 350

  
340 351
        return jPanel;
......
347 358
     */
348 359
    private javax.swing.JPanel getJPanel1() {
349 360
        if (jPanel1 == null) {
361
            GridLayout gridLayout = new GridLayout();
362
            gridLayout.setRows(4);
363
            lEncoding = new JLabel();
364
            Driver driver=table.getModelo().getOriginalDriver();
365
            if (driver instanceof IndexedShpDriver){
366
            	jLabel4.setVisible(true);
367
            	lEncoding.setVisible(true);
368
            	lEncoding.setText(((IndexedShpDriver)driver).getEncoding());
369
            }else if (driver instanceof DBFDriver){
370
            	jLabel4.setVisible(true);
371
            	lEncoding.setVisible(true);
372
            	lEncoding.setText(((DBFDriver)driver).getCharSet().name());
373
            }else{
374
            	jLabel4.setVisible(false);
375
            	lEncoding.setVisible(false);
376
            }
377
            lEncoding.setPreferredSize(new Dimension(190, 20));
350 378
            jPanel1 = new javax.swing.JPanel();
351 379

  
352
            java.awt.FlowLayout layFlowLayout8 = new java.awt.FlowLayout();
353
            layFlowLayout8.setAlignment(java.awt.FlowLayout.LEFT);
354
            jPanel1.setLayout(layFlowLayout8);
380
            jPanel1.setLayout(gridLayout);
381
            jPanel1.setPreferredSize(new Dimension(200, 100));
355 382
            jPanel1.add(getTxtName(), null);
356 383
            jPanel1.add(getTxtDate(), null);
357 384
            jPanel1.add(getTxtOwner(), null);
358
            jPanel1.setPreferredSize(new java.awt.Dimension(200, 80));
385
            jPanel1.add(lEncoding, null);
359 386
        }
360 387

  
361 388
        return jPanel1;
......
367 394
	public WindowInfo getWindowInfo() {
368 395
		WindowInfo m_viewinfo=new WindowInfo();
369 396
   		m_viewinfo.setTitle(PluginServices.getText(this, "propiedades_tabla"));
370
		m_viewinfo.setWidth(349);
371
		m_viewinfo.setHeight(375);
397
		m_viewinfo.setWidth(360);
398
		m_viewinfo.setHeight(390);
372 399

  
373 400
		return m_viewinfo;
374 401
	}
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/legend/gui/VectorialUniqueValue.java
435 435
			rs = ((FLyrVect) layer).getRecordset(); // Todos los campos, tambi?n los de uniones
436 436
			logger.debug("rs.start()");
437 437
			rs.start();
438
			int fieldCount=rs.getFieldCount();
439
			String[] nomFields = new String[fieldCount];
438 440

  
439
			String[] nomFields = new String[rs.getFieldCount()];
440

  
441
			for (int i = 0; i < rs.getFieldCount(); i++) {
441
			for (int i = 0; i < fieldCount; i++) {
442 442
				nomFields[i] = rs.getFieldName(i).trim();
443 443
			}
444 444

  
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/legend/gui/General.java
76 76
import org.gvsig.gui.beans.swing.GridBagLayoutPanel;
77 77
import org.gvsig.gui.beans.swing.JBlank;
78 78

  
79
import com.hardcode.driverManager.Driver;
79 80
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
80 81
import com.hardcode.gdbms.engine.data.driver.DriverException;
81 82
import com.iver.andami.PluginServices;
82 83
import com.iver.andami.messages.NotificationManager;
83 84
import com.iver.cit.gvsig.fmap.drivers.DBLayerDefinition;
84 85
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
86
import com.iver.cit.gvsig.fmap.drivers.dbf.DBFDriver;
87
import com.iver.cit.gvsig.fmap.drivers.shp.IndexedShpDriver;
85 88
import com.iver.cit.gvsig.fmap.edition.VectorialEditableAdapter;
86 89
import com.iver.cit.gvsig.fmap.layers.FLayer;
87 90
import com.iver.cit.gvsig.fmap.layers.FLyrDefault;
......
158 161
//		aux2.add(getPnlProperties());
159 162
//		aux2.add(getPnlHyperLink());
160 163
//		aux.addComponent("", aux2);
161
		
164

  
162 165
		aux.addComponent("", getPnlProperties());
163 166

  
164 167

  
......
629 632

  
630 633
					info = info + PluginServices.getText(this,"Origen_de_datos") + ": ";
631 634
					if (rv instanceof VectorialFileAdapter) {
632
						info = info + "\n" + rv.getDriver().getName() + "\n" +
635
						Driver driver=rv.getDriver();
636
						info = info + "\n" + driver.getName() + "\n" +
633 637
						PluginServices.getText(this,"fichero") +": " + ((VectorialFileAdapter)rv).getFile();
634 638

  
639
						if (driver instanceof IndexedShpDriver){
640
							info = info + "\n" + PluginServices.getText(this,"Encoding") + ": " +
641
							((IndexedShpDriver)driver).getEncoding();
642
			            }
635 643
					} else if (rv instanceof VectorialDBAdapter) {
636 644
						DBLayerDefinition dbdef = ((VectorialDBAdapter) rv).getLyrDef();
637 645
						info = info + "\n" + rv.getDriver().getName() + "\n";
......
653 661
					info+="\n" + PluginServices.getText(this,"type")+ ": "+((FLyrVect)layer).getTypeStringVectorLayer() + "\n";
654 662

  
655 663

  
664

  
665

  
656 666
				} else {
657 667
					info = info + PluginServices.getText(this,"Origen_de_datos") + ": " + layer.getName();
658 668
				}

Also available in: Unified diff