Attachment 226809 Details for Bug 400399 – Stores project and archive location persistently

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

[patch] Stores project and archive location persistently

0001-Persistently-remember-previously-browsed-dir-and-arc.patch (text/plain), 6.13 KB, created by Christian Georgi

on 2013-02-10 11:32:13 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Georgi

Created: 2013-02-10 11:32:13 EST

Size: 6.13 KB

patch

obsolete

>From 00cca30b99016093c162db1f63bff271dc201697 Mon Sep 17 00:00:00 2001
>From: Christian Georgi <christian.georgi@sap.com>
>Date: Sat, 9 Feb 2013 18:06:33 +0100
>Subject: [PATCH] Persistently remember previously browsed dir and archive
>
>---
> .../ui/internal/ide/IDEInternalPreferences.java    |  6 ++++
> .../datatransfer/WizardProjectsImportPage.java     | 32 +++++++++++-----------
> 2 files changed, 22 insertions(+), 16 deletions(-)
>
>diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEInternalPreferences.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEInternalPreferences.java
>index 479d2b5..779b743 100644
>--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEInternalPreferences.java
>+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEInternalPreferences.java
>@@ -115,6 +115,12 @@ public interface IDEInternalPreferences {
>     // Always show this import window
>     public static final String IMPORT_FILES_AND_FOLDERS_SHOW_DIALOG = "IMPORT_FILES_AND_FOLDERS_SHOW_DIALOG"; //$NON-NLS-1$
> 
>+    // (string) The previously browsed directory
>+    public static final String IMPORT_FILES_AND_FOLDERS_BROWSED_DIRECTORY = "IMPORT_FILES_AND_FOLDERS_BROWSED_DIRECTORY"; //$NON-NLS-1$
>+
>+    // (string) The previously browsed archive
>+    public static final String IMPORT_FILES_AND_FOLDERS_BROWSED_ARCHIVE = "IMPORT_FILES_AND_FOLDERS_BROWSED_ARCHIVE"; //$NON-NLS-1$
>+
>     /**
>      * Workspace name, will be displayed in the window title.
>      */
>diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java
>index 709c26d..ff0bb6d 100644
>--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java
>+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java
>@@ -56,6 +56,7 @@ import org.eclipse.jface.dialogs.IDialogSettings;
> import org.eclipse.jface.dialogs.MessageDialog;
> import org.eclipse.jface.layout.PixelConverter;
> import org.eclipse.jface.operation.IRunnableWithProgress;
>+import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.viewers.CheckStateChangedEvent;
> import org.eclipse.jface.viewers.CheckboxTreeViewer;
> import org.eclipse.jface.viewers.ICheckStateListener;
>@@ -88,6 +89,7 @@ import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.actions.WorkspaceModifyOperation;
> import org.eclipse.ui.dialogs.IOverwriteQuery;
> import org.eclipse.ui.dialogs.WorkingSetGroup;
>+import org.eclipse.ui.internal.ide.IDEInternalPreferences;
> import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
> import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
> import org.eclipse.ui.internal.ide.StatusUtil;
>@@ -311,14 +313,6 @@ public class WizardProjectsImportPage extends WizardPage implements
> 
> 	private ProjectRecord[] selectedProjects = new ProjectRecord[0];
> 
>-	// Keep track of the directory that we browsed to last time
>-	// the wizard was invoked.
>-	private static String previouslyBrowsedDirectory = ""; //$NON-NLS-1$
>-
>-	// Keep track of the archive that we browsed to last time
>-	// the wizard was invoked.
>-	private static String previouslyBrowsedArchive = ""; //$NON-NLS-1$
>-
> 	private Button projectFromDirectoryRadio;
> 
> 	private Button projectFromArchiveRadio;
>@@ -1202,6 +1196,7 @@ public class WizardProjectsImportPage extends WizardPage implements
> 	 */
> 	protected void handleLocationDirectoryButtonPressed() {
> 
>+		IPreferenceStore prefStore = IDEWorkbenchPlugin.getDefault().getPreferenceStore();
> 		DirectoryDialog dialog = new DirectoryDialog(directoryPathField
> 				.getShell(), SWT.SHEET);
> 		dialog
>@@ -1209,10 +1204,11 @@ public class WizardProjectsImportPage extends WizardPage implements
> 
> 		String dirName = directoryPathField.getText().trim();
> 		if (dirName.length() == 0) {
>-			dirName = previouslyBrowsedDirectory;
>+			dirName = prefStore.getString(
>+					IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_BROWSED_DIRECTORY);
> 		}
> 
>-		if (dirName.length() == 0) {
>+		if (dirName == null || dirName.length() == 0) {
> 			dialog.setFilterPath(IDEWorkbenchPlugin.getPluginWorkspace()
> 					.getRoot().getLocation().toOSString());
> 		} else {
>@@ -1224,8 +1220,9 @@ public class WizardProjectsImportPage extends WizardPage implements
> 
> 		String selectedDirectory = dialog.open();
> 		if (selectedDirectory != null) {
>-			previouslyBrowsedDirectory = selectedDirectory;
>-			directoryPathField.setText(previouslyBrowsedDirectory);
>+			prefStore.setValue(IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_BROWSED_DIRECTORY, 
>+					selectedDirectory);
>+			directoryPathField.setText(selectedDirectory);
> 			updateProjectsList(selectedDirectory);
> 		}
> 
>@@ -1236,6 +1233,7 @@ public class WizardProjectsImportPage extends WizardPage implements
> 	 */
> 	protected void handleLocationArchiveButtonPressed() {
> 
>+		IPreferenceStore prefStore = IDEWorkbenchPlugin.getDefault().getPreferenceStore();
> 		FileDialog dialog = new FileDialog(archivePathField.getShell(), SWT.SHEET);
> 		dialog.setFilterExtensions(FILE_IMPORT_MASK);
> 		dialog
>@@ -1243,10 +1241,11 @@ public class WizardProjectsImportPage extends WizardPage implements
> 
> 		String fileName = archivePathField.getText().trim();
> 		if (fileName.length() == 0) {
>-			fileName = previouslyBrowsedArchive;
>+			fileName = prefStore.getString(
>+					IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_BROWSED_ARCHIVE);
> 		}
> 
>-		if (fileName.length() == 0) {
>+		if (fileName == null || fileName.length() == 0) {
> 			dialog.setFilterPath(IDEWorkbenchPlugin.getPluginWorkspace()
> 					.getRoot().getLocation().toOSString());
> 		} else {
>@@ -1258,8 +1257,9 @@ public class WizardProjectsImportPage extends WizardPage implements
> 
> 		String selectedArchive = dialog.open();
> 		if (selectedArchive != null) {
>-			previouslyBrowsedArchive = selectedArchive;
>-			archivePathField.setText(previouslyBrowsedArchive);
>+			prefStore.setValue(IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_BROWSED_ARCHIVE, 
>+					selectedArchive);
>+			archivePathField.setText(selectedArchive);
> 			updateProjectsList(selectedArchive);
> 		}
> 
>-- 
>1.7.12.4 (Apple Git-37)
>

Actions: View | Diff

Attachments on bug 400399: 226809 | 226971 | 226972