summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-08-21 17:02:04 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-08-21 17:02:04 (GMT)
commit20da7216a801872ed60c9166b1a0045d67bcc047 (patch)
tree2fe4a3806d2871ce9e3f4d470db1c5642a040903
parentb3c496c47b0b7dc095cfa62676d93bf5e9f78fe0 (diff)
downloadQCG-Data-20da7216a801872ed60c9166b1a0045d67bcc047.zip
QCG-Data-20da7216a801872ed60c9166b1a0045d67bcc047.tar.gz
QCG-Data-20da7216a801872ed60c9166b1a0045d67bcc047.tar.bz2
[#947] x/x file transfer counts and byte count labels seem reversed or repeated
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java2
-rw-r--r--idrop-swing/release_notes.txt2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/FieldFormatHelper.java8
-rw-r--r--idrop-swing/src/main/resources/idrop.properties4
4 files changed, 9 insertions, 7 deletions
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
index 78b1a41..c4f4021 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
@@ -1,4 +1,4 @@
package org.irods.jargon.idrop.lite;
public final class Version {
- public static String VERSION="20120817-1319";
+ public static String VERSION="20120820-1410";
}
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt
index 77b7f94..1a6fc41 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -61,6 +61,8 @@ Note that the following bug and feature requests are logged in GForge with relat
[#943] startp errors LL windows
+[#947] x/x file transfer counts and byte count labels seem reversed or repeated
+
==Features==
*info view for local file system
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/FieldFormatHelper.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/FieldFormatHelper.java
index 5631d1a..11f5ab4 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/FieldFormatHelper.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/FieldFormatHelper.java
@@ -27,9 +27,9 @@ public class FieldFormatHelper {
*/
public static String formatByteProgress(long totalBytes, long currentBytes, int padValue) {
StringBuilder sb = new StringBuilder();
- sb.append(formatFileLength(totalBytes));
- sb.append(" / ");
sb.append(formatFileLength(currentBytes));
+ sb.append(" / ");
+ sb.append(formatFileLength(totalBytes));
return IRODSPasswordUtilities.pad(sb.toString(), padValue, ' ');
}
@@ -41,9 +41,9 @@ public class FieldFormatHelper {
*/
public static String formatFileProgress(int totalFiles, int currentFiles, int padValue) {
StringBuilder sb = new StringBuilder();
- sb.append(totalFiles);
- sb.append(" / ");
sb.append(currentFiles);
+ sb.append(" / ");
+ sb.append(totalFiles);
sb.append(" files");
return IRODSPasswordUtilities.pad(sb.toString(), padValue, ' ');
}
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 4ab949d..a4bca0f 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -1,7 +1,7 @@
idrop.version=1.0.1
policy.aware=false
-login.preset=false
-force.mode=false
+login.preset=true
+force.mode=true
force.no.synch=false
advanced.view=true
show.startup=true