swing/samples/net/sf/xframe/swing/demo JXTable2Applet.java,1.3,1.4 JXTableDemo3.java,1.1,1.2 JXTableDemo2.java,1.2,1.3
Kurt Riede <[email protected]> Sat, 02 Apr 2005 21:12:08 +0000
| Newsgroups | gmane.text.xml.xframe.xsddoc.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/xframe/swing/samples/net/sf/xframe/swing/demo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18511/samples/net/sf/xframe/swing/demo
Modified Files:
JXTable2Applet.java JXTableDemo3.java JXTableDemo2.java
Log Message:
code review
Index: JXTableDemo3.java
===================================================================
RCS file: /cvsroot/xframe/swing/samples/net/sf/xframe/swing/demo/JXTableDemo3.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JXTableDemo3.java 23 Mar 2005 15:28:48 -0000 1.1
--- JXTableDemo3.java 2 Apr 2005 21:12:06 -0000 1.2
***************
*** 12,15 ****
--- 12,16 ----
import javax.swing.JPanel;
import javax.swing.table.DefaultTableModel;
+ import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
***************
*** 40,48 ****
frame.getContentPane().setLayout(layout);
// create and add the table
! final TableModel model = new DefaultTableModel(15, 20);
! final JXTable jxTable = new JXTable();
jxTable.setFrozenColumns(2);
- jxTable.setModel(model);
-
frame.getContentPane().add(jxTable, BorderLayout.CENTER);
// create some buttons to change the number of frozen columns
--- 41,50 ----
frame.getContentPane().setLayout(layout);
// create and add the table
! final TableModel model1 = new DefaultTableModel(15, 3);
! final TableModel model2 = new DefaultTableModel(15, 13);
! final JXTable jxTable = new JXTable(model1);
! final TableColumnModel cm = jxTable.getColumnModel();
! jxTable.setModel(model2);
jxTable.setFrozenColumns(2);
frame.getContentPane().add(jxTable, BorderLayout.CENTER);
// create some buttons to change the number of frozen columns
Index: JXTable2Applet.java
===================================================================
RCS file: /cvsroot/xframe/swing/samples/net/sf/xframe/swing/demo/JXTable2Applet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JXTable2Applet.java 12 Nov 2004 11:37:17 -0000 1.3
--- JXTable2Applet.java 2 Apr 2005 21:12:06 -0000 1.4
***************
*** 126,130 ****
* returns true.
*/
! public JXTable2Applet(RootPaneContainer container) throws HeadlessException {
super();
init(container);
--- 126,130 ----
* returns true.
*/
! public JXTable2Applet(final RootPaneContainer container) throws HeadlessException {
super();
init(container);
***************
*** 134,138 ****
* @param frame2
*/
! private void init(RootPaneContainer theContainer) {
container = theContainer;
run();
--- 134,138 ----
* @param frame2
*/
! private void init(final RootPaneContainer theContainer) {
container = theContainer;
run();
***************
*** 236,240 ****
*/
private void addColumnGroupTable1() {
! final JXTableHeader header = (JXTableHeader) table1.getTableHeader();
final DefaultTableModel model = (DefaultTableModel) table1.getModel();
model.addColumn("from");
--- 236,240 ----
*/
private void addColumnGroupTable1() {
! final JXTableHeader header = table1.getTableHeader();
final DefaultTableModel model = (DefaultTableModel) table1.getModel();
model.addColumn("from");
***************
*** 255,259 ****
*/
private void addColumnGroupTable2() {
! final JXTableHeader header = (JXTableHeader) table2.getTableHeader();
final DefaultTableModel model = (DefaultTableModel) table2.getModel();
final TableColumnModel columnModel = table2.getColumnModel();
--- 255,259 ----
*/
private void addColumnGroupTable2() {
! final JXTableHeader header = table2.getTableHeader();
final DefaultTableModel model = (DefaultTableModel) table2.getModel();
final TableColumnModel columnModel = table2.getColumnModel();
***************
*** 307,311 ****
final TableColumnModel columnModel = table1.getColumnModel();
! final JXTableHeader header = (JXTableHeader) table1.getTableHeader();
for (int i = 0; i < columnGroupsCount; i++) {
columnModel.getColumn(2 * i + 0).setPreferredWidth(SCROLL_BLOCK_WIDTH / 2);
--- 307,311 ----
final TableColumnModel columnModel = table1.getColumnModel();
! final JXTableHeader header = table1.getTableHeader();
for (int i = 0; i < columnGroupsCount; i++) {
columnModel.getColumn(2 * i + 0).setPreferredWidth(SCROLL_BLOCK_WIDTH / 2);
***************
*** 335,339 ****
columnModel.getColumn(4).setPreferredWidth(40);
columnModel.getColumn(5).setPreferredWidth(40);
! final JXTableHeader header = (JXTableHeader) jxTable.getTableHeader();
for (int i = 0; i < columnGroupsCount; i++) {
columnModel.getColumn(TABLE_2_FROZEN_COLS + 3 * i + 0).setPreferredWidth(50);
--- 335,339 ----
columnModel.getColumn(4).setPreferredWidth(40);
columnModel.getColumn(5).setPreferredWidth(40);
! final JXTableHeader header = jxTable.getTableHeader();
for (int i = 0; i < columnGroupsCount; i++) {
columnModel.getColumn(TABLE_2_FROZEN_COLS + 3 * i + 0).setPreferredWidth(50);
***************
*** 406,411 ****
private class Saisons {
private List saisons = new ArrayList();
! public void addSaison(Saison saison) { saisons.add(saison); }
! public Saison getSaison(int i) {
if (saisons.size() <= i) {
for (int k = 0; k < i - saisons.size(); k++) {
--- 406,411 ----
private class Saisons {
private List saisons = new ArrayList();
! public void addSaison(final Saison saison) { saisons.add(saison); }
! public Saison getSaison(final int i) {
if (saisons.size() <= i) {
for (int k = 0; k < i - saisons.size(); k++) {
***************
*** 427,433 ****
private class Saison {
private List durations = new ArrayList();
! public void addDuration(Duration duration) { durations.add(duration); }
public int getDurationCount() { return durations.size(); }
! public Duration getDuration(int i) {
if (durations.size() <= i) {
for (int k = 0; k < i - durations.size(); k++) {
--- 427,433 ----
private class Saison {
private List durations = new ArrayList();
! public void addDuration(final Duration duration) { durations.add(duration); }
public int getDurationCount() { return durations.size(); }
! public Duration getDuration(final int i) {
if (durations.size() <= i) {
for (int k = 0; k < i - durations.size(); k++) {
***************
*** 443,449 ****
private Date to = null;
public Date getFrom() { return from; }
! public void setFrom(Date c) { this.from = c; }
public Date getTo() { return to; }
! public void setTo(Date c) { this.to = c; }
}
--- 443,449 ----
private Date to = null;
public Date getFrom() { return from; }
! public void setFrom(final Date c) { this.from = c; }
public Date getTo() { return to; }
! public void setTo(final Date c) { this.to = c; }
}
***************
*** 454,458 ****
private class SaisonsTableModel extends AbstractTableModel {
private Saisons saisons;
! public SaisonsTableModel(Saisons s) {
saisons = s;
}
--- 454,458 ----
private class SaisonsTableModel extends AbstractTableModel {
private Saisons saisons;
! public SaisonsTableModel(final Saisons s) {
saisons = s;
}
***************
*** 463,473 ****
return saisons.getMaxDurations();
}
! public boolean isCellEditable(int rowIndex, int columnIndex) {
return true;
}
! public Class getColumnClass(int columnIndex) {
return Date.class;
}
! public Object getValueAt(int rowIndex, int columnIndex) {
Saison saison = saisons.getSaison(columnIndex / 2);
if (saison != null) {
--- 463,473 ----
return saisons.getMaxDurations();
}
! public boolean isCellEditable(final int rowIndex, final int columnIndex) {
return true;
}
! public Class getColumnClass(final int columnIndex) {
return Date.class;
}
! public Object getValueAt(final int rowIndex, final int columnIndex) {
Saison saison = saisons.getSaison(columnIndex / 2);
if (saison != null) {
***************
*** 476,487 ****
if (columnIndex % 2 == 0) {
return duration.getFrom();
- } else {
- return duration.getTo();
}
}
}
return null;
}
! public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
Saison saison = saisons.getSaison(columnIndex / 2);
if (saison != null) {
--- 476,486 ----
if (columnIndex % 2 == 0) {
return duration.getFrom();
}
+ return duration.getTo();
}
}
return null;
}
! public void setValueAt(final Object aValue, final int rowIndex, final int columnIndex) {
Saison saison = saisons.getSaison(columnIndex / 2);
if (saison != null) {
***************
*** 496,500 ****
}
}
! public String getColumnName(int columnIndex) {
if (columnIndex % 2 == 0) {
return "from";
--- 495,499 ----
}
}
! public String getColumnName(final int columnIndex) {
if (columnIndex % 2 == 0) {
return "from";
Index: JXTableDemo2.java
===================================================================
RCS file: /cvsroot/xframe/swing/samples/net/sf/xframe/swing/demo/JXTableDemo2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JXTableDemo2.java 12 Nov 2004 11:37:17 -0000 1.2
--- JXTableDemo2.java 2 Apr 2005 21:12:06 -0000 1.3
***************
*** 176,180 ****
*/
private void addColumnGroupTable1() {
! final JXTableHeader header = (JXTableHeader) table1.getTableHeader();
final DefaultTableModel model = (DefaultTableModel) table1.getModel();
model.addColumn("from");
--- 176,180 ----
*/
private void addColumnGroupTable1() {
! final JXTableHeader header = table1.getTableHeader();
final DefaultTableModel model = (DefaultTableModel) table1.getModel();
model.addColumn("from");
***************
*** 186,191 ****
columnModel.addColumn(createColumn(numColumns, SCROLL_BLOCK_WIDTH / 2, "to"));
final ColumnGroup saisonGroup = new ColumnGroup("timeframe " + ((numColumns) / 2 + 1));
- saisonGroup.add(columnModel.getColumn(numColumns + 0));
saisonGroup.add(columnModel.getColumn(numColumns + 1));
header.addColumnGroup(saisonGroup);
}
--- 186,191 ----
columnModel.addColumn(createColumn(numColumns, SCROLL_BLOCK_WIDTH / 2, "to"));
final ColumnGroup saisonGroup = new ColumnGroup("timeframe " + ((numColumns) / 2 + 1));
saisonGroup.add(columnModel.getColumn(numColumns + 1));
+ saisonGroup.add(columnModel.getColumn(numColumns + 2));
header.addColumnGroup(saisonGroup);
}
***************
*** 195,199 ****
*/
private void addColumnGroupTable2() {
! final JXTableHeader header = (JXTableHeader) table2.getTableHeader();
final DefaultTableModel model = (DefaultTableModel) table2.getModel();
final TableColumnModel columnModel = table2.getColumnModel();
--- 195,199 ----
*/
private void addColumnGroupTable2() {
! final JXTableHeader header = table2.getTableHeader();
final DefaultTableModel model = (DefaultTableModel) table2.getModel();
final TableColumnModel columnModel = table2.getColumnModel();
***************
*** 206,212 ****
columnModel.addColumn(createColumn(numColumns + 2, 40, "P"));
final ColumnGroup columnGroup = new ColumnGroup("timeframe " + ((numColumns - TABLE_2_FROZEN_COLS) / 3 + 1));
- columnGroup.add(columnModel.getColumn(numColumns + 0));
columnGroup.add(columnModel.getColumn(numColumns + 1));
columnGroup.add(columnModel.getColumn(numColumns + 2));
header.addColumnGroup(columnGroup);
}
--- 206,212 ----
columnModel.addColumn(createColumn(numColumns + 2, 40, "P"));
final ColumnGroup columnGroup = new ColumnGroup("timeframe " + ((numColumns - TABLE_2_FROZEN_COLS) / 3 + 1));
columnGroup.add(columnModel.getColumn(numColumns + 1));
columnGroup.add(columnModel.getColumn(numColumns + 2));
+ columnGroup.add(columnModel.getColumn(numColumns + 3));
header.addColumnGroup(columnGroup);
}
***************
*** 245,249 ****
final TableColumnModel columnModel = table1.getColumnModel();
! final JXTableHeader header = (JXTableHeader) table1.getTableHeader();
for (int i = 0; i < columnGroupsCount; i++) {
columnModel.getColumn(2 * i + 0).setPreferredWidth(SCROLL_BLOCK_WIDTH / 2);
--- 245,249 ----
final TableColumnModel columnModel = table1.getColumnModel();
! final JXTableHeader header = table1.getTableHeader();
for (int i = 0; i < columnGroupsCount; i++) {
columnModel.getColumn(2 * i + 0).setPreferredWidth(SCROLL_BLOCK_WIDTH / 2);
***************
*** 273,277 ****
columnModel.getColumn(4).setPreferredWidth(40);
columnModel.getColumn(5).setPreferredWidth(40);
! final JXTableHeader header = (JXTableHeader) jxTable.getTableHeader();
for (int i = 0; i < columnGroupsCount; i++) {
columnModel.getColumn(TABLE_2_FROZEN_COLS + 3 * i + 0).setPreferredWidth(50);
--- 273,277 ----
columnModel.getColumn(4).setPreferredWidth(40);
columnModel.getColumn(5).setPreferredWidth(40);
! final JXTableHeader header = jxTable.getTableHeader();
for (int i = 0; i < columnGroupsCount; i++) {
columnModel.getColumn(TABLE_2_FROZEN_COLS + 3 * i + 0).setPreferredWidth(50);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click