From 9a47917785ef3079d740585be7e41be980964d62 Mon Sep 17 00:00:00 2001 From: Marek Zawirski Date: Sun, 17 Aug 2008 22:44:05 +0200 Subject: [PATCH] Clone wizard: force dir to suggested path only if repo selection change When user moves backward in wizard from destination page to source branch selection, then moves forward, we shouldn't overwrite his/her directory selection in destination page. Let's do it only when repository selection changes. Signed-off-by: Marek Zawirski Signed-off-by: Robin Rosenberg --- .../egit/ui/internal/clone/CloneDestinationPage.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java index 97f166a0..a5606368 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/clone/CloneDestinationPage.java @@ -278,15 +278,19 @@ class CloneDestinationPage extends WizardPage { checkPage(); return; } - validatedRepoSelection = sourcePage.getSelection(); + + if (!sourcePage.selectionEquals(validatedRepoSelection)) { + validatedRepoSelection = sourcePage.getSelection(); + // update repo-related selection only if it changed + final String n = getSuggestedName(); + setDescription(NLS.bind(UIText.CloneDestinationPage_description, n)); + directoryText.setText(new File(ResourcesPlugin.getWorkspace() + .getRoot().getRawLocation().toFile(), n).getAbsolutePath()); + } + validatedSelectedBranches = branchPage.getSelectedBranches(); validatedHEAD = branchPage.getHEAD(); - final String n = getSuggestedName(); - setDescription(NLS.bind(UIText.CloneDestinationPage_description, n)); - directoryText.setText(new File(ResourcesPlugin.getWorkspace().getRoot() - .getRawLocation().toFile(), n).getAbsolutePath()); - initialBranch.removeAll(); final Ref head = branchPage.getHEAD(); int newix = 0; -- 2.11.4.GIT