diff options
author | Jean Michel-Lemieux | 2002-06-06 11:56:09 +0000 |
---|---|---|
committer | Jean Michel-Lemieux | 2002-06-06 11:56:09 +0000 |
commit | fbe29f6177ef2f473593ba45a87b852f26706bec (patch) | |
tree | 09e47c833c8049bb75e486fa58adc3828305b088 | |
parent | 59f16c81e0d0d2a76ee400ef904f4e1201d57d94 (diff) | |
download | eclipse.platform.team-fbe29f6177ef2f473593ba45a87b852f26706bec.tar.gz eclipse.platform.team-fbe29f6177ef2f473593ba45a87b852f26706bec.tar.xz eclipse.platform.team-fbe29f6177ef2f473593ba45a87b852f26706bec.zip |
*** empty log message ***
8 files changed, 47 insertions, 36 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/SynchronizedTargetProvider.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/SynchronizedTargetProvider.java index 05479444c..9300f355f 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/SynchronizedTargetProvider.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/target/SynchronizedTargetProvider.java @@ -115,8 +115,14 @@ public abstract class SynchronizedTargetProvider extends TargetProvider { public void get(final IResource[] resources, final boolean deleteLocal, IProgressMonitor progress) throws TeamException { run(new ITargetRunnable() { public void run(IProgressMonitor monitor) throws TeamException { - for (int i = 0; i < resources.length; i++) { - getState(resources[i]).get(IResource.DEPTH_INFINITE, deleteLocal, monitor); + monitor = Policy.monitorFor(monitor); + try { + monitor.beginTask(null, resources.length * 100); + for (int i = 0; i < resources.length; i++) { + getState(resources[i]).get(IResource.DEPTH_INFINITE, deleteLocal, monitor); + } + } finally { + monitor.done(); } } }, Policy.monitorFor(progress)); @@ -145,8 +151,14 @@ public abstract class SynchronizedTargetProvider extends TargetProvider { public void put(final IResource[] resources, IProgressMonitor progress) throws TeamException { run(new ITargetRunnable() { public void run(IProgressMonitor monitor) throws TeamException { - for (int i = 0; i < resources.length; i++) { - getState(resources[i]).put(monitor); + monitor = Policy.monitorFor(monitor); + try { + monitor.beginTask(null, resources.length * 100); + for (int i = 0; i < resources.length; i++) { + getState(resources[i]).put(Policy.subMonitorFor(monitor, 100)); + } + } finally { + monitor.done(); } } }, Policy.monitorFor(progress)); diff --git a/bundles/org.eclipse.team.ui/plugin.properties b/bundles/org.eclipse.team.ui/plugin.properties index 24fe573a9..dd440743a 100644 --- a/bundles/org.eclipse.team.ui/plugin.properties +++ b/bundles/org.eclipse.team.ui/plugin.properties @@ -29,9 +29,9 @@ Deployment.uploadAction=&Upload Deployment.configSite=&Target Site... Deployment.synchronize=&Synchronize with Target... -SiteExplorerGetAs.label=Get &As... +SiteExplorerGetAs.label=Download &As... SiteExplorerGetAs.tooltip=Download the selected remote folder with a user specified project type and name. -SiteExplorerGetAsProject.label=&Get As Project +SiteExplorerGetAsProject.label=&Download As Project SiteExplorerGetAsProject.tooltip=Download the selected remote folder and create a project with the same name. SiteExplorerDiscardSite.label=&Discard Site SiteExplorerDiscardSite.tooltip=Discard the site
\ No newline at end of file diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml index ea4e05005..82721205f 100644 --- a/bundles/org.eclipse.team.ui/plugin.xml +++ b/bundles/org.eclipse.team.ui/plugin.xml @@ -132,14 +132,14 @@ objectClass="org.eclipse.team.internal.ui.target.RemoteResourceElement" id="org.eclipse.team.internal.ui.target.RemoteResourceElement"> <action - label="Get As..." - tooltip="Get As..." + label="%SiteExplorerGetAs.label" + tooltip="%SiteExplorerGetAs.tooltip" class="org.eclipse.team.internal.ui.target.GetAsAction" id="org.eclipse.team.internal.ui.target.GetAsAction"> </action> <action - label="Get As Project" - tooltip="Get As Project" + label="%SiteExplorerGetAsProject.label" + tooltip="%SiteExplorerGetAsProject.tooltip" class="org.eclipse.team.internal.ui.target.GetAsProjectAction" id="org.eclipse.team.internal.ui.target.GetAsProjectAction"> </action> @@ -149,8 +149,8 @@ objectClass="org.eclipse.team.internal.ui.target.SiteElement" id="org.eclipse.team.internal.ui.target.SiteElement"> <action - label="Discard Site" - tooltip="Discard this Site" + label="%SiteExplorerDiscardSite.label" + tooltip="%SiteExplorerDiscardSite.tooltip" class="org.eclipse.team.internal.ui.target.DiscardSiteAction" id="org.eclipse.team.internal.ui.target.DiscardSiteAction"> </action> 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 d09b8c9de..0cc40347a 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 @@ -145,14 +145,14 @@ SiteSelectionPage.disconnectTarget=&Disconnect from Site GetAsProject.thisResourceExists=The resource ''{0}'' already exists in the workspace. Overwrite? GetAsProject.thisExternalFileExists=The folder ''{0}'' exists in the local file system. Overwrite? GetAsProject.confirmOverwrite=Confirm Overwrite -GetAsProject.taskName1=Receiving ''{0}'' -GetAsProject.taskNameN=Receiving {0} folders +GetAsProject.taskName1=Downloading ''{0}'' +GetAsProject.taskNameN=Downloading {0} folders GetAsProject.errorCreatingProject=Error creating project: {0} GetAsProject.errorGettingResources=Error getting resources GetAs.checkoutFailed=Problems encountered receiving the remote folder -GetAs.enterProjectTitle=Get ''{0}'' As... -GetAs.taskname=Receiving ''{0}'' as ''{1}'' +GetAs.enterProjectTitle=Downloading ''{0}'' As... +GetAs.taskname=Downloading ''{0}'' as ''{1}'' Error=Error @@ -161,10 +161,10 @@ CreateNewFolderAction.title=New Remote Folder CreateNewFolderAction.message=Enter the name for the new remote folder: CreateNewFolderAction.newFolderName=New Folder -GetAction.title=Get +GetAction.title=Download GetAction.working=Downloading from ''{0}''... -PutAction.title=Put +PutAction.title=Upload PutAction.working=Uploading to ''{0}''... SiteExplorerView.addSiteAction=Target &Site @@ -191,7 +191,7 @@ SiteExplorerViewLabelProvider.fileSize={0} KB MappingSelectionPage.description=Specify the location on the site where you want to target your resources. MappingSelectionPage.label=Select the site or a folder: -MappingSelectionPage.newFolderLabel=&New Folder... +MappingSelectionPage.newFolderLabel=&Create Folder... MappingSelectionPage.mappingTitle=Select the location on the site ConfigureTargetWizardQuestion_2=Question @@ -209,12 +209,12 @@ GetAction.confirmFileOverwrite=You have local changes which you are about to ove GetAction.confirmFileOverwriteTitle=Confirm Overwrite -GetSyncAction.Getting..._1=Getting... +GetSyncAction.Getting..._1=Downloading... PutAction.Exception_getting_provider_2=Exception getting provider -PutSyncAction.Putting..._1=Putting... +PutSyncAction.Putting..._1=Uploading... -TargetCatchupReleaseViewer.Get_1=&Get -TargetCatchupReleaseViewer.Put_2=&Put +TargetCatchupReleaseViewer.Get_1=&Download +TargetCatchupReleaseViewer.Put_2=&Upload SiteSelectionPage.siteLabelCurrentWithMapping={0} (currently 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 547fb9810..a31189eba 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 @@ -68,8 +68,6 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar public static final String MAPPING_PAGE_NAME = "mapping-page"; //$NON-NLS-1$ protected SiteSelectionPage siteSelectionPage = null; - protected IWizardPage firstTargetPage = null; - /** * @see ConfigureProjectWizard#getExtensionPoint() */ @@ -108,7 +106,6 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar public void addPages() { Site[] sites = TargetManager.getSites(); AdaptableList wizards = getAvailableWizards(); - setWindowTitle(getWizardWindowTitle()); if(sites.length > 0 && project != null) { TargetProvider provider = null; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java index aa4ae7e4d..b3bc86624 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java @@ -269,32 +269,30 @@ public class SiteExplorerView extends ViewPart implements ISiteListener { }); Table table = new Table(sash, SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL); + TableLayout layout = new TableLayout(); + table.setLayout(layout); + table.setHeaderVisible(true); TableColumn tableColumn = new TableColumn(table, SWT.NULL); tableColumn.setText(Policy.bind("SiteExplorerView.Name_1")); //$NON-NLS-1$ tableColumn.addSelectionListener(getColumnListener()); + layout.addColumnData(new ColumnWeightData(30, true)); tableColumn = new TableColumn(table, SWT.NULL); tableColumn.setText(Policy.bind("SiteExplorerView.Size_2")); //$NON-NLS-1$ tableColumn.setAlignment(SWT.RIGHT); tableColumn.addSelectionListener(getColumnListener()); + layout.addColumnData(new ColumnWeightData(10, true)); tableColumn = new TableColumn(table, SWT.NULL); tableColumn.setText(Policy.bind("SiteExplorerView.Modified_3")); //$NON-NLS-1$ tableColumn.addSelectionListener(getColumnListener()); + layout.addColumnData(new ColumnWeightData(30, true)); tableColumn = new TableColumn(table, SWT.NULL); tableColumn.setText(Policy.bind("SiteExplorerView.URL_4")); //$NON-NLS-1$ - - TableLayout layout = new TableLayout(); - layout.addColumnData(new ColumnWeightData(30, true)); - layout.addColumnData(new ColumnWeightData(10, true)); - layout.addColumnData(new ColumnWeightData(30, true)); layout.addColumnData(new ColumnWeightData(30, true)); - table.setLayout(layout); - table.setHeaderVisible(true); - folderContentsTable = new TableViewer(table); folderContentsTable.setContentProvider(new SiteLazyContentProvider()); folderContentsTable.setLabelProvider(new SiteExplorerViewLabelProvider()); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerViewLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerViewLabelProvider.java index ff79825b9..2e47fd2dd 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerViewLabelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerViewLabelProvider.java @@ -30,7 +30,11 @@ public class SiteExplorerViewLabelProvider extends WorkbenchLabelProvider implem return super.getText(element); case 1 : if(element instanceof RemoteResourceElement) { - int size = ((RemoteResourceElement)element).getSize(); + RemoteResourceElement remote = ((RemoteResourceElement)element); + if(remote.getRemoteResource().isContainer()) { + return ""; + } + int size = remote.getSize(); int sizeKb = size / 1000; if(sizeKb == 0 && size % 1000 > 0) { sizeKb = 1; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/UploadAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/UploadAction.java index 449ded061..322dced0d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/UploadAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/UploadAction.java @@ -71,7 +71,7 @@ public class UploadAction extends TargetAction { while (iterator.hasNext()) { IProgressMonitor subMonitor = new InfiniteSubProgressMonitor(monitor, 1024); final TargetProvider provider = (TargetProvider)iterator.next(); - monitor.setTaskName(Policy.bind("UploadAction.working", provider.getURL().toExternalForm())); //$NON-NLS-1$ + subMonitor.setTaskName(Policy.bind("UploadAction.working", provider.getURL().toExternalForm())); //$NON-NLS-1$ IResource[] providerResources = (IResource[])((List)table.get(provider)).toArray(new IResource[0]); IResource[] outgoingChanges = findResourcesWithOutgoingChanges(providerResources); |