Attachment #179444 for bug #162608

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

Lines 18-23 Link Here

(-)compare/org/eclipse/compare/internal/Utilities.java (+53 lines)
18	import java.io.UnsupportedEncodingException;	18	import java.io.UnsupportedEncodingException;
19	import java.lang.reflect.InvocationTargetException;	19	import java.lang.reflect.InvocationTargetException;
20	import java.lang.reflect.Method;	20	import java.lang.reflect.Method;
		21	import java.net.SocketTimeoutException;
		22	import java.net.URL;
21	import java.net.URLConnection;	23	import java.net.URLConnection;
22	import java.util.ArrayList;	24	import java.util.ArrayList;
23	import java.util.HashMap;	25	import java.util.HashMap;
Lines 36-41 Link Here
36	import org.eclipse.compare.SharedDocumentAdapter;	38	import org.eclipse.compare.SharedDocumentAdapter;
37	import org.eclipse.compare.contentmergeviewer.IDocumentRange;	39	import org.eclipse.compare.contentmergeviewer.IDocumentRange;
38	import org.eclipse.compare.internal.core.patch.HunkResult;	40	import org.eclipse.compare.internal.core.patch.HunkResult;
		41	import org.eclipse.compare.internal.patch.PatchMessages;
39	import org.eclipse.compare.patch.IHunk;	42	import org.eclipse.compare.patch.IHunk;
40	import org.eclipse.compare.structuremergeviewer.DiffNode;	43	import org.eclipse.compare.structuremergeviewer.DiffNode;
41	import org.eclipse.compare.structuremergeviewer.ICompareInput;	44	import org.eclipse.compare.structuremergeviewer.ICompareInput;
Lines 64-69 Link Here
64	import org.eclipse.core.runtime.jobs.Job;	67	import org.eclipse.core.runtime.jobs.Job;
65	import org.eclipse.jface.action.IAction;	68	import org.eclipse.jface.action.IAction;
66	import org.eclipse.jface.dialogs.ErrorDialog;	69	import org.eclipse.jface.dialogs.ErrorDialog;
		70	import org.eclipse.jface.operation.IRunnableContext;
		71	import org.eclipse.jface.operation.IRunnableWithProgress;
67	import org.eclipse.jface.resource.ImageDescriptor;	72	import org.eclipse.jface.resource.ImageDescriptor;
68	import org.eclipse.jface.text.IDocument;	73	import org.eclipse.jface.text.IDocument;
69	import org.eclipse.jface.util.IPropertyChangeListener;	74	import org.eclipse.jface.util.IPropertyChangeListener;
Lines 861-864 Link Here
861	}	866	}
862	return false;	867	return false;
863	}	868	}
		869
		870	/**
		871	* Load content of file under <code>url</code> displaying progress on given
		872	* context.
		873	*
		874	* @param url
		875	* @param context
		876	* @return the content of file under given URL, or <code>null</code> if URL
		877	* could not be loaded
		878	* @throws InvocationTargetException
		879	* thrown on errors while URL loading
		880	* @throws OperationCanceledException
		881	* @throws InterruptedException
		882	*/
		883	public static String getURLContents(final URL url, IRunnableContext context)
		884	throws InvocationTargetException, OperationCanceledException,
		885	InterruptedException {
		886	final String[] result = new String[1];
		887	context.run(true, true, new IRunnableWithProgress() {
		888	public void run(IProgressMonitor monitor)
		889	throws InvocationTargetException, InterruptedException {
		890	SubMonitor progress = SubMonitor.convert(monitor,
		891	PatchMessages.InputPatchPage_URLConnecting, 100);
		892	try {
		893	URLConnection connection = url.openConnection();
		894	progress.worked(10);
		895	if (monitor.isCanceled())
		896	throw new OperationCanceledException();
		897	setReadTimeout(connection, 60 * 1000);
		898	progress.setTaskName(PatchMessages.InputPatchPage_URLFetchingContent);
		899	String enc = connection.getContentEncoding();
		900	if (enc == null)
		901	enc = ResourcesPlugin.getEncoding();
		902	result[0] = Utilities.readString(
		903	connection.getInputStream(), enc,
		904	connection.getContentLength(),
		905	progress.newChild(90));
		906	} catch (SocketTimeoutException e) {
		907	throw new InvocationTargetException(e);
		908	} catch (IOException e) {
		909	throw new InvocationTargetException(e);
		910	} finally {
		911	monitor.done();
		912	}
		913	}
		914	});
		915	return result[0];
		916	}
864	}	917	}




import java.io.StringReader;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.SocketTimeoutException;
import java.net.URL;
import java.net.URLConnection;

import org.eclipse.compare.internal.ICompareContextIds;
import org.eclipse.compare.internal.Utilities;

