Attachment #153188 for bug #251780

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

Lines 1-4 Link Here

(-)a/java.api.common/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.java.api.common/0	2	OpenIDE-Module: org.netbeans.modules.java.api.common/0
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.74	4	OpenIDE-Module-Specification-Version: 1.75




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.web.common</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.86</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.actions</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.ui</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>9.3</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.windows</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>




import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectInformation;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.modules.web.common.spi.ProjectWebRootQuery;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.EditableProperties;
import org.netbeans.spi.queries.FileEncodingQueryImplementation;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.CreateFromTemplateAttributesProvider;
import org.openide.loaders.DataFolder;

        }
        try {
            Project prj = ProjectManager.getDefault().findProject(helper.getProjectDirectory());
            assert prj != null : helper.getProjectDirectory();
            ProjectInformation info = ProjectUtils.getInformation(prj);
            if (info != null) {
                String pname = info.getName();

                    values.put("displayName", pdname);// NOI18N
                }
            }
            values.put("webRootPath", getWebRootPath(prj)); // NOI18N
        } catch (Exception ex) {
            //not really important, just log.
            Logger.getLogger(TemplateAttributesProviderImpl.class.getName()).log(Level.FINE, "", ex);

            return Collections.singletonMap("project", values); // NOI18N
        }
    }

    @CheckForNull
    private static String getWebRootPath(Project project) {
        for (FileObject webRoot : ProjectWebRootQuery.getWebRoots(project)) {
            return FileUtil.getRelativePath(project.getProjectDirectory(), webRoot);
        }
        return null;
    }

}

Lines 1-5 Link Here

(-)a/web.common/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.web.common	2	OpenIDE-Module: org.netbeans.modules.web.common
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/common/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/common/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.85	4	OpenIDE-Module-Specification-Version: 1.86
5		5

Lines 335-340 Link Here

(-)a/web.common/nbproject/project.xml (+1 lines)
335	<friend>org.netbeans.modules.html.validation</friend>	335	<friend>org.netbeans.modules.html.validation</friend>
336	<friend>org.netbeans.modules.j2ee.common</friend>	336	<friend>org.netbeans.modules.j2ee.common</friend>
337	<friend>org.netbeans.modules.j2ee.earproject</friend>	337	<friend>org.netbeans.modules.j2ee.earproject</friend>
		338	<friend>org.netbeans.modules.java.api.common</friend>
338	<friend>org.netbeans.modules.javaee.project</friend>	339	<friend>org.netbeans.modules.javaee.project</friend>
339	<friend>org.netbeans.modules.javascript.bower</friend>	340	<friend>org.netbeans.modules.javascript.bower</friend>
340	<friend>org.netbeans.modules.javascript.cdnjs</friend>	341	<friend>org.netbeans.modules.javascript.cdnjs</friend>

Return to bug 251780

Lines 201-206 Link Here

(-)a/java.api.common/nbproject/project.xml (-8 / +16 lines)
201	</run-dependency>	201	</run-dependency>
202	</dependency>	202	</dependency>
203	<dependency>	203	<dependency>
		204	<code-name-base>org.netbeans.modules.web.common</code-name-base>
		205	<build-prerequisite/>
		206	<compile-dependency/>
		207	<run-dependency>
		208	<specification-version>1.86</specification-version>
		209	</run-dependency>
		210	</dependency>
		211	<dependency>
204	<code-name-base>org.openide.actions</code-name-base>	212	<code-name-base>org.openide.actions</code-name-base>
205	<build-prerequisite/>	213	<build-prerequisite/>
206	<compile-dependency/>	214	<compile-dependency/>
Lines 273-286 Link Here
273	</run-dependency>	281	</run-dependency>
274	</dependency>	282	</dependency>
275	<dependency>	283	<dependency>
276	<code-name-base>org.openide.util.ui</code-name-base>
277	<build-prerequisite/>
278	<compile-dependency/>
279	<run-dependency>
280	<specification-version>9.3</specification-version>
281	</run-dependency>
282	</dependency>
283	<dependency>
284	<code-name-base>org.openide.util</code-name-base>	284	<code-name-base>org.openide.util</code-name-base>
285	<build-prerequisite/>	285	<build-prerequisite/>
286	<compile-dependency/>	286	<compile-dependency/>
Lines 297-302 Link Here
297	</run-dependency>	297	</run-dependency>
298	</dependency>	298	</dependency>
299	<dependency>	299	<dependency>
		300	<code-name-base>org.openide.util.ui</code-name-base>
		301	<build-prerequisite/>
		302	<compile-dependency/>
		303	<run-dependency>
		304	<specification-version>9.3</specification-version>
		305	</run-dependency>
		306	</dependency>
		307	<dependency>
