From dee5a1998af34baebcc2d5cfbf4a1fe27d3a01d6 Mon Sep 17 00:00:00 2001 From: "shingil.kang" Date: Tue, 4 Jun 2013 01:52:10 +0900 Subject: [PATCH] [Title] delete file column of connection explorer. [Desc.] [Issue] Change-Id: I0401a09c66cc07a72fd1db5edb1fdaee5f3da4b7 --- .../explorer/ConnectionExplorerLabelProvider.java | 65 ++++++++++------------ .../explorer/ConnectionExplorerPanel.java | 6 -- 2 files changed, 28 insertions(+), 43 deletions(-) diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerLabelProvider.java b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerLabelProvider.java index 89906dd..7ba60f2 100755 --- a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerLabelProvider.java +++ b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerLabelProvider.java @@ -26,7 +26,7 @@ package org.tizen.common.connection.explorer; import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.tizen.common.connection.ConnectionPlugin; @@ -34,7 +34,7 @@ import org.tizen.common.util.SWTUtil; import org.tizen.sdblib.IDevice; import org.tizen.sdblib.service.FileEntry; -public class ConnectionExplorerLabelProvider implements ITableLabelProvider +public class ConnectionExplorerLabelProvider extends LabelProvider { private final Image fileImage; @@ -44,7 +44,6 @@ public class ConnectionExplorerLabelProvider implements ITableLabelProvider private final Image otherImage; private final Image emulatorImage; private final Image deviceImage; - public static int index; public ConnectionExplorerLabelProvider(Display display) { @@ -59,53 +58,45 @@ public class ConnectionExplorerLabelProvider implements ITableLabelProvider } @Override - public Image getColumnImage(Object element, int columnIndex) + public Image getImage(Object element) { - if (columnIndex == 0) + if (element instanceof FileEntry) { - if (element instanceof FileEntry) - { - FileEntry entry = (FileEntry) element; - switch (entry.getType()) { - case File: - return fileImage; - case Link: - return fileLinkImage; - case Directory: - return folderImage; - case DirectoryLink: - return folderLinkImage; - case RootEmulator: - return emulatorImage; - case RootDevice: - return deviceImage; - default: - return otherImage; - } + FileEntry entry = (FileEntry) element; + switch (entry.getType()) { + case File: + return fileImage; + case Link: + return fileLinkImage; + case Directory: + return folderImage; + case DirectoryLink: + return folderLinkImage; + case RootEmulator: + return emulatorImage; + case RootDevice: + return deviceImage; + default: + return otherImage; } } return null; } @Override - public String getColumnText(Object element, int columnIndex) + public String getText(Object element) { if (element instanceof FileEntry) { FileEntry entry = (FileEntry) element; - switch (columnIndex) { - case 0: - if (entry.isRoot()) - { - return getDeviceSerialWithName(entry); - } - else - { - return entry.getName(); - } - default: - return null; + if (entry.isRoot()) + { + return getDeviceSerialWithName(entry); + } + else + { + return entry.getName(); } } else if (element instanceof IDevice) diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java index eadf54e..cf9f11e 100755 --- a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java +++ b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java @@ -157,12 +157,6 @@ public class ConnectionExplorerPanel implements IDeviceChangeListener, IDebugBri treeViewer = new TreeViewer(parent, SWT.MULTI | SWT.FULL_SELECTION); Tree tree = treeViewer.getTree(); - TreeColumn col = new TreeColumn(tree, SWT.LEFT); - col.setText(ConnectionUIMessages.Explorer_Tree_Header); - col.pack(); - - tree.setHeaderVisible(true); - contentProvider = new ConnectionExplorerContentProvider(); treeViewer.setContentProvider(contentProvider); treeViewer.setLabelProvider(new ConnectionExplorerLabelProvider(parent.getDisplay())); -- 2.7.4