import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;

			} else if (inputMethod==URL) {
				String patchFileURL = fPatchURLField.getText();
				if (patchFileURL != null) {
					try {
						String contents = Utilities.getURLContents(new URL(
								patchFileURL), getContainer());
						if (contents != null)
							reader = new StringReader(contents);
					} catch (MalformedURLException e) {
						// ignore as we tested it with modify listener on combo
					} catch (InvocationTargetException e) { // ignore
					} catch (OperationCanceledException e) { // ignore
					} catch (InterruptedException e) { // ignore
					}
				}
				fPatchSource= PatchMessages.InputPatchPage_URL_title;
			} else if (inputMethod==WORKSPACE) {

			}
		}
	}
	
	private String getURLContents(String patchFileURL) {
		final URL url;
		try {
			url = new URL(patchFileURL);
			final String[] result= new String[1];
			try {
				getContainer().run(true, true, new IRunnableWithProgress() {
					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
						SubMonitor progress = SubMonitor.convert(monitor, PatchMessages.InputPatchPage_URLConnecting, 100);
						try {
							URLConnection connection = url.openConnection();
							progress.worked(10);
							if (monitor.isCanceled())
								throw new OperationCanceledException();
							Utilities.setReadTimeout(connection, 60*1000);
							progress.setTaskName(PatchMessages.InputPatchPage_URLFetchingContent);
							String enc = connection.getContentEncoding();
							if (enc == null)
								enc = ResourcesPlugin.getEncoding();
							result[0] = Utilities.readString(connection.getInputStream(), enc, connection.getContentLength(), progress.newChild(90));
						} catch (SocketTimeoutException e) { // timeout
						} catch (IOException e) { //ignore
						}
						monitor.done();
					}
				});
				return result[0];
			} catch (OperationCanceledException e) { //ignore
			} catch (InvocationTargetException e) { //ignore
			} catch (InterruptedException e) { //ignore
			}
		} catch (MalformedURLException e) {
			// ignore as we tested it with modify listener on combo
		}
		return null;
	}

	/* (non-JavaDoc)
	 * Method declared in IWizardPage.




/*******************************************************************************
 * Copyright (c) 2000, 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.ui.*;

public class ProjectSetImporter {

	/**
	 * Imports a psf file based on a file content. This may be used when psf
	 * file is imported from any other location that local filesystem.
	 * 
	 * @param psfContents
	 *            the content of the psf file.
	 * @param filename
	 *            the name of the source file. This is included in case the
	 *            provider needs to deduce relative paths
	 * @param shell
	 * @param monitor
	 * @return list of new projects
	 * @throws InvocationTargetException
	 */
	public static IProject[] importProjectSetFromString(String psfContents,
			String filename, Shell shell, IProgressMonitor monitor)
			throws InvocationTargetException {
		XMLMemento xmlMemento = stringToXMLMemento(psfContents);
		return importProjectSet(xmlMemento, filename, shell, monitor);
	}

	/**
	 * Imports a psf file.
	 * 
	 * @param filename
	 * @param shell
	 * @param monitor
	 * @return list of new projects
	 * @throws InvocationTargetException
	 */
	public static IProject[] importProjectSet(String filename, Shell shell,
			IProgressMonitor monitor) throws InvocationTargetException {
		XMLMemento xmlMemento = filenameToXMLMemento(filename);
		return importProjectSet(xmlMemento, filename, shell, monitor);
	}

	private static IProject[] importProjectSet(XMLMemento xmlMemento,
			String filename, Shell shell, IProgressMonitor monitor)
			throws InvocationTargetException {
		try {
			XMLMemento xmlMemento = filenameToXMLMemento(filename);
			String version = xmlMemento.getString("version"); //$NON-NLS-1$
			
			List newProjects = new ArrayList();

			}
		}
	}

	private static XMLMemento stringToXMLMemento(String stringContents)
			throws InvocationTargetException {
		StringReader reader = null;
		try {
			reader = new StringReader(stringContents);
			return XMLMemento.createReadRoot(reader);
		} catch (WorkbenchException e) {
			throw new InvocationTargetException(e);
		} finally {
			if (reader != null) {
				reader.close();
			}
		}
	}

	/**
	 * Check if given file is a valid psf file
	 * 
	 * @param filename
	 * @return <code>true</code> is file is a valid psf file
	 */
	public static boolean isValidProjectSetFile(String filename) {
		try {
			return filenameToXMLMemento(filename).getString("version") != null; //$NON-NLS-1$

			return false;
		}
	}

	/**
	 * Check if given string is a valid project set
	 * 
	 * @param psfContent
	 * @return <code>true</code> if psfContent is a valid project set
	 */
	public static boolean isValidProjectSetString(String psfContent) {
		if (psfContent == null) {
			return false;
		}
		try {
			return stringToXMLMemento(psfContent).getString("version") != null; //$NON-NLS-1$
		} catch (InvocationTargetException e) {
			return false;
		}
	}

	private static void mergeWorkingSets(IWorkingSet newWs, IWorkingSet oldWs) {
		IAdaptable[] oldElements = oldWs.getElements();
		IAdaptable[] newElements = newWs.getElements();




ExportProjectSetMainPage_Initial_description=Define which projects or working sets should be exported into the team project file.
ExportProjectSetMainPage_specifyFile=Please specify the destination file.

ImportProjectSetMainPage_Project_Set_File=File
ImportProjectSetMainPage_Project_Set_Url=URL
ImportProjectSetMainPage_Browse_3=B&rowse...
ImportProjectSetMainPage_Browse=Br&owse...
ImportProjectSetMainPage_The_given_URL_cannot_be_loaded=File from given URL cannot be loaded
ImportProjectSetMainPage_The_specified_file_does_not_exist_4=The specified file does not exist
ImportProjectSetMainPage_You_have_specified_a_folder_5=You have specified a folder
ImportProjectSetMainPage_workingSetNameEmpty=The working set name must not be empty

ImportProjectSetMainPage_runInBackground=Run the import in the bac&kground
ImportProjectSetMainPage_jobName=Importing project set...
ImportProjectSetMainPage_specifyFile=Please specify a file to import.
ImportProjectSetMainPage_specifyURL=Please specify an URL to import.
ImportProjectSetMainPage_selectWorkingSet=Select a working set.
ImportProjectSetMainPage_projectSetFileInvalid=The specified file is not a valid Team Project Set file.
ImportProjectSetDialog_duplicatedWorkingSet_title=Working Set Exists

ImportProjectSetDialog_duplicatedWorkingSet_merge=&Merge
ImportProjectSetDialog_duplicatedWorkingSet_skip=&Skip
ImportProjectSetDialog_duplicatedWorkingSet_applyToAll=&Apply to all working sets in this import
ImportProjectSetDialog_malformed_url=Malformed URL

ProjectSetContentHandler_Element_provider_must_be_contained_in_element_psf_4=Element provider must be contained in element psf
ProjectSetContentHandler_Element_project_must_be_contained_in_element_provider_7=Element project must be contained in element provider

Lines 1-5 Link Here

(-)src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java (-3 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2008 IBM Corporation and others.	2	* Copyright (c) 2006, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 91-98 Link Here
91	inner.setLayoutData(data);	91	inner.setLayoutData(data);
92		92
93	fileCombo = createDropDownCombo(inner);	93	fileCombo = createDropDownCombo(inner);
94	file = PsfFilenameStore.getSuggestedDefault();	94	file = PsfFilenameStore.getInstance().getSuggestedDefault();
95	fileCombo.setItems(PsfFilenameStore.getHistory());	95	fileCombo.setItems(PsfFilenameStore.getInstance().getHistory());
96	fileCombo.setText(file);	96	fileCombo.setText(file);
97	fileCombo.addListener(SWT.Modify, new Listener() {	97	fileCombo.addListener(SWT.Modify, new Listener() {
98	public void handleEvent(Event event) {	98	public void handleEvent(Event event) {

Lines 1-5 Link Here

(-)src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java (-11 / +177 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 11-22 Link Here
11	package org.eclipse.team.internal.ui.wizards;	11	package org.eclipse.team.internal.ui.wizards;
12		12
13	import java.io.File;	13	import java.io.File;
		14	import java.lang.reflect.InvocationTargetException;
		15	import java.net.MalformedURLException;
		16	import java.net.URL;
14		17
		18	import org.eclipse.compare.internal.Utilities;
15	import org.eclipse.core.resources.ResourcesPlugin;	19	import org.eclipse.core.resources.ResourcesPlugin;
		20	import org.eclipse.core.runtime.OperationCanceledException;
16	import org.eclipse.jface.dialogs.Dialog;	21	import org.eclipse.jface.dialogs.Dialog;
17	import org.eclipse.jface.dialogs.IDialogConstants;	22	import org.eclipse.jface.dialogs.IDialogConstants;
18	import org.eclipse.jface.resource.ImageDescriptor;	23	import org.eclipse.jface.resource.ImageDescriptor;
19	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
		25	import org.eclipse.swt.dnd.Clipboard;
		26	import org.eclipse.swt.dnd.TextTransfer;
20	import org.eclipse.swt.events.SelectionAdapter;	27	import org.eclipse.swt.events.SelectionAdapter;
21	import org.eclipse.swt.events.SelectionEvent;	28	import org.eclipse.swt.events.SelectionEvent;
22	import org.eclipse.swt.layout.GridData;	29	import org.eclipse.swt.layout.GridData;
Lines 32-45 Link Here
32	String file = ""; //$NON-NLS-1$	39	String file = ""; //$NON-NLS-1$
33	Button browseButton;	40	Button browseButton;
34		41
		42	String urlString = ""; //$NON-NLS-1$
		43	Combo urlCombo;
		44
		45	// input type radios
		46	private Button fileInputButton;
		47	private Button urlInputButton;
		48
		49	// input type
		50	public static final int InputType_file = 0;
		51	public static final int InputType_URL = 1;
		52	private int inputType = InputType_file;
		53
35	private boolean runInBackground = isRunInBackgroundPreferenceOn();	54	private boolean runInBackground = isRunInBackgroundPreferenceOn();
36	// a wizard shouldn't be in an error state until the state has been modified by the user	55	// a wizard shouldn't be in an error state until the state has been modified by the user
37	private int messageType = NONE;	56	private int messageType = NONE;
38	private WorkingSetGroup workingSetGroup;	57	private WorkingSetGroup workingSetGroup;
39		58
40	public ImportProjectSetMainPage(String pageName, String title, ImageDescriptor titleImage) {	59	private PsfFilenameStore psfFilenameStore = PsfFilenameStore.getInstance();
		60	private PsfUrlStore psfUrlStore = PsfUrlStore.getInstance();
		61
		62	public ImportProjectSetMainPage(String pageName, String title,
		63	ImageDescriptor titleImage) {
41	super(pageName, title, titleImage);	64	super(pageName, title, titleImage);
42	setDescription(TeamUIMessages.ImportProjectSetMainPage_description);	65	setDescription(TeamUIMessages.ImportProjectSetMainPage_description);
		66	}
		67
		68	private void setInputType(int inputTypeSelected) {
		69	this.inputType = inputTypeSelected;
		70	// reset the message type and give the user fresh chance to input
		71	// correct data
		72	messageType = NONE;
		73	// update controls
		74	fileInputButton.setSelection(inputType == InputType_file);
		75	fileCombo.setEnabled(inputType == InputType_file);
		76	browseButton.setEnabled(inputType == InputType_file);
		77	urlInputButton.setSelection(inputType == InputType_URL);
		78	urlCombo.setEnabled(inputType == InputType_URL);
		79	// validate field
		80	if (inputType == InputType_file)
		81	updateFileEnablement();
		82	if (inputType == InputType_URL)
		83	updateUrlEnablement();
		84
43	}	85	}
44		86
45	/*	87	/*
Lines 60-80 Link Here
60	layout.marginWidth = 0;	102	layout.marginWidth = 0;
61	inner.setLayout(layout);	103	inner.setLayout(layout);
62		104
63	createLabel(inner, TeamUIMessages.ImportProjectSetMainPage_Project_Set_File_Name__2);	105	fileInputButton = new Button(inner, SWT.RADIO);
		106	fileInputButton
		107	.setText(TeamUIMessages.ImportProjectSetMainPage_Project_Set_File);
		108	fileInputButton.setEnabled(true);
		109	fileInputButton.addSelectionListener(new SelectionAdapter() {
		110	public void widgetSelected(SelectionEvent e) {
		111	setInputType(InputType_file);
		112	}
		113	});
64		114
65	fileCombo = createDropDownCombo(inner);	115	fileCombo = createDropDownCombo(inner);
66	file = PsfFilenameStore.getSuggestedDefault();	116	file = psfFilenameStore.getSuggestedDefault();
67	fileCombo.setItems(PsfFilenameStore.getHistory());	117	fileCombo.setItems(psfFilenameStore.getHistory());
68	fileCombo.setText(file);	118	fileCombo.setText(file);
69	fileCombo.addListener(SWT.Modify, new Listener() {	119	fileCombo.addListener(SWT.Modify, new Listener() {
70	public void handleEvent(Event event) {	120	public void handleEvent(Event event) {
71	file = fileCombo.getText();	121	file = fileCombo.getText();
72	updateEnablement();	122	updateFileEnablement();
73	}	123	}
74	});	124	});
75		125
76	browseButton = new Button(inner, SWT.PUSH);	126	browseButton = new Button(inner, SWT.PUSH);
77	browseButton.setText(TeamUIMessages.ImportProjectSetMainPage_Browse_3);	127	browseButton.setText(TeamUIMessages.ImportProjectSetMainPage_Browse_3);
		128
		129	urlInputButton = new Button(inner, SWT.RADIO);
		130	urlInputButton
		131	.setText(TeamUIMessages.ImportProjectSetMainPage_Project_Set_Url);
		132	urlInputButton.addSelectionListener(new SelectionAdapter() {
		133	public void widgetSelected(SelectionEvent e) {
		134	setInputType(InputType_URL);
		135	}
		136	});
		137	urlCombo = createDropDownCombo(inner);
		138	urlString = psfUrlStore.getSuggestedDefault();
		139	urlCombo.setItems(psfUrlStore.getHistory());
		140	urlCombo.setText(urlString);
		141	GridData gd = new GridData(GridData.FILL_HORIZONTAL);
		142	gd.horizontalSpan = 2;
		143	urlCombo.setLayoutData(gd);
		144	urlCombo.addListener(SWT.Modify, new Listener() {
		145	public void handleEvent(Event event) {
		146	urlString = urlCombo.getText();
		147	updateUrlEnablement();
		148	}
		149	});
		150
78	GridData data = new GridData();	151	GridData data = new GridData();
79	data.horizontalAlignment = GridData.FILL;	152	data.horizontalAlignment = GridData.FILL;
80	int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);	153	int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
Lines 115-126 Link Here
115	});	188	});
116		189
117	setControl(composite);	190	setControl(composite);
118	updateEnablement();	191	setDefaultInputType();
119	Dialog.applyDialogFont(parent);	192	Dialog.applyDialogFont(parent);
120	// future messages will be of type error
121	messageType = ERROR;
122	}	193	}
123		194
		195	private void setDefaultInputType() {
		196	// check for clipboard contents
		197	Control c = getControl();
		198	if (c != null) {
		199	Clipboard clipboard = new Clipboard(c.getDisplay());
		200	Object o = clipboard.getContents(TextTransfer.getInstance());
		201	clipboard.dispose();
		202	if (o instanceof String) {
		203	try {
		204	URL url = new URL((String) o);
		205	if (url != null) {
		206	setInputType(InputType_URL);
		207	urlCombo.setText((String) o);
		208	return;
		209	}
		210	} catch (MalformedURLException e) {
		211	// ignore, it's not and URL
		212	}
		213	}
		214	}
		215	setInputType(InputType_file);
		216	}
		217
124	private void addWorkingSetSection(Composite composite) {	218	private void addWorkingSetSection(Composite composite) {
125	workingSetGroup = new WorkingSetGroup(	219	workingSetGroup = new WorkingSetGroup(
126	composite,	220	composite,
Lines 129-137 Link Here
129	"org.eclipse.jdt.ui.JavaWorkingSetPage" /* JavaWorkingSetUpdater.ID */}); //$NON-NLS-1$	223	"org.eclipse.jdt.ui.JavaWorkingSetPage" /* JavaWorkingSetUpdater.ID */}); //$NON-NLS-1$
130	}	224	}
131		225
132	private void updateEnablement() {	226	private void updateUrlEnablement() {
		227	boolean complete = false;
		228	setMessage(null);
		229	setErrorMessage(null);
		230
		231	if (urlString.length() == 0) {
		232	setMessage(TeamUIMessages.ImportProjectSetMainPage_specifyURL,
		233	messageType);
		234	complete = false;
		235	} else {
		236
		237	try {
		238	new URL(urlString);
		239	// the URL is correct, we can clear the error message
		240	complete = true;
		241	} catch (MalformedURLException e) {
		242	messageType = ERROR;
		243	setMessage(TeamUIMessages.ImportProjectSetDialog_malformed_url,
		244	messageType);
		245	complete = false;
		246	}
		247	}
		248
		249	if (complete) {
		250	setErrorMessage(null);
		251	setDescription(TeamUIMessages.ImportProjectSetMainPage_description);
		252	}
		253
		254	setPageComplete(complete);
		255	}
		256
		257	private void updateFileEnablement() {
133	boolean complete = false;	258	boolean complete = false;
134	setMessage(null);	259	setMessage(null);
		260	setErrorMessage(null);
135		261
136	if (file.length() == 0) {	262	if (file.length() == 0) {
137	setMessage(TeamUIMessages.ImportProjectSetMainPage_specifyFile, messageType);	263	setMessage(TeamUIMessages.ImportProjectSetMainPage_specifyFile, messageType);
Lines 141-154 Link Here
141	// See if the file exists	267	// See if the file exists
142	File f = new File(file);	268	File f = new File(file);
143	if (!f.exists()) {	269	if (!f.exists()) {
		270	messageType = ERROR;
144	setMessage(TeamUIMessages.ImportProjectSetMainPage_The_specified_file_does_not_exist_4, messageType);	271	setMessage(TeamUIMessages.ImportProjectSetMainPage_The_specified_file_does_not_exist_4, messageType);
145	setPageComplete(false);	272	setPageComplete(false);
146	return;	273	return;
147	} else if (f.isDirectory()) {	274	} else if (f.isDirectory()) {
		275	messageType = ERROR;
148	setMessage(TeamUIMessages.ImportProjectSetMainPage_You_have_specified_a_folder_5, messageType);	276	setMessage(TeamUIMessages.ImportProjectSetMainPage_You_have_specified_a_folder_5, messageType);
149	setPageComplete(false);	277	setPageComplete(false);
150	return;	278	return;
151	} else if (!ProjectSetImporter.isValidProjectSetFile(file)) {	279	} else if (!ProjectSetImporter.isValidProjectSetFile(file)) {
		280	messageType = ERROR;
152	setMessage(TeamUIMessages.ImportProjectSetMainPage_projectSetFileInvalid, messageType);	281	setMessage(TeamUIMessages.ImportProjectSetMainPage_projectSetFileInvalid, messageType);
153	setPageComplete(false);	282	setPageComplete(false);
154	return;	283	return;
Lines 168-173 Link Here
168	return file;	297	return file;
169	}	298	}
170		299
		300	public String getUrl() {
		301	return urlString;
		302	}
		303
171	public void setVisible(boolean visible) {	304	public void setVisible(boolean visible) {
172	super.setVisible(visible);	305	super.setVisible(visible);
173	if (visible) {	306	if (visible) {
Lines 193-196 Link Here
193	public boolean isRunInBackgroundOn() {	326	public boolean isRunInBackgroundOn() {
194	return runInBackground;	327	return runInBackground;
195	}	328	}
		329
		330	public int getInputType() {
		331	return inputType;
		332	}
		333
		334	public String getURLContents() {
		335	try {
		336	PsfUrlStore.getInstance().remember(urlString);
		337	String urlContent = Utilities.getURLContents(new URL(urlString),
		338	getContainer());
		339	if (ProjectSetImporter.isValidProjectSetString(urlContent)) {
		340	return urlContent;
		341	} else {
		342	messageType = ERROR;
		343	setMessage(
		344	TeamUIMessages.ImportProjectSetMainPage_projectSetFileInvalid,
		345	messageType);
		346	setPageComplete(false);
		347	return null;
		348	}
		349	} catch (OperationCanceledException e) { // ignore
		350	} catch (InterruptedException e) { // ignore
		351	} catch (InvocationTargetException e) {
		352	messageType = ERROR;
		353	setMessage(
		354	TeamUIMessages.ImportProjectSetMainPage_The_given_URL_cannot_be_loaded,
		355	messageType);
		356	setPageComplete(false);
		357	} catch (MalformedURLException e) {
		358	// ignore as we tested it with modify listener on combo
		359	}
		360	return null;
		361	}
196	}	362	}

Lines 1-5 Link Here

(-)src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java (-8 / +49 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007, 2008 IBM Corporation and others.	2	* Copyright (c) 2007, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 22-30 Link Here
22	import org.eclipse.ui.IWorkingSetManager;	22	import org.eclipse.ui.IWorkingSetManager;
23		23
24	public class ImportProjectSetOperation extends TeamOperation {	24	public class ImportProjectSetOperation extends TeamOperation {
25		25
		26	private String psfFileContents;
		27	private String urlString;
26	private String psfFile;	28	private String psfFile;
27	private IWorkingSet[] workingSets;	29	private IWorkingSet[] workingSets;
		30
		31
		32	/**
		33	* Operation for importing a Team Project Set stored in a String
		34	*
		35	* @param context
		36	* a runnable context,
		37	* <code>null</null> for running in background
		38	* @param psfFileContents
		39	* the psf file content to load
		40	* @param urlString
		41	* url or path to file loaded into <code>psfFileContents</code>
		42	* @param workingSets
		43	* an array of working sets where imported project should be
		44	* added. If a working set doesn't exist it will be created. The
		45	* array cannot be <code>null</code>, pass an empty array if you
		46	* don't want to add projects to any working set.
		47	*/
		48	public ImportProjectSetOperation(IRunnableContext context,
		49	String psfFileContents, String urlString, IWorkingSet[] workingSets) {
		50	super(context);
		51	this.psfFileContents = psfFileContents;
		52	this.workingSets = workingSets;
		53	this.urlString = urlString;
		54	}
28		55
29	/**	56	/**
30	* Operation for importing a Team Project Set file	57	* Operation for importing a Team Project Set file
Lines 45-62 Link Here
45	this.psfFile = psfFile;	72	this.psfFile = psfFile;
46	this.workingSets = workingSets;	73	this.workingSets = workingSets;
47	}	74	}
		75
		76	private void runForStringContent(IProgressMonitor monitor) throws InvocationTargetException{
		77	IProject[] newProjects = ProjectSetImporter.importProjectSetFromString(
		78	psfFileContents, urlString, getShell(), monitor);
		79	createWorkingSet(workingSets, newProjects);
		80	}
		81
		82	private void runForFile(IProgressMonitor monitor) throws InvocationTargetException{
		83	PsfFilenameStore.getInstance().remember(psfFile);
		84	IProject[] newProjects = ProjectSetImporter.importProjectSet(psfFile,
		85	getShell(), monitor);
		86	createWorkingSet(workingSets, newProjects);
		87	}
48		88
49	/*	89	/*
50	* (non-Javadoc)	90	* (non-Javadoc)
51	*	91	*
52	* @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)	92	* @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
53	*/	93	*/
54	public void run(IProgressMonitor monitor) throws InvocationTargetException,	94	public void run(IProgressMonitor monitor)
55	InterruptedException {	95	throws InvocationTargetException, InterruptedException{
56	PsfFilenameStore.remember(psfFile);	96	if(psfFileContents!=null){
57	IProject[] newProjects = ProjectSetImporter.importProjectSet(psfFile,	97	runForStringContent(monitor);
58	getShell(), monitor);	98	}else{
59	createWorkingSet(workingSets, newProjects);	99	runForFile(monitor);
		100	}
60	}	101	}
61		102
62	/*	103	/*

Lines 59-65 Link Here

(-)src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java (-1 / +1 lines)
59	if (path.getFileExtension() == null) {	59	if (path.getFileExtension() == null) {
60	filename = filename + ".psf"; //$NON-NLS-1$	60	filename = filename + ".psf"; //$NON-NLS-1$
61	}	61	}
62	PsfFilenameStore.remember(filename);	62	PsfFilenameStore.getInstance().remember(filename);
63	File file = new File(filename);	63	File file = new File(filename);
64	File parentFile = file.getParentFile();	64	File parentFile = file.getParentFile();
65	if (parentFile != null && !parentFile.exists()) {	65	if (parentFile != null && !parentFile.exists()) {




/*******************************************************************************
 * Copyright (c) 2000, 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	public boolean performFinish() {
		final boolean[] result = new boolean[] {false};
		try {
			ImportProjectSetOperation op;
			if (mainPage.getInputType() == ImportProjectSetMainPage.InputType_URL) {
				String psfContent = mainPage.getURLContents();
				if(psfContent==null){
					return false;
				}
				op = new ImportProjectSetOperation(
						mainPage.isRunInBackgroundOn() ? null : getContainer(),
						psfContent, mainPage.getUrl(), mainPage.getWorkingSets());
			} else {
				op = new ImportProjectSetOperation(
						mainPage.isRunInBackgroundOn() ? null : getContainer(),
						mainPage.getFileName(), mainPage.getWorkingSets());
			}
			op.run();
			result[0] = true;
		} catch (InterruptedException e) {

	public void init(IWorkbench workbench, IStructuredSelection selection) {
		// The code that finds "selection" is broken (it is always empty), so we
		// must dig for the selection in the workbench.
		PsfFilenameStore.getInstance().setDefaultFromSelection(workbench);
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *******************************************************************************/
package org.eclipse.team.internal.ui.wizards;

import java.util.Vector;

import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.*;

public class PsfFilenameStore extends PsfStore {
import org.eclipse.ui.IWorkbenchWindow;

public class PsfFilenameStore {
	// Most recently used filename is first in the array.
	// Least recently used filename is at the end of the list.
	// When the list overflows, items drop off the end.
	private static final int HISTORY_LENGTH = 10;

	private static final String STORE_SECTION = "ImportPSFDialog"; //$NON-NLS-1$
	private static final String FILENAMES = "filenames"; //$NON-NLS-1$
	private static final String PREVIOUS = "previous"; //$NON-NLS-1$


	// This is only a cache; it is not part of the history until the user has used it.
	private static String _selectedFilename = null;

	private static PsfFilenameStore instance;
	
	public static PsfFilenameStore getInstance(){
		if(instance==null){
			instance = new PsfFilenameStore();
		}
		return instance;
	}

	private PsfFilenameStore() {
		// Singleton
	}

	public void setDefaultFromSelection(IWorkbench workbench) {
		// Scan the workbench for a selected PSF file
		IWorkbenchWindow wnd = workbench.getActiveWorkbenchWindow();
		IWorkbenchPage pg = wnd.getActivePage();

		_selectedFilename = path.toOSString();
	}

	public String getSuggestedDefault() {
		if (_selectedFilename != null) {
			return _selectedFilename;
		}
		return getPrevious();
	}

	protected String getPreviousTag() {
		return PREVIOUS;
		String retval = section.get(PREVIOUS);
		if (retval == null) {
			retval = ""; //$NON-NLS-1$
		}
		return retval;
	}

	protected String getListTag() {
		return FILENAMES;
		String[] arr = section.getArray(FILENAMES);
		if (arr == null) {
			arr = new String[0];
		}
		return arr;
	}

	
		Vector filenames = createVector(getHistory());
		if (filenames.contains(filename)) {
			// The item is in the list. Remove it and add it back at the
			// beginning. If it already was at the beginning this will be a
			// waste of time, but it's not even measurable so I don't care.
			filenames.remove(filename);
		}
		// Most recently used filename goes to the beginning of the list
		filenames.add(0, filename);

		// Forget any overflowing items
		while (filenames.size() > HISTORY_LENGTH) {
			filenames.remove(HISTORY_LENGTH);
		}

		// Make it an array
		String[] arr = (String[]) filenames.toArray(new String[filenames.size()]);

		IDialogSettings section = getSettingsSection();
		section.put(FILENAMES, arr);
		section.put(PREVIOUS, filename);
	}

	private static Vector createVector(Object[] arr) {
		Vector v = new Vector();
		for (int ix = 0; ix < arr.length; ++ix) {
			v.add(ix, arr[ix]);
		}
		return v;
	}

	private static IDialogSettings getSettingsSection() {
		if (_section != null)
			return _section;

		IDialogSettings settings = TeamUIPlugin.getPlugin().getDialogSettings();
		_section = settings.getSection(STORE_SECTION);
		if (_section != null)
			return _section;

		_section = settings.addNewSection(STORE_SECTION);
		return _section;
	}
}




/*******************************************************************************
 * Copyright (c) 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.internal.ui.wizards;

import java.util.Vector;

import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.team.internal.ui.TeamUIPlugin;

public abstract class PsfStore {
	// Most recently used filename is first in the array.
	// Least recently used filename is at the end of the list.
	// When the list overflows, items drop off the end.
	private static final int HISTORY_LENGTH = 10;

	private static final String STORE_SECTION = "ImportPSFDialog"; //$NON-NLS-1$
	
	private static IDialogSettings _section;
	
	protected abstract String getPreviousTag();
	protected abstract String getListTag();
	
	public abstract String getSuggestedDefault();
	
	protected String getPrevious() {
		IDialogSettings section = getSettingsSection();
		String retval = section.get(getPreviousTag());
		if (retval == null) {
			retval = ""; //$NON-NLS-1$
		}
		return retval;
	}

	public String[] getHistory() {
		IDialogSettings section = getSettingsSection();
		String[] arr = section.getArray(getListTag());
		if (arr == null) {
			arr = new String[0];
		}
		return arr;
	}

	public void remember(String filename) {
		Vector filenames = createVector(getHistory());
		if (filenames.contains(filename)) {
			// The item is in the list. Remove it and add it back at the
			// beginning. If it already was at the beginning this will be a
			// waste of time, but it's not even measurable so I don't care.
			filenames.remove(filename);
		}
		// Most recently used filename goes to the beginning of the list
		filenames.add(0, filename);

		// Forget any overflowing items
		while (filenames.size() > HISTORY_LENGTH) {
			filenames.remove(HISTORY_LENGTH);
		}

		// Make it an array
		String[] arr = (String[]) filenames.toArray(new String[filenames.size()]);

		IDialogSettings section = getSettingsSection();
		section.put(getListTag(), arr);
		section.put(getPreviousTag(), filename);
	}

	private Vector createVector(Object[] arr) {
		Vector v = new Vector();
		for (int ix = 0; ix < arr.length; ++ix) {
			v.add(ix, arr[ix]);
		}
		return v;
	}

	private IDialogSettings getSettingsSection() {
		if (_section != null)
			return _section;

		IDialogSettings settings = TeamUIPlugin.getPlugin().getDialogSettings();
		_section = settings.getSection(STORE_SECTION);
		if (_section != null)
			return _section;

		_section = settings.addNewSection(STORE_SECTION);
		return _section;
	}
}




/*******************************************************************************
 * Copyright (c) 2010 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 * IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.team.internal.ui.wizards;

/**
 * Stores URL history for importing project sets window.
 * 
 */
public class PsfUrlStore extends PsfStore {

	private static final String URLS = "urls"; //$NON-NLS-1$
	private static final String PREVIOUS = "previous_url"; //$NON-NLS-1$

	private static PsfUrlStore instance;

	public static PsfUrlStore getInstance() {
		if (instance == null) {
			instance = new PsfUrlStore();
		}
		return instance;
	}

	private PsfUrlStore() {
		// Singleton
	}

	protected String getPreviousTag() {
		return PREVIOUS;
	}

	protected String getListTag() {
		return URLS;
	}

	public String getSuggestedDefault() {
		return getPrevious();
	}

}

Return to bug 162608

Lines 21-29 Link Here

(-)compare/org/eclipse/compare/internal/patch/InputPatchPage.java (-45 / +11 lines)
21	import java.io.StringReader;	21	import java.io.StringReader;
22	import java.lang.reflect.InvocationTargetException;	22	import java.lang.reflect.InvocationTargetException;
23	import java.net.MalformedURLException;	23	import java.net.MalformedURLException;
24	import java.net.SocketTimeoutException;
25	import java.net.URL;	24	import java.net.URL;
26	import java.net.URLConnection;
27		25
28	import org.eclipse.compare.internal.ICompareContextIds;	26	import org.eclipse.compare.internal.ICompareContextIds;
29	import org.eclipse.compare.internal.Utilities;	27	import org.eclipse.compare.internal.Utilities;
Lines 34-48 Link Here
34	import org.eclipse.core.resources.IResource;	32	import org.eclipse.core.resources.IResource;
35	import org.eclipse.core.resources.ResourcesPlugin;	33	import org.eclipse.core.resources.ResourcesPlugin;
36	import org.eclipse.core.runtime.IPath;	34	import org.eclipse.core.runtime.IPath;
37	import org.eclipse.core.runtime.IProgressMonitor;
38	import org.eclipse.core.runtime.OperationCanceledException;	35	import org.eclipse.core.runtime.OperationCanceledException;
39	import org.eclipse.core.runtime.Path;	36	import org.eclipse.core.runtime.Path;
40	import org.eclipse.core.runtime.SubMonitor;
41	import org.eclipse.jface.dialogs.Dialog;	37	import org.eclipse.jface.dialogs.Dialog;
42	import org.eclipse.jface.dialogs.IDialogConstants;	38	import org.eclipse.jface.dialogs.IDialogConstants;
43	import org.eclipse.jface.dialogs.IDialogSettings;	39	import org.eclipse.jface.dialogs.IDialogSettings;
44	import org.eclipse.jface.dialogs.MessageDialog;	40	import org.eclipse.jface.dialogs.MessageDialog;
45	import org.eclipse.jface.operation.IRunnableWithProgress;
46	import org.eclipse.jface.viewers.DoubleClickEvent;	41	import org.eclipse.jface.viewers.DoubleClickEvent;
47	import org.eclipse.jface.viewers.IDoubleClickListener;	42	import org.eclipse.jface.viewers.IDoubleClickListener;
48	import org.eclipse.jface.viewers.ISelection;	43	import org.eclipse.jface.viewers.ISelection;
Lines 264-272 Link Here
264	} else if (inputMethod==URL) {	259	} else if (inputMethod==URL) {
265	String patchFileURL = fPatchURLField.getText();	260	String patchFileURL = fPatchURLField.getText();
266	if (patchFileURL != null) {	261	if (patchFileURL != null) {
267	String contents = getURLContents(patchFileURL);	262	try {
268	if (contents != null)	263	String contents = Utilities.getURLContents(new URL(
269	reader = new StringReader(contents);	264	patchFileURL), getContainer());
		265	if (contents != null)
		266	reader = new StringReader(contents);
		267	} catch (MalformedURLException e) {
		268	// ignore as we tested it with modify listener on combo
		269	} catch (InvocationTargetException e) { // ignore
		270	} catch (OperationCanceledException e) { // ignore
		271	} catch (InterruptedException e) { // ignore
		272	}
270	}	273	}
271	fPatchSource= PatchMessages.InputPatchPage_URL_title;	274	fPatchSource= PatchMessages.InputPatchPage_URL_title;
272	} else if (inputMethod==WORKSPACE) {	275	} else if (inputMethod==WORKSPACE) {
Lines 307-349 Link Here
307	}	310	}
308	}	311	}
309	}	312	}
310
311	private String getURLContents(String patchFileURL) {
312	final URL url;
313	try {
314	url = new URL(patchFileURL);
315	final String[] result= new String[1];
316	try {
317	getContainer().run(true, true, new IRunnableWithProgress() {
318	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
319	SubMonitor progress = SubMonitor.convert(monitor, PatchMessages.InputPatchPage_URLConnecting, 100);
320	try {
321	URLConnection connection = url.openConnection();
322	progress.worked(10);
323	if (monitor.isCanceled())
324	throw new OperationCanceledException();
325	Utilities.setReadTimeout(connection, 60*1000);
326	progress.setTaskName(PatchMessages.InputPatchPage_URLFetchingContent);
327	String enc = connection.getContentEncoding();
328	if (enc == null)
329	enc = ResourcesPlugin.getEncoding();
330	result[0] = Utilities.readString(connection.getInputStream(), enc, connection.getContentLength(), progress.newChild(90));
331	} catch (SocketTimeoutException e) { // timeout
332	} catch (IOException e) { //ignore
333	}
334	monitor.done();
335	}
336	});
337	return result[0];
338	} catch (OperationCanceledException e) { //ignore
339	} catch (InvocationTargetException e) { //ignore
340	} catch (InterruptedException e) { //ignore
341	}
342	} catch (MalformedURLException e) {
343	// ignore as we tested it with modify listener on combo
344	}
345	return null;
346	}
347		313
348	/* (non-JavaDoc)	314	/* (non-JavaDoc)
349	* Method declared in IWizardPage.	315	* Method declared in IWizardPage.

Lines 1-5 Link Here

(-)src/org/eclipse/team/internal/ui/ProjectSetImporter.java (-6 / +81 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 30-39 Link Here
30	import org.eclipse.ui.*;	30	import org.eclipse.ui.*;
31		31
32	public class ProjectSetImporter {	32	public class ProjectSetImporter {
33		33
34	public static IProject[] importProjectSet(String filename, Shell shell, IProgressMonitor monitor) throws InvocationTargetException {	34	/**
		35	* Imports a psf file based on a file content. This may be used when psf
		36	* file is imported from any other location that local filesystem.
		37	*
		38	* @param psfContents
		39	* the content of the psf file.
		40	* @param filename
		41	* the name of the source file. This is included in case the
		42	* provider needs to deduce relative paths
		43	* @param shell
		44	* @param monitor
		45	* @return list of new projects
		46	* @throws InvocationTargetException
		47	*/
		48	public static IProject[] importProjectSetFromString(String psfContents,
		49	String filename, Shell shell, IProgressMonitor monitor)
		50	throws InvocationTargetException {
		51	XMLMemento xmlMemento = stringToXMLMemento(psfContents);
		52	return importProjectSet(xmlMemento, filename, shell, monitor);
		53	}
		54
		55	/**
		56	* Imports a psf file.
		57	*
		58	* @param filename
		59	* @param shell
		60	* @param monitor
		61	* @return list of new projects
		62	* @throws InvocationTargetException
		63	*/
		64	public static IProject[] importProjectSet(String filename, Shell shell,
		65	IProgressMonitor monitor) throws InvocationTargetException {
		66	XMLMemento xmlMemento = filenameToXMLMemento(filename);
		67	return importProjectSet(xmlMemento, filename, shell, monitor);
		68	}
		69
		70	private static IProject[] importProjectSet(XMLMemento xmlMemento,
		71	String filename, Shell shell, IProgressMonitor monitor)
		72	throws InvocationTargetException {
35	try {	73	try {
36	XMLMemento xmlMemento = filenameToXMLMemento(filename);
37	String version = xmlMemento.getString("version"); //$NON-NLS-1$	74	String version = xmlMemento.getString("version"); //$NON-NLS-1$
38		75
39	List newProjects = new ArrayList();	76	List newProjects = new ArrayList();
Lines 179-185 Link Here
179	}	216	}
180	}	217	}
181	}	218	}
182		219
		220	private static XMLMemento stringToXMLMemento(String stringContents)
		221	throws InvocationTargetException {
		222	StringReader reader = null;
		223	try {
		224	reader = new StringReader(stringContents);
		225	return XMLMemento.createReadRoot(reader);
		226	} catch (WorkbenchException e) {
		227	throw new InvocationTargetException(e);
		228	} finally {
		229	if (reader != null) {
		230	reader.close();
		231	}
		232	}
		233	}
		234
		235	/**
		236	* Check if given file is a valid psf file
		237	*
		238	* @param filename
		239	* @return <code>true</code> is file is a valid psf file
		240	*/
183	public static boolean isValidProjectSetFile(String filename) {	241	public static boolean isValidProjectSetFile(String filename) {
184	try {	242	try {
185	return filenameToXMLMemento(filename).getString("version") != null; //$NON-NLS-1$	243	return filenameToXMLMemento(filename).getString("version") != null; //$NON-NLS-1$
Lines 187-193 Link Here
187	return false;	245	return false;
188	}	246	}
189	}	247	}
190		248
		249	/**
		250	* Check if given string is a valid project set
		251	*
		252	* @param psfContent
		253	* @return <code>true</code> if psfContent is a valid project set
		254	*/
		255	public static boolean isValidProjectSetString(String psfContent) {
		256	if (psfContent == null) {
		257	return false;
		258	}
		259	try {
		260	return stringToXMLMemento(psfContent).getString("version") != null; //$NON-NLS-1$
		261	} catch (InvocationTargetException e) {
		262	return false;
		263	}
		264	}
		265
191	private static void mergeWorkingSets(IWorkingSet newWs, IWorkingSet oldWs) {	266	private static void mergeWorkingSets(IWorkingSet newWs, IWorkingSet oldWs) {
192	IAdaptable[] oldElements = oldWs.getElements();	267	IAdaptable[] oldElements = oldWs.getElements();
193	IAdaptable[] newElements = newWs.getElements();	268	IAdaptable[] newElements = newWs.getElements();

Lines 105-110 Link Here

(-)src/org/eclipse/team/internal/ui/TeamUIMessages.java (-1 / +5 lines)
105	public static String HistoryPageCompareEditorInput_0;	105	public static String HistoryPageCompareEditorInput_0;
106		106
107	public static String ImportProjectSetMainPage_AddToWorkingSet;	107	public static String ImportProjectSetMainPage_AddToWorkingSet;
		108	public static String ImportProjectSetMainPage_Project_Set_File;
		109	public static String ImportProjectSetMainPage_Project_Set_Url;
108		110
109	public static String ImportProjectSetMainPage_Browse;	111	public static String ImportProjectSetMainPage_Browse;
110		112
Lines 114-119 Link Here
114	public static String ImportProjectSetDialog_duplicatedWorkingSet_merge;	116	public static String ImportProjectSetDialog_duplicatedWorkingSet_merge;
115	public static String ImportProjectSetDialog_duplicatedWorkingSet_skip;	117	public static String ImportProjectSetDialog_duplicatedWorkingSet_skip;
116	public static String ImportProjectSetDialog_duplicatedWorkingSet_applyToAll;	118	public static String ImportProjectSetDialog_duplicatedWorkingSet_applyToAll;
		119	public static String ImportProjectSetDialog_malformed_url;
117		120
118	public static String information;	121	public static String information;
119		122
Lines 310-317 Link Here
310	public static String ExportProjectSetMainPage_Initial_description;	313	public static String ExportProjectSetMainPage_Initial_description;
311	public static String ExportProjectSetMainPage_specifyFile;	314	public static String ExportProjectSetMainPage_specifyFile;
312		315
313	public static String ImportProjectSetMainPage_Project_Set_File_Name__2;
314	public static String ImportProjectSetMainPage_Browse_3;	316	public static String ImportProjectSetMainPage_Browse_3;
		317	public static String ImportProjectSetMainPage_The_given_URL_cannot_be_loaded;
315	public static String ImportProjectSetMainPage_The_specified_file_does_not_exist_4;	318	public static String ImportProjectSetMainPage_The_specified_file_does_not_exist_4;
316	public static String ImportProjectSetMainPage_You_have_specified_a_folder_5;	319	public static String ImportProjectSetMainPage_You_have_specified_a_folder_5;
317	public static String ImportProjectSetMainPage_workingSetNameEmpty;	320	public static String ImportProjectSetMainPage_workingSetNameEmpty;
Lines 320-325 Link Here
320	public static String ImportProjectSetMainPage_runInBackground;	323	public static String ImportProjectSetMainPage_runInBackground;
321	public static String ImportProjectSetMainPage_jobName;	324	public static String ImportProjectSetMainPage_jobName;
322	public static String ImportProjectSetMainPage_specifyFile;	325	public static String ImportProjectSetMainPage_specifyFile;
		326	public static String ImportProjectSetMainPage_specifyURL;
323	public static String ImportProjectSetMainPage_selectWorkingSet;	327	public static String ImportProjectSetMainPage_selectWorkingSet;
324	public static String ImportProjectSetMainPage_projectSetFileInvalid;	328	public static String ImportProjectSetMainPage_projectSetFileInvalid;
325		329

Lines 104-112 Link Here

(-)src/org/eclipse/team/internal/ui/messages.properties (-1 / +5 lines)
104	ExportProjectSetMainPage_Initial_description=Define which projects or working sets should be exported into the team project file.	104	ExportProjectSetMainPage_Initial_description=Define which projects or working sets should be exported into the team project file.
105	ExportProjectSetMainPage_specifyFile=Please specify the destination file.	105	ExportProjectSetMainPage_specifyFile=Please specify the destination file.
106		106
107	ImportProjectSetMainPage_Project_Set_File_Name__2=F&ile name:	107	ImportProjectSetMainPage_Project_Set_File=File
		108	ImportProjectSetMainPage_Project_Set_Url=URL
108	ImportProjectSetMainPage_Browse_3=B&rowse...	109	ImportProjectSetMainPage_Browse_3=B&rowse...
109	ImportProjectSetMainPage_Browse=Br&owse...	110	ImportProjectSetMainPage_Browse=Br&owse...
		111	ImportProjectSetMainPage_The_given_URL_cannot_be_loaded=File from given URL cannot be loaded
110	ImportProjectSetMainPage_The_specified_file_does_not_exist_4=The specified file does not exist	112	ImportProjectSetMainPage_The_specified_file_does_not_exist_4=The specified file does not exist
111	ImportProjectSetMainPage_You_have_specified_a_folder_5=You have specified a folder	113	ImportProjectSetMainPage_You_have_specified_a_folder_5=You have specified a folder
112	ImportProjectSetMainPage_workingSetNameEmpty=The working set name must not be empty	114	ImportProjectSetMainPage_workingSetNameEmpty=The working set name must not be empty
Lines 116-121 Link Here
116	ImportProjectSetMainPage_runInBackground=Run the import in the bac&kground	118	ImportProjectSetMainPage_runInBackground=Run the import in the bac&kground
117	ImportProjectSetMainPage_jobName=Importing project set...	119	ImportProjectSetMainPage_jobName=Importing project set...
118	ImportProjectSetMainPage_specifyFile=Please specify a file to import.	120	ImportProjectSetMainPage_specifyFile=Please specify a file to import.
		121	ImportProjectSetMainPage_specifyURL=Please specify an URL to import.
119	ImportProjectSetMainPage_selectWorkingSet=Select a working set.	122	ImportProjectSetMainPage_selectWorkingSet=Select a working set.
120	ImportProjectSetMainPage_projectSetFileInvalid=The specified file is not a valid Team Project Set file.	123	ImportProjectSetMainPage_projectSetFileInvalid=The specified file is not a valid Team Project Set file.
121	ImportProjectSetDialog_duplicatedWorkingSet_title=Working Set Exists	124	ImportProjectSetDialog_duplicatedWorkingSet_title=Working Set Exists
Lines 124-129 Link Here
124	ImportProjectSetDialog_duplicatedWorkingSet_merge=&Merge	127	ImportProjectSetDialog_duplicatedWorkingSet_merge=&Merge
125	ImportProjectSetDialog_duplicatedWorkingSet_skip=&Skip	128	ImportProjectSetDialog_duplicatedWorkingSet_skip=&Skip
126	ImportProjectSetDialog_duplicatedWorkingSet_applyToAll=&Apply to all working sets in this import	129	ImportProjectSetDialog_duplicatedWorkingSet_applyToAll=&Apply to all working sets in this import
		130	ImportProjectSetDialog_malformed_url=Malformed URL
127		131
128	ProjectSetContentHandler_Element_provider_must_be_contained_in_element_psf_4=Element provider must be contained in element psf	132	ProjectSetContentHandler_Element_provider_must_be_contained_in_element_psf_4=Element provider must be contained in element psf
129	ProjectSetContentHandler_Element_project_must_be_contained_in_element_provider_7=Element project must be contained in element provider	133	ProjectSetContentHandler_Element_project_must_be_contained_in_element_provider_7=Element project must be contained in element provider

Added Link Here

(-)src/org/eclipse/team/internal/ui/wizards/PsfStore.java (+95 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.team.internal.ui.wizards;
12
13	import java.util.Vector;
14
15	import org.eclipse.jface.dialogs.IDialogSettings;
16	import org.eclipse.team.internal.ui.TeamUIPlugin;
17
18	public abstract class PsfStore {
19	// Most recently used filename is first in the array.
20	// Least recently used filename is at the end of the list.
21	// When the list overflows, items drop off the end.
22	private static final int HISTORY_LENGTH = 10;
23
24	private static final String STORE_SECTION = "ImportPSFDialog"; //$NON-NLS-1$
25
26	private static IDialogSettings _section;
27
28	protected abstract String getPreviousTag();
29	protected abstract String getListTag();
30
31	public abstract String getSuggestedDefault();
32
33	protected String getPrevious() {
34	IDialogSettings section = getSettingsSection();
35	String retval = section.get(getPreviousTag());
36	if (retval == null) {
37	retval = ""; //$NON-NLS-1$
38	}
39	return retval;
40	}
41
42	public String[] getHistory() {
43	IDialogSettings section = getSettingsSection();
44	String[] arr = section.getArray(getListTag());
45	if (arr == null) {
46	arr = new String[0];
47	}
48	return arr;
49	}
50
51	public void remember(String filename) {
52	Vector filenames = createVector(getHistory());
53	if (filenames.contains(filename)) {
54	// The item is in the list. Remove it and add it back at the
55	// beginning. If it already was at the beginning this will be a
56	// waste of time, but it's not even measurable so I don't care.
57	filenames.remove(filename);
58	}
59	// Most recently used filename goes to the beginning of the list
60	filenames.add(0, filename);
61
62	// Forget any overflowing items
63	while (filenames.size() > HISTORY_LENGTH) {
64	filenames.remove(HISTORY_LENGTH);
65	}
66
67	// Make it an array
68	String[] arr = (String[]) filenames.toArray(new String[filenames.size()]);
69
70	IDialogSettings section = getSettingsSection();
71	section.put(getListTag(), arr);
72	section.put(getPreviousTag(), filename);
73	}
74
75	private Vector createVector(Object[] arr) {
76	Vector v = new Vector();
77	for (int ix = 0; ix < arr.length; ++ix) {
78	v.add(ix, arr[ix]);
79	}
80	return v;
81	}
82
83	private IDialogSettings getSettingsSection() {
84	if (_section != null)
85	return _section;
86
87	IDialogSettings settings = TeamUIPlugin.getPlugin().getDialogSettings();
88	_section = settings.getSection(STORE_SECTION);
89	if (_section != null)
90	return _section;
91
92	_section = settings.addNewSection(STORE_SECTION);
93	return _section;
94	}
95	}