300	<code-name-base>org.openide.windows</code-name-base>	308	<code-name-base>org.openide.windows</code-name-base>
301	<build-prerequisite/>	309	<build-prerequisite/>
302	<compile-dependency/>	310	<compile-dependency/>

Lines 47-59 Link Here

(-)a/java.api.common/src/org/netbeans/modules/java/api/common/queries/TemplateAttributesProviderImpl.java (+14 lines)
47	import java.util.Map;	47	import java.util.Map;
48	import java.util.logging.Level;	48	import java.util.logging.Level;
49	import java.util.logging.Logger;	49	import java.util.logging.Logger;
		50	import org.netbeans.api.annotations.common.CheckForNull;
50	import org.netbeans.api.project.Project;	51	import org.netbeans.api.project.Project;
51	import org.netbeans.api.project.ProjectInformation;	52	import org.netbeans.api.project.ProjectInformation;
52	import org.netbeans.api.project.ProjectManager;	53	import org.netbeans.api.project.ProjectManager;
53	import org.netbeans.api.project.ProjectUtils;	54	import org.netbeans.api.project.ProjectUtils;
		55	import org.netbeans.modules.web.common.spi.ProjectWebRootQuery;
54	import org.netbeans.spi.project.support.ant.AntProjectHelper;	56	import org.netbeans.spi.project.support.ant.AntProjectHelper;
55	import org.netbeans.spi.project.support.ant.EditableProperties;	57	import org.netbeans.spi.project.support.ant.EditableProperties;
56	import org.netbeans.spi.queries.FileEncodingQueryImplementation;	58	import org.netbeans.spi.queries.FileEncodingQueryImplementation;
		59	import org.openide.filesystems.FileObject;
57	import org.openide.filesystems.FileUtil;	60	import org.openide.filesystems.FileUtil;
58	import org.openide.loaders.CreateFromTemplateAttributesProvider;	61	import org.openide.loaders.CreateFromTemplateAttributesProvider;
59	import org.openide.loaders.DataFolder;	62	import org.openide.loaders.DataFolder;
Lines 114-119 Link Here
114	}	117	}
115	try {	118	try {
116	Project prj = ProjectManager.getDefault().findProject(helper.getProjectDirectory());	119	Project prj = ProjectManager.getDefault().findProject(helper.getProjectDirectory());
		120	assert prj != null : helper.getProjectDirectory();
117	ProjectInformation info = ProjectUtils.getInformation(prj);	121	ProjectInformation info = ProjectUtils.getInformation(prj);
118	if (info != null) {	122	if (info != null) {
119	String pname = info.getName();	123	String pname = info.getName();
Lines 125-130 Link Here
125	values.put("displayName", pdname);// NOI18N	129	values.put("displayName", pdname);// NOI18N
126	}	130	}
127	}	131	}
		132	values.put("webRootPath", getWebRootPath(prj)); // NOI18N
128	} catch (Exception ex) {	133	} catch (Exception ex) {
129	//not really important, just log.	134	//not really important, just log.
130	Logger.getLogger(TemplateAttributesProviderImpl.class.getName()).log(Level.FINE, "", ex);	135	Logger.getLogger(TemplateAttributesProviderImpl.class.getName()).log(Level.FINE, "", ex);
Lines 136-139 Link Here
136	return Collections.singletonMap("project", values); // NOI18N	141	return Collections.singletonMap("project", values); // NOI18N
137	}	142	}
138	}	143	}
		144
		145	@CheckForNull
		146	private static String getWebRootPath(Project project) {
		147	for (FileObject webRoot : ProjectWebRootQuery.getWebRoots(project)) {
		148	return FileUtil.getRelativePath(project.getProjectDirectory(), webRoot);
		149	}
		150	return null;
		151	}
		152
139	}	153	}