diff options
| author | Benjamin Muskalla | 2010-09-08 20:14:31 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2010-09-08 20:14:31 +0000 |
| commit | 5270d299ba97eaf3880d874ac8e2356080658a2a (patch) | |
| tree | 662592b48e672ef94b0be463456a1a6ec7391977 /org.eclipse.egit.ui | |
| parent | ff2c89b7635c17e55ddfc1d37fc91b60ff405a1e (diff) | |
| download | egit-5270d299ba97eaf3880d874ac8e2356080658a2a.tar.gz egit-5270d299ba97eaf3880d874ac8e2356080658a2a.tar.xz egit-5270d299ba97eaf3880d874ac8e2356080658a2a.zip | |
Use remote name as default value when synchronizing
Instead of using "origin" as remote name, we should determinate it
depending on the repository and only fall back to origin in case it's not
clear.
Bug: 324141
Change-Id: I6a05354fd19fc1ccfc7d6b3ae6c8205c757786b9
Signed-off-by: Benjamin Muskalla <bmuskalla@eclipsesource.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui')
3 files changed, 16 insertions, 4 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/RemoteSelectionCombo.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/RemoteSelectionCombo.java index 828e737f4c..05f763e186 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/RemoteSelectionCombo.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/RemoteSelectionCombo.java @@ -85,7 +85,7 @@ class RemoteSelectionCombo extends Composite { refSelectedIndex).getValue(); } - public void setDefautlValue(String remote, String ref) { + public void setDefaultValue(String remote, String ref) { int i = 0; for (; i < syncRepos.size(); i++) if (syncRepos.get(i).getName().equals(remote)) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/SelectSynchronizeResourceDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/SelectSynchronizeResourceDialog.java index e157c34ec0..db5837efe7 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/SelectSynchronizeResourceDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/SelectSynchronizeResourceDialog.java @@ -113,7 +113,7 @@ public class SelectSynchronizeResourceDialog extends TitleAreaDialog { srcRefCombo = new RemoteSelectionCombo(composite, syncRepos, UIText.RemoteSelectionCombo_sourceName, UIText.RemoteSelectionCombo_sourceRef); - srcRefCombo.setDefautlValue(UIText.SynchronizeWithAction_localRepoName, HEAD); + srcRefCombo.setDefaultValue(UIText.SynchronizeWithAction_localRepoName, HEAD); srcRefCombo.setLayoutData(data); srcRefCombo.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create()); @@ -128,7 +128,7 @@ public class SelectSynchronizeResourceDialog extends TitleAreaDialog { dstRefCombo = new RemoteSelectionCombo(composite, syncRepos, UIText.RemoteSelectionCombo_destinationName, UIText.RemoteSelectionCombo_destinationRef); - dstRefCombo.setDefautlValue(DEFAULT_REMOTE_NAME, MASTER); + dstRefCombo.setDefaultValue(getDefaultRemoteName(), MASTER); dstRefCombo.setLayoutData(data); dstRefCombo.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create()); @@ -141,6 +141,18 @@ public class SelectSynchronizeResourceDialog extends TitleAreaDialog { return composite; } + private String getDefaultRemoteName() { + boolean onlyOneRemote = syncRepos.size() == 2; + if (onlyOneRemote) + return syncRepos.get(1).getName(); + else { + for (SyncRepoEntity repo : syncRepos) + if (repo.getName().equals(DEFAULT_REMOTE_NAME)) + return DEFAULT_REMOTE_NAME; + } + return ""; //$NON-NLS-1$ + } + @Override protected void buttonPressed(int buttonId) { if (buttonId == IDialogConstants.OK_ID) { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/SyncRepoEntity.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/SyncRepoEntity.java index ed63662fef..75b4309240 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/SyncRepoEntity.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/SyncRepoEntity.java @@ -14,7 +14,7 @@ import java.util.List; /** * Simple entity for remote and local repositories containing only repo name and - * list of refs associated wit it. + * list of refs associated with it. */ public class SyncRepoEntity { |