Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-05-20 11:28:16 -0400
committerJean Michel-Lemieux2002-05-20 11:28:16 -0400
commit4399d01153c2657994794f20127e982299560f64 (patch)
treeadf36b674ac073ef1a6d10fd18e39fb207877173
parentaabb8e9469be3002a37c5aa26fb8c18049c33a5a (diff)
downloadeclipse.platform.team-4399d01153c2657994794f20127e982299560f64.tar.gz
eclipse.platform.team-4399d01153c2657994794f20127e982299560f64.tar.xz
eclipse.platform.team-4399d01153c2657994794f20127e982299560f64.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties15
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java7
2 files changed, 11 insertions, 11 deletions
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 315d59a3d..82a77d8df 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
@@ -135,10 +135,10 @@ TargetSiteCreationWizard.description=Select the type of site you want to connect
TargetSiteCreationWizard.mappingPageTitle=Specify the location on the site
TargetSiteCreationWizard.siteSelectionPage=Select or create a site
-SiteSelectionPage.description=Select and existing site or create new site where you can deploy your resources.
+SiteSelectionPage.description=Select and existing site or create new site where you want to deploy your resources.
SiteSelectionPage.label=Select an existing site or create a new one:
-SiteSelectionPage.useExisting=Use Existing Site
-SiteSelectionPage.createNew=Create a new Site
+SiteSelectionPage.useExisting=&Use Existing Site
+SiteSelectionPage.createNew=&Create a new Site
GetAsProject.thisResourceExists=The resource ''{0}'' already exists in the workspace. Overwrite?
GetAsProject.thisExternalFileExists=The folder ''{0}'' exists in the local file system. Overwrite?
@@ -179,6 +179,7 @@ SiteExplorerViewLabelProvider.fileSize={0} KB
MappingSelectionPage.description=Specify the location on the site where you want to deploy your resources.
MappingSelectionPage.label=Select the site or a folder:
MappingSelectionPage.newFolderLabel=&New Folder...
+MappingSelectionPage.mappingTitle=Select the location on the site
ConfigureTargetWizardQuestion_2=Question
ConfigureTargetWizardError_6=Error
@@ -186,16 +187,16 @@ ConfigureTargetWizardError_mapping_the_project_with_this_site_7=Error mapping th
ConfigureTargetWizardURL_doesn__t_exist_on_the_server_8=URL doesn\'t exist on the server
ConfigureTargetWizardValidating_connection_to_Site..._9=Validating connection to Site...
ConfigureTargetWizardConnection_Error_10=Connection Error
-ConfigureTargetWizard.alreadyMapped=\'{0}\' is already mapped to \'{1}\'. Are you sure you want to change to another location?
-ConfigureTargetWizard.errorOccurred=An error occured connecting to \'{0}\'.\n\nCode: {1}\nMessage: {2}\n\nDo you still want to keep this connection?
+ConfigureTargetWizard.alreadyMapped=''{0}'' is already mapped to ''{1}''. Are you sure you want to change to another location?
+ConfigureTargetWizard.errorOccurred=An error occured connecting to ''{0}''.\n\nCode: {1}\nMessage: {2}\n\nDo you still want to keep this connection?
GetAction.Exception_getting_provider_2=Exception getting provider
GetSyncAction.Getting..._1=Getting...
PutAction.Exception_getting_provider_2=Exception getting provider
PutSyncAction.Putting..._1=Putting...
-TargetCatchupReleaseViewer.Get_1=Get
-TargetCatchupReleaseViewer.Put_2=Put
+TargetCatchupReleaseViewer.Get_1=&Get
+TargetCatchupReleaseViewer.Put_2=&Put
SiteSelectionPage.siteLabelCurrentWithMapping={0} (current as {1})
SiteSelectionPage.siteLabelCurrent={0} (current)
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
index bdc59a098..d433e8cb2 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
@@ -122,7 +122,7 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar
}
if(project != null) {
- mappingPage = new MappingSelectionPage(ConfigureTargetWizard.MAPPING_PAGE_NAME, Policy.bind("webdavMainPage.mappingTitle"), null); //$NON-NLS-1$
+ mappingPage = new MappingSelectionPage(ConfigureTargetWizard.MAPPING_PAGE_NAME, Policy.bind("MappingSelectionPage.mappingTitle"), null); //$NON-NLS-1$
mappingPage.setWizard(this);
}
@@ -237,8 +237,7 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar
if(getMappingPage() != null) {
path = getMappingPage().getMapping();
}
- setMapping(getContainer(), project, site, path);
- return true;
+ return setMapping(getContainer(), project, site, path);
}
// allow target wizard to finish
@@ -258,7 +257,7 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar
if(provider != null) {
if(! MessageDialog.openQuestion(container.getShell(),
Policy.bind("ConfigureTargetWizardQuestion_2"), //$NON-NLS-1$
- Policy.bind("ConfigureTargetWizard.alreadyMapped", project.getName(), provider.getSite().getURL().toExternalForm()))) { //$NON-NLS-1$
+ Policy.bind("ConfigureTargetWizard.alreadyMapped", project.getName(), provider.getURL().toExternalForm()))) { //$NON-NLS-1$
return false;
}
TargetManager.unmap(project);

Back to the top