Author: adietish Date: 2010-12-01 12:00:31 -0500 (Wed, 01 Dec 2010) New Revision: 27070 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java Log: cleanup Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-12-01 16:55:37 UTC (rev 27069) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-12-01 17:00:31 UTC (rev 27070) @@ -14,9 +14,6 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -61,14 +58,9 @@ private Composite container; private Combo cloudSelector; private Label filterLabel; - @SuppressWarnings("unused") - private DeltaCloudImage selectedElement; - private DeltaCloud[] clouds; private DeltaCloud currCloud; - private ImageViewLabelAndContentProvider contentProvider; - private ModifyListener cloudModifyListener = new ModifyListener() { @Override @@ -81,8 +73,6 @@ currCloud = clouds[index]; storeSelectedCloud(); -// viewer.setInput(new DeltaCloudImage[0]); -// viewer.refresh(); Display.getCurrent().asyncExec(new Runnable() { @Override @@ -167,18 +157,8 @@ filterLabel.setText(CVMessages.getString(FILTERED_LABEL)); filterLabel.setToolTipText(CVMessages.getString(FILTERED_TOOLTIP)); - Composite tableArea = new Composite(container, SWT.NULL); - TableColumnLayout tableLayout = new TableColumnLayout(); - tableArea.setLayout(tableLayout); + Composite tableArea = createTableViewer(); - viewer = new TableViewer(tableArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); - Table table = viewer.getTable(); - table.setHeaderVisible(true); - table.setLinesVisible(true); - createColumns(tableLayout, table); - contentProvider = new ImageViewLabelAndContentProvider(); - viewer.setContentProvider(contentProvider); - viewer.setLabelProvider(contentProvider); ImageComparator comparator = new ImageComparator(0); viewer.setComparator(comparator); getSite().setSelectionProvider(viewer); @@ -220,11 +200,26 @@ // Create the help context id for the viewer's control PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "org.jboss.tools.deltacloud.ui.viewer"); hookContextMenu(); - hookSelection(); DeltaCloudManager.getDefault().addCloudManagerListener(this); } + private Composite createTableViewer() { + Composite tableArea = new Composite(container, SWT.NULL); + TableColumnLayout tableLayout = new TableColumnLayout(); + tableArea.setLayout(tableLayout); + + viewer = new TableViewer(tableArea, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); + Table table = viewer.getTable(); + table.setHeaderVisible(true); + table.setLinesVisible(true); + createColumns(tableLayout, table); + ImageViewLabelAndContentProvider provider = new ImageViewLabelAndContentProvider(); + viewer.setContentProvider(provider); + viewer.setLabelProvider(provider); + return tableArea; + } + private void createColumns(TableColumnLayout tableLayout, Table table) { for (int i = 0; i < ImageViewLabelAndContentProvider.Column.getSize(); ++i) { ImageViewLabelAndContentProvider.Column c = @@ -239,25 +234,11 @@ table.setSortDirection(SWT.NONE); } - private void hookSelection() { - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - @Override - public void selectionChanged(SelectionChangedEvent event) { - handleSelection(); - } - }); - } - private void hookContextMenu() { IMenuManager contextMenu = UIUtils.createContextMenu(viewer.getTable()); UIUtils.registerContributionManager(UIUtils.getContextMenuId(ID), contextMenu, viewer.getTable()); } - private void handleSelection() { - IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); - selectedElement = (DeltaCloudImage) selection.getFirstElement(); - } - @Override public void setFocus() { viewer.getTable().setFocus();