~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/ShelveDialog.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:
10
10
import java.util.ArrayList;
11
11
import java.util.List;
12
12
 
 
13
import org.eclipse.core.resources.IResource;
13
14
import org.eclipse.jface.dialogs.Dialog;
14
15
import org.eclipse.jface.dialogs.IDialogConstants;
15
16
import org.eclipse.jface.layout.GridDataFactory;
46
47
        private List<IBzrResourceStatus> shelveableResources;
47
48
        private List<IBzrResourceStatus> selectedResources;
48
49
        private List<IBzrResourceStatus> filesToShelve;
 
50
        private List<IResource> filesToAdd;
49
51
        private String message;
50
52
        private boolean isWholeBranch;
51
53
 
87
89
                resourcesComposite.setResources(shelveableResources);
88
90
                resourcesComposite.setSelection(selectedResources);
89
91
                resourcesComposite.refreshTableViewer();
90
 
                resourcesComposite.addUntrackedFilesFilter();
 
92
                resourcesComposite.removeUntrackedFilesFilter();
91
93
                resourcesComposite.addCheckStateListener(new ICheckStateListener() {
92
94
                        public void checkStateChanged(CheckStateChangedEvent event) {
93
95
                                enableOkButton();
131
133
        @Override
132
134
        protected void okPressed() {
133
135
                filesToShelve = resourcesComposite.getSelection();
 
136
                filesToAdd = resourcesComposite.getSelectionUnknownResources();
134
137
                isWholeBranch = wholeBranchEnabled ? wholeBranch.getSelection() : false;
135
138
                message = messageTextBox.getText();
136
139
                super.okPressed();
162
165
                return filesToShelve;
163
166
        }
164
167
 
 
168
        public List<IResource> getFilesToAdd() {
 
169
                return filesToAdd;
 
170
        }
 
171
        
165
172
        public int open(List<IBzrResourceStatus> shelveableResources, List<IBzrResourceStatus> selectedResources,
166
173
                        boolean shouldBlock) {
167
174
                setShellStyle(SWT.RESIZE | SWT.MODELESS | SWT.CLOSE | SWT.MAX | SWT.BORDER | SWT.TITLE);