Automated merge with file:///Users/mkleint/hg-incoming/main before_merge_to_jet-parsing-api
authorMilos Kleint <mkleint@netbeans.org>
Wed, 19 Nov 2008 10:08:53 +0100
changeset 277877d275390546
parent 2776 ad1521f4e6a0
parent 2777 f83d0154a266
child 2779 f2fe61f45b56
child 2797 7ef4ed248346
Automated merge with file:///Users/mkleint/hg-incoming/main
     1.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/resources/layer.xml	Tue Nov 18 11:14:17 2008 -0800
     1.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/resources/layer.xml	Wed Nov 19 10:08:53 2008 +0100
     1.3 @@ -73,11 +73,6 @@
     1.4      
     1.5      <folder name="Projects">
     1.6          <folder name="org-netbeans-modules-web-project">
     1.7 -            <folder name="Nodes">
     1.8 -                <file name="org-netbeans-modules-visualweb-project-jsf-ui-JSFNodeFactory.instance">
     1.9 -                    <attr name="position" intvalue="900"/>
    1.10 -                </file>
    1.11 -            </folder>
    1.12              <folder name="BrokenLibraryRefFilterProviders">
    1.13                <file name="org-netbeans-modules-visualweb-project-jsf-libraries-ComplibBrokenLibraryRefFilterProvider.instance"/>
    1.14                <file name="org-netbeans-modules-visualweb-project-jsf-libraries-WebServicesBrokenLibraryRefFilterProvider.instance"/>
     2.1 --- a/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/JSFNodeFactory.java	Tue Nov 18 11:14:17 2008 -0800
     2.2 +++ b/visualweb.project.jsf/src/org/netbeans/modules/visualweb/project/jsf/ui/JSFNodeFactory.java	Wed Nov 19 10:08:53 2008 +0100
     2.3 @@ -49,7 +49,6 @@
     2.4  import java.beans.PropertyChangeEvent;
     2.5  import java.beans.PropertyChangeListener;
     2.6  import java.util.ArrayList;
     2.7 -import java.util.Iterator;
     2.8  import java.util.List;
     2.9  import javax.swing.SwingUtilities;
    2.10  import javax.swing.event.ChangeEvent;
    2.11 @@ -60,12 +59,12 @@
    2.12  import org.netbeans.spi.project.ui.support.NodeList;
    2.13  import org.openide.nodes.Node;
    2.14  import org.openide.util.Lookup;
    2.15 -import org.openide.util.NbBundle;
    2.16  
    2.17  /** Visual Web framework extra nodes factory.
    2.18   *
    2.19   * @author Po-Ting Wu
    2.20   */
    2.21 +@NodeFactory.Registration(projectType="org-netbeans-modules-web-project",position=900)
    2.22  public class JSFNodeFactory implements NodeFactory {
    2.23      /** Creates a new instance of JSFNodeFactory */
    2.24      public JSFNodeFactory() {