148190#32

3 files changed, 24 insertions, 36 deletions

diff --git a/ajde/src/org/aspectj/ajde/ui/IdeUIAdapter.java b/ajde/src/org/aspectj/ajde/ui/IdeUIAdapter.java
deleted file mode 100644
index 9174aef88..000000000
--- a/ajde/src/org/aspectj/ajde/ui/IdeUIAdapter.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
- *               2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
- * ******************************************************************/
-
-
-package org.aspectj.ajde.ui;
-
-/**
- * @author Mik Kersten
- */
-public interface IdeUIAdapter {
-
-	public void displayStatusInformation(String message);
-}
diff --git a/ajde/src/org/aspectj/ajde/ui/StructureSearchManager.java b/ajde/src/org/aspectj/ajde/ui/StructureSearchManager.java
index 3c4e95e74..5ec11e6a4 100644
--- a/ajde/src/org/aspectj/ajde/ui/StructureSearchManager.java
+++ b/ajde/src/org/aspectj/ajde/ui/StructureSearchManager.java
@@ -8,17 +8,20 @@
  * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
- *     Xerox/PARC     initial implementation 
+ *     Xerox/PARC     initial implementation
+ *     Helen Hawkins  Converted to new interface (bug 148190) 
  * ******************************************************************/
 
  
 package org.aspectj.ajde.ui;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
-import org.aspectj.ajde.Ajde;
-import org.aspectj.asm.*;
-//import org.aspectj.asm.internal.*;
+import org.aspectj.asm.AsmManager;
+import org.aspectj.asm.IHierarchy;
+import org.aspectj.asm.IProgramElement;
 
 /**
  * @author	Mik Kersten
@@ -35,7 +38,7 @@ public class StructureSearchManager {
 		IProgramElement.Kind kind) {
 		
 		List matches = new ArrayList();
-		IHierarchy model = Ajde.getDefault().getStructureModelManager().getHierarchy();
+		IHierarchy model = AsmManager.getDefault().getHierarchy();
 		if (model.equals(IHierarchy.NO_STRUCTURE)) {
 			return null;
 		} else {
diff --git a/ajde/src/org/aspectj/ajde/ui/StructureViewManager.java b/ajde/src/org/aspectj/ajde/ui/StructureViewManager.java
index cfe6337a0..1d06d9409 100644
--- a/ajde/src/org/aspectj/ajde/ui/StructureViewManager.java
+++ b/ajde/src/org/aspectj/ajde/ui/StructureViewManager.java
@@ -8,18 +8,26 @@
  * http://www.eclipse.org/legal/epl-v10.html 
  *  
  * Contributors: 
- *     Xerox/PARC     initial implementation 
+ *     Xerox/PARC     initial implementation
+ *     Helen Hawkins  Converted to new interface (bug 148190) 
  * ******************************************************************/
 
  
 package org.aspectj.ajde.ui;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.internal.*;
-import org.aspectj.asm.*;
-import org.aspectj.asm.internal.*;
+import org.aspectj.ajde.ui.internal.NavigationHistoryModel;
+import org.aspectj.ajde.ui.internal.TreeStructureViewBuilder;
+import org.aspectj.asm.AsmManager;
+import org.aspectj.asm.IHierarchy;
+import org.aspectj.asm.IHierarchyListener;
+import org.aspectj.asm.IProgramElement;
+import org.aspectj.asm.IRelationship;
+import org.aspectj.asm.internal.AspectJElementHierarchy;
 
 /**
  * @author	Mik Kersten
@@ -81,7 +89,7 @@ public class StructureViewManager {
      * @param newFilePath the canonicalized path to the new file
 	 */
 	public void fireNavigationAction(String newFilePath, int lineNumber) {				
-		IProgramElement currNode = Ajde.getDefault().getStructureModelManager().getHierarchy().findElementForSourceLine(
+		IProgramElement currNode = AsmManager.getDefault().getHierarchy().findElementForSourceLine(
 			newFilePath,
 			lineNumber);
 		
@@ -135,7 +143,7 @@ public class StructureViewManager {
 	
 	public void refreshView(StructureView view) {
 		IStructureViewNode activeNode = view.getActiveNode();
-		treeViewBuilder.buildView(view, Ajde.getDefault().getStructureModelManager().getHierarchy());
+		treeViewBuilder.buildView(view, AsmManager.getDefault().getHierarchy());
 		view.setActiveNode(activeNode);
 	}