Attachment 87263 Details for Bug 81895 – Corrected patch to show column headers.

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

[patch] Corrected patch to show column headers.

bug81895-patch.txt (text/plain), 12.36 KB, created by Remy Suen

on 2008-01-18 09:53:32 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Suen

Created: 2008-01-18 09:53:32 EST

Size: 12.36 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.tests
>Index: Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 ImportExistingProjectsWizardTest.java
>--- Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java	4 Dec 2007 18:48:31 -0000	1.2
>+++ Eclipse UI Tests/org/eclipse/ui/tests/datatransfer/ImportExistingProjectsWizardTest.java	18 Jan 2008 14:50:35 -0000
>@@ -145,6 +145,8 @@
> 			WizardProjectsImportPage wpip = getNewWizard();
> 			HashSet projects = new HashSet();
> 			projects.add("HelloWorld");
>+			HashSet projectParents = new HashSet();
>+			projectParents.add("HelloWorld");
> 
> 			wpip.getProjectFromDirectoryRadio().setSelection((false)); // We
> 																		// want
>@@ -156,12 +158,16 @@
> 
> 			ProjectRecord[] selectedProjects = wpip.getValidProjects();
> 			ArrayList projectNames = new ArrayList();
>+			ArrayList parentNames = new ArrayList();
> 			for (int i = 0; i < selectedProjects.length; i++) {
> 				projectNames.add(selectedProjects[i].getProjectName());
>+				parentNames.add(selectedProjects[i].getParentName());
> 			}
> 
> 			assertTrue("Not all projects were found correctly in zip",
> 					projectNames.containsAll(projects));
>+			assertTrue("Not all project parent names were extracted correctly from zip",
>+					parentNames.containsAll(projectParents));
> 		} catch (IOException e) {
> 			fail(e.toString());
> 		}
>@@ -175,6 +181,8 @@
> 			WizardProjectsImportPage wpip = getNewWizard();
> 			HashSet projects = new HashSet();
> 			projects.add("HelloWorld");
>+			HashSet projectParents = new HashSet();
>+			projectParents.add("HelloWorld");
> 
> 			wpip.getProjectFromDirectoryRadio().setSelection((false)); // We
> 																		// want
>@@ -185,13 +193,17 @@
> 			wpip.updateProjectsList(archiveFile.getPath());
> 
> 			ProjectRecord[] selectedProjects = wpip.getValidProjects();
>+			ArrayList parentNames = new ArrayList();
> 			ArrayList projectNames = new ArrayList();
> 			for (int i = 0; i < selectedProjects.length; i++) {
> 				projectNames.add(selectedProjects[i].getProjectName());
>+				parentNames.add(selectedProjects[i].getParentName());
> 			}
> 
> 			assertTrue("Not all projects were found correctly in tar",
> 					projectNames.containsAll(projects));
>+			assertTrue("Not all project parent names were extracted correctly from tar",
>+					parentNames.containsAll(projectParents));
> 		} catch (IOException e) {
> 			fail(e.toString());
> 		}
>@@ -204,18 +216,24 @@
> 			WizardProjectsImportPage wpip = getNewWizard();
> 			HashSet projects = new HashSet();
> 			projects.add("HelloWorld");
>+			HashSet projectParents = new HashSet();
>+			projectParents.add(wsPath.toOSString());
> 			// We're importing a directory
> 			wpip.getProjectFromDirectoryRadio().setSelection((true));
> 			wpip.updateProjectsList(wsPath.toOSString());
> 
> 			ProjectRecord[] selectedProjects = wpip.getValidProjects();
> 			ArrayList projectNames = new ArrayList();
>+			ArrayList parentNames = new ArrayList();
> 			for (int i = 0; i < selectedProjects.length; i++) {
> 				projectNames.add(selectedProjects[i].getProjectName());
>+				parentNames.add(selectedProjects[i].getParentName());
> 			}
> 
> 			assertTrue("Not all projects were found correctly in directory",
> 					projectNames.containsAll(projects));
>+			assertTrue("Not all project parents were extracted correctly from directory",
>+					parentNames.containsAll(projectParents));
> 		} catch (IOException e) {
> 			fail(e.toString());
> 		}
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties,v
>retrieving revision 1.23
>diff -u -r1.23 messages.properties
>--- src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties	26 Nov 2007 18:48:40 -0000	1.23
>+++ src/org/eclipse/ui/internal/wizards/datatransfer/messages.properties	18 Jan 2008 14:50:35 -0000
>@@ -81,6 +81,8 @@
> WizardProjectsImportPage_ArchiveSelectTitle=Select &archive file:
> WizardProjectsImportPage_SelectArchiveDialogTitle=Select archive containing the projects to import
> WizardProjectsImportPage_ProjectsListTitle=&Projects:
>+WizardProjectsImportPage_ProjectNameColumnHeader=Project Name
>+WizardProjectsImportPage_ProjectParentColumnHeader=Parent Container
> WizardProjectsImportPage_ProcessingMessage=Processing results
> WizardProjectsImportPage_SelectDialogTitle=Select root directory of the projects to import
> WizardProjectsImportPage_SearchingMessage=Searching for projects
>Index: src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java,v
>retrieving revision 1.12
>diff -u -r1.12 DataTransferMessages.java
>--- src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java	26 Nov 2007 18:48:40 -0000	1.12
>+++ src/org/eclipse/ui/internal/wizards/datatransfer/DataTransferMessages.java	18 Jan 2008 14:50:35 -0000
>@@ -79,6 +79,8 @@
> 	public static String WizardExternalProjectImportPage_description;
> 	public static String WizardExternalProjectImportPage_notAProject;
> 	public static String WizardProjectsImportPage_ProjectsListTitle;
>+	public static String WizardProjectsImportPage_ProjectNameColumnHeader;
>+	public static String WizardProjectsImportPage_ProjectParentColumnHeader;
> 	public static String WizardProjectsImportPage_ProcessingMessage;
> 	public static String WizardProjectsImportPage_SelectDialogTitle;
> 	public static String WizardProjectsImportPage_SearchingMessage;
>Index: src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java,v
>retrieving revision 1.45
>diff -u -r1.45 WizardProjectsImportPage.java
>--- src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java	26 Nov 2007 18:48:40 -0000	1.45
>+++ src/org/eclipse/ui/internal/wizards/datatransfer/WizardProjectsImportPage.java	18 Jan 2008 14:50:35 -0000
>@@ -29,23 +29,11 @@
> import java.util.zip.ZipException;
> import java.util.zip.ZipFile;
> 
>-import org.eclipse.osgi.util.NLS;
>-
>-import org.eclipse.swt.SWT;
>-import org.eclipse.swt.events.FocusAdapter;
>-import org.eclipse.swt.events.SelectionAdapter;
>-import org.eclipse.swt.events.SelectionEvent;
>-import org.eclipse.swt.events.TraverseEvent;
>-import org.eclipse.swt.events.TraverseListener;
>-import org.eclipse.swt.layout.GridData;
>-import org.eclipse.swt.layout.GridLayout;
>-import org.eclipse.swt.widgets.Button;
>-import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.swt.widgets.DirectoryDialog;
>-import org.eclipse.swt.widgets.FileDialog;
>-import org.eclipse.swt.widgets.Label;
>-import org.eclipse.swt.widgets.Text;
>-
>+import org.eclipse.core.resources.IProject;
>+import org.eclipse.core.resources.IProjectDescription;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.resources.IWorkspace;
>+import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
>@@ -55,13 +43,6 @@
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.SubProgressMonitor;
>-
>-import org.eclipse.core.resources.IProject;
>-import org.eclipse.core.resources.IProjectDescription;
>-import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.resources.IWorkspace;
>-import org.eclipse.core.resources.ResourcesPlugin;
>-
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.dialogs.ErrorDialog;
> import org.eclipse.jface.dialogs.IDialogConstants;
>@@ -71,12 +52,30 @@
> import org.eclipse.jface.viewers.CheckStateChangedEvent;
> import org.eclipse.jface.viewers.CheckboxTreeViewer;
> import org.eclipse.jface.viewers.ICheckStateListener;
>+import org.eclipse.jface.viewers.ILabelProviderListener;
>+import org.eclipse.jface.viewers.ITableLabelProvider;
> import org.eclipse.jface.viewers.ITreeContentProvider;
>-import org.eclipse.jface.viewers.LabelProvider;
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.jface.viewers.ViewerComparator;
> import org.eclipse.jface.wizard.WizardPage;
>-
>+import org.eclipse.osgi.util.NLS;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.FocusAdapter;
>+import org.eclipse.swt.events.SelectionAdapter;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.events.TraverseEvent;
>+import org.eclipse.swt.events.TraverseListener;
>+import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
>+import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.DirectoryDialog;
>+import org.eclipse.swt.widgets.FileDialog;
>+import org.eclipse.swt.widgets.Label;
>+import org.eclipse.swt.widgets.Text;
>+import org.eclipse.swt.widgets.Tree;
>+import org.eclipse.swt.widgets.TreeColumn;
> import org.eclipse.ui.actions.WorkspaceModifyOperation;
> import org.eclipse.ui.dialogs.IOverwriteQuery;
> import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
>@@ -118,6 +117,8 @@
> 		String projectName;
> 
> 		Object parent;
>+		
>+		String parentName;
> 
> 		int level;
> 
>@@ -156,6 +157,15 @@
> 			IProjectDescription newDescription = null;
> 			try {
> 				if (projectArchiveFile != null) {
>+					String label = structureProvider.getFullPath(projectArchiveFile);
>+					int sepIndex = label.lastIndexOf('/');
>+					if (sepIndex == -1) {
>+						// there is no parent, so we will just use the empty string
>+						parentName = ""; //$NON-NLS-1$
>+					} else {
>+						parentName = label.substring(0, sepIndex);
>+					}
>+					
> 					InputStream stream = structureProvider
> 							.getContents(projectArchiveFile);
> 					if (stream != null) {
>@@ -165,6 +175,8 @@
> 						stream.close();
> 					}
> 				} else {
>+					parentName = projectSystemFile.getParent();
>+					
> 					IPath path = new Path(projectSystemFile.getPath());
> 					// if the file is in the default location, use the directory
> 					// name as the project name
>@@ -219,6 +231,15 @@
> 		public String getProjectName() {
> 			return projectName;
> 		}
>+
>+		/**
>+		 * Gets the name of the project's containing parent.
>+		 * 
>+		 * @return the project's container
>+		 */
>+		public String getParentName() {
>+			return parentName;
>+		}
> 	}
> 
> 	// dialog store id constants
>@@ -354,6 +375,17 @@
> 				| GridData.GRAB_VERTICAL | GridData.FILL_BOTH);
> 		projectsList.getControl().setLayoutData(listData);
> 
>+		Tree projectsTree = projectsList.getTree();
>+		projectsTree.setHeaderVisible(true);
>+		// create a column for the project and its parent container
>+		TreeColumn projectColumn = new TreeColumn(projectsTree, SWT.LEAD);
>+		projectColumn.setWidth(150);
>+		projectColumn.setText(DataTransferMessages.WizardProjectsImportPage_ProjectNameColumnHeader);
>+		
>+		TreeColumn parentColumn = new TreeColumn(projectsTree, SWT.LEAD);
>+		parentColumn.setWidth(150);
>+		parentColumn.setText(DataTransferMessages.WizardProjectsImportPage_ProjectParentColumnHeader);
>+
> 		projectsList.setContentProvider(new ITreeContentProvider() {
> 
> 			/*
>@@ -413,14 +445,29 @@
> 
> 		});
> 
>-		projectsList.setLabelProvider(new LabelProvider() {
>-			/*
>-			 * (non-Javadoc)
>-			 * 
>-			 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
>-			 */
>-			public String getText(Object element) {
>-				return ((ProjectRecord) element).getProjectName();
>+		projectsList.setLabelProvider(new ITableLabelProvider() {
>+			public Image getColumnImage(Object element, int columnIndex) {
>+				return null;
>+			}
>+
>+			public String getColumnText(Object element, int columnIndex) {
>+				if (columnIndex == 0) {
>+					return ((ProjectRecord) element).getProjectName();
>+				}
>+				return ((ProjectRecord) element).getParentName();
>+			}
>+
>+			public void addListener(ILabelProviderListener listener) {
>+			}
>+
>+			public void dispose() {
>+			}
>+
>+			public boolean isLabelProperty(Object element, String property) {
>+				return false;
>+			}
>+
>+			public void removeListener(ILabelProviderListener listener) {
> 			}
> 		});
>

Actions: View | Diff

Attachments on bug 81895: 85282 | 85303 | 85313 | 87261 | 87263 | 90579