Fix for bug#40771

De-coupled AJDE APIs from javax.swing, and moved browser-specific funtionality into the the ajbrowser module.

4 files changed, 61 insertions, 5 deletions

diff --git a/ajde/testsrc/AjdeModuleTests.java b/ajde/testsrc/AjdeModuleTests.java
index c26330ed9..58d6c03d6 100644
--- a/ajde/testsrc/AjdeModuleTests.java
+++ b/ajde/testsrc/AjdeModuleTests.java
@@ -18,7 +18,7 @@ import junit.framework.*;
 
 public class AjdeModuleTests extends TestCase {
 
-    public static Test suite() { 
+    public static TestSuite suite() { 
         TestSuite suite = new TestSuite(AjdeModuleTests.class.getName());
         suite.addTest(org.aspectj.ajde.AjdeTests.suite()); 
         suite.addTest(org.aspectj.ajde.internal.AjdeInternalTests.suite()); 
diff --git a/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java b/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java
index 178d92efe..0506eb36d 100644
--- a/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java
@@ -13,7 +13,6 @@
 package org.aspectj.ajde;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.List;
 
 /**
diff --git a/ajde/testsrc/org/aspectj/ajde/NullIdeEditorAdapter.java b/ajde/testsrc/org/aspectj/ajde/NullIdeEditorAdapter.java
new file mode 100644
index 000000000..2dc416748
--- /dev/null
+++ b/ajde/testsrc/org/aspectj/ajde/NullIdeEditorAdapter.java
@@ -0,0 +1,58 @@
+/*
+ * Created on Jul 25, 2003
+ *
+ * To change the template for this generated file go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+package org.aspectj.ajde;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.aspectj.bridge.ISourceLocation;
+
+/**
+ * @author beatmik
+ *
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class NullIdeEditorAdapter implements EditorAdapter {
+
+	public void showSourceLine(
+		String filePath,
+		int lineNumber,
+		boolean highlight) {
+
+	}
+
+	public void showSourceLine(
+		ISourceLocation sourceLocation,
+		boolean highlight) {
+
+	}
+
+	public void showSourceLine(int lineNumber, boolean highlight) {
+
+	}
+
+	public String getCurrFile() {
+		return null;
+	}
+
+	public void saveContents() throws IOException {
+	}
+
+	public void pasteToCaretPos(String text) {
+
+	}
+
+
+	public void showSourcelineAnnotation(
+		String filePath,
+		int lineNumber,
+		List items) {
+
+	}
+
+}
diff --git a/ajde/testsrc/org/aspectj/ajde/NullIdeManager.java b/ajde/testsrc/org/aspectj/ajde/NullIdeManager.java
index 71a50575e..c659dd2c8 100644
--- a/ajde/testsrc/org/aspectj/ajde/NullIdeManager.java
+++ b/ajde/testsrc/org/aspectj/ajde/NullIdeManager.java
@@ -45,7 +45,7 @@ public class NullIdeManager {
 			UserPreferencesAdapter preferencesAdapter = new UserPreferencesStore(false);
 			ProjectPropertiesAdapter browserProjectProperties = new NullIdeProperties(testProjectPath);
 			taskListManager = new NullIdeTaskListManager();
-			BasicEditor ajdeEditor = new BasicEditor();
+			EditorAdapter ajdeEditor = new NullIdeEditorAdapter();
 			IdeUIAdapter uiAdapter = new NullIdeUIAdapter();
 			JFrame nullFrame = new JFrame();
 			//configurationManager.setConfigFiles(getConfigFilesList(configFiles));	
@@ -57,8 +57,7 @@ public class NullIdeManager {
 				preferencesAdapter,
 				uiAdapter,
 				new IconRegistry(),
-				nullFrame,
-				true);	
+				nullFrame);	
 				
 			//Ajde.getDefault().enableLogging( System.out );
 		} catch (Throwable t) {