diff options
| author | Stéphane Bégaudeau | 2017-04-28 13:19:49 +0000 |
|---|---|---|
| committer | Stephane Begaudeau | 2017-05-04 12:27:30 +0000 |
| commit | 17ae4d0490218780375397a7823c1bca1dd89cae (patch) | |
| tree | eddd4fb3e03894cee9b21d9a6bb56c1676d4c17e | |
| parent | 150334cc43b9bc550ceff4ffa4f0c9c829932592 (diff) | |
| download | org.eclipse.sirius-17ae4d0490218780375397a7823c1bca1dd89cae.tar.gz org.eclipse.sirius-17ae4d0490218780375397a7823c1bca1dd89cae.tar.xz org.eclipse.sirius-17ae4d0490218780375397a7823c1bca1dd89cae.zip | |
[507314] Move the default rules to a dedicated bundle
The new bundle can now safely depend on both the standard widgets and
reference widget.
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=507314
Change-Id: I34f2e8ba619193b84548416704a431e0f11629bf
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
31 files changed, 773 insertions, 45 deletions
diff --git a/packaging/org.eclipse.sirius.parent/pom.xml b/packaging/org.eclipse.sirius.parent/pom.xml index e991af253e..09523ed1b4 100644 --- a/packaging/org.eclipse.sirius.parent/pom.xml +++ b/packaging/org.eclipse.sirius.parent/pom.xml @@ -367,6 +367,7 @@ <module>../../plugins/org.eclipse.sirius.properties.edit</module> <module>../../plugins/org.eclipse.sirius.properties.ext.widgets.reference</module> <module>../../plugins/org.eclipse.sirius.properties.ext.widgets.reference.edit</module> + <module>../../plugins/org.eclipse.sirius.properties.defaultrules</module> <module>../../plugins/org.eclipse.sirius.editor.properties</module> <module>../../plugins/org.eclipse.sirius.editor.properties.ext.widgets.reference</module> <module>../../plugins/org.eclipse.sirius.properties.core</module> diff --git a/packaging/org.eclipse.sirius.properties.feature/feature.xml b/packaging/org.eclipse.sirius.properties.feature/feature.xml index 99da775897..0de668b58a 100644 --- a/packaging/org.eclipse.sirius.properties.feature/feature.xml +++ b/packaging/org.eclipse.sirius.properties.feature/feature.xml @@ -46,6 +46,7 @@ install-size="0" version="0.0.0" unpack="false"/> + <plugin id="org.eclipse.sirius.ui.properties" download-size="0" @@ -81,4 +82,11 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.sirius.properties.defaultrules" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> diff --git a/packaging/org.eclipse.sirius.specifier.properties.feature/feature.xml b/packaging/org.eclipse.sirius.specifier.properties.feature/feature.xml index 0712bf6fda..19697a8477 100644 --- a/packaging/org.eclipse.sirius.specifier.properties.feature/feature.xml +++ b/packaging/org.eclipse.sirius.specifier.properties.feature/feature.xml @@ -18,6 +18,7 @@ <license url="%licenseURL"> %license </license> + <plugin id="org.eclipse.sirius.editor.properties" download-size="0" @@ -25,4 +26,11 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.sirius.properties.defaultrules" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> diff --git a/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF index 70c8fccf89..9f848dbfd4 100644 --- a/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.sirius.editor.properties/META-INF/MANIFEST.MF @@ -20,7 +20,8 @@ Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)", org.eclipse.sirius.ext.swt;bundle-version="4.0.0", org.eclipse.sirius.ext.base;bundle-version="4.1.0", org.eclipse.sirius.properties.core;bundle-version="5.0.0", - org.eclipse.eef.ide;bundle-version="2.0.0" + org.eclipse.eef.ide;bundle-version="2.0.0", + org.eclipse.sirius.properties.defaultrules;bundle-version="5.0.0" Export-Package: org.eclipse.sirius.editor.properties.api;version="5.0.0", org.eclipse.sirius.editor.properties.internal;version="5.0.0";x-internal:=true, org.eclipse.sirius.editor.properties.tools.internal.menu;version="4.1.0";x-internal:=true, diff --git a/plugins/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/PropertiesMenuBuilder.java b/plugins/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/PropertiesMenuBuilder.java index 69825c3aed..e17f0e3a16 100644 --- a/plugins/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/PropertiesMenuBuilder.java +++ b/plugins/org.eclipse.sirius.editor.properties/src/org/eclipse/sirius/editor/properties/tools/internal/menu/PropertiesMenuBuilder.java @@ -29,7 +29,7 @@ import org.eclipse.sirius.properties.PageDescription; import org.eclipse.sirius.properties.PropertiesFactory; import org.eclipse.sirius.properties.PropertiesPackage; import org.eclipse.sirius.properties.ViewExtensionDescription; -import org.eclipse.sirius.properties.core.api.DefaultRulesProvider; +import org.eclipse.sirius.properties.defaultrules.api.DefaultRulesProvider; import org.eclipse.sirius.viewpoint.description.DescriptionPackage; import org.eclipse.sirius.viewpoint.description.Group; import org.eclipse.ui.IEditorPart; @@ -129,9 +129,8 @@ public class PropertiesMenuBuilder extends AbstractTypeRestrictingMenuBuilder { } /** - * Utility class used to extend the Default Property View description - * without loading the default rules in the resource set of the odesign - * until the moment when the action will be executed. + * Utility class used to extend the Default Property View description without loading the default rules in the + * resource set of the odesign until the moment when the action will be executed. * * @author sbegaudeau */ diff --git a/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF index 01e2b2b805..ba6c1414aa 100644 --- a/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.sirius.properties.core/META-INF/MANIFEST.MF @@ -27,7 +27,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.0.0", org.eclipse.eef.core;bundle-version="2.0.0", org.eclipse.eef.ide;bundle-version="2.0.0", org.eclipse.emf.transaction;bundle-version="1.8.0", - org.eclipse.sirius.ext.emf.edit;bundle-version="5.0.0" + org.eclipse.sirius.ext.emf.edit;bundle-version="5.0.0", + org.eclipse.sirius.properties.defaultrules;bundle-version="5.0.0" Import-Package: com.google.common.base;version="[15.0.0,16.0.0)", com.google.common.collect;version="[15.0.0,16.0.0)" Bundle-Activator: org.eclipse.sirius.properties.core.internal.SiriusPropertiesCorePlugin$Implementation diff --git a/plugins/org.eclipse.sirius.properties.core/build.properties b/plugins/org.eclipse.sirius.properties.core/build.properties index 7e7a95a24b..4b5c2caf4a 100644 --- a/plugins/org.eclipse.sirius.properties.core/build.properties +++ b/plugins/org.eclipse.sirius.properties.core/build.properties @@ -14,7 +14,6 @@ bin.includes = META-INF/,\ .,\ about.html,\ plugin.properties,\ - plugin.xml,\ - model/ + plugin.xml javacProjectSettings = true javacDefaultEncoding.. = US-ASCII diff --git a/plugins/org.eclipse.sirius.properties.core/plugin.properties b/plugins/org.eclipse.sirius.properties.core/plugin.properties index 60e3a49504..adf544f62b 100644 --- a/plugins/org.eclipse.sirius.properties.core/plugin.properties +++ b/plugins/org.eclipse.sirius.properties.core/plugin.properties @@ -16,8 +16,6 @@ descriptionConverterExtensionPoint.Name=Description Converter descriptionPreprocessorExtensionPoint.Name=Description Preprocessor descriptionLinkResolverExtensionPoint.Name=Description Link Resolver -DefaultRulesProvider_DefaultPropertiesNotFound=The model containing the default configuration of the Properties page has not been found. - SiriusToolServices_MainTabLabel=Main AbstractDescriptionConverter_noConverterFound=No description converter found for configuration element ''{0}'' diff --git a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/Messages.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/Messages.java index 3b44998722..cbf92d1df4 100644 --- a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/Messages.java +++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/Messages.java @@ -27,9 +27,6 @@ public final class Messages { // CHECKSTYLE:OFF @TranslatableMessage - public static String DefaultRulesProvider_DefaultPropertiesNotFound; - - @TranslatableMessage public static String SiriusToolServices_MainTabLabel; @TranslatableMessage diff --git a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/SiriusToolServices.java b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/SiriusToolServices.java index a1b202f3d3..78b396b2c7 100644 --- a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/SiriusToolServices.java +++ b/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/internal/SiriusToolServices.java @@ -25,8 +25,8 @@ import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.properties.EditSupport; import org.eclipse.sirius.properties.ViewExtensionDescription; -import org.eclipse.sirius.properties.core.api.DefaultRulesProvider; import org.eclipse.sirius.properties.core.api.SiriusInputDescriptor; +import org.eclipse.sirius.properties.defaultrules.api.DefaultRulesProvider; import org.eclipse.sirius.tools.api.command.SiriusCommand; import org.eclipse.sirius.viewpoint.DRepresentation; import org.eclipse.sirius.viewpoint.DSemanticDecorator; @@ -36,8 +36,7 @@ import org.eclipse.sirius.viewpoint.description.tool.InitialOperation; import org.eclipse.sirius.viewpoint.description.tool.ModelOperation; /** - * This class contains various services provided by the Sirius UI Properties - * bundle to the interpreter. + * This class contains various services provided by the Sirius UI Properties bundle to the interpreter. * * @author sbegaudeau */ @@ -84,9 +83,8 @@ public class SiriusToolServices { * the URI of the operation to search for. * @param session * the Sirius session which determines the scope to search into. - * @return the {@link ModelOperation} instance found at the specified URI, - * either in one of the VSMs for which at least one Viewpoint is - * currently enabled in the session, or from the default ruleset, or + * @return the {@link ModelOperation} instance found at the specified URI, either in one of the VSMs for which at + * least one Viewpoint is currently enabled in the session, or from the default ruleset, or * <code>null</code> if no matching operation could be located. */ private ModelOperation findModelOperation(String initialCommandUri, Session session) { @@ -103,13 +101,11 @@ public class SiriusToolServices { } /** - * Returns all the (VSM-like) resources in which to search for the - * {@link ModelOperation} to execute. + * Returns all the (VSM-like) resources in which to search for the {@link ModelOperation} to execute. * * @param session * the Sirius session. - * @return all the resources in which to look for the ModelOperation, in - * order of preference. + * @return all the resources in which to look for the ModelOperation, in order of preference. */ private Set<Resource> getResourcesInScope(Session session) { Set<Resource> result = new LinkedHashSet<>(); @@ -128,13 +124,11 @@ public class SiriusToolServices { } /** - * Returns the {@link SiriusContext} associated with a - * {@link SiriusInputDescriptor} (typically the "input" variable of the - * properties view). + * Returns the {@link SiriusContext} associated with a {@link SiriusInputDescriptor} (typically the "input" variable + * of the properties view). * * @param sid - * a {@link SiriusInputDescriptor} (typically the "input" - * variable of the properties view). + * a {@link SiriusInputDescriptor} (typically the "input" variable of the properties view). * @return the input's full context. */ public SiriusContext context(SiriusInputDescriptor sid) { @@ -209,14 +203,12 @@ public class SiriusToolServices { } /** - * Returns the Sirius {@link DSemanticDecorator} associated to a given - * context. + * Returns the Sirius {@link DSemanticDecorator} associated to a given context. * * @param ctx * a Sirius context. * - * @return the Sirius {@link DSemanticDecorator} associated to a given - * context. + * @return the Sirius {@link DSemanticDecorator} associated to a given context. */ public DSemanticDecorator semanticDecorator(SiriusContext ctx) { return ctx.getSemanticDecorator(); @@ -260,13 +252,10 @@ public class SiriusToolServices { * Returns a helper with EMF Edit-related operations on a given element. * * @param input - * a {@link SiriusInputDescriptor} (typically the "input" - * variable of the properties view). + * a {@link SiriusInputDescriptor} (typically the "input" variable of the properties view). * @param self - * the target semantic element on which the helper should - * operator. - * @return an instance of EditSupport bounnd to the specified semantic - * element. + * the target semantic element on which the helper should operator. + * @return an instance of EditSupport bounnd to the specified semantic element. */ public EditSupport emfEditServices(SiriusInputDescriptor input, EObject self) { EditSupportSpec ess = new EditSupportSpec(input.getFullContext(), self); diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/.checkstyle b/plugins/org.eclipse.sirius.properties.defaultrules/.checkstyle new file mode 100644 index 0000000000..3c756ff819 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/.checkstyle @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false"> + <local-check-config name="Sirius Checks" location="/org.eclipse.sirius.settings/CheckstyleConfiguration.xml" type="project" description=""> + <additional-data name="protect-config-file" value="false"/> + </local-check-config> + <fileset name="all" enabled="true" check-config-name="Sirius Checks" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> + <filter name="FilesFromPackage" enabled="true"> + <filter-data value="src-gen"/> + </filter> +</fileset-config> diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/.classpath b/plugins/org.eclipse.sirius.properties.defaultrules/.classpath new file mode 100644 index 0000000000..eca7bdba8f --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/.project b/plugins/org.eclipse.sirius.properties.defaultrules/.project new file mode 100644 index 0000000000..3087ccf0fe --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/.project @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.sirius.properties.defaultrules</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + </natures> +</projectDescription> diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/.settings/fr.obeo.baseliner.prefs b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/fr.obeo.baseliner.prefs new file mode 100644 index 0000000000..edbf92725a --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/fr.obeo.baseliner.prefs @@ -0,0 +1,2 @@ +baselineSource=platform\:/resource/org.eclipse.sirius.targets/baseline.target +eclipse.preferences.version=1 diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..9093a2c880 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +#Thu Jan 26 14:35:58 CET 2012 +eclipse.preferences.version=1 +encoding/<project>=US-ASCII +encoding/analysis_templates=ISO-8859-1 diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..a287fefdba --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Mon Sep 24 15:04:19 CEST 2007 +eclipse.preferences.version=1 +line.separator=\n diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..97c066b909 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,354 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not 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.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.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.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +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.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +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.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +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.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled +org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,NORMAL,NORMAL,NORMAL,NORMAL,HIGH +org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,TODOCBR,TODOMCH,TODOYMO,OPTIMISATION_POSSIBLE,TODONEWMM +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16 +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_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +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_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=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_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=1 +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_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.clear_blank_lines_in_block_comment=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=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.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=120 +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=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +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=false +org.eclipse.jdt.core.formatter.indentation.size=4 +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=do not 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=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=do not 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=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=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=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_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_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_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=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_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_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=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_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=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=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not 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_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_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_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_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_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_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=200 +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.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +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_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..f903dbceb5 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,62 @@ +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_to_enhanced_for_loop=true +cleanup.correct_indentation=true +cleanup.format_source_code=true +cleanup.format_source_code_changes_only=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.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=true +cleanup.qualify_static_field_accesses_with_declaring_class=true +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=true +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +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=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +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_profile=_Sirius +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_Sirius +formatter_settings_version=12 +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.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 0000000000..b196c64a34 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.pde.prefs new file mode 100644 index 0000000000..c307a7b58e --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/.settings/org.eclipse.pde.prefs @@ -0,0 +1,32 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=0 +compilers.p.build=0 +compilers.p.build.bin.includes=0 +compilers.p.build.encodings=0 +compilers.p.build.java.compiler=0 +compilers.p.build.java.compliance=0 +compilers.p.build.missing.output=0 +compilers.p.build.output.library=0 +compilers.p.build.source.library=0 +compilers.p.build.src.includes=0 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=0 +compilers.p.missing-packages=0 +compilers.p.missing-version-export-package=1 +compilers.p.missing-version-import-package=1 +compilers.p.missing-version-require-bundle=0 +compilers.p.no-required-att=0 +compilers.p.not-externalized-att=0 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=0 +compilers.p.unknown-resource=0 +compilers.p.unresolved-ex-points=0 +compilers.p.unresolved-import=0 +compilers.s.create-docs=false +compilers.s.doc-folder=doc +compilers.s.open-tags=1 +eclipse.preferences.version=1 diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.properties.defaultrules/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..8a12cbdd70 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/META-INF/MANIFEST.MF @@ -0,0 +1,15 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.eclipse.sirius.properties.defaultrules +Bundle-Version: 5.0.0.qualifier +Bundle-Vendor: %providerName +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Localization: plugin +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)", + org.eclipse.sirius.properties;bundle-version="5.0.0", + org.eclipse.sirius.ext.base;bundle-version="5.0.0", + org.eclipse.sirius.properties.ext.widgets.reference;bundle-version="5.0.0" +Export-Package: org.eclipse.sirius.properties.defaultrules.api;version="5.0.0", + org.eclipse.sirius.properties.defaultrules.internal;version="5.0.0";x-internal:=true diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/about.html b/plugins/org.eclipse.sirius.properties.defaultrules/about.html new file mode 100644 index 0000000000..420ad0f930 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/about.html @@ -0,0 +1,27 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0043)http://www.eclipse.org/legal/epl/about.html --> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2006</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + + +</body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/build.properties b/plugins/org.eclipse.sirius.properties.defaultrules/build.properties new file mode 100644 index 0000000000..e2928cbcbb --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/build.properties @@ -0,0 +1,21 @@ +# ==================================================================== +# Copyright (c) 2017 Obeo +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Obeo - initial API and implementation +# ==================================================================== +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties,\ + model/,\ + about.html +javacProjectSettings = true +javacDefaultEncoding.. = US-ASCII +src.includes = about.html,\ + model/ diff --git a/plugins/org.eclipse.sirius.properties.core/model/properties.odesign b/plugins/org.eclipse.sirius.properties.defaultrules/model/properties.odesign index c9e61aeee4..c9e61aeee4 100644 --- a/plugins/org.eclipse.sirius.properties.core/model/properties.odesign +++ b/plugins/org.eclipse.sirius.properties.defaultrules/model/properties.odesign diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/plugin.properties b/plugins/org.eclipse.sirius.properties.defaultrules/plugin.properties new file mode 100644 index 0000000000..c4d1728564 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/plugin.properties @@ -0,0 +1,14 @@ +# ==================================================================== +# Copyright (c) 2017 Obeo +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Obeo - initial API and implementation +# ==================================================================== +pluginName = Sirius Properties Default Rules +providerName = Eclipse Modeling Project + +DefaultRulesProvider_DefaultPropertiesNotFound=The model containing the default configuration of the Properties page has not been found.
\ No newline at end of file diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/pom.xml b/plugins/org.eclipse.sirius.properties.defaultrules/pom.xml new file mode 100644 index 0000000000..39b23006c0 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/pom.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2017 Obeo + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html + + Contributors: + Obeo - Initial API and implementation +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.sirius</groupId> + <artifactId>sirius-parent</artifactId> + <version>5.0.0-SNAPSHOT</version> + <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath> + </parent> + + <artifactId>org.eclipse.sirius.properties.defaultrules</artifactId> + <packaging>eclipse-plugin</packaging> + <version>5.0.0-SNAPSHOT</version> + +</project> diff --git a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/api/DefaultRulesProvider.java b/plugins/org.eclipse.sirius.properties.defaultrules/src/org/eclipse/sirius/properties/defaultrules/api/DefaultRulesProvider.java index cca2eb6546..4feb2a8b75 100644 --- a/plugins/org.eclipse.sirius.properties.core/src/org/eclipse/sirius/properties/core/api/DefaultRulesProvider.java +++ b/plugins/org.eclipse.sirius.properties.defaultrules/src/org/eclipse/sirius/properties/defaultrules/api/DefaultRulesProvider.java @@ -8,17 +8,19 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.properties.core.api; +package org.eclipse.sirius.properties.defaultrules.api; import java.util.Optional; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.sirius.properties.ViewExtensionDescription; -import org.eclipse.sirius.properties.core.internal.Messages; -import org.eclipse.sirius.properties.core.internal.SiriusPropertiesCorePlugin; +import org.eclipse.sirius.properties.defaultrules.internal.Messages; +import org.eclipse.sirius.properties.defaultrules.internal.SiriusPropertiesDefaultRulesPlugin; import org.eclipse.sirius.viewpoint.description.Group; /** @@ -36,7 +38,7 @@ public final class DefaultRulesProvider { /** * The URI of the model containing the default value of the properties page to create. */ - private static final URI DEFAULT_RULES_RESOURCE_URI = URI.createURI("platform:/plugin/org.eclipse.sirius.properties.core/model/properties.odesign", true); //$NON-NLS-1$ + private static final URI DEFAULT_RULES_RESOURCE_URI = URI.createURI("platform:/plugin/org.eclipse.sirius.properties.defaultrules/model/properties.odesign", true); //$NON-NLS-1$ /** * The resource set used to load the default rules. @@ -71,7 +73,8 @@ public final class DefaultRulesProvider { Optional<Resource> optionalResource = Optional.ofNullable(resourceSet.getResource(DEFAULT_RULES_RESOURCE_URI, true)); if (!optionalResource.isPresent()) { - SiriusPropertiesCorePlugin.getPlugin().error(Messages.DefaultRulesProvider_DefaultPropertiesNotFound); + IStatus status = new Status(IStatus.ERROR, SiriusPropertiesDefaultRulesPlugin.PLUGIN_ID, Messages.DefaultRulesProvider_DefaultPropertiesNotFound); + SiriusPropertiesDefaultRulesPlugin.getPlugin().getLog().log(status); } // @formatter:off diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/src/org/eclipse/sirius/properties/defaultrules/internal/Messages.java b/plugins/org.eclipse.sirius.properties.defaultrules/src/org/eclipse/sirius/properties/defaultrules/internal/Messages.java new file mode 100644 index 0000000000..743e5cdda4 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/src/org/eclipse/sirius/properties/defaultrules/internal/Messages.java @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright (c) 2017 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.properties.defaultrules.internal; + +import org.eclipse.sirius.ext.base.I18N; +import org.eclipse.sirius.ext.base.I18N.TranslatableMessage; + +/** + * Utility class used for the internationalization. + * + * @author sbegaudeau + */ +public final class Messages { + + static { + I18N.initializeMessages(Messages.class, SiriusPropertiesDefaultRulesPlugin.INSTANCE); + } + + // CHECKSTYLE:OFF + + @TranslatableMessage + public static String DefaultRulesProvider_DefaultPropertiesNotFound; + // CHECKSTYLE:ON + + private Messages() { + // Prevents instantiation. + } +} diff --git a/plugins/org.eclipse.sirius.properties.defaultrules/src/org/eclipse/sirius/properties/defaultrules/internal/SiriusPropertiesDefaultRulesPlugin.java b/plugins/org.eclipse.sirius.properties.defaultrules/src/org/eclipse/sirius/properties/defaultrules/internal/SiriusPropertiesDefaultRulesPlugin.java new file mode 100644 index 0000000000..59377d17c5 --- /dev/null +++ b/plugins/org.eclipse.sirius.properties.defaultrules/src/org/eclipse/sirius/properties/defaultrules/internal/SiriusPropertiesDefaultRulesPlugin.java @@ -0,0 +1,71 @@ +/******************************************************************************* + * Copyright (c) 2017 Obeo. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.properties.defaultrules.internal; + +import org.eclipse.emf.common.EMFPlugin; +import org.eclipse.emf.common.util.ResourceLocator; + +/** + * The plugin for <code>org.eclipse.sirius.properties.core</code>. + * + * @author sbegaudeau + */ +public class SiriusPropertiesDefaultRulesPlugin extends EMFPlugin { + /** + * The identifier of the plugin. + */ + public static final String PLUGIN_ID = "org.eclipse.sirius.properties.defaultrules"; //$NON-NLS-1$ + + /** + * The sole instance of the plugin. + */ + public static final SiriusPropertiesDefaultRulesPlugin INSTANCE = new SiriusPropertiesDefaultRulesPlugin(); + + /** + * The sole instance of the bundle activator. + */ + private static Implementation plugin; + + /** + * The constructor. + */ + public SiriusPropertiesDefaultRulesPlugin() { + super(new ResourceLocator[0]); + } + + @Override + public ResourceLocator getPluginResourceLocator() { + return plugin; + } + + /** + * Returns the singleton instance of the Eclipse plugin. + * + * @return the singleton instance. + */ + public static Implementation getPlugin() { + return plugin; + } + + /** + * The bundle activator. + * + * @author sbegaudeau + */ + public static class Implementation extends EclipsePlugin { + /** + * The constructor. + */ + public Implementation() { + SiriusPropertiesDefaultRulesPlugin.plugin = this; + } + } +} diff --git a/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF index f3a08fbfc4..4b8d798a27 100644 --- a/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF @@ -32,7 +32,8 @@ Require-Bundle: org.eclipse.eef;bundle-version="1.8.0", org.eclipse.acceleo.query;bundle-version="5.0.2", org.eclipse.sirius.properties.ext.widgets.reference;bundle-version="[4.1.1,5.1.0)", org.eclipse.sirius.ecore.extender;bundle-version="4.1.0", - org.eclipse.sirius.properties.core;bundle-version="5.0.0" + org.eclipse.sirius.properties.core;bundle-version="5.0.0", + org.eclipse.sirius.properties.defaultrules;bundle-version="5.0.0" Import-Package: com.ibm.icu.util;version="54.1.0", org.eclipse.sirius.ui.business.api.dialect;version="3.1.0", org.eclipse.sirius.ui.tools.api.properties;version="2.1.0" diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java index 70fca2e517..e9333d0b89 100644 --- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java +++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/SiriusTabDescriptorProvider.java @@ -35,13 +35,13 @@ import org.eclipse.sirius.common.interpreter.api.VariableManagerFactory; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.properties.PageDescription; import org.eclipse.sirius.properties.ViewExtensionDescription; -import org.eclipse.sirius.properties.core.api.DefaultRulesProvider; import org.eclipse.sirius.properties.core.api.OverridesProvider; import org.eclipse.sirius.properties.core.api.SiriusDomainClassTester; import org.eclipse.sirius.properties.core.api.SiriusInputDescriptor; import org.eclipse.sirius.properties.core.api.SiriusInterpreter; import org.eclipse.sirius.properties.core.api.ViewDescriptionConverter; import org.eclipse.sirius.properties.core.api.ViewDescriptionPreprocessor; +import org.eclipse.sirius.properties.defaultrules.api.DefaultRulesProvider; import org.eclipse.sirius.ui.properties.internal.SiriusUIPropertiesPlugin; import org.eclipse.sirius.viewpoint.description.DescriptionPackage; import org.eclipse.sirius.viewpoint.description.Group; |
