Revision 1685

View differences:

org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.swing/org.gvsig.raster.swing.impl/src/main/java/org/gvsig/raster/swing/impl/pagedtable/PagedTablePanel.java
147 147
		if (jTable == null) {
148 148
			jTable = new PagedJTable(model, modelLoader.getColumnNames());
149 149
			jTable.addMouseListener(this);
150
			jTable.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
150 151
			
151 152
			TableColumn column = null;
152 153

  
......
156 157
				column.setResizable(true);
157 158
				if (modelLoader.getColumnWidths() == null)
158 159
					column.setPreferredWidth(widthPerColumn);
159
				else
160
					column.setPreferredWidth(modelLoader.getColumnWidths()[i]);
160
				else {
161
					if(modelLoader.getColumnWidths()[i] > 0)
162
						column.setMaxWidth(modelLoader.getColumnWidths()[i]);
163
				}
164
				if(modelLoader.getCellEditorForColumn(i) != null)
165
					column.setCellEditor(modelLoader.getCellEditorForColumn(i));
166
				if(modelLoader.getRenderForColumn(i) != null)
167
					column.setCellRenderer(modelLoader.getRenderForColumn(i));
161 168
			}
162 169
		}
163 170

  
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.swing/org.gvsig.raster.swing.impl/src/main/java/org/gvsig/raster/swing/impl/pagedtable/ModelLoaderImpl.java
50 50
	}
51 51
	
52 52
	public TableCellEditor getCellEditorForColumn(int column) {
53
		return editorList.get(column);
53
		if(editorList.size() > column)
54
			return editorList.get(column);
55
		return null;
54 56
	}
55 57

  
56 58
	public TableCellRenderer getRenderForColumn(int column) {
57
		return renderList.get(column);
59
		if(renderList.size() > column)
60
			return renderList.get(column);
61
		return null;
58 62
	}
59 63

  
60 64
	public TableModel getTableModel() {
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.swing/org.gvsig.raster.swing.impl/src/test/java/org/gvsig/raster/swing/impl/pagedtable/TestPagedTablePanel.java
43 43

  
44 44
	public TestPagedTablePanel() {
45 45
		String[] c = new String[]{"uno", "dos", "tres"};
46
		int[] sizes = new int[]{40, 80, -1};
46 47
		GCPModel model = new GCPModel(c);
47 48
		CheckBoxColumnRenderer r = new CheckBoxColumnRenderer(this);
48 49
		CheckBoxColumnEditor e = new CheckBoxColumnEditor();
......
50 51
		modelLoader.setRenderForColumn(0, r);
51 52
		modelLoader.setCellEditorForColumn(0, e);
52 53
		modelLoader.setColumnNames(c);
54
		modelLoader.setColumnWidths(sizes);
53 55
		desc = new PagedTableImpl(modelLoader);
54 56
		JPanel table = (JPanel)desc.getComponent();
55 57
		table.setBorder(BorderFactory.createTitledBorder("My table"));
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.swing/org.gvsig.raster.swing.impl/src/test/java/org/gvsig/raster/swing/impl/pagedtable/GCPModel.java
49 49
		super.setValueAt(value, row, col);
50 50
	}
51 51

  
52
	public void addNewLine() {
53
		addNew();
54
	}
52 55
	public void addNew() {
53 56
		Object[] line = new Object[nColumns];
54 57
		line[0] = new Boolean(true);
org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.swing/org.gvsig.raster.swing.api/src/main/java/org/gvsig/raster/swing/pagedtable/TableModel.java
32 32
 */
33 33
public interface TableModel{
34 34
    public Object[] getNewLine();
35
    public void addNewLine();
35 36
}

Also available in: Unified diff