Attachment #110579 for bug #201893

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 201893
Collapse All | Expand All

Lines 203-209 Link Here

(-)a/java.j2seproject/nbproject/project.xml (-1 / +1 lines)
203	<compile-dependency/>	203	<compile-dependency/>
204	<run-dependency>	204	<run-dependency>
205	<release-version>1</release-version>	205	<release-version>1</release-version>
206	<specification-version>1.38</specification-version>	206	<specification-version>1.39</specification-version>
207	</run-dependency>	207	</run-dependency>
208	</dependency>	208	</dependency>
209	<dependency>	209	<dependency>




import java.util.Properties;
import java.util.Set;
import java.util.logging.Logger;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.modules.java.api.common.ant.UpdateHelper;
import org.netbeans.modules.java.api.common.project.ProjectProperties;
import org.netbeans.modules.java.api.common.project.BaseActionProvider;
import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.LookupProvider;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.netbeans.spi.project.SingleMethod;
import org.openide.util.Lookup;
import org.openide.util.Parameters;

/** Action provider of the J2SE project. This is the place where to do
 * strange things to J2SE actions. E.g. compile-single.
 */
public class J2SEActionProvider extends BaseActionProvider implements AntTargetsProvider {

    private static final Logger LOG = Logger.getLogger(J2SEActionProvider.class.getName());


        return names;
    }

    @ProjectServiceProvider(
            service=ActionProvider.class,
            projectTypes={@LookupProvider.Registration.ProjectType(id="org-netbeans-modules-java-j2seproject",position=100)})
    public static J2SEActionProvider create(@NonNull final Lookup lkp) {
        Parameters.notNull("lkp", lkp); //NOI18N
        final J2SEProject project = lkp.lookup(J2SEProject.class);
        final J2SEActionProvider j2seActionProvider = new J2SEActionProvider(project, project.getUpdateHelper());
        j2seActionProvider.startFSListener();
        return j2seActionProvider;
            return Lookups.fixed(j2seActionProvider);
        }

    }

}




                    <attr name="position" intvalue="200"/>
                </file>
            </folder>
            <folder name="Lookup"/>
                <file name="J2SEActionProvider.instance">
                    <attr name="instanceOf" stringvalue="org.netbeans.spi.project.LookupProvider"/>
                    <attr name="instanceCreate" newvalue="org.netbeans.modules.java.j2seproject.J2SEActionProvider$Registration"/>
                    <!-- <attr name="position" intvalue="100"/> -->
                </file>
            </folder>
            <folder name="Actions">
                <file name="org-netbeans-modules-project-ui-NewFile$WithSubMenu.shadow">
                    <attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-NewFile$WithSubMenu.instance"/>

Lines 134-140 Link Here

(-)a/javafx2.project/nbproject/project.xml (-1 / +1 lines)
134	<compile-dependency/>	134	<compile-dependency/>
135	<run-dependency>	135	<run-dependency>
136	<release-version>1</release-version>	136	<release-version>1</release-version>
137	<specification-version>1.34</specification-version>	137	<specification-version>1.39</specification-version>
138	</run-dependency>	138	</run-dependency>
139	</dependency>	139	</dependency>
140	<dependency>	140	<dependency>




import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;
import org.netbeans.spi.project.ActionProvider;
import org.netbeans.spi.project.LookupProvider;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;
import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.Parameters;

