Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java174
1 files changed, 87 insertions, 87 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java
index 7144e81c9..4aa2694ef 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AddWizard.java
@@ -31,12 +31,12 @@ import org.eclipse.ui.PlatformUI;
public class AddWizard extends ResizableWizard {
- private final AddOperation op;
- private final IFile[] unknowns;
- private CommitWizardFileTypePage fFileTypePage;
+ private final AddOperation op;
+ private final IFile[] unknowns;
+ private CommitWizardFileTypePage fFileTypePage;
- public static void run(Shell shell, final AddOperation op) throws InvocationTargetException, InterruptedException {
- // Prompt if there are files of unknown type being added
+ public static void run(Shell shell, final AddOperation op) throws InvocationTargetException, InterruptedException {
+ // Prompt if there are files of unknown type being added
PlatformUI.getWorkbench().getProgressService().run(true, true, monitor -> {
try {
op.buildScope(monitor);
@@ -44,17 +44,17 @@ public class AddWizard extends ResizableWizard {
throw new InvocationTargetException(e);
}
});
-
- IFile[] unknowns = getUnaddedWithUnknownFileType(op.getTraversals());
- if (unknowns.length == 0) {
- op.run();
- } else {
- AddWizard wizard = new AddWizard(op, unknowns);
- ResizableWizard.open(shell, wizard);
- }
- }
-
- private static IFile[] getUnaddedWithUnknownFileType(final ResourceTraversal[] traversals) throws InvocationTargetException, InterruptedException {
+
+ IFile[] unknowns = getUnaddedWithUnknownFileType(op.getTraversals());
+ if (unknowns.length == 0) {
+ op.run();
+ } else {
+ AddWizard wizard = new AddWizard(op, unknowns);
+ ResizableWizard.open(shell, wizard);
+ }
+ }
+
+ private static IFile[] getUnaddedWithUnknownFileType(final ResourceTraversal[] traversals) throws InvocationTargetException, InterruptedException {
final List<IResource> unadded = new ArrayList<>();
PlatformUI.getWorkbench().getProgressService().busyCursorWhile(monitor -> {
final IFileContentManager manager = Team.getFileContentManager();
@@ -88,77 +88,77 @@ public class AddWizard extends ResizableWizard {
throw new InvocationTargetException(e);
}
}
- }
+ }
});
- return unadded.toArray(new IFile[unadded.size()]);
- }
-
- public AddWizard(AddOperation op, IFile[] unknowns) {
- super("AddWizard", CVSUIPlugin.getPlugin().getDialogSettings()); //$NON-NLS-1$
- this.op = op;
- this.unknowns = unknowns;
- setWindowTitle(CVSUIMessages.AddWizard_0);
- setDefaultPageImageDescriptor(CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION));
- }
-
- @Override
- public void addPages() {
-
- final Collection<String> names= new HashSet<String>();
- final Collection<String> extensions= new HashSet<String>();
- getUnknownNamesAndExtension(unknowns, names, extensions);
-
- if (names.size() + extensions.size() > 0) {
- fFileTypePage= new CommitWizardFileTypePage(extensions, names);
- addPage(fFileTypePage);
- }
-
- super.addPages();
- }
-
- private static void getUnknownNamesAndExtension(IFile[] files, Collection<String> names, Collection<String> extensions) {
-
- final IFileContentManager manager= Team.getFileContentManager();
-
- for (int i = 0; i < files.length; i++) {
- IFile file = files[i];
-
- final String extension= file.getFileExtension();
- if (extension != null && !manager.isKnownExtension(extension)) {
- extensions.add(extension);
- }
-
- final String name= file.getName();
- if (extension == null && name != null && !manager.isKnownFilename(name))
- names.add(name);
- }
- }
-
- @Override
+ return unadded.toArray(new IFile[unadded.size()]);
+ }
+
+ public AddWizard(AddOperation op, IFile[] unknowns) {
+ super("AddWizard", CVSUIPlugin.getPlugin().getDialogSettings()); //$NON-NLS-1$
+ this.op = op;
+ this.unknowns = unknowns;
+ setWindowTitle(CVSUIMessages.AddWizard_0);
+ setDefaultPageImageDescriptor(CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION));
+ }
+
+ @Override
+ public void addPages() {
+
+ final Collection<String> names= new HashSet<String>();
+ final Collection<String> extensions= new HashSet<String>();
+ getUnknownNamesAndExtension(unknowns, names, extensions);
+
+ if (names.size() + extensions.size() > 0) {
+ fFileTypePage= new CommitWizardFileTypePage(extensions, names);
+ addPage(fFileTypePage);
+ }
+
+ super.addPages();
+ }
+
+ private static void getUnknownNamesAndExtension(IFile[] files, Collection<String> names, Collection<String> extensions) {
+
+ final IFileContentManager manager= Team.getFileContentManager();
+
+ for (int i = 0; i < files.length; i++) {
+ IFile file = files[i];
+
+ final String extension= file.getFileExtension();
+ if (extension != null && !manager.isKnownExtension(extension)) {
+ extensions.add(extension);
+ }
+
+ final String name= file.getName();
+ if (extension == null && name != null && !manager.isKnownFilename(name))
+ names.add(name);
+ }
+ }
+
+ @Override
public boolean performFinish() {
- final Map extensionsToSave= new HashMap();
- final Map extensionsNotToSave= new HashMap();
-
- fFileTypePage.getModesForExtensions(extensionsToSave, extensionsNotToSave);
- CommitWizardFileTypePage.saveExtensionMappings(extensionsToSave);
- op.addModesForExtensions(extensionsNotToSave);
-
- final Map namesToSave= new HashMap();
- final Map namesNotToSave= new HashMap();
-
- fFileTypePage.getModesForNames(namesToSave, namesNotToSave);
- CommitWizardFileTypePage.saveNameMappings(namesToSave);
- op.addModesForNames(namesNotToSave);
-
- try {
- op.run();
- } catch (InvocationTargetException e) {
- return false;
- } catch (InterruptedException e) {
- return false;
- }
-
- return super.performFinish();
- }
-
+ final Map extensionsToSave= new HashMap();
+ final Map extensionsNotToSave= new HashMap();
+
+ fFileTypePage.getModesForExtensions(extensionsToSave, extensionsNotToSave);
+ CommitWizardFileTypePage.saveExtensionMappings(extensionsToSave);
+ op.addModesForExtensions(extensionsNotToSave);
+
+ final Map namesToSave= new HashMap();
+ final Map namesNotToSave= new HashMap();
+
+ fFileTypePage.getModesForNames(namesToSave, namesNotToSave);
+ CommitWizardFileTypePage.saveNameMappings(namesToSave);
+ op.addModesForNames(namesNotToSave);
+
+ try {
+ op.run();
+ } catch (InvocationTargetException e) {
+ return false;
+ } catch (InterruptedException e) {
+ return false;
+ }
+
+ return super.performFinish();
+ }
+
}

Back to the top