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

2 files changed, 3 insertions, 64 deletions

diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/BrowserManager.java b/ajbrowser/src/org/aspectj/tools/ajbrowser/BrowserManager.java
index 5f6f9e6e8..7af4f2199 100644
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/BrowserManager.java
+++ b/ajbrowser/src/org/aspectj/tools/ajbrowser/BrowserManager.java
@@ -35,7 +35,6 @@ public class BrowserManager {
 	private static final BrowserManager INSTANCE = new BrowserManager();
 	private BrowserProperties browserProjectProperties;
 	private EditorManager editorManager;
-	private StructureViewPanel fileStructurePanel = null;
 	
 	public static BrowserManager getDefault() {
 		return INSTANCE;
@@ -73,22 +72,16 @@ public class BrowserManager {
 				preferencesAdapter,
 				browserUIAdapter,
 				new IconRegistry(),
-				topFrame);	
+				topFrame,
+				true);	
 			
 			editorManager = new EditorManager(ajdeEditor);
 			
-			FileStructureView structureView = Ajde.getDefault().getStructureViewManager().createViewForSourceFile(
-				editorManager.getCurrFile(),
-				Ajde.getDefault().getStructureViewManager().getDefaultViewProperties()
-			);
-			Ajde.getDefault().getStructureViewManager().setDefaultFileView(structureView);			
-			fileStructurePanel = new StructureViewPanel(structureView);
-			
 			Ajde.getDefault().getBuildManager().addListener(BUILD_MESSAGES_LISTENER);
 			
 			MultiStructureViewPanel multiViewPanel = new MultiStructureViewPanel(
 				AjdeUIManager.getDefault().getViewManager().getBrowserPanel(),
-				fileStructurePanel
+				AjdeUIManager.getDefault().getFileStructurePanel()
 			);
 			
 			topFrame.init(
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/BuildConfigPopupMenu.java b/ajbrowser/src/org/aspectj/tools/ajbrowser/BuildConfigPopupMenu.java
deleted file mode 100644
index 8ca49e727..000000000
--- a/ajbrowser/src/org/aspectj/tools/ajbrowser/BuildConfigPopupMenu.java
+++ /dev/null
@@ -1,54 +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 Common Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
- * ******************************************************************/
-
-
-package org.aspectj.tools.ajbrowser;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Iterator;
-
-import javax.swing.AbstractAction;
-import javax.swing.Icon;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-
-import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.swing.*;
-import org.aspectj.asm.ProgramElementNode;
-
-public class BuildConfigPopupMenu extends JPopupMenu {
-
-	public BuildConfigPopupMenu(final AbstractAction action) {
-		java.util.List configFiles = Ajde.getDefault().getProjectProperties().getBuildConfigFiles();
-		for (Iterator it = configFiles.iterator(); it.hasNext(); ) {
-	    	final String buildConfig = (String)it.next();
-	    	JMenuItem buildItem = new JMenuItem(buildConfig);
-	    	buildItem.setFont(AjdeWidgetStyles.DEFAULT_LABEL_FONT);
-	    	buildItem.addActionListener(
-	    		new ActionListener() {
-		    		public void actionPerformed(ActionEvent e) {
-		    			Ajde.getDefault().getConfigurationManager().setActiveConfigFile(buildConfig);
-                        if (EditorManager.isShiftDown(e.getModifiers())) {
-                            Ajde.getDefault().getBuildManager().buildFresh();
-                        } else {
-                            Ajde.getDefault().getBuildManager().build();
-                        }
-				        action.actionPerformed(e);
-					}
-	    		});
-	    	buildItem.setIcon((Icon)AjdeUIManager.getDefault().getIconRegistry().getStructureIcon(ProgramElementNode.Kind.FILE_LST).getIconResource());
-	    	this.add(buildItem);
-		}
-	}
-}