diff --git a/bndtools.api/bnd.bnd b/bndtools.api/bnd.bnd index a26b03d5c4e..dd6976f8633 100644 --- a/bndtools.api/bnd.bnd +++ b/bndtools.api/bnd.bnd @@ -3,17 +3,22 @@ -buildpath: \ osgi.annotation;version=latest;maven-scope=provided,\ - osgi.core;version=latest;maven-scope=provided, \ + osgi.core;version=latest;maven-scope=provided,\ aQute.libg;version=project,\ - biz.aQute.bnd.util;version=latest, \ - biz.aQute.bndlib;version=latest, \ + biz.aQute.bnd.util;version=latest,\ + biz.aQute.bndlib;version=latest,\ org.eclipse.core.resources,\ org.eclipse.core.runtime,\ - org.eclipse.equinox.common, \ - org.eclipse.equinox.registry, \ - org.eclipse.swt,\ + org.eclipse.equinox.common,\ + org.eclipse.equinox.registry,\ + org.eclipse.swt,\ org.eclipse.swt.cocoa.macosx.x86_64,\ - org.eclipse.jface + org.eclipse.jface,\ + org.eclipse.core.jobs,\ + slf4j.api,\ + org.eclipse.jface.text,\ + org.eclipse.ui.ide,\ + org.eclipse.jdt.core Import-Package: \ ${eclipse.importpackage},\ diff --git a/bndtools.core/src/org/bndtools/build/api/BuildErrorDetailsHandler.java b/bndtools.api/src/org/bndtools/api/builder/BuildErrorDetailsHandler.java similarity index 98% rename from bndtools.core/src/org/bndtools/build/api/BuildErrorDetailsHandler.java rename to bndtools.api/src/org/bndtools/api/builder/BuildErrorDetailsHandler.java index a86d784af34..71b35b108d0 100644 --- a/bndtools.core/src/org/bndtools/build/api/BuildErrorDetailsHandler.java +++ b/bndtools.api/src/org/bndtools/api/builder/BuildErrorDetailsHandler.java @@ -1,4 +1,4 @@ -package org.bndtools.build.api; +package org.bndtools.api.builder; import java.util.List; diff --git a/bndtools.core/src/org/bndtools/build/api/BuildListener.java b/bndtools.api/src/org/bndtools/api/builder/BuildListener.java similarity index 96% rename from bndtools.core/src/org/bndtools/build/api/BuildListener.java rename to bndtools.api/src/org/bndtools/api/builder/BuildListener.java index 6fa02dfa664..896ab5a59db 100644 --- a/bndtools.core/src/org/bndtools/build/api/BuildListener.java +++ b/bndtools.api/src/org/bndtools/api/builder/BuildListener.java @@ -1,4 +1,4 @@ -package org.bndtools.build.api; +package org.bndtools.api.builder; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; diff --git a/bndtools.api/src/org/bndtools/api/builder/BuildLoggerConstants.java b/bndtools.api/src/org/bndtools/api/builder/BuildLoggerConstants.java new file mode 100644 index 00000000000..6671197751d --- /dev/null +++ b/bndtools.api/src/org/bndtools/api/builder/BuildLoggerConstants.java @@ -0,0 +1,9 @@ +package org.bndtools.api.builder; + +public interface BuildLoggerConstants { + + int LOG_FULL = 2; + int LOG_BASIC = 1; + int LOG_NONE = 0; + +} diff --git a/bndtools.core/src/org/bndtools/build/api/IProjectDecorator.java b/bndtools.api/src/org/bndtools/api/builder/IProjectDecorator.java similarity index 92% rename from bndtools.core/src/org/bndtools/build/api/IProjectDecorator.java rename to bndtools.api/src/org/bndtools/api/builder/IProjectDecorator.java index 623aedff1b5..a8e3666d161 100644 --- a/bndtools.core/src/org/bndtools/build/api/IProjectDecorator.java +++ b/bndtools.api/src/org/bndtools/api/builder/IProjectDecorator.java @@ -1,4 +1,4 @@ -package org.bndtools.build.api; +package org.bndtools.api.builder; import java.io.File; import java.util.Collection; diff --git a/bndtools.core/src/org/bndtools/build/api/MarkerData.java b/bndtools.api/src/org/bndtools/api/builder/MarkerData.java similarity index 96% rename from bndtools.core/src/org/bndtools/build/api/MarkerData.java rename to bndtools.api/src/org/bndtools/api/builder/MarkerData.java index 95d4d674167..c92f8dff108 100644 --- a/bndtools.core/src/org/bndtools/build/api/MarkerData.java +++ b/bndtools.api/src/org/bndtools/api/builder/MarkerData.java @@ -1,4 +1,4 @@ -package org.bndtools.build.api; +package org.bndtools.api.builder; import java.util.Map; diff --git a/bndtools.api/src/org/bndtools/api/builder/package-info.java b/bndtools.api/src/org/bndtools/api/builder/package-info.java new file mode 100644 index 00000000000..a94c495cd63 --- /dev/null +++ b/bndtools.api/src/org/bndtools/api/builder/package-info.java @@ -0,0 +1,5 @@ + +@Version("1.0.0") +package org.bndtools.api.builder; + +import org.osgi.annotation.versioning.Version; diff --git a/bndtools.core/src/org/bndtools/facade/ExtensionFacade.java b/bndtools.api/src/org/bndtools/facade/ExtensionFacade.java similarity index 100% rename from bndtools.core/src/org/bndtools/facade/ExtensionFacade.java rename to bndtools.api/src/org/bndtools/facade/ExtensionFacade.java diff --git a/bndtools.core/src/org/bndtools/facade/ExtensionServiceTracker.java b/bndtools.api/src/org/bndtools/facade/ExtensionServiceTracker.java similarity index 100% rename from bndtools.core/src/org/bndtools/facade/ExtensionServiceTracker.java rename to bndtools.api/src/org/bndtools/facade/ExtensionServiceTracker.java diff --git a/bndtools.core/src/org/bndtools/facade/package-info.java b/bndtools.api/src/org/bndtools/facade/package-info.java similarity index 69% rename from bndtools.core/src/org/bndtools/facade/package-info.java rename to bndtools.api/src/org/bndtools/facade/package-info.java index baeb6b51274..e40470fae89 100644 --- a/bndtools.core/src/org/bndtools/facade/package-info.java +++ b/bndtools.api/src/org/bndtools/facade/package-info.java @@ -1,3 +1,2 @@ -@org.osgi.annotation.bundle.Export @org.osgi.annotation.versioning.Version("1.0.0") package org.bndtools.facade; diff --git a/bndtools.builder/_plugin.xml b/bndtools.builder/_plugin.xml index 104a4ef010c..f9cf0bff833 100644 --- a/bndtools.builder/_plugin.xml +++ b/bndtools.builder/_plugin.xml @@ -15,7 +15,7 @@ name="Bndtools Nature" > - + @@ -27,8 +27,8 @@ name="Bndtools Builder" > - - + + @@ -43,18 +43,18 @@ - - - + --> diff --git a/bndtools.builder/bnd.bnd b/bndtools.builder/bnd.bnd index 7dbe479e31c..10f024a2bed 100644 --- a/bndtools.builder/bnd.bnd +++ b/bndtools.builder/bnd.bnd @@ -35,7 +35,8 @@ org.eclipse.equinox.common,\ org.eclipse.equinox.registry,\ org.eclipse.equinox.preferences,\ - slf4j.api + slf4j.api,\ + org.osgi.service.component.annotations -testpath: \ ${junit},\ @@ -58,5 +59,15 @@ Import-Package: \ aQute.libg.*;-split-package:=merge-first, \ org.bndtools.utils.* +Export-Package: \ + org.bndtools.builder.classpath.*,\ + org.bndtools.builder.decorator.*,\ + org.bndtools.builder.facade.*,\ + org.bndtools.builder.handlers.*,\ + org.bndtools.builder.jobs.*,\ + org.bndtools.builder.utils.*,\ + org.bndtools.builder.validate.* + + -includeresource: \ plugin.xml=_plugin.xml diff --git a/bndtools.builder/src/org/bndtools/builder/BuilderPlugin.java b/bndtools.builder/src/org/bndtools/builder/BuilderPlugin.java index 3e6175eee06..ea54d55e07b 100644 --- a/bndtools.builder/src/org/bndtools/builder/BuilderPlugin.java +++ b/bndtools.builder/src/org/bndtools/builder/BuilderPlugin.java @@ -1,10 +1,16 @@ package org.bndtools.builder; -import org.bndtools.build.api.IProjectDecorator; +import org.bndtools.api.builder.IProjectDecorator; import org.bndtools.builder.decorator.ui.ProjectDecoratorImpl; +import org.bndtools.builder.facade.BuilderFacade; +import org.bndtools.facade.ExtensionFacade; import org.osgi.framework.BundleContext; public class BuilderPlugin extends org.eclipse.core.runtime.Plugin { + public static final String PLUGIN_ID = "bndtools.builder"; + + static final Class BUILDER_FACADE = BuilderFacade.class; + static final Class EXTENSION_FACADE = ExtensionFacade.class; private static BuilderPlugin instance = null; diff --git a/bndtools.builder/src/org/bndtools/builder/classpath/BndContainerInitializer.java b/bndtools.builder/src/org/bndtools/builder/classpath/BndContainerInitializer.java index 102563895db..be1caabeeb6 100644 --- a/bndtools.builder/src/org/bndtools/builder/classpath/BndContainerInitializer.java +++ b/bndtools.builder/src/org/bndtools/builder/classpath/BndContainerInitializer.java @@ -20,8 +20,7 @@ import org.bndtools.api.ILogger; import org.bndtools.api.Logger; import org.bndtools.api.ModelListener; -import org.bndtools.builder.BndtoolsBuilder; -import org.bndtools.builder.BuildLogger; +import org.bndtools.api.builder.BuildLoggerConstants; import org.bndtools.builder.BuilderPlugin; import org.bndtools.utils.jar.PseudoJar; import org.eclipse.core.resources.IProject; @@ -202,7 +201,7 @@ private static class Updater { IAccessRule.K_DISCOURAGED | IAccessRule.IGNORE_IF_BETTER); private static final IClasspathAttribute EMPTY_INDEX = JavaCore.newClasspathAttribute( IClasspathAttribute.INDEX_LOCATION_ATTRIBUTE_NAME, - "platform:/plugin/" + BndtoolsBuilder.PLUGIN_ID + "/org/bndtools/builder/classpath/empty.index"); + "platform:/plugin/" + BuilderPlugin.PLUGIN_ID + "/org/bndtools/builder/classpath/empty.index"); private static final IClasspathAttribute TEST = JavaCore.newClasspathAttribute("test", Boolean.TRUE.toString()); private static final IClasspathAttribute WITHOUT_TEST_CODE = JavaCore @@ -273,7 +272,7 @@ void updateClasspathContainer(boolean init) throws CoreException { static void setClasspathContainer(IJavaProject javaProject, BndContainer container) throws JavaModelException { BndPreferences prefs = new BndPreferences(); - if (prefs.getBuildLogging() == BuildLogger.LOG_FULL) { + if (prefs.getBuildLogging() == BuildLoggerConstants.LOG_FULL) { StringBuilder sb = new StringBuilder(); sb.append(container.getDescription()) .append(" for ") diff --git a/bndtools.builder/src/org/bndtools/builder/classpath/BndContainerSourceManager.java b/bndtools.builder/src/org/bndtools/builder/classpath/BndContainerSourceManager.java index 05cfe7f8b0f..35ff9362b91 100644 --- a/bndtools.builder/src/org/bndtools/builder/classpath/BndContainerSourceManager.java +++ b/bndtools.builder/src/org/bndtools/builder/classpath/BndContainerSourceManager.java @@ -14,7 +14,6 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; -import org.bndtools.builder.BndtoolsBuilder; import org.bndtools.builder.BuilderPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -77,7 +76,7 @@ public static void saveAttachedSources(final IProject project, final IClasspathE try (OutputStream out = IO.outputStream(propertiesFile)) { props.store(out, new Date().toString()); } catch (final IOException e) { - throw new CoreException(new Status(IStatus.ERROR, BndtoolsBuilder.PLUGIN_ID, + throw new CoreException(new Status(IStatus.ERROR, BuilderPlugin.PLUGIN_ID, "Failure to write container source attachments", e)); } } @@ -200,7 +199,7 @@ private static Properties loadSourceAttachmentProperties(final IProject project) try (InputStream in = IO.stream(propertiesFile)) { props.load(in); } catch (final IOException e) { - throw new CoreException(new Status(IStatus.ERROR, BndtoolsBuilder.PLUGIN_ID, + throw new CoreException(new Status(IStatus.ERROR, BuilderPlugin.PLUGIN_ID, "Failure to read container source attachments", e)); } } diff --git a/bndtools.builder/src/org/bndtools/builder/decorator/ui/ComponentDecorator.java b/bndtools.builder/src/org/bndtools/builder/decorator/ui/ComponentDecorator.java index 0afbbfb1a76..5b8181853ad 100644 --- a/bndtools.builder/src/org/bndtools/builder/decorator/ui/ComponentDecorator.java +++ b/bndtools.builder/src/org/bndtools/builder/decorator/ui/ComponentDecorator.java @@ -3,7 +3,7 @@ import org.bndtools.api.BndtoolsConstants; import org.bndtools.api.ILogger; import org.bndtools.api.Logger; -import org.bndtools.builder.ComponentMarker; +import org.bndtools.builder.handlers.component.ComponentMarker; import org.bndtools.core.ui.icons.Icons; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; diff --git a/bndtools.builder/src/org/bndtools/builder/decorator/ui/PackageDecorator.java b/bndtools.builder/src/org/bndtools/builder/decorator/ui/PackageDecorator.java index 4bf8cf19a81..5bc9bad7b19 100644 --- a/bndtools.builder/src/org/bndtools/builder/decorator/ui/PackageDecorator.java +++ b/bndtools.builder/src/org/bndtools/builder/decorator/ui/PackageDecorator.java @@ -4,8 +4,8 @@ import org.bndtools.api.ILogger; import org.bndtools.api.Logger; -import org.bndtools.build.api.IProjectDecorator.BndProjectInfo; -import org.bndtools.builder.BndtoolsBuilder; +import org.bndtools.api.builder.IProjectDecorator.BndProjectInfo; +import org.bndtools.builder.BuilderPlugin; import org.bndtools.core.ui.icons.Icons; import org.bndtools.utils.swt.SWTConcurrencyUtil; import org.eclipse.core.resources.IProject; @@ -37,7 +37,7 @@ public class PackageDecorator extends LabelProvider implements ILightweightLabelDecorator { private static final ILogger logger = Logger.getLogger(PackageDecorator.class); private static final String packageDecoratorId = "bndtools.packageDecorator"; - private static final QualifiedName packageDecoratorKey = new QualifiedName(BndtoolsBuilder.PLUGIN_ID, + private static final QualifiedName packageDecoratorKey = new QualifiedName(BuilderPlugin.PLUGIN_ID, packageDecoratorId); private static final String excluded = " "; private static final ImageDescriptor exportedIcon = Icons.desc("icons/plus-decorator.png"); diff --git a/bndtools.builder/src/org/bndtools/builder/decorator/ui/ProjectDecoratorImpl.java b/bndtools.builder/src/org/bndtools/builder/decorator/ui/ProjectDecoratorImpl.java index 635f588c844..a02df7a8ccf 100644 --- a/bndtools.builder/src/org/bndtools/builder/decorator/ui/ProjectDecoratorImpl.java +++ b/bndtools.builder/src/org/bndtools/builder/decorator/ui/ProjectDecoratorImpl.java @@ -1,7 +1,7 @@ package org.bndtools.builder.decorator.ui; -import org.bndtools.build.api.IProjectDecorator; -import org.bndtools.builder.ComponentMarker; +import org.bndtools.api.builder.IProjectDecorator; +import org.bndtools.builder.handlers.component.ComponentMarker; import org.eclipse.core.resources.IProject; import org.osgi.annotation.bundle.Capability; import org.osgi.namespace.service.ServiceNamespace; diff --git a/bndtools.builder/src/org/bndtools/builder/facade/BuilderFacade.java b/bndtools.builder/src/org/bndtools/builder/facade/BuilderFacade.java new file mode 100644 index 00000000000..8077231aae0 --- /dev/null +++ b/bndtools.builder/src/org/bndtools/builder/facade/BuilderFacade.java @@ -0,0 +1,167 @@ +package org.bndtools.builder.facade; + +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.BiConsumer; + +import org.bndtools.api.ILogger; +import org.bndtools.api.Logger; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Filter; +import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceReference; +import org.osgi.util.tracker.ServiceTracker; + +import aQute.bnd.exceptions.Exceptions; + +public class BuilderFacade extends IncrementalProjectBuilder { + + static org.slf4j.Logger consoleLog = org.slf4j.LoggerFactory.getLogger(BuilderFacade.class); + static ILogger uiLog = Logger.getLogger(BuilderFacade.class); + + ServiceTracker tracker; + String id; + IConfigurationElement config; + String propertyName; + Object data; + static final BundleContext bc = Optional.ofNullable(FrameworkUtil.getBundle(BuilderFacade.class)) + .map(Bundle::getBundleContext) + .orElse(null); + + + List, IProjectBuilder>> onNewService = new ArrayList<>(); + List, IProjectBuilder>> onClosedService = new ArrayList<>(); + + public void onNewService(BiConsumer, IProjectBuilder> callback) { + onNewService.add(callback); + } + + public void onClosedService(BiConsumer, IProjectBuilder> callback) { + onClosedService.add(callback); + } + + public boolean isEmpty() { + return tracker.isEmpty(); + } + + public int size() { + return tracker.size(); + } + + public Optional getService() { + return Optional.ofNullable(tracker.getService()); + } + + public IProjectBuilder getRequiredService() { + consoleLog.debug("{} Attempting to get service {}", this, id); + return getService().orElseThrow(() -> { + final String className = IProjectBuilder.class.getCanonicalName(); + uiLog.logWarning(MessageFormat.format("Service {0} ({1}) not found.", id, className), null); + consoleLog.warn("{} Service {} ({}) not found", this, id, className); + return new RuntimeException("Service " + id + " (" + className + ") not found"); + }); + } + + @Override + public void setInitializationData(IConfigurationElement config, String propertyName, Object data) + throws CoreException { + this.config = config; + this.propertyName = propertyName; + this.data = data; + this.id = config.getAttribute("id"); + + consoleLog.debug("{} Initializing facade, propName: \"{}\", data: \"{}\"", this, propertyName, data); + + if (data != null) { + final String dataString = data.toString(); + this.id = dataString; + } + + if (id == null) { + id = "org.bndtools.builder.impl.BndtoolsBuilder"; + } + try { + initializeTracker(id); + } catch (Exception e) { + consoleLog.error("{} uncaught exception", this, e); + throw Exceptions.duck(e); + } + } + + public void close() { + consoleLog.debug("{} close()", this); + tracker.close(); + } + + /** + * Invoked by the Eclipse UI. Initialization is deferred until + * {@link #setInitializationData} is called. + */ + public BuilderFacade() {} + + /** + * Constructor for programmatic instantiation. + * + * @param id + */ + public BuilderFacade(String id) { + initializeTracker(id); + } + + private void initializeTracker(String id) { + consoleLog.debug("{} Initializing tracker", this); + Filter filter = null; + try { + filter = bc.createFilter("(component.name=" + id + ")"); + consoleLog.debug("{} Tracking services with filter: {}", this, filter); + tracker = new BuilderServiceTracker(this, bc, filter); + tracker.open(); + } catch (InvalidSyntaxException e) { + consoleLog.error("{} couldn't build filter for {}", this, filter, e); + throw Exceptions.duck(e); + } + } + + @Override + public String toString() { + return "[" + id + ":" + System.identityHashCode(this) + "]"; + } + + @Override + final protected IProject[] build(int kind, Map args, IProgressMonitor monitor) + throws CoreException { + consoleLog.debug("{} calling build: {}, {}", this, kind, args); + return getRequiredService().build(kind, args, monitor); + } + + @Override + final protected void clean(IProgressMonitor monitor) throws CoreException { + consoleLog.debug("{} calling clean", this); + getRequiredService().clean(monitor); + } + + @Override + final public ISchedulingRule getRule(int kind, Map args) { + consoleLog.debug("{} calling getRule: {}, {}", this, kind, args); + return getRequiredService().getRule(kind, args); + } + + public ISchedulingRule superGetRule(int kind, Map args) { + return super.getRule(kind, args); + } + + public void superStartupOnInitialize() { + super.startupOnInitialize(); + } +} diff --git a/bndtools.builder/src/org/bndtools/builder/facade/BuilderServiceTracker.java b/bndtools.builder/src/org/bndtools/builder/facade/BuilderServiceTracker.java new file mode 100644 index 00000000000..ff8dcb6d67b --- /dev/null +++ b/bndtools.builder/src/org/bndtools/builder/facade/BuilderServiceTracker.java @@ -0,0 +1,89 @@ +package org.bndtools.builder.facade; + +import static org.bndtools.builder.facade.BuilderFacade.consoleLog; +import static org.bndtools.builder.facade.BuilderFacade.uiLog; + +import java.lang.ref.WeakReference; + +import org.osgi.framework.BundleContext; +import org.osgi.framework.Filter; +import org.osgi.framework.ServiceObjects; +import org.osgi.framework.ServiceReference; +import org.osgi.util.tracker.ServiceTracker; + +class BuilderServiceTracker extends ServiceTracker { + private final WeakReference parent; + + BuilderServiceTracker(BuilderFacade parent, BundleContext context, Filter filter) { + super(context, filter, null); + // Reference back to the parent facade needs to be weak + // so as not to prevent it being garbage collected once it + // becomes unreachable. + this.parent = new WeakReference<>(parent); + } + + @Override + public IProjectBuilder addingService(ServiceReference reference) { + BuilderFacade parent = parent(); + if (parent == null) { + return null; + } + consoleLog.debug("{} addingService: {}", parent, reference); + + ServiceObjects objs = context.getServiceObjects(reference); + final Object service = objs.getService(); + + if (!(service instanceof IProjectBuilder)) { + String msg = String.format("%s downstreamClass is not an instance of %s, was %s", parent, + IProjectBuilder.class.getCanonicalName(), service.getClass()); + consoleLog.error(msg); + uiLog.logError(msg, null); + objs.ungetService(service); + return null; + } + consoleLog.debug("{} Returning non-factory extension", parent); + final IProjectBuilder retval = (IProjectBuilder) service; + retval.setSuper(parent); + parent.onNewService.forEach(callback -> { + consoleLog.debug("{} notifying callback of new service: {}", parent, callback); + callback.accept(reference, retval); + }); + // Now that the new backing service has started the build rules may + // have changed and the parent's state should be cleared to reflect + // this. + parent.forgetLastBuiltState(); + return retval; + } + + @Override + public void modifiedService(ServiceReference reference, IProjectBuilder service) { + parent(); + } + + @Override + public void removedService(ServiceReference reference, IProjectBuilder service) { + BuilderFacade parent = parent(); + if (parent != null) { + consoleLog.debug("{} notifying service removal", parent); + parent.onClosedService.forEach(callback -> { + consoleLog.debug("{} notifying callback of service removal: {}", parent, callback); + callback.accept(reference, service); + }); + } + try { + ServiceObjects objs = context.getServiceObjects(reference); + objs.ungetService(service); + } catch (IllegalStateException | IllegalArgumentException e) { + // When the context has been stopped or service already ungotten + } + } + + private BuilderFacade parent() { + BuilderFacade parent = this.parent.get(); + if (parent == null) { + consoleLog.debug("closing tracker {}", filter); + close(); + } + return parent; + } +} diff --git a/bndtools.builder/src/org/bndtools/builder/facade/IProjectBuilder.java b/bndtools.builder/src/org/bndtools/builder/facade/IProjectBuilder.java new file mode 100644 index 00000000000..36db3d15951 --- /dev/null +++ b/bndtools.builder/src/org/bndtools/builder/facade/IProjectBuilder.java @@ -0,0 +1,78 @@ +package org.bndtools.builder.facade; + +import java.util.Map; + +import org.eclipse.core.resources.IBuildConfiguration; +import org.eclipse.core.resources.IBuildContext; +import org.eclipse.core.resources.ICommand; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResourceDelta; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.jobs.ISchedulingRule; + +public abstract class IProjectBuilder { + + // Called "zuper" as in "super", it's kind-of the loosely-coupled superclass + // of this class. + // Obviously can't use "super" because it is a Java keyword. + protected BuilderFacade zuper; + + public void setSuper(BuilderFacade zuper) { + this.zuper = zuper; + } + + protected abstract IProject[] build(int kind, Map args, IProgressMonitor monitor) + throws CoreException; + + protected void clean(IProgressMonitor monitor) throws CoreException {} + + public ISchedulingRule getRule(int kind, Map args) { + return zuper.superGetRule(kind, args); + } + + public final void forgetLastBuiltState() { + zuper.forgetLastBuiltState(); + } + + public final void rememberLastBuiltState() { + zuper.rememberLastBuiltState(); + } + + public final ICommand getCommand() { + return zuper.getCommand(); + } + + public final IResourceDelta getDelta(IProject project) { + return zuper.getDelta(project); + } + + public final IProject getProject() { + return zuper.getProject(); + } + + public final IBuildConfiguration getBuildConfig() { + return zuper.getBuildConfig(); + } + + public final boolean hasBeenBuilt(IProject project) { + return zuper.hasBeenBuilt(project); + } + + public final boolean isInterrupted() { + return zuper.isInterrupted(); + } + + public final void needRebuild() { + zuper.needRebuild(); + } + + protected void startupOnInitialize() { + zuper.superStartupOnInitialize(); + } + + public final IBuildContext getContext() { + return zuper.getContext(); + } + +} diff --git a/bndtools.builder/src/org/bndtools/builder/facade/package-info.java b/bndtools.builder/src/org/bndtools/builder/facade/package-info.java new file mode 100644 index 00000000000..97dcec6f069 --- /dev/null +++ b/bndtools.builder/src/org/bndtools/builder/facade/package-info.java @@ -0,0 +1,4 @@ +@Version("1.0.0") +package org.bndtools.builder.facade; + +import org.osgi.annotation.versioning.Version; diff --git a/bndtools.builder/src/org/bndtools/builder/handlers/activator/BundleActivatorErrorHandler.java b/bndtools.builder/src/org/bndtools/builder/handlers/activator/BundleActivatorErrorHandler.java index d11d02b6c2a..f5e42ec6261 100644 --- a/bndtools.builder/src/org/bndtools/builder/handlers/activator/BundleActivatorErrorHandler.java +++ b/bndtools.builder/src/org/bndtools/builder/handlers/activator/BundleActivatorErrorHandler.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; +import org.bndtools.api.builder.MarkerData; import org.bndtools.build.api.AbstractBuildErrorDetailsHandler; -import org.bndtools.build.api.MarkerData; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.jdt.core.IJavaProject; diff --git a/bndtools.builder/src/org/bndtools/builder/handlers/baseline/BaselineErrorHandler.java b/bndtools.builder/src/org/bndtools/builder/handlers/baseline/BaselineErrorHandler.java index 19ff18758af..26cec8bfc33 100644 --- a/bndtools.builder/src/org/bndtools/builder/handlers/baseline/BaselineErrorHandler.java +++ b/bndtools.builder/src/org/bndtools/builder/handlers/baseline/BaselineErrorHandler.java @@ -10,8 +10,8 @@ import org.bndtools.api.BndtoolsConstants; import org.bndtools.api.ILogger; import org.bndtools.api.Logger; +import org.bndtools.api.builder.MarkerData; import org.bndtools.build.api.AbstractBuildErrorDetailsHandler; -import org.bndtools.build.api.MarkerData; import org.bndtools.builder.utils.MemberValuePairLocationRetriever; import org.bndtools.utils.jdt.ASTUtil; import org.eclipse.core.resources.IFile; diff --git a/bndtools.builder/src/org/bndtools/builder/handlers/baseline/BundleVersionErrorHandler.java b/bndtools.builder/src/org/bndtools/builder/handlers/baseline/BundleVersionErrorHandler.java index 7ef858e5978..9ca2b6a7bdc 100644 --- a/bndtools.builder/src/org/bndtools/builder/handlers/baseline/BundleVersionErrorHandler.java +++ b/bndtools.builder/src/org/bndtools/builder/handlers/baseline/BundleVersionErrorHandler.java @@ -8,8 +8,8 @@ import java.util.regex.Pattern; import org.bndtools.api.BndtoolsConstants; +import org.bndtools.api.builder.MarkerData; import org.bndtools.build.api.AbstractBuildErrorDetailsHandler; -import org.bndtools.build.api.MarkerData; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; diff --git a/bndtools.builder/src/org/bndtools/builder/ComponentMarker.java b/bndtools.builder/src/org/bndtools/builder/handlers/component/ComponentMarker.java similarity index 97% rename from bndtools.builder/src/org/bndtools/builder/ComponentMarker.java rename to bndtools.builder/src/org/bndtools/builder/handlers/component/ComponentMarker.java index 3afb8ca45aa..93d12083716 100644 --- a/bndtools.builder/src/org/bndtools/builder/ComponentMarker.java +++ b/bndtools.builder/src/org/bndtools/builder/handlers/component/ComponentMarker.java @@ -1,11 +1,12 @@ -package org.bndtools.builder; +package org.bndtools.builder.handlers.component; import java.io.File; import org.bndtools.api.BndtoolsConstants; import org.bndtools.api.ILogger; import org.bndtools.api.Logger; -import org.bndtools.build.api.IProjectDecorator.BndProjectInfo; +import org.bndtools.api.builder.IProjectDecorator.BndProjectInfo; +import org.bndtools.builder.BuilderPlugin; import org.bndtools.builder.decorator.ui.ComponentDecorator; import org.bndtools.builder.decorator.ui.PackageDecorator; import org.eclipse.core.resources.IMarker; diff --git a/bndtools.builder/src/org/bndtools/builder/handlers/component/DSAnnotationErrorHandler.java b/bndtools.builder/src/org/bndtools/builder/handlers/component/DSAnnotationErrorHandler.java index 6a63b66e616..c352e5eb3e1 100644 --- a/bndtools.builder/src/org/bndtools/builder/handlers/component/DSAnnotationErrorHandler.java +++ b/bndtools.builder/src/org/bndtools/builder/handlers/component/DSAnnotationErrorHandler.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; +import org.bndtools.api.builder.MarkerData; import org.bndtools.build.api.AbstractBuildErrorDetailsHandler; -import org.bndtools.build.api.MarkerData; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.jdt.core.IJavaProject; diff --git a/bndtools.builder/src/org/bndtools/builder/jobs/newproject/AdjustClasspathsForNewProjectJob.java b/bndtools.builder/src/org/bndtools/builder/jobs/newproject/AdjustClasspathsForNewProjectJob.java index 9521d19b65f..e0544ef3db2 100644 --- a/bndtools.builder/src/org/bndtools/builder/jobs/newproject/AdjustClasspathsForNewProjectJob.java +++ b/bndtools.builder/src/org/bndtools/builder/jobs/newproject/AdjustClasspathsForNewProjectJob.java @@ -5,7 +5,7 @@ import org.bndtools.api.ILogger; import org.bndtools.api.Logger; -import org.bndtools.builder.BndtoolsBuilder; +import org.bndtools.builder.BuilderPlugin; import org.bndtools.builder.classpath.BndContainerInitializer; import org.bndtools.utils.workspace.WorkspaceUtils; import org.eclipse.core.resources.IProject; @@ -58,7 +58,7 @@ public IStatus runInWorkspace(IProgressMonitor monitor) { } } catch (CoreException e) { IStatus result = new Status(e.getStatus() - .getSeverity(), BndtoolsBuilder.PLUGIN_ID, + .getSeverity(), BuilderPlugin.PLUGIN_ID, "Failure to update classpath for project " + eclipseProject, e); logger.logStatus(result); } diff --git a/bndtools.core/bndtools.shared.bndrun b/bndtools.core/bndtools.shared.bndrun index 139d30f41a6..034635bb19b 100644 --- a/bndtools.core/bndtools.shared.bndrun +++ b/bndtools.core/bndtools.shared.bndrun @@ -42,6 +42,7 @@ bnd.identity;id='org.apache.felix.gogo.runtime',\ bnd.identity;id='org.apache.felix.gogo.shell',\ bnd.identity;id='org.bndtools.applaunch',\ + bnd.identity;id='org.bndtools.builder',\ bnd.identity;id='org.bndtools.headless.build.manager',\ bnd.identity;id='org.bndtools.headless.build.plugin.ant',\ bnd.identity;id='org.bndtools.headless.build.plugin.gradle',\ diff --git a/bndtools.core/bndtools.win32.x86_64.bndrun b/bndtools.core/bndtools.win32.x86_64.bndrun index 83779fa7b9a..3490c5ccd53 100644 --- a/bndtools.core/bndtools.win32.x86_64.bndrun +++ b/bndtools.core/bndtools.win32.x86_64.bndrun @@ -75,6 +75,7 @@ org.apache.xmlgraphics;version='[2.3.0,2.3.1)',\ org.apiguardian.api;version='[1.1.2,1.1.3)',\ org.bndtools.applaunch;version=snapshot,\ + org.bndtools.builder;version=snapshot,\ org.bndtools.headless.build.manager;version=snapshot,\ org.bndtools.headless.build.plugin.ant;version=snapshot,\ org.bndtools.headless.build.plugin.gradle;version=snapshot,\ diff --git a/bndtools.core/logback.xml b/bndtools.core/logback.xml index 80566cd677a..b8f8ed022e2 100644 --- a/bndtools.core/logback.xml +++ b/bndtools.core/logback.xml @@ -6,8 +6,8 @@ - - + + diff --git a/bndtools.core/src/bndtools/Plugin.java b/bndtools.core/src/bndtools/Plugin.java index c2042a0bb97..ec1cd97049e 100644 --- a/bndtools.core/src/bndtools/Plugin.java +++ b/bndtools.core/src/bndtools/Plugin.java @@ -13,13 +13,11 @@ import org.bndtools.api.Logger; import org.bndtools.core.editors.quickfix.facade.QuickFixProcessorFacade; import org.bndtools.core.ui.icons.Icons; +import org.bndtools.facade.ExtensionFacade; import org.bndtools.headless.build.manager.api.HeadlessBuildManager; import org.bndtools.versioncontrol.ignores.manager.api.VersionControlIgnoresManager; import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; @@ -39,6 +37,8 @@ public class Plugin extends AbstractUIPlugin { + static final Class EXTENSION_FACADE = ExtensionFacade.class; + private static final ILogger logger = Logger .getLogger(Plugin.class); @@ -98,34 +98,35 @@ private void registerWorkspaceURLHandler(BundleContext context) { } private void runStartupParticipants() { - IConfigurationElement[] elements = Platform.getExtensionRegistry() - .getConfigurationElementsFor(PLUGIN_ID, "bndtoolsStartupParticipant"); - - for (IConfigurationElement element : elements) { - try { - Object obj = element.createExecutableExtension("class"); - if (obj instanceof Runnable) { - Runnable participant = (Runnable) obj; - participant.run(); - } else if (obj instanceof IStartupParticipant) { - IStartupParticipant isp = (IStartupParticipant) obj; - startupParticipants.add(isp); - isp.start(); - } - } catch (CoreException e) { - logger.logError("Error executing startup participant", e); - } - } + // IConfigurationElement[] elements = Platform.getExtensionRegistry() + // .getConfigurationElementsFor(PLUGIN_ID, + // "bndtoolsStartupParticipant"); + // + // for (IConfigurationElement element : elements) { + // try { + // Object obj = element.createExecutableExtension("class"); + // if (obj instanceof Runnable) { + // Runnable participant = (Runnable) obj; + // participant.run(); + // } else if (obj instanceof IStartupParticipant) { + // IStartupParticipant isp = (IStartupParticipant) obj; + // startupParticipants.add(isp); + // isp.start(); + // } + // } catch (CoreException e) { + // logger.logError("Error executing startup participant", e); + // } + // } } private void stopStartupParticipants() { - for (IStartupParticipant isp : startupParticipants) { - try { - isp.stop(); - } catch (Exception e) { - logger.logError("Error stopping startup participant", e); - } - } + // for (IStartupParticipant isp : startupParticipants) { + // try { + // isp.stop(); + // } catch (Exception e) { + // logger.logError("Error stopping startup participant", e); + // } + // } } private void unregisterWorkspaceURLHandler() { diff --git a/bndtools.core/src/bndtools/editor/pages/ProjectBuildPage.java b/bndtools.core/src/bndtools/editor/pages/ProjectBuildPage.java index 3a6c9b909e9..690b40f94cb 100644 --- a/bndtools.core/src/bndtools/editor/pages/ProjectBuildPage.java +++ b/bndtools.core/src/bndtools/editor/pages/ProjectBuildPage.java @@ -10,7 +10,7 @@ import org.bndtools.api.BndtoolsConstants; import org.bndtools.api.ILogger; import org.bndtools.api.Logger; -import org.bndtools.build.api.BuildErrorDetailsHandler; +import org.bndtools.api.builder.BuildErrorDetailsHandler; import org.bndtools.build.api.BuildErrorDetailsHandlers; import org.bndtools.core.ui.ExtendedFormEditor; import org.bndtools.core.ui.IFormPageFactory; diff --git a/bndtools.core/src/bndtools/explorer/BndtoolsExplorer.java b/bndtools.core/src/bndtools/explorer/BndtoolsExplorer.java index 418d26e7f8e..1982ff2a224 100644 --- a/bndtools.core/src/bndtools/explorer/BndtoolsExplorer.java +++ b/bndtools.core/src/bndtools/explorer/BndtoolsExplorer.java @@ -11,8 +11,8 @@ import java.util.Objects; import org.bndtools.api.BndtoolsConstants; +import org.bndtools.api.builder.BuildListener; import org.bndtools.build.api.AbstractBuildListener; -import org.bndtools.build.api.BuildListener; import org.bndtools.core.ui.icons.Icons; import org.bndtools.utils.swt.FilterPanelPart; import org.eclipse.core.resources.IMarker; diff --git a/bndtools.core/src/bndtools/wizards/project/AbstractNewBndProjectWizard.java b/bndtools.core/src/bndtools/wizards/project/AbstractNewBndProjectWizard.java index f71c8b3929d..aca844c5327 100644 --- a/bndtools.core/src/bndtools/wizards/project/AbstractNewBndProjectWizard.java +++ b/bndtools.core/src/bndtools/wizards/project/AbstractNewBndProjectWizard.java @@ -15,7 +15,7 @@ import org.bndtools.api.ILogger; import org.bndtools.api.Logger; import org.bndtools.api.ProjectPaths; -import org.bndtools.build.api.BuildErrorDetailsHandler; +import org.bndtools.api.builder.BuildErrorDetailsHandler; import org.bndtools.headless.build.manager.api.HeadlessBuildManager; import org.bndtools.utils.copy.ResourceCopier; import org.bndtools.utils.javaproject.JavaProjectUtils; diff --git a/bndtools.core/src/org/bndtools/build/api/AbstractBuildErrorDetailsHandler.java b/bndtools.core/src/org/bndtools/build/api/AbstractBuildErrorDetailsHandler.java index ff8dabdccf2..e891bcef4ff 100644 --- a/bndtools.core/src/org/bndtools/build/api/AbstractBuildErrorDetailsHandler.java +++ b/bndtools.core/src/org/bndtools/build/api/AbstractBuildErrorDetailsHandler.java @@ -5,6 +5,8 @@ import java.util.List; import java.util.Map; +import org.bndtools.api.builder.BuildErrorDetailsHandler; +import org.bndtools.api.builder.MarkerData; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; diff --git a/bndtools.core/src/org/bndtools/build/api/AbstractBuildListener.java b/bndtools.core/src/org/bndtools/build/api/AbstractBuildListener.java index e1d16a71025..47a4f2dccc4 100644 --- a/bndtools.core/src/org/bndtools/build/api/AbstractBuildListener.java +++ b/bndtools.core/src/org/bndtools/build/api/AbstractBuildListener.java @@ -1,5 +1,6 @@ package org.bndtools.build.api; +import org.bndtools.api.builder.BuildListener; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; diff --git a/bndtools.core/src/org/bndtools/build/api/BuildErrorDetailsHandlers.java b/bndtools.core/src/org/bndtools/build/api/BuildErrorDetailsHandlers.java index f6c2265663a..2e3a91e9baf 100644 --- a/bndtools.core/src/org/bndtools/build/api/BuildErrorDetailsHandlers.java +++ b/bndtools.core/src/org/bndtools/build/api/BuildErrorDetailsHandlers.java @@ -5,6 +5,7 @@ import org.bndtools.api.ILogger; import org.bndtools.api.Logger; +import org.bndtools.api.builder.BuildErrorDetailsHandler; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; diff --git a/bndtools.core/src/org/bndtools/build/api/DefaultBuildErrorDetailsHandler.java b/bndtools.core/src/org/bndtools/build/api/DefaultBuildErrorDetailsHandler.java index d9d87848ef3..2d5780d7975 100644 --- a/bndtools.core/src/org/bndtools/build/api/DefaultBuildErrorDetailsHandler.java +++ b/bndtools.core/src/org/bndtools/build/api/DefaultBuildErrorDetailsHandler.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; +import org.bndtools.api.builder.MarkerData; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; diff --git a/bndtools.core/src/org/bndtools/core/editors/BndMarkerQuickAssistProcessor.java b/bndtools.core/src/org/bndtools/core/editors/BndMarkerQuickAssistProcessor.java index 47065060b5e..0d78164f9bd 100644 --- a/bndtools.core/src/org/bndtools/core/editors/BndMarkerQuickAssistProcessor.java +++ b/bndtools.core/src/org/bndtools/core/editors/BndMarkerQuickAssistProcessor.java @@ -4,7 +4,7 @@ import java.util.LinkedList; import java.util.List; -import org.bndtools.build.api.BuildErrorDetailsHandler; +import org.bndtools.api.builder.BuildErrorDetailsHandler; import org.bndtools.build.api.BuildErrorDetailsHandlers; import org.eclipse.core.resources.IMarker; import org.eclipse.jface.text.IDocument; diff --git a/bndtools.core/src/org/bndtools/core/editors/BndResourceMarkerAnnotationModel.java b/bndtools.core/src/org/bndtools/core/editors/BndResourceMarkerAnnotationModel.java index 165dc582193..45ba9afa2a3 100644 --- a/bndtools.core/src/org/bndtools/core/editors/BndResourceMarkerAnnotationModel.java +++ b/bndtools.core/src/org/bndtools/core/editors/BndResourceMarkerAnnotationModel.java @@ -1,6 +1,6 @@ package org.bndtools.core.editors; -import org.bndtools.build.api.BuildErrorDetailsHandler; +import org.bndtools.api.builder.BuildErrorDetailsHandler; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.ui.texteditor.MarkerAnnotation; diff --git a/bndtools.m2e/src/bndtools/m2e/BndConfigurator.java b/bndtools.m2e/src/bndtools/m2e/BndConfigurator.java index 1e39583fcf1..417b2e28889 100644 --- a/bndtools.m2e/src/bndtools/m2e/BndConfigurator.java +++ b/bndtools.m2e/src/bndtools/m2e/BndConfigurator.java @@ -15,8 +15,8 @@ import org.apache.maven.project.MavenProject; import org.bndtools.api.ILogger; import org.bndtools.api.Logger; -import org.bndtools.build.api.IProjectDecorator; -import org.bndtools.build.api.IProjectDecorator.BndProjectInfo; +import org.bndtools.api.builder.IProjectDecorator; +import org.bndtools.api.builder.IProjectDecorator.BndProjectInfo; import org.bndtools.facade.ExtensionFacade; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IMarker; diff --git a/org.bndtools.builder/.classpath b/org.bndtools.builder/.classpath new file mode 100644 index 00000000000..a999886b19e --- /dev/null +++ b/org.bndtools.builder/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/org.bndtools.builder/.gitignore b/org.bndtools.builder/.gitignore new file mode 100644 index 00000000000..424c03f066d --- /dev/null +++ b/org.bndtools.builder/.gitignore @@ -0,0 +1,5 @@ +/bin/ +/bin_test/ +/generated/ +/runtimefw +/workspace* diff --git a/org.bndtools.builder/.project b/org.bndtools.builder/.project new file mode 100644 index 00000000000..002cd8d87ba --- /dev/null +++ b/org.bndtools.builder/.project @@ -0,0 +1,23 @@ + + + org.bndtools.builder + + + + + + org.eclipse.jdt.core.javabuilder + + + + + bndtools.core.bndbuilder + + + + + + org.eclipse.jdt.core.javanature + bndtools.core.bndnature + + diff --git a/org.bndtools.builder/.settings/org.eclipse.core.resources.prefs b/org.bndtools.builder/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000000..99f26c0203a --- /dev/null +++ b/org.bndtools.builder/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.bndtools.builder/.settings/org.eclipse.core.runtime.prefs b/org.bndtools.builder/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 00000000000..5a0ad22d2a7 --- /dev/null +++ b/org.bndtools.builder/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +line.separator=\n diff --git a/org.bndtools.builder/.settings/org.eclipse.jdt.core.prefs b/org.bndtools.builder/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..7085ada58e5 --- /dev/null +++ b/org.bndtools.builder/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,517 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.codeComplete.argumentPrefixes= +org.eclipse.jdt.core.codeComplete.argumentSuffixes= +org.eclipse.jdt.core.codeComplete.fieldPrefixes= +org.eclipse.jdt.core.codeComplete.fieldSuffixes= +org.eclipse.jdt.core.codeComplete.localPrefixes= +org.eclipse.jdt.core.codeComplete.localSuffixes= +org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled +org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,NORMAL +org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME +org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=true +org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false +org.eclipse.jdt.core.formatter.align_with_spaces=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=17 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=81 +org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 +org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false +org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true +org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.indent_tag_description=false +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=1 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false +org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=true +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true +org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.incompatibleJDKLevel=ignore +org.eclipse.jdt.core.incompleteClasspath=error +org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/org.bndtools.builder/.settings/org.eclipse.jdt.ui.prefs b/org.bndtools.builder/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000000..b67dd052ad7 --- /dev/null +++ b/org.bndtools.builder/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,148 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=true +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=true +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=false +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_functional_interfaces=true +cleanup.convert_to_enhanced_for_loop=true +cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=false +cleanup.lazy_logical_operator=false +cleanup.make_local_variable_final=true +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=false +cleanup.merge_conditional_blocks=false +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.number_suffix=true +cleanup.objects_equals=true +cleanup.organize_imports=false +cleanup.precompile_regex=true +cleanup.push_down_negation=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_redundant_modifiers=true +cleanup.remove_redundant_semicolons=true +cleanup.remove_redundant_type_arguments=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_array_creation=true +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=true +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.simplify_lambda_expression_and_method_ref=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_anonymous_class_creation=false +cleanup.use_autoboxing=false +cleanup.use_blocks=false +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_directly_map_method=true +cleanup.use_lambda=true +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=false +cleanup.use_this_for_non_static_field_access_only_if_necessary=true +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup.use_type_arguments=false +cleanup.use_unboxing=false +cleanup.use_var=false +cleanup_profile=_bnd +cleanup_settings_version=2 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_bnd +formatter_settings_version=16 +org.eclipse.jdt.ui.exception.name=e +org.eclipse.jdt.ui.gettersetter.use.is=true +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=false +org.eclipse.jdt.ui.keywordthis=false +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.overrideannotation=true +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false +sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.correct_indentation=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=true +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=false +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_with_declaring_class=true +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=true +sp_cleanup.remove_redundant_semicolons=true +sp_cleanup.remove_redundant_type_arguments=false +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=true +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_type_arguments=false diff --git a/org.bndtools.builder/bnd.bnd b/org.bndtools.builder/bnd.bnd new file mode 100644 index 00000000000..6df852d7ef4 --- /dev/null +++ b/org.bndtools.builder/bnd.bnd @@ -0,0 +1,84 @@ +# Set javac settings from JDT prefs +-include: ${workspace}/cnf/includes/jdt.bnd, ${workspace}/cnf/includes/bndtools.bnd + +Bundle-SymbolicName: ${p};singleton:=true +Bundle-ActivationPolicy: lazy + +Import-Package: \ + ${eclipse.importpackage},\ + * + +# Bundle Content + + +-conditionalpackage: \ + aQute.lib.*,\ + aQute.libg.*,\ + org.bndtools.utils.* + +-buildpath: \ + osgi.annotation;version=latest;maven-scope=provided,\ + osgi.core;version=latest;maven-scope=provided,\ + org.osgi.namespace.service;version=latest;maven-scope=provided,\ + org.osgi.util.function;version=latest,\ + org.osgi.util.promise;version=latest,\ + aQute.libg;version=project,\ + biz.aQute.bnd.util;version=latest,\ + biz.aQute.bndlib;version=latest,\ + biz.aQute.resolve;version=latest,\ + biz.aQute.repository;version=latest,\ + bndtools.api;version=latest,\ + bndtools.utils;version=project;packages='*',\ + bndtools.core;version=snapshot,\ + org.eclipse.osgi;maven-scope=provided,\ + org.eclipse.core.contenttype,\ + org.eclipse.core.runtime,\ + org.eclipse.core.resources,\ + org.eclipse.core.jobs,\ + org.eclipse.core.commands,\ + org.eclipse.jface,\ + org.eclipse.jface.text,\ + org.eclipse.text,\ + org.eclipse.ui.ide,\ + org.eclipse.ui.workbench,\ + org.eclipse.debug.core,\ + org.eclipse.jdt.core,\ + org.eclipse.jdt.launching,\ + org.eclipse.jdt.ui,\ + org.eclipse.swt,\ + org.eclipse.swt.cocoa.macosx.x86_64,\ + org.eclipse.equinox.common,\ + org.eclipse.equinox.registry,\ + org.eclipse.equinox.preferences,\ + slf4j.api,\ + org.osgi.service.component.annotations,\ + bndtools.builder + +#-buildpath: \ +# osgi.core,\ +# org.osgi.util.function,\ +# org.osgi.util.promise,\ +# org.eclipse.core.resources,\ +# org.eclipse.equinox.common,\ +# org.eclipse.equinox.registry,\ +# bndtools.api,\ +# bndtools.builder,\ +# bndtools.core,\ +# bndtools.utils;version=project;packages='*',\ +# org.eclipse.core.jobs,\ +# org.eclipse.jdt.core,\ +# org.eclipse.ui.workbench,\ +# org.osgi.service.component.annotations,\ +# biz.aQute.bndlib,\ +# org.eclipse.equinox.preferences,\ +# aQute.libg,\ +# biz.aQute.bnd.util,\ +# org.eclipse.ui.ide,\ +# org.eclipse.core.runtime,\ +# org.eclipse.swt,\ +# org.eclipse.swt.gtk.linux.x86_64,\ +# org.eclipse.text,\ +# slf4j.api,\ +# org.eclipse.jdt.launching + +-privatepackage: org.bndtools.builder.impl \ No newline at end of file diff --git a/bndtools.builder/src/org/bndtools/builder/BndFileModel.java b/org.bndtools.builder/src/org/bndtools/builder/impl/BndFileModel.java similarity index 97% rename from bndtools.builder/src/org/bndtools/builder/BndFileModel.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/BndFileModel.java index d152c1fe4ad..b1b1f02ee0f 100644 --- a/bndtools.builder/src/org/bndtools/builder/BndFileModel.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/BndFileModel.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.util.Collection; import java.util.Set; diff --git a/bndtools.builder/src/org/bndtools/builder/BndProjectInfoAdapter.java b/org.bndtools.builder/src/org/bndtools/builder/impl/BndProjectInfoAdapter.java similarity index 89% rename from bndtools.builder/src/org/bndtools/builder/BndProjectInfoAdapter.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/BndProjectInfoAdapter.java index ef96aa9e906..5b782f468eb 100644 --- a/bndtools.builder/src/org/bndtools/builder/BndProjectInfoAdapter.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/BndProjectInfoAdapter.java @@ -1,10 +1,10 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.io.File; import java.util.ArrayList; import java.util.Collection; -import org.bndtools.build.api.IProjectDecorator.BndProjectInfo; +import org.bndtools.api.builder.IProjectDecorator.BndProjectInfo; import aQute.bnd.build.Project; import aQute.bnd.osgi.Packages; diff --git a/bndtools.builder/src/org/bndtools/builder/BndProjectNature.java b/org.bndtools.builder/src/org/bndtools/builder/impl/BndProjectNature.java similarity index 99% rename from bndtools.builder/src/org/bndtools/builder/BndProjectNature.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/BndProjectNature.java index fb806442bc3..6a9b4125fb9 100644 --- a/bndtools.builder/src/org/bndtools/builder/BndProjectNature.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/BndProjectNature.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.util.ArrayList; import java.util.List; diff --git a/bndtools.builder/src/org/bndtools/builder/BndSourceGenerateCompilationParticipant.java b/org.bndtools.builder/src/org/bndtools/builder/impl/BndSourceGenerateCompilationParticipant.java similarity index 96% rename from bndtools.builder/src/org/bndtools/builder/BndSourceGenerateCompilationParticipant.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/BndSourceGenerateCompilationParticipant.java index 0f9fd2ffa6a..b785097a3dd 100644 --- a/bndtools.builder/src/org/bndtools/builder/BndSourceGenerateCompilationParticipant.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/BndSourceGenerateCompilationParticipant.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.io.File; import java.util.Set; @@ -9,6 +9,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.compiler.CompilationParticipant; +import org.osgi.service.component.annotations.Component; import aQute.bnd.build.Project; import aQute.bnd.build.Workspace; @@ -19,6 +20,7 @@ import aQute.service.reporter.Reporter.SetLocation; import bndtools.central.Central; +@Component public class BndSourceGenerateCompilationParticipant extends CompilationParticipant { private static final ILogger logger = Logger .getLogger(BndSourceGenerateCompilationParticipant.class); diff --git a/bndtools.builder/src/org/bndtools/builder/BndtoolsBuilder.java b/org.bndtools.builder/src/org/bndtools/builder/impl/BndtoolsBuilder.java similarity index 93% rename from bndtools.builder/src/org/bndtools/builder/BndtoolsBuilder.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/BndtoolsBuilder.java index 4a203b0caa7..cdd5fe26d29 100644 --- a/bndtools.builder/src/org/bndtools/builder/BndtoolsBuilder.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/BndtoolsBuilder.java @@ -1,4 +1,6 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; + +import static org.eclipse.core.resources.IncrementalProjectBuilder.CLEAN_BUILD; import java.io.File; import java.nio.file.Files; @@ -12,8 +14,11 @@ import org.bndtools.api.BndtoolsConstants; import org.bndtools.api.ILogger; import org.bndtools.api.Logger; +import org.bndtools.builder.BuilderPlugin; import org.bndtools.builder.classpath.BndContainerInitializer; import org.bndtools.builder.decorator.ui.PackageDecorator; +import org.bndtools.builder.facade.IProjectBuilder; +import org.bndtools.builder.handlers.component.ComponentMarker; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -28,6 +33,8 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.ui.preferences.ScopedPreferenceStore; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.ServiceScope; import aQute.bnd.build.Project; import aQute.bnd.build.Workspace; @@ -60,23 +67,21 @@ * create project test.2, add -buildpath: test * */ -public class BndtoolsBuilder extends IncrementalProjectBuilder { - public static final String PLUGIN_ID = "bndtools.builder"; +@Component(service = { + IProjectBuilder.class, BndtoolsBuilder.class +}, scope = ServiceScope.PROTOTYPE) +public class BndtoolsBuilder extends IProjectBuilder { public static final String BUILDER_ID = BndtoolsConstants.BUILDER_ID; private static final ILogger logger = Logger.getLogger(BndtoolsBuilder.class); - static final Set dirty = Collections.newSetFromMap(new ConcurrentHashMap()); + final Set dirty = Collections.newSetFromMap(new ConcurrentHashMap()); static BndPreferences prefs = new BndPreferences(); - static { - CnfWatcher.install(); - } - private BuildLogger buildLog; private boolean postponed; /** * Called from Eclipse when it thinks this project should be build. We're - * proposed to figure out if we've changed and then build as quickly as + * supposed to figure out if we've changed and then build as quickly as * possible. *

* We ensure we're called in proper order defined by bnd, if not we will @@ -89,8 +94,8 @@ public class BndtoolsBuilder extends IncrementalProjectBuilder { */ @Override protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException { - IProject myProject = getProject(); + buildLog = new BuildLogger(prefs.getBuildLogging(), myProject.getName(), kind); BuildListeners listeners = new BuildListeners(); @@ -171,7 +176,7 @@ protected IProject[] build(int kind, Map args, IProgressMonitor return null; } - boolean force = kind == FULL_BUILD; + boolean force = kind == IncrementalProjectBuilder.FULL_BUILD; model.clear(); DeltaWrapper delta = new DeltaWrapper(model, getDelta(myProject), buildLog); @@ -317,7 +322,7 @@ protected IProject[] build(int kind, Map args, IProgressMonitor } catch ( Exception e) { - throw new CoreException(new Status(IStatus.ERROR, PLUGIN_ID, 0, "Build Error!", e)); + throw new CoreException(new Status(IStatus.ERROR, BuilderPlugin.PLUGIN_ID, 0, "Build Error!", e)); } finally { if (buildLog.isActive()) logger.logInfo(buildLog.format(), null); @@ -368,7 +373,7 @@ protected void clean(IProgressMonitor monitor) throws CoreException { // Tell Eclipse what we did... Central.refreshFile(model.getTarget(), monitor, true); } catch (Exception e) { - throw new CoreException(new Status(IStatus.ERROR, PLUGIN_ID, 0, "Build Error!", e)); + throw new CoreException(new Status(IStatus.ERROR, BuilderPlugin.PLUGIN_ID, 0, "Build Error!", e)); } finally { if (buildLog.isActive()) logger.logInfo(buildLog.format(), null); diff --git a/bndtools.builder/src/org/bndtools/builder/BndtoolsDynamicReferenceProvider.java b/org.bndtools.builder/src/org/bndtools/builder/impl/BndtoolsDynamicReferenceProvider.java similarity index 84% rename from bndtools.builder/src/org/bndtools/builder/BndtoolsDynamicReferenceProvider.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/BndtoolsDynamicReferenceProvider.java index a1cd99be135..9ef057bad06 100644 --- a/bndtools.builder/src/org/bndtools/builder/BndtoolsDynamicReferenceProvider.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/BndtoolsDynamicReferenceProvider.java @@ -1,9 +1,10 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.bndtools.api.central.ICentral; import org.eclipse.core.resources.IBuildConfiguration; import org.eclipse.core.resources.IDynamicReferenceProvider; import org.eclipse.core.resources.IProject; @@ -11,15 +12,23 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Status; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; import aQute.bnd.build.Project; import aQute.bnd.build.Workspace; import bndtools.central.Central; +@Component public class BndtoolsDynamicReferenceProvider implements IDynamicReferenceProvider { + private static IWorkspaceRoot eclipse = ResourcesPlugin.getWorkspace() .getRoot(); + // This reference forces it to wait until Central is initialized + @Reference + ICentral central; + @Override public List getDependentProjects(IBuildConfiguration buildConfiguration) throws CoreException { try { diff --git a/bndtools.builder/src/org/bndtools/builder/BndtoolsMarkerResolutionGenerator.java b/org.bndtools.builder/src/org/bndtools/builder/impl/BndtoolsMarkerResolutionGenerator.java similarity index 92% rename from bndtools.builder/src/org/bndtools/builder/BndtoolsMarkerResolutionGenerator.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/BndtoolsMarkerResolutionGenerator.java index 0675719de24..f12e18711c1 100644 --- a/bndtools.builder/src/org/bndtools/builder/BndtoolsMarkerResolutionGenerator.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/BndtoolsMarkerResolutionGenerator.java @@ -1,8 +1,8 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.util.List; -import org.bndtools.build.api.BuildErrorDetailsHandler; +import org.bndtools.api.builder.BuildErrorDetailsHandler; import org.bndtools.build.api.BuildErrorDetailsHandlers; import org.eclipse.core.resources.IMarker; import org.eclipse.ui.IMarkerResolution; diff --git a/bndtools.builder/src/org/bndtools/builder/BuildListeners.java b/org.bndtools.builder/src/org/bndtools/builder/impl/BuildListeners.java similarity index 96% rename from bndtools.builder/src/org/bndtools/builder/BuildListeners.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/BuildListeners.java index 0ee65e06717..3866b419c9a 100644 --- a/bndtools.builder/src/org/bndtools/builder/BuildListeners.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/BuildListeners.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.io.File; import java.util.ArrayList; @@ -8,8 +8,8 @@ import org.bndtools.api.BndtoolsConstants; import org.bndtools.api.ILogger; import org.bndtools.api.Logger; -import org.bndtools.build.api.BuildListener; -import org.bndtools.build.api.BuildListener.BuildState; +import org.bndtools.api.builder.BuildListener; +import org.bndtools.api.builder.BuildListener.BuildState; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IPath; diff --git a/bndtools.builder/src/org/bndtools/builder/BuildLogger.java b/org.bndtools.builder/src/org/bndtools/builder/impl/BuildLogger.java similarity index 91% rename from bndtools.builder/src/org/bndtools/builder/BuildLogger.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/BuildLogger.java index 4b87fbe176a..eaf91ab7ded 100644 --- a/bndtools.builder/src/org/bndtools/builder/BuildLogger.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/BuildLogger.java @@ -1,4 +1,9 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; + + +import static org.bndtools.api.builder.BuildLoggerConstants.LOG_BASIC; +import static org.bndtools.api.builder.BuildLoggerConstants.LOG_FULL; +import static org.bndtools.api.builder.BuildLoggerConstants.LOG_NONE; import java.util.Formatter; import java.util.concurrent.TimeUnit; @@ -6,9 +11,6 @@ import org.eclipse.core.resources.IncrementalProjectBuilder; public class BuildLogger { - public static final int LOG_FULL = 2; - public static final int LOG_BASIC = 1; - public static final int LOG_NONE = 0; private final int level; private final String name; private final int kind; diff --git a/bndtools.builder/src/org/bndtools/builder/ClasspathContainerFilter.java b/org.bndtools.builder/src/org/bndtools/builder/impl/ClasspathContainerFilter.java similarity index 95% rename from bndtools.builder/src/org/bndtools/builder/ClasspathContainerFilter.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/ClasspathContainerFilter.java index 5427629a046..d5160f8a736 100644 --- a/bndtools.builder/src/org/bndtools/builder/ClasspathContainerFilter.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/ClasspathContainerFilter.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import org.bndtools.api.BndtoolsConstants; import org.eclipse.jdt.core.IClasspathContainer; diff --git a/bndtools.builder/src/org/bndtools/builder/CnfWatcher.java b/org.bndtools.builder/src/org/bndtools/builder/impl/CnfWatcher.java similarity index 73% rename from bndtools.builder/src/org/bndtools/builder/CnfWatcher.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/CnfWatcher.java index 228f9fc9707..30ac8dd5d38 100644 --- a/bndtools.builder/src/org/bndtools/builder/CnfWatcher.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/CnfWatcher.java @@ -1,10 +1,11 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.util.Collection; import org.bndtools.api.BndtoolsConstants; import org.bndtools.api.ILogger; import org.bndtools.api.Logger; +import org.bndtools.api.builder.BuildLoggerConstants; import org.bndtools.utils.workspace.WorkspaceUtils; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResourceChangeEvent; @@ -16,22 +17,38 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Deactivate; +import org.osgi.service.component.annotations.Reference; +import org.osgi.service.component.annotations.ServiceScope; import aQute.bnd.build.Project; import aQute.bnd.build.Workspace; import bndtools.central.Central; +@Component(immediate = true, scope = ServiceScope.SINGLETON) public class CnfWatcher implements IResourceChangeListener { + public static final String PLUGIN_ID = "bndtools.builder"; + private static final ILogger logger = Logger.getLogger(CnfWatcher.class); - private static final CnfWatcher INSTANCE = new CnfWatcher(); + static final org.slf4j.Logger consoleLog = org.slf4j.LoggerFactory.getLogger(CnfWatcher.class); + + @Reference + BndtoolsBuilder builder; - static CnfWatcher install() { + @Activate + void activate() { + consoleLog.debug("Activating CnfWatcher"); ResourcesPlugin.getWorkspace() - .addResourceChangeListener(INSTANCE, IResourceChangeEvent.POST_CHANGE); - return INSTANCE; + .addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE); } - private CnfWatcher() {} + @Deactivate + void deactivate() { + ResourcesPlugin.getWorkspace() + .removeResourceChangeListener(this); + } @Override public void resourceChanged(final IResourceChangeEvent event) { @@ -68,7 +85,7 @@ private void processEvent(IResourceChangeEvent event) { Project p = allProjects.iterator() .next(); - DeltaWrapper dw = new DeltaWrapper(p, delta, new BuildLogger(BuildLogger.LOG_NONE, "", 0)); + DeltaWrapper dw = new DeltaWrapper(p, delta, new BuildLogger(BuildLoggerConstants.LOG_NONE, "", 0)); if (dw.hasCnfChanged()) { WorkspaceJob j = new WorkspaceJob("Refreshing workspace for cnf change") { @Override @@ -83,7 +100,7 @@ public IStatus runInWorkspace(IProgressMonitor arg0) throws CoreException { ms.deleteMarkers("*"); ms.setMarkers(workspace, BndtoolsConstants.MARKER_BND_WORKSPACE_PROBLEM); } catch (Exception e) { - return new Status(IStatus.ERROR, BndtoolsBuilder.PLUGIN_ID, + return new Status(IStatus.ERROR, PLUGIN_ID, "error during workspace refresh", e); } diff --git a/bndtools.builder/src/org/bndtools/builder/CompositeResourceDeltaVisitor.java b/org.bndtools.builder/src/org/bndtools/builder/impl/CompositeResourceDeltaVisitor.java similarity index 95% rename from bndtools.builder/src/org/bndtools/builder/CompositeResourceDeltaVisitor.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/CompositeResourceDeltaVisitor.java index 056f69133af..123a311ad01 100644 --- a/bndtools.builder/src/org/bndtools/builder/CompositeResourceDeltaVisitor.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/CompositeResourceDeltaVisitor.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.util.LinkedList; import java.util.List; diff --git a/bndtools.builder/src/org/bndtools/builder/CompositeResourceProxyVisitor.java b/org.bndtools.builder/src/org/bndtools/builder/impl/CompositeResourceProxyVisitor.java similarity index 95% rename from bndtools.builder/src/org/bndtools/builder/CompositeResourceProxyVisitor.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/CompositeResourceProxyVisitor.java index 908681744a9..a51724f9df1 100644 --- a/bndtools.builder/src/org/bndtools/builder/CompositeResourceProxyVisitor.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/CompositeResourceProxyVisitor.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.util.LinkedList; import java.util.List; diff --git a/bndtools.builder/src/org/bndtools/builder/DeltaWrapper.java b/org.bndtools.builder/src/org/bndtools/builder/impl/DeltaWrapper.java similarity index 97% rename from bndtools.builder/src/org/bndtools/builder/DeltaWrapper.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/DeltaWrapper.java index fd31f2cad74..720cfcca3b0 100644 --- a/bndtools.builder/src/org/bndtools/builder/DeltaWrapper.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/DeltaWrapper.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import static java.util.stream.Collectors.toSet; @@ -26,7 +26,7 @@ import aQute.lib.strings.Strings; import bndtools.central.Central; -class DeltaWrapper { +public class DeltaWrapper { private static final IPath EXT = new Path("/cnf/ext"); private final Project model; @@ -40,13 +40,13 @@ class DeltaWrapper { Constants.DEFAULT_PROP_TARGET_DIR }; - DeltaWrapper(Project model, IResourceDelta delta, BuildLogger log) { + public DeltaWrapper(Project model, IResourceDelta delta, BuildLogger log) { this.model = model; this.delta = delta; this.log = log; } - boolean hasCnfChanged() throws Exception { + public boolean hasCnfChanged() throws Exception { if (delta == null) { log.basic("Full build because delta for cnf is null"); return true; diff --git a/bndtools.builder/src/org/bndtools/builder/ExportedBundle.java b/org.bndtools.builder/src/org/bndtools/builder/impl/ExportedBundle.java similarity index 97% rename from bndtools.builder/src/org/bndtools/builder/ExportedBundle.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/ExportedBundle.java index 7c636635afa..fb83e748af5 100644 --- a/bndtools.builder/src/org/bndtools/builder/ExportedBundle.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/ExportedBundle.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import org.eclipse.core.runtime.IPath; diff --git a/bndtools.builder/src/org/bndtools/builder/MarkerSupport.java b/org.bndtools.builder/src/org/bndtools/builder/impl/MarkerSupport.java similarity index 97% rename from bndtools.builder/src/org/bndtools/builder/MarkerSupport.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/MarkerSupport.java index 57e90a48828..568ce1b9e33 100644 --- a/bndtools.builder/src/org/bndtools/builder/MarkerSupport.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/MarkerSupport.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import static org.bndtools.api.BndtoolsConstants.BNDTOOLS_MARKER_CONTEXT_ATTR; import static org.bndtools.api.BndtoolsConstants.BNDTOOLS_MARKER_FILE_ATTR; @@ -23,10 +23,10 @@ import org.bndtools.api.IProjectValidator; import org.bndtools.api.IValidator; import org.bndtools.api.Logger; +import org.bndtools.api.builder.BuildErrorDetailsHandler; +import org.bndtools.api.builder.MarkerData; import org.bndtools.build.api.AbstractBuildErrorDetailsHandler; -import org.bndtools.build.api.BuildErrorDetailsHandler; import org.bndtools.build.api.BuildErrorDetailsHandlers; -import org.bndtools.build.api.MarkerData; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -47,7 +47,7 @@ import aQute.service.reporter.Reporter.SetLocation; class MarkerSupport { - private static final ILogger logger = Logger.getLogger(BndtoolsBuilder.class); + private static final ILogger logger = Logger.getLogger(MarkerSupport.class); private final IProject project; private static final org.slf4j.Logger consoleLogger = LoggerFactory.getLogger(MarkerSupport.class); diff --git a/bndtools.builder/src/org/bndtools/builder/WorkingSetTracker.java b/org.bndtools.builder/src/org/bndtools/builder/impl/WorkingSetTracker.java similarity index 99% rename from bndtools.builder/src/org/bndtools/builder/WorkingSetTracker.java rename to org.bndtools.builder/src/org/bndtools/builder/impl/WorkingSetTracker.java index c95e1e31284..b766c71102f 100644 --- a/bndtools.builder/src/org/bndtools/builder/WorkingSetTracker.java +++ b/org.bndtools.builder/src/org/bndtools/builder/impl/WorkingSetTracker.java @@ -1,4 +1,4 @@ -package org.bndtools.builder; +package org.bndtools.builder.impl; import java.util.Iterator; import java.util.List; diff --git a/org.bndtools.launch/src/bndtools/launch/UpdateGuard.java b/org.bndtools.launch/src/bndtools/launch/UpdateGuard.java index 23d5e321d26..aabaebff1d3 100644 --- a/org.bndtools.launch/src/bndtools/launch/UpdateGuard.java +++ b/org.bndtools.launch/src/bndtools/launch/UpdateGuard.java @@ -6,7 +6,7 @@ import java.util.TimerTask; import java.util.concurrent.atomic.AtomicBoolean; -import org.bndtools.build.api.BuildListener; +import org.bndtools.api.builder.BuildListener; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.osgi.framework.BundleContext;