Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2015-08-29 03:44:04 -0400
committerMatthias Sohn2015-09-02 09:09:12 -0400
commit18add7c109cf8efed662592ff81ae888d6c47a1d (patch)
tree80f565632979d90d3a1814ab13ebaabc53da9e8b
parent5216666154c0738bd418a149f8a9ea38b9fc5c15 (diff)
downloadegit-github-18add7c109cf8efed662592ff81ae888d6c47a1d.tar.gz
egit-github-18add7c109cf8efed662592ff81ae888d6c47a1d.tar.xz
egit-github-18add7c109cf8efed662592ff81ae888d6c47a1d.zip
Fix maven build
- Follow up on moved EGit preferences: in EGit commit 1332a1fedf6a2f189eb90644946a7309423eccf3 we changed the way how to get the default repository directory - Update link to Orbit p2 repository, the S build we used so far isn't available anymore and didn't match the version we use in github.target. Now we use the orbit release for Mars for both. Change-Id: Iffe228baa753083b55ca62385bab61dd5d9f23ea Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rwxr-xr-xorg.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositoryImportWizard.java2
-rw-r--r--org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CloneGistHandler.java5
-rw-r--r--pom.xml2
3 files changed, 4 insertions, 5 deletions
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositoryImportWizard.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositoryImportWizard.java
index 0e8575bf..9290b636 100755
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositoryImportWizard.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/RepositoryImportWizard.java
@@ -81,7 +81,7 @@ public class RepositoryImportWizard extends Wizard implements IImportWizard {
IPreferenceStore store = org.eclipse.egit.ui.Activator.getDefault()
.getPreferenceStore();
- String defaultRepoDir = store.getString(UIPreferences.DEFAULT_REPO_DIR);
+ String defaultRepoDir = RepositoryUtil.getDefaultRepositoryDir();
File directory = new File(new File(defaultRepoDir, repo.getOwner()),
repo.getName());
diff --git a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CloneGistHandler.java b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CloneGistHandler.java
index 91490812..6a206dfb 100644
--- a/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CloneGistHandler.java
+++ b/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/CloneGistHandler.java
@@ -53,7 +53,7 @@ public class CloneGistHandler extends TaskDataHandler {
/**
* Get gist name for task data used to create projects and Git repositories
- *
+ *
* @param data
* @return name
*/
@@ -82,8 +82,7 @@ public class CloneGistHandler extends TaskDataHandler {
}
private File getParentDirectory() {
- String destinationDir = Activator.getDefault().getPreferenceStore()
- .getString(UIPreferences.DEFAULT_REPO_DIR);
+ String destinationDir = RepositoryUtil.getDefaultRepositoryDir();
File parentDir = new File(destinationDir);
if (!parentDir.exists() || !parentDir.isDirectory())
parentDir = ResourcesPlugin.getWorkspace().getRoot()
diff --git a/pom.xml b/pom.xml
index a73912ca..194c817a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
<platform-version-name>mars</platform-version-name>
<mylyn-site>http://download.eclipse.org/mylyn/releases/3.7</mylyn-site>
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
- <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/</orbit-site>
+ <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</orbit-site>
<download-publish-path>/home/data/httpd/download.eclipse.org/egit/github/updates-nightly</download-publish-path>
</properties>

Back to the top