|
From: Dan C. <cor...@us...> - 2010-01-10 11:49:06
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2040/src/org/jcommander/ui/filepanel/controls Modified Files: FileTableControl.java Added Files: FileTableContentProvider.java Log Message: Temporary workaround: do not use SWT.VIRTUAL and the --- NEW FILE: FileTableContentProvider.java --- package org.jcommander.ui.filepanel.controls; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.jcommander.ui.filepanel.model.FileControlModel; import org.jcommander.ui.filepanel.model.IFileControlModelListener; public class FileTableContentProvider implements IStructuredContentProvider, IFileControlModelListener { private FileControlModel model; private TableViewer viewer; public Object[] getElements(Object inputElement) { if (null != this.model) { return this.model.getElements(); } return new Object[] {}; } public void dispose() { // TODO Auto-generated method stub } public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (null != oldInput) { ((FileControlModel) oldInput).removeListener(this); } if (null != newInput) { ((FileControlModel) newInput).addListener(this); } this.model = ((FileControlModel) newInput); this.viewer = (TableViewer) viewer; } public void contentChanged() { viewer.refresh(); } } Index: FileTableControl.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTableControl.java,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** FileTableControl.java 6 Aug 2006 10:33:26 -0000 1.91 --- FileTableControl.java 10 Jan 2010 11:48:56 -0000 1.92 *************** *** 93,97 **** protected Image COLUMN_SORT_DESCENDING_IMAGE; ! IContentProvider contentProvider = new DeferredContentProvider(sortedColumnComparator); class FileTableLabelProvider implements ITableLabelProvider, ITableColorProvider { --- 93,97 ---- protected Image COLUMN_SORT_DESCENDING_IMAGE; ! IContentProvider contentProvider = new FileTableContentProvider(); class FileTableLabelProvider implements ITableLabelProvider, ITableColorProvider { *************** *** 256,261 **** | SWT.H_SCROLL | SWT.SINGLE ! | SWT.FULL_SELECTION ! | SWT.VIRTUAL); table.setFont(JFaceResources.getDialogFont()); --- 256,261 ---- | SWT.H_SCROLL | SWT.SINGLE ! | SWT.FULL_SELECTION); ! // | SWT.VIRTUAL); table.setFont(JFaceResources.getDialogFont()); *************** *** 720,723 **** --- 720,724 ---- public void setModel(FileControlModel model) { this.model = model; + tableViewer.setInput(this.model); model.setControl(this); } *************** *** 835,839 **** } ! ((DeferredContentProvider)contentProvider).setSortOrder(sortedColumnComparator); updateColumnTitles(absoluteColumnIndex); --- 836,840 ---- } ! // ((DeferredContentProvider)contentProvider).setSortOrder(sortedColumnComparator); updateColumnTitles(absoluteColumnIndex); |