FCL/sftools/dev/eclipseenv/wrttools: comparison plugins/org.symbian.tools.wrttools/src/org/symbian/tools/wrttools/wizards/projectimport/WrtProjectLocationWizardPage.java

equal deleted inserted replaced

-:109da596fa9d
+:f5df819c1852
 import org.symbian.tools.wrttools.util.CoreUtil;
 import org.symbian.tools.wrttools.util.ProjectUtils;
 @SuppressWarnings({ "restriction", "unchecked", "rawtypes" })
 public class WrtProjectLocationWizardPage extends WizardPage implements IOverwriteQuery {
-/**
-* @since 3.5
-*
-*/
 private final class ProjectLabelProvider extends LabelProvider implements IColorProvider {
 public Color getBackground(Object element) {
 return null;
 }
 public Color getForeground(Object element) {
 // Keep track of the directory that we browsed to last time
 // the wizard was invoked.
 private static String previouslyBrowsedDirectory = ""; //$NON-NLS-1$
-private final static String STORE_ARCHIVE_SELECTED = "WizardProjectsImportPage.STORE_ARCHIVE_SELECTED"; //$NON-NLS-1$
+private static final String STORE_ARCHIVE_SELECTED = "WizardProjectsImportPage.STORE_ARCHIVE_SELECTED"; //$NON-NLS-1$
 private Text archivePathField;
 private Button browseArchivesButton;
 private Button browseDirectoriesButton;
+private List createdProjects;
-List createdProjects;
 private Text directoryPathField;
 // The last time that the file or folder at the selected path was modified
 // to mimize searches
 private long lastModified;
 private CheckboxTreeViewer projectsList;
 private ProjectRecord[] selectedProjects = new ProjectRecord[0];
 /**
 * The import structure provider.
 *
 * @since 3.4
 */
 private ILeveledImportStructureProvider structureProvider;
 private IProject[] wsProjects;
 return createdProjects;
 }
 /**
 * Collect the list of .project files that are under directory into files.
 *
 * @param files
 * @param directory
 * @param directoriesVisited
 *            Set of canonical paths of directories, used as recursion guard
 * @param monitor
 return true;
 }
 /**
 * Collect the list of .project files that are under directory into files.
 *
 * @param files
 * @param monitor
 *            The monitor to report to
 * @return boolean <code>true</code> if the operation was completed.
 */
 files.add(projectRecord);
 }
 return true;
 }
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets
-* .Composite)
-*/
 public void createControl(Composite parent) {
 initializeDialogUnits(parent);
 Composite workArea = new Composite(parent, SWT.NONE);
 updateProjectsList(directoryPathField.getText().trim());
 }
 /**
 * Create the project described in record. If it is successful return true.
 *
 * @param record
 * @return boolean <code>true</code> if successful
 * @throws InterruptedException
 */
 private boolean createExistingProject(final ProjectRecord record, IProgressMonitor monitor)
 }
 }
 /**
 * Create the selected projects
 *
 * @return boolean <code>true</code> if all project creations were
 *         successful.
 */
 public boolean createProjects() {
 saveWidgetValues();
 return true;
 }
 /**
 * Create the checkbox list for the found projects.
 *
 * @param workArea
 */
 private void createProjectsList(Composite workArea) {
 Label title = new Label(workArea, SWT.NONE);
 GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
 gridData.widthHint = new PixelConverter(projectsList.getControl()).convertWidthInCharsToPixels(25);
 gridData.heightHint = new PixelConverter(projectsList.getControl()).convertHeightInCharsToPixels(10);
 projectsList.getControl().setLayoutData(gridData);
 projectsList.setContentProvider(new ITreeContentProvider() {
-/*
-* (non-Javadoc)
-*
-* @see org.eclipse.jface.viewers.IContentProvider#dispose()
-*/
 public void dispose() {
+}
-}
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java
-* .lang.Object)
-*/
 public Object[] getChildren(Object parentElement) {
 return null;
 }
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.jface.viewers.IStructuredContentProvider#getElements
-* (java.lang.Object)
-*/
 public Object[] getElements(Object inputElement) {
 return getProjectRecords();
 }
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.jface.viewers.ITreeContentProvider#getParent(java
-* .lang.Object)
-*/
 public Object getParent(Object element) {
 return null;
 }
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java
-* .lang.Object)
-*/
 public boolean hasChildren(Object element) {
 return false;
 }
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse
-* .jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-*/
 public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 }
 });
 projectsList.setLabelProvider(new ProjectLabelProvider());
 projectsList.addCheckStateListener(new ICheckStateListener() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged
-* (org.eclipse.jface.viewers.CheckStateChangedEvent)
-*/
 public void checkStateChanged(CheckStateChangedEvent event) {
 ProjectRecord element = (ProjectRecord) event.getElement();
 if (element.hasConflicts()) {
 projectsList.setChecked(element, false);
 }
 createSelectionButtons(listComposite);
 }
 /**
 * Create the area where you select the root directory for the projects.
 *
 * @param workArea
 *            Composite
 */
 private void createProjectsRoot(Composite workArea) {
 projectFromDirectoryRadio.setSelection(true);
 archivePathField.setEnabled(false);
 browseArchivesButton.setEnabled(false);
 browseDirectoriesButton.addSelectionListener(new SelectionAdapter() {
-/*
-* (non-Javadoc)
-*
-* @see org.eclipse.swt.events.SelectionAdapter#widgetS
-* elected(org.eclipse.swt.events.SelectionEvent)
-*/
 public void widgetSelected(SelectionEvent e) {
 handleLocationDirectoryButtonPressed();
 }
 });
 browseArchivesButton.addSelectionListener(new SelectionAdapter() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
-* .swt.events.SelectionEvent)
-*/
 public void widgetSelected(SelectionEvent e) {
 handleLocationArchiveButtonPressed();
 }
 });
 directoryPathField.addTraverseListener(new TraverseListener() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.swt.events.TraverseListener#keyTraversed(org.eclipse
-* .swt.events.TraverseEvent)
-*/
 public void keyTraversed(TraverseEvent e) {
 if (e.detail == SWT.TRAVERSE_RETURN) {
 e.doit = false;
 updateProjectsList(directoryPathField.getText().trim());
 }
 }
 });
 directoryPathField.addFocusListener(new FocusAdapter() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt
-* .events.FocusEvent)
-*/
 public void focusLost(org.eclipse.swt.events.FocusEvent e) {
 updateProjectsList(directoryPathField.getText().trim());
 }
 });
 archivePathField.addTraverseListener(new TraverseListener() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.swt.events.TraverseListener#keyTraversed(org.eclipse
-* .swt.events.TraverseEvent)
-*/
 public void keyTraversed(TraverseEvent e) {
 if (e.detail == SWT.TRAVERSE_RETURN) {
 e.doit = false;
 updateProjectsList(archivePathField.getText().trim());
 }
 }
 });
 archivePathField.addFocusListener(new FocusAdapter() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt
-* .events.FocusEvent)
-*/
 public void focusLost(org.eclipse.swt.events.FocusEvent e) {
 updateProjectsList(archivePathField.getText().trim());
 }
 });
 projectFromDirectoryRadio.addSelectionListener(new SelectionAdapter() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse
-* .swt.events.SelectionEvent)
-*/
 public void widgetSelected(SelectionEvent e) {
 directoryRadioSelected();
 }
 });
 projectFromArchiveRadio.addSelectionListener(new SelectionAdapter() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse
-* .swt.events.SelectionEvent)
-*/
 public void widgetSelected(SelectionEvent e) {
 archiveRadioSelected();
 }
 });
 }
 /**
 * Create the selection buttons in the listComposite.
 *
 * @param listComposite
 */
 private void createSelectionButtons(Composite listComposite) {
 Composite buttonsComposite = new Composite(listComposite, SWT.NONE);
 GridLayout layout = new GridLayout();
 setButtonLayoutData(selectAll);
 Button deselectAll = new Button(buttonsComposite, SWT.PUSH);
 deselectAll.setText(DataTransferMessages.DataTransfer_deselectAll);
 deselectAll.addSelectionListener(new SelectionAdapter() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
-* .swt.events.SelectionEvent)
-*/
 public void widgetSelected(SelectionEvent e) {
 projectsList.setCheckedElements(new Object[0]);
 setPageComplete(false);
 }
 });
 Dialog.applyDialogFont(deselectAll);
 setButtonLayoutData(deselectAll);
 Button refresh = new Button(buttonsComposite, SWT.PUSH);
 refresh.setText(DataTransferMessages.DataTransfer_refresh);
 refresh.addSelectionListener(new SelectionAdapter() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
-* .swt.events.SelectionEvent)
-*/
 public void widgetSelected(SelectionEvent e) {
 if (projectFromDirectoryRadio.getSelection()) {
 updateProjectsList(directoryPathField.getText().trim());
 } else {
 updateProjectsList(archivePathField.getText().trim());
 }
 }
 /**
 * Display an error dialog with the specified message.
 *
 * @param message
 *            the error message
 */
 protected void displayErrorDialog(String message) {
 MessageDialog.open(MessageDialog.ERROR, getContainer().getShell(), getErrorDialogTitle(), message, SWT.SHEET);
 return IDEWorkbenchMessages.WizardExportPage_internalErrorTitle;
 }
 /**
 * Method used for test suite.
 *
 * @return Button the Import from Directory RadioButton
 */
 public Button getProjectFromDirectoryRadio() {
 return projectFromDirectoryRadio;
 }
 /**
 * Get the array of project records that can be imported from the source
 * workspace or archive, selected by the user. If a project with the same
 * name exists in both the source workspace and the current workspace, then
 * the hasConflicts flag would be set on that project record.
 *
 * Method declared public for test suite.
 *
 * @return ProjectRecord[] array of projects that can be imported into the
 *         workspace
 */
 public ProjectRecord[] getProjectRecords() {
 List projectRecords = new ArrayList();
 return (ProjectRecord[]) projectRecords.toArray(new ProjectRecord[projectRecords.size()]);
 }
 /**
 * Retrieve all the projects in the current workspace.
 *
 * @return IProject[] array of IProject in the current workspace
 */
 private IProject[] getProjectsInWorkspace() {
 if (wsProjects == null) {
 wsProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
 return wsProjects;
 }
 /**
 * Method used for test suite.
 *
 * @return CheckboxTreeViewer the viewer containing all the projects found
 */
 public CheckboxTreeViewer getProjectsList() {
 return projectsList;
 }
 }
 /**
 * Determine if the project with the given name is in the current workspace.
 *
 * @param projectName
 *            String the project name to check
 * @return boolean true if the project with the given name is in this
 *         workspace
 */
 /**
 * The <code>WizardDataTransfer</code> implementation of this
 * <code>IOverwriteQuery</code> method asks the user whether the existing
 * resource at the given path should be overwritten.
 *
 * @param pathString
 * @return the user's reply: one of <code>"YES"</code>, <code>"NO"</code>,
 *         <code>"ALL"</code>, or <code>"CANCEL"</code>
 */
 public String queryOverwrite(String pathString) {
 /**
 * Use the dialog store to restore widget values to the values that they
 * held last time this wizard was used to completion, or alternatively, if
 * an initial path is specified, use it to select values.
 *
 * Method declared public only for use of tests.
 */
 public void restoreWidgetValues() {
 // First, check to see if we have resore settings, and
 }
 /**
 * Since Finish was pressed, write widget values to the dialog store so that
 * they will persist into the next invocation of this wizard page.
 *
 * Method declared public only for use of tests.
 */
 public void saveWidgetValues() {
 IDialogSettings settings = getDialogSettings();
 if (settings != null) {
 }
 /**
 * Update the list of projects based on path. Method declared public only
 * for test suite.
 *
 * @param path
 */
 public void updateProjectsList(final String path) {
 // on an empty path empty selectedProjects
 if (path == null || path.length() == 0) {
 // We can't access the radio button from the inner class so get the
 // status beforehand
 final boolean dirSelected = this.projectFromDirectoryRadio.getSelection();
 try {
 getContainer().run(true, true, new IRunnableWithProgress() {
-/*
-* (non-Javadoc)
-*
-* @see
-* org.eclipse.jface.operation.IRunnableWithProgress#run(org
-* .eclipse.core.runtime.IProgressMonitor)
-*/
 public void run(IProgressMonitor monitor) {
 monitor.beginTask(DataTransferMessages.WizardProjectsImportPage_SearchingMessage, 100);
 selectedProjects = new ProjectRecord[0];
 Collection files = new ArrayList();
 monitor.worked(50);
 monitor.subTask(DataTransferMessages.WizardProjectsImportPage_ProcessingMessage);
 while (filesIterator.hasNext()) {
 selectedProjects[index++] = (ProjectRecord) filesIterator.next();
 }
-}
+} else if (dirSelected && directory.isDirectory()) {
-else if (dirSelected && directory.isDirectory()) {
 if (!collectProjectFilesFromDirectory(files, directory, null, monitor)) {
 return;
 }
 Iterator filesIterator = files.iterator();
 selectedProjects = new ProjectRecord[files.size()];

changeset 484	f5df819c1852
parent 483	109da596fa9d