Cyberduck Mountain Duck CLI

Changeset 16920


Ignore:
Timestamp:
Feb 23, 2015 9:05:05 AM (7 years ago)
Author:
dkocher
Message:

Inline.

Location:
trunk/source/ch/cyberduck/core/transfer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/ch/cyberduck/core/transfer/DownloadTransfer.java

    r16585 r16920  
    181181            log.debug(String.format("Find transfer action for Resume=%s,Reload=%s", resumeRequested, reloadRequested));
    182182        }
    183         final TransferAction action;
    184183        if(resumeRequested) {
    185             // Force resume
    186             action = TransferAction.resume;
    187         }
    188         else if(reloadRequested) {
    189             action = TransferAction.forName(
     184            // Force resume by user or retry of failed transfer
     185            return TransferAction.resume;
     186        }
     187        if(reloadRequested) {
     188            return TransferAction.forName(
    190189                    PreferencesFactory.get().getProperty("queue.download.reload.action"));
    191190        }
    192         else {
    193             // Use default
    194             action = TransferAction.forName(
    195                     PreferencesFactory.get().getProperty("queue.download.action")
    196             );
    197         }
     191        // Use default
     192        final TransferAction action = TransferAction.forName(
     193                PreferencesFactory.get().getProperty("queue.download.action"));
    198194        if(action.equals(TransferAction.callback)) {
    199195            for(TransferItem download : roots) {
  • trunk/source/ch/cyberduck/core/transfer/UploadTransfer.java

    r16585 r16920  
    170170            log.debug(String.format("Find transfer action for Resume=%s,Reload=%s", resumeRequested, reloadRequested));
    171171        }
    172         final TransferAction action;
    173172        if(resumeRequested) {
    174             // Force resume
    175             action = TransferAction.resume;
     173            // Force resume by user or retry of failed transfer
     174            return TransferAction.resume;
    176175        }
    177176        else if(reloadRequested) {
    178             action = TransferAction.forName(PreferencesFactory.get().getProperty("queue.upload.reload.action"));
    179         }
    180         else {
    181             // Use default
    182             action = TransferAction.forName(PreferencesFactory.get().getProperty("queue.upload.action"));
    183         }
     177            return TransferAction.forName(
     178                    PreferencesFactory.get().getProperty("queue.upload.reload.action"));
     179        }
     180        // Use default
     181        final TransferAction action = TransferAction.forName(
     182                PreferencesFactory.get().getProperty("queue.upload.action"));
    184183        if(action.equals(TransferAction.callback)) {
    185184            for(TransferItem upload : roots) {
Note: See TracChangeset for help on using the changeset viewer.