Revert "Internalize all of Callgraph API."

This reverts commit f2ae5915386035466689bce8e7d27861708e3daa.

8 files changed, 23 insertions, 24 deletions

diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/.project b/systemtap/org.eclipse.linuxtools.callgraph.tests/.project
index 5172dac5f5..465b99aed9 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/.project
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.linuxtools.internal.callgraph.tests</name>
+	<name>org.eclipse.linuxtools.callgraph.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF
index 3ce049e346..e9cd340150 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF
@@ -7,13 +7,12 @@ Bundle-Activator: org.eclipse.linuxtools.callgraph.tests.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.draw2d,
+ org.eclipse.linuxtools.callgraph;bundle-version="0.0.1",
  org.junit,
  org.eclipse.zest.core;bundle-version="1.2.0",
  org.eclipse.zest.layouts;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.cdt.core.model,
- org.eclipse.linuxtools.internal.callgraph,
- org.eclipse.linuxtools.internal.callgraph.core,
- org.eclipse.linuxtools.internal.callgraph.graphlisteners
+ org.eclipse.linuxtools.callgraph.core
 Bundle-Vendor: Eclipse
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/AllTests.java b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/AllTests.java
index 574248e167..75d5541834 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/AllTests.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/AllTests.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.linuxtools.callgraph.tests;
 
-import org.eclipse.linuxtools.internal.callgraph.core.SystemTapUIErrorMessages;
+import org.eclipse.linuxtools.callgraph.core.SystemTapUIErrorMessages;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -21,7 +21,7 @@ public class AllTests {
 	public static Test suite() {
 		SystemTapUIErrorMessages.setActive(false);
 		TestSuite suite = new TestSuite(
-				"Test for org.eclipse.linuxtools.internal.callgraph.tests");
+				"Test for org.eclipse.linuxtools.callgraph.tests");
 		//$JUnit-BEGIN$
 		suite.addTestSuite(StapGraphParserTest.class);
 		suite.addTestSuite(SystemTapGraphViewTest.class);
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java
index dffdcf0fb9..b5a49be6ef 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java
@@ -13,13 +13,13 @@ package org.eclipse.linuxtools.callgraph.tests;
 import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.linuxtools.internal.callgraph.graphlisteners.StapGraphMouseListener;
-import org.eclipse.linuxtools.internal.callgraph.CallGraphConstants;
-import org.eclipse.linuxtools.internal.callgraph.CallgraphView;
-import org.eclipse.linuxtools.internal.callgraph.StapGraph;
-import org.eclipse.linuxtools.internal.callgraph.StapGraphParser;
-import org.eclipse.linuxtools.internal.callgraph.core.StapUIJob;
-import org.eclipse.linuxtools.internal.callgraph.core.ViewFactory;
+import org.eclipse.linuxtools.callgraph.CallGraphConstants;
+import org.eclipse.linuxtools.callgraph.CallgraphView;
+import org.eclipse.linuxtools.callgraph.StapGraph;
+import org.eclipse.linuxtools.callgraph.StapGraphParser;
+import org.eclipse.linuxtools.callgraph.core.StapUIJob;
+import org.eclipse.linuxtools.callgraph.core.ViewFactory;
+import org.eclipse.linuxtools.callgraph.graphlisteners.StapGraphMouseListener;
 import org.eclipse.zest.core.widgets.GraphItem;
 
 public class MouseListenerTest extends TestCase {
@@ -29,7 +29,7 @@ public class MouseListenerTest extends TestCase {
 		parse.setSourcePath(Activator.PLUGIN_LOCATION + "eag.graph");
 		parse.testRun(new NullProgressMonitor(), true);
 
-		CallgraphView cView = (CallgraphView) ViewFactory.createView("org.eclipse.linuxtools.internal.callgraph.callgraphview");
+		CallgraphView cView = (CallgraphView) ViewFactory.createView("org.eclipse.linuxtools.callgraph.callgraphview");
 
 		StapUIJob j = new StapUIJob("Test Graph UI Job", parse,
 				CallGraphConstants.viewID);
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/StapGraphParserTest.java b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/StapGraphParserTest.java
index bde33b9a7b..29d17aff8f 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/StapGraphParserTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/StapGraphParserTest.java
@@ -15,7 +15,7 @@ import java.util.HashMap;
 
 import junit.framework.TestCase;
 
-import org.eclipse.linuxtools.internal.callgraph.StapGraphParser;
+import org.eclipse.linuxtools.callgraph.StapGraphParser;
 
 public class StapGraphParserTest extends TestCase {
 	
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphTest.java b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphTest.java
index afcecda44b..d2b0f08e02 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphTest.java
@@ -18,11 +18,11 @@ import junit.framework.TestCase;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.Action;
-import org.eclipse.linuxtools.internal.callgraph.CallGraphConstants;
-import org.eclipse.linuxtools.internal.callgraph.CallgraphView;
-import org.eclipse.linuxtools.internal.callgraph.StapGraphParser;
-import org.eclipse.linuxtools.internal.callgraph.core.StapUIJob;
-import org.eclipse.linuxtools.internal.callgraph.core.ViewFactory;
+import org.eclipse.linuxtools.callgraph.CallGraphConstants;
+import org.eclipse.linuxtools.callgraph.CallgraphView;
+import org.eclipse.linuxtools.callgraph.StapGraphParser;
+import org.eclipse.linuxtools.callgraph.core.StapUIJob;
+import org.eclipse.linuxtools.callgraph.core.ViewFactory;
 
 public class SystemTapGraphTest extends TestCase {	
 	
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphViewTest.java b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphViewTest.java
index 6763866c10..eb804add5a 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphViewTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphViewTest.java
@@ -13,8 +13,8 @@ package org.eclipse.linuxtools.callgraph.tests;
 
 import junit.framework.TestCase;
 
-import org.eclipse.linuxtools.internal.callgraph.core.SystemTapTextView;
-import org.eclipse.linuxtools.internal.callgraph.core.ViewFactory;
+import org.eclipse.linuxtools.callgraph.core.SystemTapTextView;
+import org.eclipse.linuxtools.callgraph.core.ViewFactory;
 
 public class SystemTapGraphViewTest extends TestCase {
 	private SystemTapTextView stapView = new SystemTapTextView();
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/test.xml b/systemtap/org.eclipse.linuxtools.callgraph.tests/test.xml
index 7d7ef736f5..26051bcb78 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/test.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/test.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <project name="testsuite" default="run" basedir=".">
-	<property name="classname" value="org.eclipse.linuxtools.internal.callgraph.tests.AllTests" />
-	<property name="plugin-name" value="org.eclipse.linuxtools.internal.callgraph.tests" />
+	<property name="classname" value="org.eclipse.linuxtools.callgraph.tests.AllTests" />
+	<property name="plugin-name" value="org.eclipse.linuxtools.callgraph.tests" />
 
 	<property name="library-file" value="${eclipse-home}/dropins/${subProjectName2}/plugins/org.eclipse.test/library.xml" />