From 5206d634e19b438830d310dcdf27f606b5ad3cdc Mon Sep 17 00:00:00 2001 From: "shingil.kang" Date: Thu, 2 Jan 2014 17:21:38 +0900 Subject: [PATCH] TOOLS: fixed a bug where a error occurs when explorering the folder having block/character device files. show N/A in size label when expressing block/character device files in connection explorer. Change-Id: I7dc779144822f05e4ba8caa5f6fca6948c83314b Signed-off-by: shingil.kang --- .../explorer/ConnectionExplorerFileLabelProvider.java | 7 ++++++- .../common/connection/explorer/ConnectionExplorerPanel.java | 6 ++++-- .../src/org/tizen/sdblib/service/FileEntryType.java | 11 +++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerFileLabelProvider.java b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerFileLabelProvider.java index 28e9d59..9fd0c5b 100644 --- a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerFileLabelProvider.java +++ b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerFileLabelProvider.java @@ -16,6 +16,7 @@ public class ConnectionExplorerFileLabelProvider implements ITableLabelProvider private final Image otherImage; private final Image emulatorImage; private final Image deviceImage; + public static final String UNKNOWN_FILE_SIZE = "N/A"; public ConnectionExplorerFileLabelProvider() { @@ -43,7 +44,11 @@ public class ConnectionExplorerFileLabelProvider implements ITableLabelProvider if (column_index == 2) { - return ConnectionExplorerPanel.sizeFormat.format(Long.valueOf(((FileEntry) element).getSize())); + FileEntry fileEntry = (FileEntry) element; + if (fileEntry.getType().isDevice()) + return UNKNOWN_FILE_SIZE; + else + return ConnectionExplorerPanel.sizeFormat.format(Long.valueOf(fileEntry.getSize())); } return ""; 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 df9aa48..5f507e0 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 @@ -283,7 +283,8 @@ public class ConnectionExplorerPanel implements IDeviceChangeListener, IDebugBri totalLength -= 1; continue; } - totalSize += Integer.valueOf(entry.getSize()); + if(!entry.getType().isDevice()) + totalSize += Integer.valueOf(entry.getSize()); } } @@ -496,7 +497,8 @@ public class ConnectionExplorerPanel implements IDeviceChangeListener, IDebugBri totalLength -= 1; continue; } - totalSize += Integer.valueOf(entry.getSize()); + if(!entry.getType().isDevice()) + totalSize += Integer.valueOf(entry.getSize()); } } ConnectionExplorer.statusLineManager.setMessage(totalLength + " object(s) selected. Size:" + sizeFormat.format(totalSize) + " bytes"); diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntryType.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntryType.java index bd2f754..780c1ef 100644 --- a/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntryType.java +++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntryType.java @@ -189,6 +189,17 @@ FileEntryType return isDirectory() || isRoot(); } + /** + * Return if type is BlockDevice or CharacterDevice + * @return {@code true} if type is BlockDevice or CharacterDevice + */ + public + boolean + isDevice() + { + return equals( BlockDevice ) || equals( CharacterDevice ); + } + /* (non-Javadoc) * @see java.lang.Enum#toString() */ -- 2.7.4