From: Mailing l. f. S. c. m. <jtc...@li...> - 2007-07-02 13:16:09
|
Revision: 2683 http://jtcfrost.svn.sourceforge.net/jtcfrost/?rev=2683&view=rev Author: bback Date: 2007-07-02 06:16:07 -0700 (Mon, 02 Jul 2007) Log Message: ----------- - the filename tooltip in upload table or download table shows the time when the item was added/started/finished Modified Paths: -------------- trunk/frost-wot/source/frost/fileTransfer/download/DownloadTableFormat.java trunk/frost-wot/source/frost/fileTransfer/download/FrostDownloadItem.java trunk/frost-wot/source/frost/fileTransfer/upload/UploadTableFormat.java trunk/frost-wot/source/frost/storage/perst/FrostFilesStorage.java Modified: trunk/frost-wot/source/frost/fileTransfer/download/DownloadTableFormat.java =================================================================== --- trunk/frost-wot/source/frost/fileTransfer/download/DownloadTableFormat.java 2007-07-02 11:24:44 UTC (rev 2682) +++ trunk/frost-wot/source/frost/fileTransfer/download/DownloadTableFormat.java 2007-07-02 13:16:07 UTC (rev 2683) @@ -178,6 +178,51 @@ } } + private class ShowNameTooltipRenderer extends BaseRenderer { + public ShowNameTooltipRenderer() { + super(); + } + public Component getTableCellRendererComponent( + JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + + String tooltip = null; + ModelItem item = modelTable.getItemAt(row); //It may be null + if (item != null) { + FrostDownloadItem downloadItem = (FrostDownloadItem) item; + StringBuilder sb = new StringBuilder(); + sb.append("<html>").append(downloadItem.getFilename()); + if( downloadItem.getDownloadAddedMillis() > 0 ) { + sb.append("<br>Added: "); + sb.append(DateFun.FORMAT_DATE_VISIBLE.print(downloadItem.getDownloadAddedMillis())); + sb.append(" "); + sb.append(DateFun.FORMAT_TIME_VISIBLE.print(downloadItem.getDownloadAddedMillis())); + } + if( downloadItem.getDownloadStartedMillis() > 0 ) { + sb.append("<br>Started: "); + sb.append(DateFun.FORMAT_DATE_VISIBLE.print(downloadItem.getDownloadStartedMillis())); + sb.append(" "); + sb.append(DateFun.FORMAT_TIME_VISIBLE.print(downloadItem.getDownloadStartedMillis())); + } + if( downloadItem.getDownloadFinishedMillis() > 0 ) { + sb.append("<br>Finished: "); + sb.append(DateFun.FORMAT_DATE_VISIBLE.print(downloadItem.getDownloadFinishedMillis())); + sb.append(" "); + sb.append(DateFun.FORMAT_TIME_VISIBLE.print(downloadItem.getDownloadFinishedMillis())); + } + sb.append("</html>"); + tooltip = sb.toString(); + } + setToolTipText(tooltip); + return this; + } + } + private class ShowStateContentTooltipRenderer extends BaseRenderer { public ShowStateContentTooltipRenderer() { super(); @@ -756,7 +801,7 @@ RightAlignRenderer rightAlignRenderer = new RightAlignRenderer(); ShowContentTooltipRenderer showContentTooltipRenderer = new ShowContentTooltipRenderer(); - columnModel.getColumn(3).setCellRenderer(showContentTooltipRenderer); // filename + columnModel.getColumn(3).setCellRenderer(new ShowNameTooltipRenderer()); // filename columnModel.getColumn(4).setCellRenderer(rightAlignRenderer); // size columnModel.getColumn(5).setCellRenderer(new ShowStateContentTooltipRenderer()); // state columnModel.getColumn(6).setCellRenderer(baseRenderer); // lastReceived Modified: trunk/frost-wot/source/frost/fileTransfer/download/FrostDownloadItem.java =================================================================== --- trunk/frost-wot/source/frost/fileTransfer/download/FrostDownloadItem.java 2007-07-02 11:24:44 UTC (rev 2682) +++ trunk/frost-wot/source/frost/fileTransfer/download/FrostDownloadItem.java 2007-07-02 13:16:07 UTC (rev 2683) @@ -270,7 +270,7 @@ return downloadAddedTime; } - public long getDownloadFinishedTime() { + public long getDownloadFinishedMillis() { return downloadFinishedTime; } @@ -278,7 +278,7 @@ this.downloadFinishedTime = downloadFinishedTime; } - public long getDownloadStartedTime() { + public long getDownloadStartedMillis() { return downloadStartedTime; } Modified: trunk/frost-wot/source/frost/fileTransfer/upload/UploadTableFormat.java =================================================================== --- trunk/frost-wot/source/frost/fileTransfer/upload/UploadTableFormat.java 2007-07-02 11:24:44 UTC (rev 2682) +++ trunk/frost-wot/source/frost/fileTransfer/upload/UploadTableFormat.java 2007-07-02 13:16:07 UTC (rev 2683) @@ -152,7 +152,52 @@ return this; } } + + private class ShowNameTooltipRenderer extends BaseRenderer { + public ShowNameTooltipRenderer() { + super(); + } + public Component getTableCellRendererComponent( + JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + String tooltip = null; + ModelItem item = modelTable.getItemAt(row); //It may be null + if (item != null) { + FrostUploadItem uploadItem = (FrostUploadItem) item; + StringBuilder sb = new StringBuilder(); + sb.append("<html>").append(uploadItem.getFilename()); + if( uploadItem.getUploadAddedMillis() > 0 ) { + sb.append("<br>Added: "); + sb.append(DateFun.FORMAT_DATE_VISIBLE.print(uploadItem.getUploadAddedMillis())); + sb.append(" "); + sb.append(DateFun.FORMAT_TIME_VISIBLE.print(uploadItem.getUploadAddedMillis())); + } + if( uploadItem.getUploadStartedMillis() > 0 ) { + sb.append("<br>Started: "); + sb.append(DateFun.FORMAT_DATE_VISIBLE.print(uploadItem.getUploadStartedMillis())); + sb.append(" "); + sb.append(DateFun.FORMAT_TIME_VISIBLE.print(uploadItem.getUploadStartedMillis())); + } + if( uploadItem.getUploadFinishedMillis() > 0 ) { + sb.append("<br>Finished: "); + sb.append(DateFun.FORMAT_DATE_VISIBLE.print(uploadItem.getUploadFinishedMillis())); + sb.append(" "); + sb.append(DateFun.FORMAT_TIME_VISIBLE.print(uploadItem.getUploadFinishedMillis())); + } + sb.append("</html>"); + tooltip = sb.toString(); + } + setToolTipText(tooltip); + return this; + } + } + private class ShowStateContentTooltipRenderer extends BaseRenderer { public ShowStateContentTooltipRenderer() { super(); @@ -618,7 +663,7 @@ RightAlignRenderer numberRightRenderer = new RightAlignRenderer(); ShowContentTooltipRenderer showContentTooltipRenderer = new ShowContentTooltipRenderer(); - columnModel.getColumn(2).setCellRenderer(showContentTooltipRenderer); // filename + columnModel.getColumn(2).setCellRenderer(new ShowNameTooltipRenderer()); // filename columnModel.getColumn(3).setCellRenderer(numberRightRenderer); // filesize columnModel.getColumn(4).setCellRenderer(new ShowStateContentTooltipRenderer()); // state columnModel.getColumn(5).setCellRenderer(showContentTooltipRenderer); // path Modified: trunk/frost-wot/source/frost/storage/perst/FrostFilesStorage.java =================================================================== --- trunk/frost-wot/source/frost/storage/perst/FrostFilesStorage.java 2007-07-02 11:24:44 UTC (rev 2682) +++ trunk/frost-wot/source/frost/storage/perst/FrostFilesStorage.java 2007-07-02 13:16:07 UTC (rev 2683) @@ -142,8 +142,8 @@ pi.enabled = (dlItem.isEnabled()==null?true:dlItem.isEnabled().booleanValue()); pi.state = dlItem.getState(); pi.downloadAddedTime = dlItem.getDownloadAddedMillis(); - pi.downloadStartedTime = dlItem.getDownloadStartedTime(); - pi.downloadFinishedTime = dlItem.getDownloadFinishedTime(); + pi.downloadStartedTime = dlItem.getDownloadStartedMillis(); + pi.downloadFinishedTime = dlItem.getDownloadFinishedMillis(); pi.retries = dlItem.getRetries(); pi.lastDownloadStopTime = dlItem.getLastDownloadStopTime(); pi.gqIdentifier = dlItem.getGqIdentifier(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |