1.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/actions/ImportAction.java	Tue Feb 13 01:26:00 2007 +0000
     1.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/actions/ImportAction.java	Tue Feb 13 05:17:00 2007 +0000
     1.3 @@ -19,17 +19,16 @@
     1.4  
     1.5  package org.netbeans.modules.visualweb.project.jsf.actions;
     1.6  
     1.7 +import java.util.Collection;
     1.8  import org.netbeans.modules.visualweb.project.jsf.api.Importable;
     1.9  import java.util.Iterator;
    1.10  import javax.swing.Action;
    1.11 -
    1.12  import javax.swing.JComponent;
    1.13  import javax.swing.JMenu;
    1.14  import javax.swing.JMenuItem;
    1.15  import javax.swing.event.MenuEvent;
    1.16  import javax.swing.event.MenuListener;
    1.17  import org.netbeans.spi.project.ui.support.MainProjectSensitiveActions;
    1.18 -
    1.19  import org.openide.NotifyDescriptor;
    1.20  import org.openide.util.Lookup;
    1.21  import org.openide.NotifyDescriptor.Message;
    1.22 @@ -38,7 +37,6 @@
    1.23  import org.openide.util.actions.Presenter.Menu;
    1.24  import org.openide.awt.StatusDisplayer;
    1.25  import org.openide.DialogDisplayer;
    1.26 -
    1.27  import org.openide.awt.JMenuPlus;
    1.28  import org.openide.util.HelpCtx;
    1.29  import org.openide.util.NbBundle;
    1.30 @@ -115,14 +113,12 @@
    1.31              JMenu menu = (JMenu)e.getSource();
    1.32  
    1.33              // Add the import items to the menu
    1.34 -            Lookup l = Lookup.getDefault();
    1.35 -            Lookup.Template template = new Lookup.Template(Importable.class);
    1.36 -            Iterator it = l.lookup(template).allInstances().iterator();
    1.37 -            while (it.hasNext()) {
    1.38 -                Importable type = (Importable) it.next();
    1.39 -                JMenuItem item = createMenuItem(type);
    1.40 +            Collection<Importable> importables = (Collection<Importable>) Lookup.getDefault().lookupAll(Importable.class); 
    1.41 +            for( Importable importable : importables ){
    1.42 +                JMenuItem item = createMenuItem(importable);
    1.43                  menu.add(item);
    1.44              }
    1.45 +           
    1.46              menu.add(createAddFileMenuItem(ImportFileAction.TYPE_IMAGE));
    1.47              menu.add(createAddFileMenuItem(ImportFileAction.TYPE_STYLESHEET));
    1.48              menu.add(createAddFileMenuItem(ImportFileAction.TYPE_JAVA));