/**
 * Skeleton of JFX Action Provider

        return prj.getProjectDirectory().getFileObject (getBuildXmlName(ep.evaluator()));
    }

    @ProjectServiceProvider(
            service=ActionProvider.class,
            projectTypes={@LookupProvider.Registration.ProjectType(id="org-netbeans-modules-java-j2seproject",position=90)})
    public static ActionProvider create(@NonNull final Lookup lkp) {
        Parameters.notNull("lkp", lkp); //NOI18N
        final Project project = lkp.lookup(Project.class);
        return new JFXActionProvider(project);
            final Project project = baseContext.lookup(Project.class);
            final JFXActionProvider jfxActionProvider = new JFXActionProvider(project);
            return Lookups.fixed(jfxActionProvider);
        }

    }
}





    <folder name="Projects">
        <folder name="org-netbeans-modules-java-j2seproject">
            <folder name="Lookup"/>
<!--                <file name="JFXActionProvider.instance">
                    <attr name="instanceOf" stringvalue="org.netbeans.spi.project.LookupProvider"/>
                    <attr name="instanceCreate" newvalue="org.netbeans.modules.javafx2.project.JFXActionProvider$Registration"/>
                    <attr name="position" intvalue="90"/>
                </file> -->
            </folder>
        </folder>
    </folder>


Return to bug 201893

Lines 51-69 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java (-14 / +14 lines)
51	import java.util.Properties;	51	import java.util.Properties;
52	import java.util.Set;	52	import java.util.Set;
53	import java.util.logging.Logger;	53	import java.util.logging.Logger;
		54	import org.netbeans.api.annotations.common.NonNull;
54	import org.netbeans.api.java.project.JavaProjectConstants;	55	import org.netbeans.api.java.project.JavaProjectConstants;
55	import org.netbeans.modules.java.api.common.ant.UpdateHelper;	56	import org.netbeans.modules.java.api.common.ant.UpdateHelper;
56	import org.netbeans.modules.java.api.common.project.ProjectProperties;	57	import org.netbeans.modules.java.api.common.project.ProjectProperties;
57	import org.netbeans.modules.java.api.common.project.BaseActionProvider;	58	import org.netbeans.modules.java.api.common.project.BaseActionProvider;
		59	import org.netbeans.spi.project.ActionProvider;
58	import org.netbeans.spi.project.LookupProvider;	60	import org.netbeans.spi.project.LookupProvider;
		61	import org.netbeans.spi.project.ProjectServiceProvider;
59	import org.netbeans.spi.project.SingleMethod;	62	import org.netbeans.spi.project.SingleMethod;
60	import org.openide.util.Lookup;	63	import org.openide.util.Lookup;
61	import org.openide.util.lookup.Lookups;	64	import org.openide.util.Parameters;
62		65
63	/** Action provider of the J2SE project. This is the place where to do	66	/** Action provider of the J2SE project. This is the place where to do
64	* strange things to J2SE actions. E.g. compile-single.	67	* strange things to J2SE actions. E.g. compile-single.
65	*/	68	*/
66	class J2SEActionProvider extends BaseActionProvider implements AntTargetsProvider {	69	public class J2SEActionProvider extends BaseActionProvider implements AntTargetsProvider {
67		70
68	private static final Logger LOG = Logger.getLogger(J2SEActionProvider.class.getName());	71	private static final Logger LOG = Logger.getLogger(J2SEActionProvider.class.getName());
69		72
Lines 208-225 Link Here
208	return names;	211	return names;
209	}	212	}
210		213
211	/**	214	@ProjectServiceProvider(
212	* position=100	215	service=ActionProvider.class,
213	*/	216	projectTypes={@LookupProvider.Registration.ProjectType(id="org-netbeans-modules-java-j2seproject",position=100)})
214	public static class Registration implements LookupProvider {	217	public static J2SEActionProvider create(@NonNull final Lookup lkp) {
215	@Override	218	Parameters.notNull("lkp", lkp); //NOI18N
216	public Lookup createAdditionalLookup(Lookup baseContext) {	219	final J2SEProject project = lkp.lookup(J2SEProject.class);
217	final J2SEProject project = baseContext.lookup(J2SEProject.class);	220	final J2SEActionProvider j2seActionProvider = new J2SEActionProvider(project, project.getUpdateHelper());
218	final J2SEActionProvider j2seActionProvider = new J2SEActionProvider(project, project.getUpdateHelper());	221	j2seActionProvider.startFSListener();
219	j2seActionProvider.startFSListener();	222	return j2seActionProvider;
220	return Lookups.fixed(j2seActionProvider);
221	}
222
223	}	223	}
224		224
225	}	225	}

