Remove redundant initialization of GitProjectData

This change adds a static 'add()' method to GitProjectData in order to
put a project data object into the cache that has been created using
the constructor. This change affects the ConnectProviderOperation.
Previously for each newly imported project GitProjectData was
initialized twice.

Change-Id: Id3df0345167dd2cb51f3ffca336f74c21868ab45
Signed-off-by: Philipp Thun <philipp.thun@sap.com>

3 files changed, 17 insertions, 2 deletions

diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java
index 77050e1dcc..4dfb0fc55b 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java
@@ -118,6 +118,7 @@ public class ConnectProviderOperation implements IEGitOperation {
 					try {
 						projectData.setRepositoryMappings(Arrays.asList(actualMapping));
 						projectData.store();
+						GitProjectData.add(project, projectData);
 					} catch (CoreException ce) {
 						try {
 							GitProjectData.delete(project);
@@ -145,7 +146,6 @@ public class ConnectProviderOperation implements IEGitOperation {
 					}
 					RepositoryProvider
 							.map(project, GitProvider.class.getName());
-					projectData = GitProjectData.get(project);
 					project.refreshLocal(IResource.DEPTH_INFINITE,
 							new SubProgressMonitor(monitor, 50));
 					monitor.worked(10);
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
index bde093e73a..bd1fed247d 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/GitProjectData.java
@@ -192,6 +192,20 @@ public class GitProjectData {
 			d.deletePropertyFilesAndUncache();
 	}
 
+	/**
+	 * Add the Eclipse project to our association of projects/repositories
+	 *
+	 * @param p
+	 *            Eclipse project
+	 * @param d
+	 *            {@link GitProjectData} associated with this project
+	 */
+	public static void add(final IProject p, final GitProjectData d) {
+		trace("add(" + p.getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		cache(p, d);
+	}
+
 	static void trace(final String m) {
 		// TODO is this the right location?
 		if (GitTraceLocation.CORE.isActive())
@@ -254,7 +268,7 @@ public class GitProjectData {
 	}
 
 	/**
-	 * TODO: is this right?
+	 * Set repository mappings
 	 *
 	 * @param newMappings
 	 */
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/nonswt/decoration/DecoratableResourceHelperTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/nonswt/decoration/DecoratableResourceHelperTest.java
index 0f2a3c70ba..c31951d1df 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/nonswt/decoration/DecoratableResourceHelperTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/nonswt/decoration/DecoratableResourceHelperTest.java
@@ -71,6 +71,7 @@ public class DecoratableResourceHelperTest extends LocalDiskRepositoryTestCase {
 		GitProjectData projectData = new GitProjectData(project);
 		projectData.setRepositoryMappings(Collections.singleton(mapping));
 		projectData.store();
+		GitProjectData.add(project, projectData);
 
 		RepositoryProvider.map(project, GitProvider.class.getName());