Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2015-07-25 22:14:25 +0000
committerMatthias Sohn2015-08-14 10:27:59 +0000
commit1332a1fedf6a2f189eb90644946a7309423eccf3 (patch)
treece5eb26db74eda1e114fd6b091198d21eb33b6de /org.eclipse.egit.ui.test
parent69acbc57ef1f3869426297045aa7816e2b23af31 (diff)
downloadegit-1332a1fedf6a2f189eb90644946a7309423eccf3.tar.gz
egit-1332a1fedf6a2f189eb90644946a7309423eccf3.tar.xz
egit-1332a1fedf6a2f189eb90644946a7309423eccf3.zip
Use default repository location for all import wizards
Bug: 395143 Change-Id: Iadc600c78e58195da4d2173764b90001fb410b2a Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui.test')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java5
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardTest.java6
2 files changed, 5 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java
index 19196c19a5..dfe69aa962 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java
@@ -164,8 +164,9 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase {
if (!repoRoot.exists())
FileUtils.mkdir(repoRoot, true);
// make sure the default directory for Repos is not the user home
- org.eclipse.egit.ui.Activator.getDefault().getPreferenceStore()
- .setValue(UIPreferences.DEFAULT_REPO_DIR, repoRoot.getPath());
+ IEclipsePreferences p = InstanceScope.INSTANCE
+ .getNode(Activator.getPluginId());
+ p.put(GitCorePreferences.core_defaultRepositoryDir, repoRoot.getPath());
}
@After
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardTest.java
index 32cb71f4ca..a7daa3ef11 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardTest.java
@@ -29,10 +29,9 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.egit.core.RepositoryUtil;
import org.eclipse.egit.core.op.DisconnectProviderOperation;
import org.eclipse.egit.core.project.RepositoryMapping;
-import org.eclipse.egit.ui.Activator;
-import org.eclipse.egit.ui.UIPreferences;
import org.eclipse.egit.ui.common.ExistingOrNewPage;
import org.eclipse.egit.ui.common.ExistingOrNewPage.Row;
import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
@@ -262,8 +261,7 @@ public class SharingWizardTest extends LocalRepositoryTestCase {
projectName1, projectName2);
SWTBotShell createRepoDialog = existingOrNewPage
.clickCreateRepository();
- String repoDir = Activator.getDefault().getPreferenceStore()
- .getString(UIPreferences.DEFAULT_REPO_DIR);
+ String repoDir = RepositoryUtil.getDefaultRepositoryDir();
File repoFolder = new File(repoDir, repoName);
createRepoDialog.bot()
.textWithLabel(UIText.CreateRepositoryPage_DirectoryLabel)

Back to the top