Lines 70-82 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/resources/layer.xml (-7 / +1 lines)
70	<attr name="position" intvalue="200"/>	70	<attr name="position" intvalue="200"/>
71	</file>	71	</file>
72	</folder>	72	</folder>
73	<folder name="Lookup">	73	<folder name="Lookup"/>
74	<file name="J2SEActionProvider.instance">
75	<attr name="instanceOf" stringvalue="org.netbeans.spi.project.LookupProvider"/>
76	<attr name="instanceCreate" newvalue="org.netbeans.modules.java.j2seproject.J2SEActionProvider$Registration"/>
77	<!-- <attr name="position" intvalue="100"/> -->
78	</file>
79	</folder>
80	<folder name="Actions">	74	<folder name="Actions">
81	<file name="org-netbeans-modules-project-ui-NewFile$WithSubMenu.shadow">	75	<file name="org-netbeans-modules-project-ui-NewFile$WithSubMenu.shadow">
82	<attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-NewFile$WithSubMenu.instance"/>	76	<attr name="originalFile" stringvalue="Actions/Project/org-netbeans-modules-project-ui-NewFile$WithSubMenu.instance"/>

Lines 50-61 Link Here

(-)a/javafx2.project/src/org/netbeans/modules/javafx2/project/JFXActionProvider.java (-13 / +9 lines)
50	import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;	50	import org.netbeans.modules.java.j2seproject.api.J2SEPropertyEvaluator;
51	import org.netbeans.spi.project.ActionProvider;	51	import org.netbeans.spi.project.ActionProvider;
52	import org.netbeans.spi.project.LookupProvider;	52	import org.netbeans.spi.project.LookupProvider;
		53	import org.netbeans.spi.project.ProjectServiceProvider;
53	import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;	54	import org.netbeans.spi.project.support.ant.GeneratedFilesHelper;
54	import org.netbeans.spi.project.support.ant.PropertyEvaluator;	55	import org.netbeans.spi.project.support.ant.PropertyEvaluator;
55	import org.openide.filesystems.FileObject;	56	import org.openide.filesystems.FileObject;
56	import org.openide.util.Exceptions;	57	import org.openide.util.Exceptions;
57	import org.openide.util.Lookup;	58	import org.openide.util.Lookup;
58	import org.openide.util.lookup.Lookups;	59	import org.openide.util.Parameters;
59		60
60	/**	61	/**
61	* Skeleton of JFX Action Provider	62	* Skeleton of JFX Action Provider
Lines 121-137 Link Here
121	return prj.getProjectDirectory().getFileObject (getBuildXmlName(ep.evaluator()));	122	return prj.getProjectDirectory().getFileObject (getBuildXmlName(ep.evaluator()));
122	}	123	}
123		124
124	/**	125	@ProjectServiceProvider(
125	* position=90	126	service=ActionProvider.class,
126	*/	127	projectTypes={@LookupProvider.Registration.ProjectType(id="org-netbeans-modules-java-j2seproject",position=90)})
127	public static class Registration implements LookupProvider {	128	public static ActionProvider create(@NonNull final Lookup lkp) {
128	@Override	129	Parameters.notNull("lkp", lkp); //NOI18N
129	@NonNull	130	final Project project = lkp.lookup(Project.class);
130	public Lookup createAdditionalLookup(@NonNull Lookup baseContext) {	131	return new JFXActionProvider(project);
131	final Project project = baseContext.lookup(Project.class);
132	final JFXActionProvider jfxActionProvider = new JFXActionProvider(project);
133	return Lookups.fixed(jfxActionProvider);
134	}
135
136	}	132	}
137	}	133	}

Lines 13-25 Link Here

(-)a/javafx2.project/src/org/netbeans/modules/javafx2/project/layer.xml (-7 / +1 lines)
13		13
14	<folder name="Projects">	14	<folder name="Projects">
15	<folder name="org-netbeans-modules-java-j2seproject">	15	<folder name="org-netbeans-modules-java-j2seproject">
16	<folder name="Lookup">	16	<folder name="Lookup"/>
17	<!-- <file name="JFXActionProvider.instance">
18	<attr name="instanceOf" stringvalue="org.netbeans.spi.project.LookupProvider"/>
19	<attr name="instanceCreate" newvalue="org.netbeans.modules.javafx2.project.JFXActionProvider$Registration"/>
20	<attr name="position" intvalue="90"/>
21	</file> -->
22	</folder>
23	</folder>	17	</folder>
24	</folder>	18	</folder>
25		19