← Back to branch summary

~piastucki/bzr-eclipse/execute-bit

« back to all changes in this revision

Viewing changes to org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/CommitDialog.java

  • Committer: Piotr Piastucki
  • Date: 2013-06-11 18:05:50 UTC
  • mfrom: (297.1.1 bzr-eclipse-pp)
  • Revision ID: piotr_piastucki-20130611180550-ip8izfw7jxdw8g2c
Merge lp:~piastucki/bzr-eclipse/shelve-unknown-files

Show diffs side-by-side

added added

removed removed

Lines of Context:
org.vcs.bazaar.eclipse.ui/src/org/vcs/bazaar/eclipse/ui/dialogs/CommitDialog.java
64
64
import org.eclipse.swt.widgets.ToolBar;
65
65
import org.eclipse.swt.widgets.ToolItem;
66
66
import org.eclipse.ui.model.IWorkbenchAdapter;
67
 
import org.vcs.bazaar.client.BazaarStatusKind;
68
67
import org.vcs.bazaar.client.commandline.commands.options.Option;
69
68
import org.vcs.bazaar.client.commandline.syntax.ICommitOptions;
70
69
import org.vcs.bazaar.eclipse.core.history.BazaarFileHistory;
429
428
        return filtered;
430
429
    }
431
430
 
432
 
    private List<IResource> getToAddList(List<IBzrResourceStatus> list) {
433
 
        List<IResource> filtered = new ArrayList<IResource>();
434
 
        for (IBzrResourceStatus status : list) {
435
 
            if (status.contains(BazaarStatusKind.UNKNOWN)) {
436
 
                filtered.add(status.getResource().getIResource());
437
 
            }
438
 
        }
439
 
        return filtered;
440
 
    }
441
 
 
442
431
        private void enableOkButton() {
443
432
                String text = commitTextBox.getText(); 
444
433
                boolean enabled = text != null && !text.trim().isEmpty();
452
441
     */
453
442
    @Override
454
443
    protected void okPressed() {
455
 
        filesToAdd = getToAddList(resourceSelectionComposite.getSelection());
 
444
        filesToAdd = resourceSelectionComposite.getSelectionUnknownResources();
456
445
        filesToCommit = getCommitList(resourceSelectionComposite.getSelection());
457
446
        commitMessage = commitTextBox.getText();
458
447
        pushAfterCommit = pushAfterCommitButton.getSelection();