Attachment #56177 for bug #162608

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

Lines 10-15 Link Here

(-)src/org/eclipse/team/internal/ui/wizards/ProjectSetImportWizard.java (-6 / +13 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.team.internal.ui.wizards;	11	package org.eclipse.team.internal.ui.wizards;
12		12
		13	import java.io.IOException;
		14	import java.io.InputStream;
13	import java.lang.reflect.InvocationTargetException;	15	import java.lang.reflect.InvocationTargetException;
14		16
15	import org.eclipse.core.resources.IProject;	17	import org.eclipse.core.resources.IProject;
Lines 45-56 Link Here
45	try {	47	try {
46	getContainer().run(true, true, new WorkspaceModifyOperation(null) {	48	getContainer().run(true, true, new WorkspaceModifyOperation(null) {
47	public void execute(IProgressMonitor monitor) throws InvocationTargetException {	49	public void execute(IProgressMonitor monitor) throws InvocationTargetException {
48	String psfFile = mainPage.getFileName();	50	try {
49	PsfFilenameStore.remember(psfFile);	51	String psfFile = mainPage.getFileName();
50	IProject[] newProjects= ProjectSetImporter.importProjectSet(psfFile, getShell(), monitor);	52	InputStream is = mainPage.getInputStream();
51	if (workingSetName != null)	53	PsfFilenameStore.remember(psfFile);
52	createWorkingSet(workingSetName, newProjects);	54	IProject[] newProjects= ProjectSetImporter.importProjectSet(is, getShell(), monitor);
53	result[0] = true;	55	if (workingSetName != null)
		56	createWorkingSet(workingSetName, newProjects);
		57	result[0] = true;
		58	} catch (IOException e) {
		59	throw new InvocationTargetException(e);
		60	}
54	}	61	}
55	});	62	});
56	} catch (InterruptedException e) {	63	} catch (InterruptedException e) {




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

import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;

import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;

import org.eclipse.ui.PlatformUI;

public class ImportProjectSetMainPage extends TeamWizardPage {
	private Button fileRadio;
	Combo fileCombo;
	String file = ""; //$NON-NLS-1$
	private URL url;
	private Button fileBrowseButton;
	Button browseButton;
	private Button urlRadio;
	private Text urlText;
	Button addToWorkingSet;
	Text workingSetField;
	

	private String workingSetName = ""; //$NON-NLS-1$
	
	private boolean haveBrowsed;
	private boolean fileSelected;
	
	// constants
	//private static final int SIZING_TEXT_FIELD_WIDTH = 80;

		layout.marginWidth = 0;
		inner.setLayout(layout);
		
		fileRadio = new Button(inner, SWT.RADIO);
		fileRadio.setText(TeamUIMessages.ImportProjectSetMainPage_Project_Set_File_Name__2);
		fileRadio.setSelection(true);

		fileCombo = createDropDownCombo(inner);
		file = PsfFilenameStore.getSuggestedDefault();

			}
		});

		fileBrowseButton = new Button(inner, SWT.PUSH);
		fileBrowseButton.setText(TeamUIMessages.ImportProjectSetMainPage_Browse_3); 
		GridData data = new GridData();
		data.horizontalAlignment = GridData.FILL;
		int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
		data.widthHint = Math.max(widthHint, fileBrowseButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
		fileBrowseButton.setLayoutData(data);
		fileBrowseButton.addListener(SWT.Selection, new Listener() {
			public void handleEvent(Event event) {
				FileDialog d = new FileDialog(getShell());
				d.setFilterExtensions(new String[] {"*.psf", "*"}); //$NON-NLS-1$ //$NON-NLS-2$

			}
		});

		urlRadio = new Button(inner, SWT.RADIO);
		urlRadio.setText(TeamUIMessages.ImportProjectSetMainPage_Project_Set_File_URL);
		
		urlText = new Text(inner, SWT.SINGLE | SWT.BORDER);
		urlText.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).span(2, 1).create());
		urlText.addModifyListener(new ModifyListener() {

			public void modifyText(ModifyEvent e) {
				updateEnablement();
			}
			
		});
		
		SelectionListener radioEnablement = new SelectionAdapter() {
			
			public void widgetSelected(SelectionEvent e) {
				updateEnablement();
			}
			
		};
		fileRadio.addSelectionListener(radioEnablement);
		urlRadio.addSelectionListener(radioEnablement);
		
		Label separator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
		separator.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());

		addWorkingSetSection(composite);
		setControl(composite);
		updateEnablement();

		boolean complete;
		setMessage(null);
		
		fileSelected = fileRadio.getSelection();
		fileCombo.setEnabled(fileSelected);
		fileBrowseButton.setEnabled(fileSelected);
		urlText.setEnabled(!fileSelected);
		
		workingSetField.setEnabled(addToWorkingSet.getSelection());
		browseButton.setEnabled(addToWorkingSet.getSelection());
		
		if (fileSelected) {
			// Check file selection
			if (file.length() == 0) {
				setPageComplete(false);
				return;
			} else {
				// See if the file exists
				File f = new File(file);
				if (!f.exists()) {
					setMessage(TeamUIMessages.ImportProjectSetMainPage_The_specified_file_does_not_exist_4, ERROR); 
					setPageComplete(false);
					return;
				} else if (f.isDirectory()) {
					setMessage(TeamUIMessages.ImportProjectSetMainPage_You_have_specified_a_folder_5, ERROR); 
					setPageComplete(false);
					return;
				} 
			}
		} else {
			// Check URL selection
			if (urlText.getText().trim().equals("")) { //$NON-NLS-1$
			if (!f.exists()) {
				setMessage(TeamUIMessages.ImportProjectSetMainPage_The_specified_file_does_not_exist_4, ERROR); 
				setPageComplete(false);
				setMessage(TeamUIMessages.ImportProjectSetMainPage_Inform_file_URL, ERROR);
				return;
			}
			try {
				url = new URL(urlText.getText().trim());
			} catch (MalformedURLException e) {
				setPageComplete(false);
				setMessage(TeamUIMessages.ImportProjectSetMainPage_URL_is_not_valid, ERROR);
				return;
			}
		}
		
		//If add to working set checkbox selected and the user has not selected

	public String getFileName() {
		return file;
	}
	
	public InputStream getInputStream() throws IOException {
		if (fileSelected) {
			return new FileInputStream(file);
		}
		return url.openStream();
	}

	public void setVisible(boolean visible) {
		super.setVisible(visible);

		if (!createWorkingSet) return null;
		return workingSetName;
	}

}

