Author: rombert
Date: Fri Oct 9 15:09:55 2015
New Revision: 1707757
URL: http://svn.apache.org/viewvc?rev=1707757&view=rev
Log:
SLING-4189 - Add basic code completion for Sightly
Install the Sightly facet when configuring a content project.
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java?rev=1707757&r1=1707756&r2=1707757&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
(original)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
Fri Oct 9 15:09:55 2015
@@ -28,14 +28,23 @@ import org.eclipse.wst.common.project.fa
public class ConfigurationHelper {
- public static void convertToContentPackageProject(IProject
aContentProject,
- IProgressMonitor monitor, IPath jcr_root) throws
CoreException {
- IProjectFacet slingContentFacet =
ProjectFacetsManager.getProjectFacet("sling.content");
- IFacetedProject fp2 =
ProjectFacetsManager.create(aContentProject, true, null);
- fp2.installProjectFacet(slingContentFacet.getLatestVersion(),
null, null);
+ public static void convertToContentPackageProject(IProject project,
+ IProgressMonitor monitor, IPath contentSyncRoot) throws
CoreException {
+
+ IFacetedProject facetedProject =
ProjectFacetsManager.create(project, true, null);
+
+ // install content facet
+ IProjectFacet slingContentFacet =
ProjectFacetsManager.getProjectFacet("sling.content");
+
facetedProject.installProjectFacet(slingContentFacet.getLatestVersion(), null,
null);
+ ProjectUtil.setSyncDirectoryPath(project, contentSyncRoot);
+
+ // also install sightly facet 1.1 by default
+ IProjectFacet sightlyFacet =
ProjectFacetsManager.getProjectFacet("sightly");
+ if ( sightlyFacet != null ) {
+
facetedProject.installProjectFacet(sightlyFacet.getLatestVersion(), null, null);
+ }
- ProjectUtil.setSyncDirectoryPath(aContentProject, jcr_root);
- aContentProject.refreshLocal(IResource.DEPTH_INFINITE, new
NullProgressMonitor());
+ project.refreshLocal(IResource.DEPTH_INFINITE, new
NullProgressMonitor());
}
public static void convertToBundleProject(IProject aBundleProject)
