Attachment #130743 for bug #186943

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 186943
Collapse All | Expand All




import javax.swing.Icon;
import javax.swing.event.ChangeListener;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.modules.projectapi.AuxiliaryConfigBasedPreferencesProvider;
import org.netbeans.modules.projectapi.AuxiliaryConfigImpl;
import org.netbeans.spi.project.AuxiliaryConfiguration;

     * @return some information about it
     * @see Project#getLookup
     */
    public static ProjectInformation getInformation(@NonNull Project p) {
        Lookup l = p.getLookup();
        ProjectInformation pi = l.lookup(ProjectInformation.class);
        return new AnnotateIconProxyProjectInformation(pi != null ? pi : new BasicInformation(p));

     * @return a list of sources for it
     * @see Project#getLookup
     */
    public static Sources getSources(@NonNull Project p) {
        Lookup l = p.getLookup();
        Sources s = l.lookup(Sources.class);
        if (s != null) {

     * @return {@link Preferences} for the given project
     * @since 1.16
     */
    public static Preferences getPreferences(@NonNull Project project, @NonNull Class clazz, boolean shared) {
        Parameters.notNull("project", project);
        Parameters.notNull("clazz", clazz);
        

     * @param master the original master project (for use with candidate param)
     * @param candidate a candidate added subproject for master, or null
     */
    private static boolean visit(@NonNull Map<Project,Boolean> encountered, @NonNull Project curr, Project master, @NullAllowed Project candidate) {
        if (encountered.containsKey(curr)) {
            if (encountered.get(curr)) {
                return false;

     * @return an auxiliary configuration handle
     * @since org.netbeans.modules.projectapi/1 1.17
     */
    public static AuxiliaryConfiguration getAuxiliaryConfiguration(@NonNull Project project) {
        Parameters.notNull("project", project);
        return new AuxiliaryConfigImpl(project);
    }

     * @throws IOException if no such directory could be created
     * @since org.netbeans.modules.projectapi/1 1.26
     */
    public static FileObject getCacheDirectory(@NonNull Project project, @NonNull Class<?> owner) throws IOException {
        FileObject d;
        CacheDirectoryProvider cdp = project.getLookup().lookup(CacheDirectoryProvider.class);
        if (cdp != null) {

Lines 61-66 Link Here

(-)a/projectapi/src/org/netbeans/modules/projectapi/AuxiliaryConfigBasedPreferencesProvider.java (-1 / +2 lines)
61	import java.util.prefs.AbstractPreferences;	61	import java.util.prefs.AbstractPreferences;
62	import java.util.prefs.BackingStoreException;	62	import java.util.prefs.BackingStoreException;
63	import java.util.prefs.Preferences;	63	import java.util.prefs.Preferences;
		64	import org.netbeans.api.annotations.common.NonNull;
64	import org.netbeans.api.project.Project;	65	import org.netbeans.api.project.Project;
65	import org.netbeans.api.project.ProjectManager;	66	import org.netbeans.api.project.ProjectManager;
66	import org.netbeans.api.project.ProjectUtils;	67	import org.netbeans.api.project.ProjectUtils;
Lines 323-329 Link Here
323	modified = true;	324	modified = true;
324	}	325	}
325		326
326	public static String findCNBForClass(Class<?> cls) {	327	public static String findCNBForClass(@NonNull Class<?> cls) {
327	String absolutePath;	328	String absolutePath;
328	ModuleInfo owner = Modules.getDefault().ownerOf(cls);	329	ModuleInfo owner = Modules.getDefault().ownerOf(cls);
329	if (owner != null) {	330	if (owner != null) {




import java.beans.PropertyChangeListener;
import java.text.MessageFormat;
import javax.swing.JComponent;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.Sources;


public final class NewFileWizard extends TemplateWizard {

    @NonNull
    private Project currP;
    private MessageFormat format;
    // private String[] recommendedTypes;

    @NonNull
    private Project getCurrentProject() {
        return currP;
    }

    private void setCurrentProject(@NonNull Project p) {
        this.currP = p;
    }

    public NewFileWizard(@NonNull Project project /*, String recommendedTypes[] */) {
        setCurrentProject(project);
        putProperty(ProjectChooserFactory.WIZARD_KEY_PROJECT, getCurrentProject());
        format = new MessageFormat(NbBundle.getBundle(NewFileWizard.class).getString("LBL_NewFileWizard_MessageFormat"));




            LOAD.exit();
        }
    }

    @NonNull
    public Project[] getOpenProjects() {
        return ProjectManager.mutex().readAccess(new Mutex.Action<Project[]>() {
            public @Override Project[] run() {


               
    // Used from NewFile action        
    public List<DataObject> getTemplatesLRU( @NonNull Project project,  PrivilegedTemplates priv ) {
        List<FileObject> pLRU = getTemplateNamesLRU( project,  priv );
        List<DataObject> templates = new ArrayList<DataObject>();
        for( Iterator<FileObject> it = pLRU.iterator(); it.hasNext(); ) {

            this.icon = icon;
        }
    }
    public static List<TemplateItem> prepareTemplates(@NonNull Project project, @NonNull Lookup lookup) {
        // check the action context for recommmended/privileged templates..
        PrivilegedTemplates privs = lookup.lookup(PrivilegedTemplates.class);
        final List<TemplateItem> items = new ArrayList<TemplateItem>();

            OpenProjectListSettings.getInstance().setMainProjectURL( mainRoot );
    }
        
    private ArrayList<FileObject> getTemplateNamesLRU( @NonNull final Project project, PrivilegedTemplates priv ) {
        // First take recently used templates and try to find those which
        // are supported by the project.
        

Lines 46-51 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/ProjectChooserFactoryImpl.java (-1 / +2 lines)
46		46
47	import java.io.File;	47	import java.io.File;
48	import javax.swing.JFileChooser;	48	import javax.swing.JFileChooser;
		49	import org.netbeans.api.annotations.common.NonNull;
49	import org.netbeans.api.project.Project;	50	import org.netbeans.api.project.Project;
50	import org.netbeans.modules.project.uiapi.ProjectChooserFactory;	51	import org.netbeans.modules.project.uiapi.ProjectChooserFactory;
51	import org.netbeans.api.project.SourceGroup;	52	import org.netbeans.api.project.SourceGroup;
Lines 65-71 Link Here
65	return ProjectChooserAccessory.createProjectChooser( false );	66	return ProjectChooserAccessory.createProjectChooser( false );
66	}	67	}
67		68
68	public @Override WizardDescriptor.Panel<WizardDescriptor> createSimpleTargetChooser(Project project, SourceGroup[] folders,	69	public @Override WizardDescriptor.Panel<WizardDescriptor> createSimpleTargetChooser(@NonNull Project project, @NonNull SourceGroup[] folders,
69	WizardDescriptor.Panel<WizardDescriptor> bottomPanel, boolean freeFileExtension) {	70	WizardDescriptor.Panel<WizardDescriptor> bottomPanel, boolean freeFileExtension) {
70	return new SimpleTargetChooserPanel(project, folders, bottomPanel, false, freeFileExtension);	71	return new SimpleTargetChooserPanel(project, folders, bottomPanel, false, freeFileExtension);
71	}	72	}




import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.SourceGroup;
import static org.netbeans.modules.project.ui.Bundle.*;

    private final ChangeSupport changeSupport = new ChangeSupport(this);
    private SimpleTargetChooserPanelGUI gui;

    @NonNull
    private Project project;
    @NonNull
    private SourceGroup[] folders;
    private WizardDescriptor.Panel<WizardDescriptor> bottomPanel;
    private WizardDescriptor wizard;

    private boolean freeFileExtension;
    
    @SuppressWarnings("LeakingThisInConstructor")
    SimpleTargetChooserPanel(@NonNull Project project, @NonNull SourceGroup[] folders,
            WizardDescriptor.Panel<WizardDescriptor> bottomPanel, boolean isFolder, boolean freeFileExtension) {
        this.folders = folders;
        this.project = project;




import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup;

    private static final Dimension PREF_DIM = new Dimension(500, 340);
    
    private final ListCellRenderer CELL_RENDERER = new GroupCellRenderer();

    @NonNull
    private Project project;
    private String expectedExtension;
    private final ChangeSupport changeSupport = new ChangeSupport(this);
    @NonNull
    private SourceGroup[] folders;
    private boolean isFolder;
    private boolean freeFileExtension;
    
    @SuppressWarnings("LeakingThisInConstructor")
    @Messages("LBL_SimpleTargetChooserPanel_Name=Name and Location")
    public SimpleTargetChooserPanelGUI( @NonNull Project project, @NonNull SourceGroup[] folders, Component bottomPanel, boolean isFolder, boolean freeFileExtension) {
        this.project = project;
        this.folders = folders.clone();
        this.isFolder = isFolder;

        "LBL_TargetChooser_CreatedFile_Label=&Created File:",
        "# sample folder name", "LBL_folder_name=folder"
    })
    final void initValues(FileObject template, @NullAllowed FileObject preselectedFolder, String documentName) {
        assert project != null;
        
        projectTextField.setText(ProjectUtils.getInformation(project).getDisplayName());

    public SourceGroup getTargetGroup() {
        return (SourceGroup)locationComboBox.getSelectedItem();
    }

    @CheckForNull
    public String getTargetFolder() {
        
        String folderName = folderTextField.getText().trim();

    private javax.swing.JSeparator targetSeparator;
    // End of variables declaration//GEN-END:variables

    @CheckForNull
    private SourceGroup getPreselectedGroup( SourceGroup[] groups, FileObject folder ) {        
        for( int i = 0; folder != null && i < groups.length; i++ ) {
            if( FileUtil.isParentOf( groups[i].getRootFolder(), folder )




import java.awt.event.ActionListener;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.project.Project;
import org.netbeans.modules.project.uiapi.ProjectChooserFactory;
import org.netbeans.spi.project.ui.templates.support.Templates;

    private final ChangeSupport changeSupport = new ChangeSupport(this);
    private TemplateChooserPanelGUI gui;

    @NonNull
    private Project project;
    // private String[] recommendedTypes;
    private WizardDescriptor wizard;

    TemplateChooserPanel( @NonNull Project p /*, String recommendedTypes[] */ ) {
        this.project = p;
        /* this.recommendedTypes = recommendedTypes; */
    }

Lines 110-116 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/TemplateChooserPanelGUI.java (-1 / +1 lines)
110	projectsComboBox.setRenderer (projectCellRenderer);	110	projectsComboBox.setRenderer (projectCellRenderer);
111	}	111	}
112		112
113	public void readValues (Project p, String category, String template) {	113	public void readValues (@NonNull Project p, String category, String template) {
114	assert p != null : "Project can not be null"; //NOI18N	114	assert p != null : "Project can not be null"; //NOI18N
115	boolean wf;	115	boolean wf;
116	synchronized (this) {	116	synchronized (this) {




import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu.Separator;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.project.Project;
import org.netbeans.modules.project.ui.NewFileWizard;
import org.netbeans.modules.project.ui.NoProjectNew;

@Messages({
    "LBL_NewFileAction_Name=&New File...",
    "LBL_NewFileAction_PopupName=New",
    "# {0} - Name of the template", "LBL_NewFileAction_Template_PopupName={0}..."
})
public class NewFile extends ProjectAction implements PropertyChangeListener, Popup {



    // Private methods ---------------------------------------------------------

    @NonNull
    private Project preselectedProject( Lookup context ) {
        Project preselectedProject = null;


        "LBL_NewFileAction_File_PopupName=Other...",
        "NewFile.please_wait=Please wait..."
    })
    private void fillSubMenu(final JMenu menuItem, @NonNull final Project project) {
        menuItem.removeAll();
        JMenuItem wait = new JMenuItem(NewFile_please_wait());
        wait.setEnabled(false);





import java.io.File;
import javax.swing.JFileChooser;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.SourceGroup;
import org.openide.WizardDescriptor;

/**
 * Factory to be implemented by the UI implementation
 * @author Petr Hrebejk
 */
public interface ProjectChooserFactory {


    public JFileChooser createProjectChooser(); 
    
    public WizardDescriptor.Panel<WizardDescriptor> createSimpleTargetChooser(@NonNull Project project, @NonNull SourceGroup[] folders,
            WizardDescriptor.Panel<WizardDescriptor> bottomPanel, boolean freeFileExtension);
            
}




package org.netbeans.spi.project.ui.templates.support;

import java.io.IOException;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.SourceGroup;

     * @return a builder which can be used to customize and then create the target chooser
     * @since org.netbeans.modules.projectuiapi/1 1.45
     */
    public static SimpleTargetChooserBuilder buildSimpleTargetChooser(@NonNull Project project, @NonNull SourceGroup[] folders) {
        Parameters.notNull("project", project);
        Parameters.notNull("folders", folders);
        return new SimpleTargetChooserBuilder(project, folders);

     * @since org.netbeans.modules.projectuiapi/1 1.45
     */
    public static final class SimpleTargetChooserBuilder {
        @NonNull
        final Project project;
        @NonNull
        final SourceGroup[] folders;
        WizardDescriptor.Panel<WizardDescriptor> bottomPanel;
        boolean freeFileExtension;
        SimpleTargetChooserBuilder(@NonNull Project project, @NonNull SourceGroup[] folders) {
            this.project = project;
            this.folders = folders;
        }

Return to bug 186943

Lines 60-65 Link Here

(-)a/projectapi/src/org/netbeans/api/project/ProjectUtils.java (-6 / +7 lines)
60	import javax.swing.Icon;	60	import javax.swing.Icon;
61	import javax.swing.event.ChangeListener;	61	import javax.swing.event.ChangeListener;
62	import org.netbeans.api.annotations.common.NonNull;	62	import org.netbeans.api.annotations.common.NonNull;
		63	import org.netbeans.api.annotations.common.NullAllowed;
63	import org.netbeans.modules.projectapi.AuxiliaryConfigBasedPreferencesProvider;	64	import org.netbeans.modules.projectapi.AuxiliaryConfigBasedPreferencesProvider;
64	import org.netbeans.modules.projectapi.AuxiliaryConfigImpl;	65	import org.netbeans.modules.projectapi.AuxiliaryConfigImpl;
65	import org.netbeans.spi.project.AuxiliaryConfiguration;	66	import org.netbeans.spi.project.AuxiliaryConfiguration;
Lines 97-103 Link Here
97	* @return some information about it	98	* @return some information about it
98	* @see Project#getLookup	99	* @see Project#getLookup
99	*/	100	*/
100	public static ProjectInformation getInformation(Project p) {	101	public static ProjectInformation getInformation(@NonNull Project p) {
101	Lookup l = p.getLookup();	102	Lookup l = p.getLookup();
102	ProjectInformation pi = l.lookup(ProjectInformation.class);	103	ProjectInformation pi = l.lookup(ProjectInformation.class);
103	return new AnnotateIconProxyProjectInformation(pi != null ? pi : new BasicInformation(p));	104	return new AnnotateIconProxyProjectInformation(pi != null ? pi : new BasicInformation(p));
Lines 112-118 Link Here
112	* @return a list of sources for it	113	* @return a list of sources for it
113	* @see Project#getLookup	114	* @see Project#getLookup
114	*/	115	*/
115	public static Sources getSources(Project p) {	116	public static Sources getSources(@NonNull Project p) {
116	Lookup l = p.getLookup();	117	Lookup l = p.getLookup();
117	Sources s = l.lookup(Sources.class);	118	Sources s = l.lookup(Sources.class);
118	if (s != null) {	119	if (s != null) {
Lines 181-187 Link Here
181	* @return {@link Preferences} for the given project	182	* @return {@link Preferences} for the given project
182	* @since 1.16	183	* @since 1.16
183	*/	184	*/
184	public static Preferences getPreferences(Project project, Class clazz, boolean shared) {	185	public static Preferences getPreferences(@NonNull Project project, @NonNull Class clazz, boolean shared) {
185	Parameters.notNull("project", project);	186	Parameters.notNull("project", project);
186	Parameters.notNull("clazz", clazz);	187	Parameters.notNull("clazz", clazz);
187		188
Lines 195-201 Link Here
195	* @param master the original master project (for use with candidate param)	196	* @param master the original master project (for use with candidate param)
196	* @param candidate a candidate added subproject for master, or null	197	* @param candidate a candidate added subproject for master, or null
197	*/	198	*/
198	private static boolean visit(Map<Project,Boolean> encountered, Project curr, Project master, Project candidate) {	199	private static boolean visit(@NonNull Map<Project,Boolean> encountered, @NonNull Project curr, Project master, @NullAllowed Project candidate) {
199	if (encountered.containsKey(curr)) {	200	if (encountered.containsKey(curr)) {
200	if (encountered.get(curr)) {	201	if (encountered.get(curr)) {
201	return false;	202	return false;
Lines 376-382 Link Here
376	* @return an auxiliary configuration handle	377	* @return an auxiliary configuration handle
377	* @since org.netbeans.modules.projectapi/1 1.17	378	* @since org.netbeans.modules.projectapi/1 1.17
378	*/	379	*/
379	public static AuxiliaryConfiguration getAuxiliaryConfiguration(Project project) {	380	public static AuxiliaryConfiguration getAuxiliaryConfiguration(@NonNull Project project) {
380	Parameters.notNull("project", project);	381	Parameters.notNull("project", project);
381	return new AuxiliaryConfigImpl(project);	382	return new AuxiliaryConfigImpl(project);
382	}	383	}
Lines 395-401 Link Here
395	* @throws IOException if no such directory could be created	396	* @throws IOException if no such directory could be created
396	* @since org.netbeans.modules.projectapi/1 1.26	397	* @since org.netbeans.modules.projectapi/1 1.26
397	*/	398	*/
398	public static FileObject getCacheDirectory(Project project, Class<?> owner) throws IOException {	399	public static FileObject getCacheDirectory(@NonNull Project project, @NonNull Class<?> owner) throws IOException {
399	FileObject d;	400	FileObject d;
400	CacheDirectoryProvider cdp = project.getLookup().lookup(CacheDirectoryProvider.class);	401	CacheDirectoryProvider cdp = project.getLookup().lookup(CacheDirectoryProvider.class);
401	if (cdp != null) {	402	if (cdp != null) {

Lines 47-52 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/NewFileWizard.java (-2 / +6 lines)
47	import java.beans.PropertyChangeListener;	47	import java.beans.PropertyChangeListener;
48	import java.text.MessageFormat;	48	import java.text.MessageFormat;
49	import javax.swing.JComponent;	49	import javax.swing.JComponent;
		50	import org.netbeans.api.annotations.common.NonNull;
50	import org.netbeans.api.project.Project;	51	import org.netbeans.api.project.Project;
51	import org.netbeans.api.project.ProjectUtils;	52	import org.netbeans.api.project.ProjectUtils;
52	import org.netbeans.api.project.Sources;	53	import org.netbeans.api.project.Sources;
Lines 62-79 Link Here
62		63
63	public final class NewFileWizard extends TemplateWizard {	64	public final class NewFileWizard extends TemplateWizard {
64		65
		66	@NonNull
65	private Project currP;	67	private Project currP;
66	private MessageFormat format;	68	private MessageFormat format;
67	// private String[] recommendedTypes;	69	// private String[] recommendedTypes;
		70
		71	@NonNull
68	private Project getCurrentProject() {	72	private Project getCurrentProject() {
69	return currP;	73	return currP;
70	}	74	}
71		75
72	private void setCurrentProject(Project p) {	76	private void setCurrentProject(@NonNull Project p) {
73	this.currP = p;	77	this.currP = p;
74	}	78	}
75		79
76	public NewFileWizard(Project project /, String recommendedTypes[] /) {	80	public NewFileWizard(@NonNull Project project /, String recommendedTypes[] /) {
77	setCurrentProject(project);	81	setCurrentProject(project);
78	putProperty(ProjectChooserFactory.WIZARD_KEY_PROJECT, getCurrentProject());	82	putProperty(ProjectChooserFactory.WIZARD_KEY_PROJECT, getCurrentProject());
79	format = new MessageFormat(NbBundle.getBundle(NewFileWizard.class).getString("LBL_NewFileWizard_MessageFormat"));	83	format = new MessageFormat(NbBundle.getBundle(NewFileWizard.class).getString("LBL_NewFileWizard_MessageFormat"));

Lines 956-962 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/OpenProjectList.java (-4 / +5 lines)
956	LOAD.exit();	956	LOAD.exit();
957	}	957	}
958	}	958	}
959		959
		960	@NonNull
960	public Project[] getOpenProjects() {	961	public Project[] getOpenProjects() {
961	return ProjectManager.mutex().readAccess(new Mutex.Action<Project[]>() {	962	return ProjectManager.mutex().readAccess(new Mutex.Action<Project[]>() {
962	public @Override Project[] run() {	963	public @Override Project[] run() {
Lines 1087-1093 Link Here
1087		1088
1088		1089
1089	// Used from NewFile action	1090	// Used from NewFile action
1090	public List<DataObject> getTemplatesLRU( Project project, PrivilegedTemplates priv ) {	1091	public List<DataObject> getTemplatesLRU( @NonNull Project project, PrivilegedTemplates priv ) {
1091	List<FileObject> pLRU = getTemplateNamesLRU( project, priv );	1092	List<FileObject> pLRU = getTemplateNamesLRU( project, priv );
1092	List<DataObject> templates = new ArrayList<DataObject>();	1093	List<DataObject> templates = new ArrayList<DataObject>();
1093	for( Iterator<FileObject> it = pLRU.iterator(); it.hasNext(); ) {	1094	for( Iterator<FileObject> it = pLRU.iterator(); it.hasNext(); ) {
Lines 1264-1270 Link Here
1264	this.icon = icon;	1265	this.icon = icon;
1265	}	1266	}
1266	}	1267	}
1267	public static List<TemplateItem> prepareTemplates(Project project, Lookup lookup) {	1268	public static List<TemplateItem> prepareTemplates(@NonNull Project project, @NonNull Lookup lookup) {
1268	// check the action context for recommmended/privileged templates..	1269	// check the action context for recommmended/privileged templates..
1269	PrivilegedTemplates privs = lookup.lookup(PrivilegedTemplates.class);	1270	PrivilegedTemplates privs = lookup.lookup(PrivilegedTemplates.class);
1270	final List<TemplateItem> items = new ArrayList<TemplateItem>();	1271	final List<TemplateItem> items = new ArrayList<TemplateItem>();
Lines 1353-1359 Link Here
1353	OpenProjectListSettings.getInstance().setMainProjectURL( mainRoot );	1354	OpenProjectListSettings.getInstance().setMainProjectURL( mainRoot );
1354	}	1355	}
1355		1356
1356	private ArrayList<FileObject> getTemplateNamesLRU( final Project project, PrivilegedTemplates priv ) {	1357	private ArrayList<FileObject> getTemplateNamesLRU( @NonNull final Project project, PrivilegedTemplates priv ) {
1357	// First take recently used templates and try to find those which	1358	// First take recently used templates and try to find those which
1358	// are supported by the project.	1359	// are supported by the project.
1359		1360

Lines 49-54 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/SimpleTargetChooserPanel.java (-1 / +4 lines)
49	import javax.swing.JPanel;	49	import javax.swing.JPanel;
50	import javax.swing.event.ChangeEvent;	50	import javax.swing.event.ChangeEvent;
51	import javax.swing.event.ChangeListener;	51	import javax.swing.event.ChangeListener;
		52	import org.netbeans.api.annotations.common.NonNull;
52	import org.netbeans.api.project.Project;	53	import org.netbeans.api.project.Project;
53	import org.netbeans.api.project.SourceGroup;	54	import org.netbeans.api.project.SourceGroup;
54	import static org.netbeans.modules.project.ui.Bundle.*;	55	import static org.netbeans.modules.project.ui.Bundle.*;
Lines 69-75 Link Here
69	private final ChangeSupport changeSupport = new ChangeSupport(this);	70	private final ChangeSupport changeSupport = new ChangeSupport(this);
70	private SimpleTargetChooserPanelGUI gui;	71	private SimpleTargetChooserPanelGUI gui;
71		72
		73	@NonNull
72	private Project project;	74	private Project project;
		75	@NonNull
73	private SourceGroup[] folders;	76	private SourceGroup[] folders;
74	private WizardDescriptor.Panel<WizardDescriptor> bottomPanel;	77	private WizardDescriptor.Panel<WizardDescriptor> bottomPanel;
75	private WizardDescriptor wizard;	78	private WizardDescriptor wizard;
Lines 77-83 Link Here
77	private boolean freeFileExtension;	80	private boolean freeFileExtension;
78		81
79	@SuppressWarnings("LeakingThisInConstructor")	82	@SuppressWarnings("LeakingThisInConstructor")
80	SimpleTargetChooserPanel(Project project, SourceGroup[] folders,	83	SimpleTargetChooserPanel(@NonNull Project project, @NonNull SourceGroup[] folders,
81	WizardDescriptor.Panel<WizardDescriptor> bottomPanel, boolean isFolder, boolean freeFileExtension) {	84	WizardDescriptor.Panel<WizardDescriptor> bottomPanel, boolean isFolder, boolean freeFileExtension) {
82	this.folders = folders;	85	this.folders = folders;
83	this.project = project;	86	this.project = project;

Lines 49-54 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/TemplateChooserPanel.java (-1 / +3 lines)
49	import java.awt.event.ActionListener;	49	import java.awt.event.ActionListener;
50	import javax.swing.event.ChangeEvent;	50	import javax.swing.event.ChangeEvent;
51	import javax.swing.event.ChangeListener;	51	import javax.swing.event.ChangeListener;
		52	import org.netbeans.api.annotations.common.NonNull;
52	import org.netbeans.api.project.Project;	53	import org.netbeans.api.project.Project;
53	import org.netbeans.modules.project.uiapi.ProjectChooserFactory;	54	import org.netbeans.modules.project.uiapi.ProjectChooserFactory;
54	import org.netbeans.spi.project.ui.templates.support.Templates;	55	import org.netbeans.spi.project.ui.templates.support.Templates;
Lines 73-83 Link Here
73	private final ChangeSupport changeSupport = new ChangeSupport(this);	74	private final ChangeSupport changeSupport = new ChangeSupport(this);
74	private TemplateChooserPanelGUI gui;	75	private TemplateChooserPanelGUI gui;
75		76
		77	@NonNull
76	private Project project;	78	private Project project;
77	// private String[] recommendedTypes;	79	// private String[] recommendedTypes;
78	private WizardDescriptor wizard;	80	private WizardDescriptor wizard;
79		81
80	TemplateChooserPanel( Project p /, String recommendedTypes[] / ) {	82	TemplateChooserPanel( @NonNull Project p /, String recommendedTypes[] / ) {
81	this.project = p;	83	this.project = p;
82	/* this.recommendedTypes = recommendedTypes; */	84	/* this.recommendedTypes = recommendedTypes; */
83	}	85	}

Lines 53-58 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/actions/ActionsUtil.java (+2 lines)
53	import java.util.Set;	53	import java.util.Set;
54	import java.util.logging.Level;	54	import java.util.logging.Level;
55	import java.util.logging.Logger;	55	import java.util.logging.Logger;
		56	import org.netbeans.api.annotations.common.NonNull;
56	import org.netbeans.api.project.FileOwnerQuery;	57	import org.netbeans.api.project.FileOwnerQuery;
57	import org.netbeans.api.project.Project;	58	import org.netbeans.api.project.Project;
58	import org.netbeans.spi.project.ActionProvider;	59	import org.netbeans.spi.project.ActionProvider;
Lines 76-81 Link Here
76	* have the command supported it will return array including the project. If there	77	* have the command supported it will return array including the project. If there
77	* is one project with the command disabled it will return empty array.	78	* is one project with the command disabled it will return empty array.
78	*/	79	*/
		80	@NonNull
79	public static Project[] getProjectsFromLookup( Lookup lookup, String command ) {	81	public static Project[] getProjectsFromLookup( Lookup lookup, String command ) {
80	// First find out whether there is a project directly in the Lookup	82	// First find out whether there is a project directly in the Lookup
81	Set<Project> result = new LinkedHashSet<Project>(); // XXX or use OpenProjectList.projectByDisplayName?	83	Set<Project> result = new LinkedHashSet<Project>(); // XXX or use OpenProjectList.projectByDisplayName?

Lines 63-68 Link Here

(-)a/projectui/src/org/netbeans/modules/project/ui/actions/NewFile.java (-2 / +4 lines)
63	import javax.swing.JMenu;	63	import javax.swing.JMenu;
64	import javax.swing.JMenuItem;	64	import javax.swing.JMenuItem;
65	import javax.swing.JPopupMenu.Separator;	65	import javax.swing.JPopupMenu.Separator;
		66	import org.netbeans.api.annotations.common.NonNull;
66	import org.netbeans.api.project.Project;	67	import org.netbeans.api.project.Project;
67	import org.netbeans.modules.project.ui.NewFileWizard;	68	import org.netbeans.modules.project.ui.NewFileWizard;
68	import org.netbeans.modules.project.ui.NoProjectNew;	69	import org.netbeans.modules.project.ui.NoProjectNew;
Lines 91-97 Link Here
91	@Messages({	92	@Messages({
92	"LBL_NewFileAction_Name=&New File...",	93	"LBL_NewFileAction_Name=&New File...",
93	"LBL_NewFileAction_PopupName=New",	94	"LBL_NewFileAction_PopupName=New",
94	"#{0} Name of the template", "LBL_NewFileAction_Template_PopupName={0}..."	95	"# {0} - Name of the template", "LBL_NewFileAction_Template_PopupName={0}..."
95	})	96	})
96	public class NewFile extends ProjectAction implements PropertyChangeListener, Popup {	97	public class NewFile extends ProjectAction implements PropertyChangeListener, Popup {
97		98
Lines 239-244 Link Here
239		240
240	// Private methods ---------------------------------------------------------	241	// Private methods ---------------------------------------------------------
241		242
		243	@NonNull
242	private Project preselectedProject( Lookup context ) {	244	private Project preselectedProject( Lookup context ) {
243	Project preselectedProject = null;	245	Project preselectedProject = null;
244		246
Lines 298-304 Link Here
298	"LBL_NewFileAction_File_PopupName=Other...",	300	"LBL_NewFileAction_File_PopupName=Other...",
299	"NewFile.please_wait=Please wait..."	301	"NewFile.please_wait=Please wait..."
300	})	302	})
301	private void fillSubMenu(final JMenu menuItem, final Project project) {	303	private void fillSubMenu(final JMenu menuItem, @NonNull final Project project) {
302	menuItem.removeAll();	304	menuItem.removeAll();
303	JMenuItem wait = new JMenuItem(NewFile_please_wait());	305	JMenuItem wait = new JMenuItem(NewFile_please_wait());
304	wait.setEnabled(false);	306	wait.setEnabled(false);

Lines 46-57 Link Here

(-)a/projectuiapi/src/org/netbeans/modules/project/uiapi/ProjectChooserFactory.java (-2 / +3 lines)
46		46
47	import java.io.File;	47	import java.io.File;
48	import javax.swing.JFileChooser;	48	import javax.swing.JFileChooser;
		49	import org.netbeans.api.annotations.common.NonNull;
49	import org.netbeans.api.project.Project;	50	import org.netbeans.api.project.Project;
50	import org.netbeans.api.project.SourceGroup;	51	import org.netbeans.api.project.SourceGroup;
51	import org.openide.WizardDescriptor;	52	import org.openide.WizardDescriptor;
52		53
53	/**	54	/**
54	* Factory to be implemented bu the ui implementation	55	* Factory to be implemented by the UI implementation
55	* @author Petr Hrebejk	56	* @author Petr Hrebejk
56	*/	57	*/
57	public interface ProjectChooserFactory {	58	public interface ProjectChooserFactory {
Lines 70-76 Link Here
70		71
71	public JFileChooser createProjectChooser();	72	public JFileChooser createProjectChooser();
72		73
73	public WizardDescriptor.Panel<WizardDescriptor> createSimpleTargetChooser(Project project, SourceGroup[] folders,	74	public WizardDescriptor.Panel<WizardDescriptor> createSimpleTargetChooser(@NonNull Project project, @NonNull SourceGroup[] folders,
74	WizardDescriptor.Panel<WizardDescriptor> bottomPanel, boolean freeFileExtension);	75	WizardDescriptor.Panel<WizardDescriptor> bottomPanel, boolean freeFileExtension);
75		76
76	}	77	}

Lines 45-50 Link Here

(-)a/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/Templates.java (-2 / +5 lines)
45	package org.netbeans.spi.project.ui.templates.support;	45	package org.netbeans.spi.project.ui.templates.support;
46		46
47	import java.io.IOException;	47	import java.io.IOException;
		48	import org.netbeans.api.annotations.common.NonNull;
48	import org.netbeans.api.project.FileOwnerQuery;	49	import org.netbeans.api.project.FileOwnerQuery;
49	import org.netbeans.api.project.Project;	50	import org.netbeans.api.project.Project;
50	import org.netbeans.api.project.SourceGroup;	51	import org.netbeans.api.project.SourceGroup;
Lines 267-273 Link Here
267	* @return a builder which can be used to customize and then create the target chooser	268	* @return a builder which can be used to customize and then create the target chooser
268	* @since org.netbeans.modules.projectuiapi/1 1.45	269	* @since org.netbeans.modules.projectuiapi/1 1.45
269	*/	270	*/
270	public static SimpleTargetChooserBuilder buildSimpleTargetChooser(Project project, SourceGroup[] folders) {	271	public static SimpleTargetChooserBuilder buildSimpleTargetChooser(@NonNull Project project, @NonNull SourceGroup[] folders) {
271	Parameters.notNull("project", project);	272	Parameters.notNull("project", project);
272	Parameters.notNull("folders", folders);	273	Parameters.notNull("folders", folders);
273	return new SimpleTargetChooserBuilder(project, folders);	274	return new SimpleTargetChooserBuilder(project, folders);
Lines 279-289 Link Here
279	* @since org.netbeans.modules.projectuiapi/1 1.45	280	* @since org.netbeans.modules.projectuiapi/1 1.45
280	*/	281	*/
281	public static final class SimpleTargetChooserBuilder {	282	public static final class SimpleTargetChooserBuilder {
		283	@NonNull
282	final Project project;	284	final Project project;
		285	@NonNull
283	final SourceGroup[] folders;	286	final SourceGroup[] folders;
284	WizardDescriptor.Panel<WizardDescriptor> bottomPanel;	287	WizardDescriptor.Panel<WizardDescriptor> bottomPanel;
285	boolean freeFileExtension;	288	boolean freeFileExtension;
286	SimpleTargetChooserBuilder(Project project, SourceGroup[] folders) {	289	SimpleTargetChooserBuilder(@NonNull Project project, @NonNull SourceGroup[] folders) {
287	this.project = project;	290	this.project = project;
288	this.folders = folders;	291	this.folders = folders;
289	}	292	}