[jtcfrost-svn] SF.net SVN: jtcfrost: [2854] trunk/frost-wot/source/frost/util/ CopyToClipboard.java

[Mailing l. f. S. c. m. <jtc...@li...>]

Revision: 2854
          http://jtcfrost.svn.sourceforge.net/jtcfrost/?rev=2854&view=rev
Author:   bback
Date:     2007-10-23 12:20:10 -0700 (Tue, 23 Oct 2007)

Log Message:
-----------
- fixed 'Copy keys and filenames' for shared files

Modified Paths:
--------------
    trunk/frost-wot/source/frost/util/CopyToClipboard.java

Modified: trunk/frost-wot/source/frost/util/CopyToClipboard.java
===================================================================
--- trunk/frost-wot/source/frost/util/CopyToClipboard.java	2007-10-23 09:43:23 UTC (rev 2853)
+++ trunk/frost-wot/source/frost/util/CopyToClipboard.java	2007-10-23 19:20:10 UTC (rev 2854)
@@ -154,15 +154,18 @@
     private static void appendKeyAndFilename(final StringBuilder textToCopy, String key, final String filename, final String keyNotAvailableMessage) {
         if (key == null) {
             key = keyNotAvailableMessage;
-        }
-        textToCopy.append(key);
-        if( key.startsWith("CHK@") ) {
-            // CHK, append filename if there is not already a filename
+            // no key, its a shared file
+            textToCopy.append(filename);
+        } else if( key.startsWith("CHK@") ) {
+            textToCopy.append(key);
+            // CHK, append filename if there is not already a filename in the key
             if( key.indexOf('/') < 0 ) {
                 textToCopy.append("/");
                 textToCopy.append(filename);
             }
+        } else {
+            // else for KSK,SSK,USK: don't append filename, key contains all needed information
+            textToCopy.append(key);
         }
-        // else for KSK,SSK,USK: don't append filename, key is enough
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.