You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/11/30 08:56:38 UTC
svn commit: r721780 - in /geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer: TransferListenerSupport.java monitor/ProgressSpinnerMonitor.java monitor/SimpleMonitor.java

Author: jdillon
Date: Sat Nov 29 23:56:38 2008
New Revision: 721780

URL: http://svn.apache.org/viewvc?rev=721780&view=rev
Log:
Tidy

Modified:
    geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/TransferListenerSupport.java
    geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinnerMonitor.java
    geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/SimpleMonitor.java

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/TransferListenerSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/TransferListenerSupport.java?rev=721780&r1=721779&r2=721780&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/TransferListenerSupport.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/TransferListenerSupport.java Sat Nov 29 23:56:38 2008
@@ -47,4 +47,16 @@
     public void transferFailed(final TransferEvent event) {
         log.trace("Transfer failure: {}", event);
     }
+
+    protected String renderRequestType(final TransferEvent event) {
+        assert event != null;
+
+        return event.getRequestType() == TransferEvent.RequestType.UPLOAD ? "Uploading" : "Downloading";
+    }
+
+    protected String renderRequestTypeFinished(final TransferEvent event) {
+        assert event != null;
+
+        return event.getRequestType() == TransferEvent.RequestType.UPLOAD ? "Uploaded" : "Downloaded";
+    }
 }
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinnerMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinnerMonitor.java?rev=721780&r1=721779&r2=721780&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinnerMonitor.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/ProgressSpinnerMonitor.java Sat Nov 29 23:56:38 2008
@@ -71,7 +71,7 @@
 
         spinner.reset();
 
-        String type = event.getRequestType() == TransferEvent.RequestType.UPLOAD ? "Uploading" : "Downloading";
+        String type = renderRequestType(event);
         String location = event.getLocation();
 
         String message = type + ": " + location;
@@ -106,7 +106,7 @@
         super.transferCompleted(event);
 
         long total = event.getContentLength();
-        String type = event.getRequestType() == TransferEvent.RequestType.UPLOAD ? "Uploaded" : "Downloaded";
+        String type = renderRequestTypeFinished(event);
         String bytes = total >= 1024 ? ( total / 1024 ) + "K" : total + "b";
 
         // HACK: pad at end just incase, should really blank the reset of the line

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/SimpleMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/SimpleMonitor.java?rev=721780&r1=721779&r2=721780&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/SimpleMonitor.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/transfer/monitor/SimpleMonitor.java Sat Nov 29 23:56:38 2008
@@ -53,7 +53,7 @@
 
         super.transferStarted(event);
 
-        String type = event.getRequestType() == TransferEvent.RequestType.UPLOAD ? "Uploading" : "Downloading";
+        String type = renderRequestType(event);
         String location = event.getLocation();
 
         String message = type + ": " + location;
@@ -69,7 +69,7 @@
         super.transferCompleted(event);
 
         long total = event.getContentLength();
-        String type = event.getRequestType() == TransferEvent.RequestType.UPLOAD ? "Uploaded" : "Downloaded";
+        String type = renderRequestTypeFinished(event);
         String bytes = total >= 1024 ? ( total / 1024 ) + "K" : total + "b";
 
         println(type + " " + bytes);