Author: rombert
Date: Tue Oct 13 12:10:38 2015
New Revision: 1708363
URL: http://svn.apache.org/viewvc?rev=1708363&view=rev
Log:
SLING-4189 - Add basic code completion for Sightly
Added tracing for installing the Sightly project nature
Modified:
sling/trunk/tooling/ide/eclipse-sightly-core/.options
sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java
Modified: sling/trunk/tooling/ide/eclipse-sightly-core/.options
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/.options?rev=1708363&r1=1708362&r2=1708363&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/.options (original)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/.options Tue Oct 13 12:10:38
2015
@@ -0,0 +1,2 @@
+org.apache.sling.ide.eclipse-sightly-core/debug=false
+org.apache.sling.ide.eclipse-sightly-core/debug/console=false
\ No newline at end of file
Modified: sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF?rev=1708363&r1=1708362&r2=1708363&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/META-INF/MANIFEST.MF Tue Oct
13 12:10:38 2015
@@ -2,12 +2,18 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.apache.sling.ide.eclipse-sightly-core;singleton:=true
Bundle-Version: 1.0.9.qualifier
+Bundle-Activator: org.apache.sling.ide.eclipse.sightly.internal.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
- org.eclipse.swt
-Import-Package: org.eclipse.jface.resource,
+ org.eclipse.swt,
+ org.eclipse.osgi
+Import-Package: org.apache.sling.ide.eclipse.core.debug,
+ org.apache.sling.ide.eclipse.core,
+ org.apache.sling.ide.eclipse.core.facet,
+ org.apache.sling.ide.log,
+ org.eclipse.jface.resource,
org.eclipse.jface.text,
org.eclipse.jface.text.contentassist,
org.eclipse.wst.common.project.facet.core,
@@ -23,8 +29,7 @@ Import-Package: org.eclipse.jface.resour
org.eclipse.wst.validation.internal.model,
org.eclipse.wst.validation.internal.provisional.core,
org.eclipse.wst.xml.core.internal.provisional.document,
- org.eclipse.wst.xml.core.internal.regions,
- org.apache.sling.ide.eclipse.core.facet
+ org.eclipse.wst.xml.core.internal.regions
Export-Package: org.apache.sling.ide.eclipse.sightly,
org.apache.sling.ide.eclipse.sightly.model,
org.apache.sling.ide.eclipse.sightly.validation
Modified: sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml?rev=1708363&r1=1708362&r2=1708363&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-sightly-core/plugin.xml Tue Oct 13 12:10:38
2015
@@ -54,4 +54,14 @@
<delegate
class="org.apache.sling.ide.eclipse.sightly.internal.SightlyFacetUninstallDelegate"/>
</action>
</extension>
+
+ <extension
+ point="org.eclipse.ui.trace.traceComponents">
+ <component
+ id="org.eclipse.ui.trace.tracingPrefPage"
+ label="Sling IDE Tooling">
+ <bundle
+ name="org.apache.sling.ide.eclipse-sightly-core"></bundle>
+ </component>
+ </extension>
</plugin>
\ No newline at end of file
Modified:
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java?rev=1708363&r1=1708362&r2=1708363&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java
(original)
+++
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/Activator.java
Tue Oct 13 12:10:38 2015
@@ -16,8 +16,13 @@
*/
package org.apache.sling.ide.eclipse.sightly.internal;
+import org.apache.sling.ide.log.Logger;
+import org.apache.sling.ide.eclipse.core.ServiceUtil;
+import org.apache.sling.ide.eclipse.core.debug.PluginLoggerRegistrar;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.util.tracker.ServiceTracker;
public class Activator extends Plugin {
@@ -27,8 +32,17 @@ public class Activator extends Plugin {
// The shared instance
private static Activator plugin;
+ private ServiceRegistration<Logger> loggerRegistration;
+
+ private ServiceTracker<Logger, Logger> loggerTracker;
+
public void start(BundleContext context) throws Exception {
+
+ loggerRegistration = PluginLoggerRegistrar.register(this);
+ loggerTracker = new ServiceTracker<>(context,
loggerRegistration.getReference(), null);
+ loggerTracker.open();
+
super.start(context);
plugin = this;
}
@@ -40,6 +54,8 @@ public class Activator extends Plugin {
public void stop(BundleContext context) throws Exception {
plugin = null;
+ loggerRegistration.unregister();
+
super.stop(context);
}
@@ -51,5 +67,10 @@ public class Activator extends Plugin {
public static Activator getDefault() {
return plugin;
}
+
+ public Logger getLogger() {
+
+ return ServiceUtil.getNotNull(loggerTracker);
+ }
}
Modified:
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java?rev=1708363&r1=1708362&r2=1708363&view=diff
==============================================================================
---
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java
(original)
+++
sling/trunk/tooling/ide/eclipse-sightly-core/src/org/apache/sling/ide/eclipse/sightly/internal/SightlyFacetInstallDelegate.java
Tue Oct 13 12:10:38 2015
@@ -16,6 +16,7 @@
*/
package org.apache.sling.ide.eclipse.sightly.internal;
+import org.apache.sling.ide.log.Logger;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -42,6 +43,8 @@ public class SightlyFacetInstallDelegate
@Override
public void execute(IProject project, IProjectFacetVersion version, Object
config, IProgressMonitor monitor)
throws CoreException {
+
+ Logger logger = Activator.getDefault().getLogger();
Validator[] validators =
ValManager.getDefault().getValidators(project);
ValidatorMutable[] mutis = new ValidatorMutable[validators.length];
@@ -54,9 +57,14 @@ public class SightlyFacetInstallDelegate
for ( ValidatorMutable validator : mutis ) {
if ( HTML_VALIDATOR_ID.equals(validator.getId()) ) {
if ( validator.isManualValidation() ||
validator.isBuildValidation() ) {
+
validator.setBuildValidation(false);
validator.setManualValidation(false);
changed = true;
+
+ logger.trace("Disabled {0} for project {1}", validator,
project.getName());
+
+ break;
}
}
}
