performance plugin issues

Change-Id: I6b1baf6d5e84624538823e8740f95663d65ef59c

3 files changed, 15 insertions, 7 deletions

diff --git a/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF b/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF
index 0e0c0e917..e73d27164 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF
+++ b/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF
@@ -24,6 +24,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jgit,
  org.eclipse.team.core,
  org.eclipse.emf.compare.rcp;bundle-version="2.4.0"
-Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
- com.google.common.collect;version="[11.0.0,16.0.0)",
- com.google.common.io;version="[11.0.0,16.0.0)"
+Import-Package: com.google.common.base;version="[15.0.0,22.0.0)",
+ com.google.common.collect;version="[15.0.0,22.0.0)",
+ com.google.common.io;version="[15.0.0,22.0.0)"
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java
index 609f5f0aa..fba93226e 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java
@@ -33,6 +33,10 @@ import java.util.Map.Entry;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceDescription;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.egit.core.Activator;
+import org.eclipse.egit.core.GitCorePreferences;
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EPackage;
@@ -124,8 +128,12 @@ public abstract class AbstractEMFComparePerformanceTest {
 			EPackage.Registry.INSTANCE.put(perf.getNsURI(), perf);
 			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("performance",
 					new XMIResourceFactoryImpl());
+
 		}
 
+		IEclipsePreferences eGitPreferences = InstanceScope.INSTANCE.getNode(Activator.getPluginId());
+		eGitPreferences.putBoolean(GitCorePreferences.core_autoShareProjects, false);
+
 		// Deactivate auto-building
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		if (workspace != null) {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java
index 2025e5983..533805e7d 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java
@@ -38,8 +38,8 @@ public class EMFComparePerfStats {
 
 	EMFComparePerfStats() {
 		fMemoryBean = ManagementFactory.getMemoryMXBean();
-		elapsedTimeInMatch = new Stopwatch();
-		elapsedTimeInDiff = new Stopwatch();
+		elapsedTimeInMatch = Stopwatch.createUnstarted();
+		elapsedTimeInDiff = Stopwatch.createUnstarted();
 	}
 
 	void beforeMatch() {
@@ -63,7 +63,7 @@ public class EMFComparePerfStats {
 	}
 
 	public long elapsedTimeInMatch(TimeUnit unit) {
-		return elapsedTimeInMatch.elapsedTime(unit);
+		return elapsedTimeInMatch.elapsed(unit);
 	}
 
 	public long usedHeapBeforeMatch(SizeUnit unit) {
@@ -75,7 +75,7 @@ public class EMFComparePerfStats {
 	}
 
 	public long elapsedTimeInDiff(TimeUnit unit) {
-		return elapsedTimeInDiff.elapsedTime(unit);
+		return elapsedTimeInDiff.elapsed(unit);
 	}
 
 	public long usedHeapBeforeDiff(SizeUnit unit) {