Lines 99-104 Link Here

(-)src/org/eclipse/team/internal/ui/TeamUIMessages.java (+6 lines)
99		99
100	public static String ImportProjectSetMainPage_Browse;	100	public static String ImportProjectSetMainPage_Browse;
101		101
		102	public static String ImportProjectSetMainPage_Inform_file_URL;
		103
		104	public static String ImportProjectSetMainPage_Project_Set_File_URL;
		105
		106	public static String ImportProjectSetMainPage_URL_is_not_valid;
		107
102	public static String information;	108	public static String information;
103		109
104	public static String ConfigureProjectAction_configureProject;	110	public static String ConfigureProjectAction_configureProject;




public class ProjectSetImporter {
	
	public static IProject[] importProjectSet(String filename, Shell shell, IProgressMonitor monitor) throws InvocationTargetException {
		try {
			return importProjectSet(new FileInputStream(filename), filename, shell, monitor);
		} catch (FileNotFoundException e) {
			throw new InvocationTargetException(e);
		}
	}

	public static IProject[] importProjectSet(InputStream is, Shell shell, IProgressMonitor monitor)
			throws InvocationTargetException {
		return importProjectSet(is, null, shell, monitor);
	}

	private static IProject[] importProjectSet(InputStream is, String filename, Shell shell,
			IProgressMonitor monitor) throws InvocationTargetException {
		InputStreamReader reader = null;
		try {
			reader = new InputStreamReader(is, "UTF-8"); //$NON-NLS-1$
			
			XMLMemento xmlMemento = XMLMemento.createReadRoot(reader);
			String version = xmlMemento.getString("version"); //$NON-NLS-1$

Return to bug 162608

Lines 98-103 Link Here

(-)src/org/eclipse/team/internal/ui/messages.properties (+3 lines)
98	ImportProjectSetMainPage_createWorkingSetLabel=&Create a working set containing the imported projects	98	ImportProjectSetMainPage_createWorkingSetLabel=&Create a working set containing the imported projects
99	ImportProjectSetMainPage_workingSetLabel=&Working Set Name:	99	ImportProjectSetMainPage_workingSetLabel=&Working Set Name:
100	ImportProjectSetMainPage_AddToWorkingSet=&Add the imported team project set to a working set	100	ImportProjectSetMainPage_AddToWorkingSet=&Add the imported team project set to a working set
		101	ImportProjectSetMainPage_Inform_file_URL=Inform the .psf file URL
		102	ImportProjectSetMainPage_URL_is_not_valid=The URL is not valid
101		103
102	ProjectSetContentHandler_Element_provider_must_be_contained_in_element_psf_4=Element provider must be contained in element psf	104	ProjectSetContentHandler_Element_provider_must_be_contained_in_element_psf_4=Element provider must be contained in element psf
103	ProjectSetContentHandler_Element_project_must_be_contained_in_element_provider_7=Element project must be contained in element provider	105	ProjectSetContentHandler_Element_project_must_be_contained_in_element_provider_7=Element project must be contained in element provider
Lines 125-130 Link Here
125	ImportProjectSetMainPage_allFiles=All Files (.)	127	ImportProjectSetMainPage_allFiles=All Files (.)
126	ImportProjectSetAction_0=An error occurred importing this project set.	128	ImportProjectSetAction_0=An error occurred importing this project set.
127	ImportProjectSetMainPage_Project_Set_Files_2=Team Project Set Files (*.psf)	129	ImportProjectSetMainPage_Project_Set_Files_2=Team Project Set Files (*.psf)
		130	ImportProjectSetMainPage_Project_Set_File_URL=&URL:
128	ExportProjectSetMainPage__File_name__1=&File name:	131	ExportProjectSetMainPage__File_name__1=&File name:
129	ExportProjectSetMainPage_WorkspaceButton=W&orkspace	132	ExportProjectSetMainPage_WorkspaceButton=W&orkspace
130	ExportProjectSetMainPage_ExportWorkingSets=Export working sets	133	ExportProjectSetMainPage_ExportWorkingSets=Export working sets

Lines 25-33 Link Here

(-)src/org/eclipse/team/internal/ui/ProjectSetImporter.java (-1 / +15 lines)
25	public class ProjectSetImporter {	25	public class ProjectSetImporter {
26		26
27	public static IProject[] importProjectSet(String filename, Shell shell, IProgressMonitor monitor) throws InvocationTargetException {	27	public static IProject[] importProjectSet(String filename, Shell shell, IProgressMonitor monitor) throws InvocationTargetException {
		28	try {
		29	return importProjectSet(new FileInputStream(filename), filename, shell, monitor);
		30	} catch (FileNotFoundException e) {
		31	throw new InvocationTargetException(e);
		32	}
		33	}
		34
		35	public static IProject[] importProjectSet(InputStream is, Shell shell, IProgressMonitor monitor)
		36	throws InvocationTargetException {
		37	return importProjectSet(is, null, shell, monitor);
		38	}
		39
		40	private static IProject[] importProjectSet(InputStream is, String filename, Shell shell,
		41	IProgressMonitor monitor) throws InvocationTargetException {
28	InputStreamReader reader = null;	42	InputStreamReader reader = null;
29	try {	43	try {
30	reader = new InputStreamReader(new FileInputStream(filename), "UTF-8"); //$NON-NLS-1$	44	reader = new InputStreamReader(is, "UTF-8"); //$NON-NLS-1$
31		45
32	XMLMemento xmlMemento = XMLMemento.createReadRoot(reader);	46	XMLMemento xmlMemento = XMLMemento.createReadRoot(reader);
33	String version = xmlMemento.getString("version"); //$NON-NLS-1$	47	String version = xmlMemento.getString("version"); //$NON-NLS-1$