Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2008-02-04 11:38:15 +0000
committerTomasz Zarna2008-02-04 11:38:15 +0000
commit01f5b8bda44132bb6dd62f67f76e3760a3430b7f (patch)
treeaa241353535dcc0be0097c7687d1cd5b5b5c3ef0 /bundles/org.eclipse.team.ui
parent783c11e73f81a6606ee0ffc7f63f8567b9b75580 (diff)
downloadeclipse.platform.team-01f5b8bda44132bb6dd62f67f76e3760a3430b7f.tar.gz
eclipse.platform.team-01f5b8bda44132bb6dd62f67f76e3760a3430b7f.tar.xz
eclipse.platform.team-01f5b8bda44132bb6dd62f67f76e3760a3430b7f.zip
bug 214079: Import Team Project wizard describes what it is, not what it does
Diffstat (limited to 'bundles/org.eclipse.team.ui')
-rw-r--r--bundles/org.eclipse.team.ui/plugin.properties4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties20
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java17
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java7
6 files changed, 45 insertions, 16 deletions
diff --git a/bundles/org.eclipse.team.ui/plugin.properties b/bundles/org.eclipse.team.ui/plugin.properties
index 80359bf3c..8d5aa8938 100644
--- a/bundles/org.eclipse.team.ui/plugin.properties
+++ b/bundles/org.eclipse.team.ui/plugin.properties
@@ -47,9 +47,9 @@ ViewCommand.historyView.name=History
ViewCommand.historyView.description=Show the Team History view
ProjectSetImportWizard.name=Team Project Set
-ProjectSetImportWizard.description=A wizard that imports a Team Project Set
+ProjectSetImportWizard.description=Import a set of projects by fetching the project contents from the appropriate repositories described in a file.
ProjectSetExportWizard.name=Team Project Set
-ProjectSetExportWizard.description=A wizard that exports a Team Project Set
+ProjectSetExportWizard.description=Export a file containing the names and locations of the shared projects in the workspace.
Command.category.name=Team
Command.category.description=Actions that apply when working with a Team
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java
index 506761727..f69ad8710 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java
@@ -287,6 +287,8 @@ public class TeamUIMessages extends NLS {
public static String ExportProjectSetMainPage_A_project_must_be_selected;
public static String ExportProjectSetMainPage_A_working_set_must_be_selected;
public static String ExportProjectSetMainPage_None_of_the_selected_working_sets_have_an_available_project_to_export;
+ public static String ExportProjectSetMainPage_Initial_description;
+ public static String ExportProjectSetMainPage_specifyFile;
public static String ImportProjectSetMainPage_Project_Set_File_Name__2;
public static String ImportProjectSetMainPage_Browse_3;
@@ -297,6 +299,8 @@ public class TeamUIMessages extends NLS {
public static String ImportProjectSetMainPage_workingSetLabel;
public static String ImportProjectSetMainPage_runInBackground;
public static String ImportProjectSetMainPage_jobName;
+ public static String ImportProjectSetMainPage_specifyFile;
+ public static String ImportProjectSetMainPage_selectWorkingSet;
public static String ProjectSetContentHandler_Element_provider_must_be_contained_in_element_psf_4;
public static String ProjectSetContentHandler_Element_project_must_be_contained_in_element_provider_7;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index 801d0a381..b7d7f386c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -91,6 +91,14 @@ ExportProjectSetMainPage_None_of_the_selected_working_sets_have_an_available_pro
ExportProjectSetMainPage_WorkspaceDialogTitleMessage=Select a Folder in the Workspace and Type in a Filename
ExportProjectSetMainPage_WorkspaceDialogErrorNoFilename=Enter a filename.
ExportProjectSetMainPage_WorkspaceDialogErrorFilenameSegments=Filename cannot contain any segments.
+ExportProjectSetMainPage_Project_Set_Files_3=Team Project Set Files (*.psf)
+ExportProjectSetMainPage_WorkspaceDialogTitle=Team Project Set Save Location
+ExportProjectSetMainPage_default=projectSet.psf
+ExportProjectSetMainPage__File_name__1=&File name:
+ExportProjectSetMainPage_WorkspaceButton=W&orkspace
+ExportProjectSetMainPage_ExportWorkingSets=&Export working sets
+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_Name__2=F&ile name:
ImportProjectSetMainPage_Browse_3=B&rowse...
@@ -103,6 +111,8 @@ ImportProjectSetMainPage_workingSetLabel=&Working Set Name:
ImportProjectSetMainPage_AddToWorkingSet=&Add the imported team project set to a working set
ImportProjectSetMainPage_runInBackground=Run the import in the bac&kground
ImportProjectSetMainPage_jobName=Importing project set...
+ImportProjectSetMainPage_specifyFile=Please specify a file to import.
+ImportProjectSetMainPage_selectWorkingSet=Select a working set.
ImportProjectSetDialog_duplicatedWorkingSet_title=Working Set Exists
ImportProjectSetDialog_duplicatedWorkingSet_message=Working Set ''{0}'' already exists. What would you like to do?
ImportProjectSetDialog_duplicatedWorkingSet_replace=Replace
@@ -132,15 +142,9 @@ ProjectSetImportWizard_Import_a_Project_Set_3=Import a Team Project Set
ProjectSetImportWizard_workingSetExistsTitle=Working Set Exists
ProjectSetImportWizard_workingSetExistsMessage=Working set ''{0}'' already exists. Overwrite?
-ExportProjectSetMainPage_Project_Set_Files_3=Team Project Set Files (*.psf)
-ExportProjectSetMainPage_WorkspaceDialogTitle=Team Project Set Save Location
-ExportProjectSetMainPage_default=projectSet.psf
ImportProjectSetMainPage_allFiles=All Files (*.*)
ImportProjectSetAction_0=An error occurred importing this project set.
ImportProjectSetMainPage_Project_Set_Files_2=Team Project Set Files (*.psf)
-ExportProjectSetMainPage__File_name__1=&File name:
-ExportProjectSetMainPage_WorkspaceButton=W&orkspace
-ExportProjectSetMainPage_ExportWorkingSets=&Export working sets
SyncViewPreferencePage_lastRefreshRunNever=Never
@@ -347,8 +351,8 @@ RemoveSynchronizeParticipantAction_4=There are unsaved changes.
RemoveSynchronizeParticipantAction_5=Save Changes
ConfigureProjectWizard_showAll=&Show All Wizards
-ImportProjectSetMainPage_description=Creates projects from a previously exported project set file by fetching the project contents from the appropriate repositories.
-ExportProjectSetMainPage_description=Save a file containing the names and locations of the shared projects in the workspace.
+ImportProjectSetMainPage_description=Import the team project file.
+ExportProjectSetMainPage_description=Export selected resources into the team project file.
ExportProjectSetMainPage_DeselectAll=&Deselect All
ExportProjectSetMainPage_FileButton=F&ile
ExportProjectSetMainPage_EditButton=Edit...
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java
index eb671ef78..7b4dda99a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java
@@ -77,6 +77,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
fileRadio.addListener(SWT.Selection, new Listener() {
public void handleEvent(Event event) {
saveToFileSystem = true;
+ file = fileCombo.getText();
updateEnablement();
}
});
@@ -184,7 +185,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
workspaceRadio.setSelection(!saveToFileSystem);
if (file.length() == 0) {
- setMessage(null);
+ setErrorMessage(TeamUIMessages.ExportProjectSetMainPage_specifyFile);
complete = false;
} else {
File f = new File(file);
@@ -192,14 +193,22 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
setMessage(TeamUIMessages.ExportProjectSetMainPage_You_have_specified_a_folder_5, ERROR);
complete = false;
} else {
- if (!isSaveToFileSystem() && workspaceFile == null)
+ if (!isSaveToFileSystem() && workspaceFile == null) {
+ setErrorMessage(TeamUIMessages.ExportProjectSetMainPage_specifyFile);
complete = false;
- else
+ } else {
complete = true;
+ }
}
}
+
+ if (!isSaveToFileSystem() && workspaceFile != null) {
+ complete = true;
+ }
+
if (complete) {
- setMessage(null);
+ setErrorMessage(null);
+ setDescription(TeamUIMessages.ExportProjectSetMainPage_description);
}
setPageComplete(complete);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
index c7f7fd4fe..d6eb0cf7f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
@@ -196,7 +196,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
public ExportProjectSetMainPage(String pageName, String title, ImageDescriptor titleImage) {
super(pageName, title, titleImage);
- setDescription(TeamUIMessages.ExportProjectSetMainPage_description);
+ setDescription(TeamUIMessages.ExportProjectSetMainPage_Initial_description);
}
/*
@@ -409,6 +409,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
if (complete) {
setErrorMessage(null);
+ setDescription(TeamUIMessages.ExportProjectSetMainPage_description);
} else {
setErrorMessage(TeamUIMessages.ExportProjectSetMainPage_A_project_must_be_selected);
}
@@ -652,8 +653,12 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
}
}
- if (complete || !pageShown) {
+ if (!complete && !pageShown) {
setErrorMessage(null);
+ setDescription(TeamUIMessages.ExportProjectSetMainPage_Initial_description);
+ } else if (complete || !pageShown) {
+ setErrorMessage(null);
+ setDescription(TeamUIMessages.ExportProjectSetMainPage_description);
} else {
setErrorMessage(TeamUIMessages.ExportProjectSetMainPage_None_of_the_selected_working_sets_have_an_available_project_to_export);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
index d342e0af4..0065836a9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
@@ -198,6 +198,7 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
browseButton.setEnabled(addToWorkingSet.getSelection());
if (file.length() == 0) {
+ setErrorMessage(TeamUIMessages.ImportProjectSetMainPage_specifyFile);
setPageComplete(false);
return;
} else {
@@ -218,10 +219,16 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
//a working set, mark page incomplete
if (addToWorkingSet.getSelection() && !haveBrowsed){
setPageComplete(false);
+ setErrorMessage(TeamUIMessages.ImportProjectSetMainPage_selectWorkingSet);
return;
}
complete = validateWorkingSetName();
+
+ if (complete) {
+ setErrorMessage(null);
+ setDescription(TeamUIMessages.ImportProjectSetMainPage_description);
+ }
setPageComplete(complete);
}

Back to the top