Attachment 142362 Details for Bug 179775 – Patch v01

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch v01

ImportArchiveErrorDialog 01.txt (text/plain), 3.09 KB, created by Prakash Rangaraj

on 2009-07-23 06:34:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Prakash Rangaraj

Created: 2009-07-23 06:34:20 EDT

Size: 3.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/internal/wizards/datatransfer/WizardArchiveFileResourceImportPage1.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardArchiveFileResourceImportPage1.java,v
>retrieving revision 1.13
>diff -u -r1.13 WizardArchiveFileResourceImportPage1.java
>--- src/org/eclipse/ui/internal/wizards/datatransfer/WizardArchiveFileResourceImportPage1.java	25 May 2009 20:52:03 -0000	1.13
>+++ src/org/eclipse/ui/internal/wizards/datatransfer/WizardArchiveFileResourceImportPage1.java	23 Jul 2009 10:21:31 -0000
>@@ -19,16 +19,14 @@
> import java.util.zip.ZipException;
> import java.util.zip.ZipFile;
> 
>+import org.eclipse.jface.dialogs.IDialogSettings;
>+import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.jface.viewers.ITreeContentProvider;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.widgets.Button;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.FileDialog;
> import org.eclipse.swt.widgets.Listener;
>-
>-import org.eclipse.jface.dialogs.IDialogSettings;
>-import org.eclipse.jface.viewers.IStructuredSelection;
>-import org.eclipse.jface.viewers.ITreeContentProvider;
>-
> import org.eclipse.ui.IWorkbench;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.model.AdaptableList;
>@@ -149,6 +147,7 @@
>     private boolean ensureZipSourceIsValid() {
>         ZipFile specifiedFile = getSpecifiedZipSourceFile();
>         if (specifiedFile == null) {
>+			setErrorMessage(DataTransferMessages.ZipImport_badFormat);
>             return false;
>         }
>         return ArchiveFileManipulations.closeZipFile(specifiedFile, getShell());
>@@ -157,6 +156,7 @@
>     private boolean ensureTarSourceIsValid() {
>     	TarFile specifiedFile = getSpecifiedTarSourceFile();
>     	if( specifiedFile == null ) {
>+			setErrorMessage(DataTransferMessages.TarImport_badFormat);
>     		return false;
>     	}
>     	return ArchiveFileManipulations.closeTarFile(specifiedFile, getShell());
>@@ -300,9 +300,9 @@
>         try {
>             return new ZipFile(fileName);
>         } catch (ZipException e) {
>-            displayErrorDialog(DataTransferMessages.ZipImport_badFormat);
>+			// ignore
>         } catch (IOException e) {
>-            displayErrorDialog(DataTransferMessages.ZipImport_couldNotRead);
>+			// ignore
>         }
> 
>         sourceNameField.setFocus();
>@@ -329,9 +329,9 @@
>         try {
>             return new TarFile(fileName);
>         } catch (TarException e) {
>-        	displayErrorDialog(DataTransferMessages.TarImport_badFormat);
>+			// ignore
>         } catch (IOException e) {
>-            displayErrorDialog(DataTransferMessages.ZipImport_couldNotRead);
>+			// ignore
>         }
> 
>         sourceNameField.setFocus();
>@@ -489,7 +489,7 @@
>             enableButtonGroup(false);
>             return false;
>         }
>-        
>+
>         List resourcesToExport = selectionGroup.getAllWhiteCheckedItems();
>         if (resourcesToExport.size() == 0){
>         	setErrorMessage(DataTransferMessages.FileImport_noneSelected);

Actions: View | Diff

Attachments on bug 179775: 142362 | 142363