diff --git a/bundles/org.eclipse.passage.lic.emf.meta/.classpath b/bundles/org.eclipse.passage.lic.emf.meta/.classpath new file mode 100644 index 000000000..eca7bdba8 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.emf.meta/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/bundles/org.eclipse.passage.lic.emf.meta/.project b/bundles/org.eclipse.passage.lic.emf.meta/.project new file mode 100644 index 000000000..86d7f460c --- /dev/null +++ b/bundles/org.eclipse.passage.lic.emf.meta/.project @@ -0,0 +1,28 @@ + + + org.eclipse.passage.lic.emf.meta + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..8f9ec5cde --- /dev/null +++ b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,101 @@ +eclipse.preferences.version=1 +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.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +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.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +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.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning +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=error +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=warning +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=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning +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.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=enabled +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=warning +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=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=warning +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=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning diff --git a/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..906381876 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,122 @@ +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=false +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=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.insert_inferred_type_arguments=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=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=false +cleanup.remove_redundant_semicolons=false +cleanup.remove_redundant_type_arguments=false +cleanup.remove_trailing_whitespaces=false +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_anonymous_class_creation=false +cleanup.use_blocks=false +cleanup.use_blocks_only_for_return_and_throw=false +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_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile +cleanup_settings_version=2 +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +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=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +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=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_semicolons=false +sp_cleanup.remove_redundant_type_arguments=false +sp_cleanup.remove_trailing_whitespaces=false +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=false +sp_cleanup.remove_unused_imports=false +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 diff --git a/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.ds.annotations.prefs new file mode 100644 index 000000000..73a356b6d --- /dev/null +++ b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.ds.annotations.prefs @@ -0,0 +1,8 @@ +classpath=true +dsVersion=V1_3 +eclipse.preferences.version=1 +enabled=true +generateBundleActivationPolicyLazy=true +path=OSGI-INF +validationErrorLevel=error +validationErrorLevel.missingImplicitUnbindMethod=error diff --git a/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.prefs new file mode 100644 index 000000000..47bd5bdfc --- /dev/null +++ b/bundles/org.eclipse.passage.lic.emf.meta/.settings/org.eclipse.pde.prefs @@ -0,0 +1,34 @@ +compilers.f.unresolved-features=1 +compilers.f.unresolved-plugins=1 +compilers.incompatible-environment=1 +compilers.p.build=1 +compilers.p.build.bin.includes=1 +compilers.p.build.encodings=2 +compilers.p.build.java.compiler=2 +compilers.p.build.java.compliance=1 +compilers.p.build.missing.output=2 +compilers.p.build.output.library=1 +compilers.p.build.source.library=1 +compilers.p.build.src.includes=1 +compilers.p.deprecated=1 +compilers.p.discouraged-class=1 +compilers.p.internal=1 +compilers.p.missing-packages=2 +compilers.p.missing-version-export-package=2 +compilers.p.missing-version-import-package=2 +compilers.p.missing-version-require-bundle=1 +compilers.p.no-required-att=0 +compilers.p.no.automatic.module=1 +compilers.p.not-externalized-att=0 +compilers.p.service.component.without.lazyactivation=1 +compilers.p.unknown-attribute=1 +compilers.p.unknown-class=1 +compilers.p.unknown-element=1 +compilers.p.unknown-identifier=1 +compilers.p.unknown-resource=1 +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/bundles/org.eclipse.passage.lic.emf.meta/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.emf.meta/META-INF/MANIFEST.MF new file mode 100644 index 000000000..a83b64b84 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.emf.meta/META-INF/MANIFEST.MF @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Automatic-Module-Name: org.eclipse.passage.lic.emf.meta +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.passage.lic.emf.meta +Bundle-Version: 0.6.0.qualifier +Bundle-Name: %Bundle-Name +Bundle-Vendor: %Bundle-Vendor +Bundle-Copyright: %Bundle-Copyright +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport +Export-Package: org.eclipse.passage.lic.emf.meta diff --git a/bundles/org.eclipse.passage.lic.emf.meta/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.emf.meta/OSGI-INF/l10n/bundle.properties new file mode 100644 index 000000000..01cea052e --- /dev/null +++ b/bundles/org.eclipse.passage.lic.emf.meta/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,23 @@ +#Properties file for org.eclipse.passage.lic.emf.meta +############################################################################### +# Copyright (c) 2020 ArSysOp and others +# +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/. +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# ArSysOp - initial API and implementation +############################################################################### + +Bundle-Name = Passage LIC EMF Meta +Bundle-Vendor = Eclipse Passage +Bundle-Copyright = Copyright (c) 2020 ArSysOp and others.\n\ +\n\ +This program and the accompanying materials are made\n\ +available under the terms of the Eclipse Public License 2.0\n\ +which is available at https://www.eclipse.org/legal/epl-2.0/\n\ +\n\ +SPDX-License-Identifier: EPL-2.0\n\ diff --git a/bundles/org.eclipse.passage.lic.emf.meta/about.html b/bundles/org.eclipse.passage.lic.emf.meta/about.html new file mode 100644 index 000000000..164f781a8 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.emf.meta/about.html @@ -0,0 +1,36 @@ + + + + +About + + +

About This Content

+ +

November 30, 2017

+

License

+ +

+ 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 2.0 ("EPL"). A copy of the EPL is + available at http://www.eclipse.org/legal/epl-2.0. + For purposes of the EPL, "Program" will mean the Content. +

+ +

+ 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 http://www.eclipse.org. +

+ + + \ No newline at end of file diff --git a/bundles/org.eclipse.passage.lic.emf.meta/build.properties b/bundles/org.eclipse.passage.lic.emf.meta/build.properties new file mode 100644 index 000000000..9eb249799 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.emf.meta/build.properties @@ -0,0 +1,19 @@ +############################################################################### +# Copyright (c) 2020 ArSysOp and others +# +# This program and the accompanying materials are made available under the +# terms of the Eclipse Public License 2.0 which is available at +# https://www.eclipse.org/legal/epl-2.0/. +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# ArSysOp - initial API and implementation +############################################################################### + +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + OSGI-INF/,\ + about.html diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java b/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java similarity index 100% rename from bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java rename to bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ClassMetadata.java diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java b/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java similarity index 100% rename from bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java rename to bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposableClassMetadata.java diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java b/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java similarity index 77% rename from bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java rename to bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java index 325cddd71..59c12e2a1 100644 --- a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java +++ b/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/ComposedClassMetadata.java @@ -5,8 +5,6 @@ import java.util.Optional; import java.util.Set; -import org.eclipse.passage.lic.internal.emf.i18n.EmfMessages; - /** * Creates composed class metadata to suitable for dynamic environment * @@ -31,13 +29,13 @@ public Optional find(Class clazz) { @Override public void consider(ClassMetadata fragment) { - Objects.requireNonNull(fragment, EmfMessages.ComposedClassMetadata_e_null_class_metadata); + Objects.requireNonNull(fragment); registry.add(fragment); } @Override public void forget(ClassMetadata fragment) { - Objects.requireNonNull(fragment, EmfMessages.ComposedClassMetadata_e_null_class_metadata); + Objects.requireNonNull(fragment); registry.remove(fragment); } diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java b/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java similarity index 100% rename from bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java rename to bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/EntityMetadata.java diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java b/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java similarity index 85% rename from bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java rename to bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java index dcacfc18e..8e8403925 100644 --- a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java +++ b/bundles/org.eclipse.passage.lic.emf.meta/src/org/eclipse/passage/lic/emf/meta/PlainEntityMetadata.java @@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.passage.lic.internal.emf.i18n.EmfMessages; /** * Encapsulates the ECore metadata for the object to reduce the number of @@ -43,9 +42,9 @@ public final class PlainEntityMetadata implements EntityMetadata { * */ public PlainEntityMetadata(EClass type, EStructuralFeature id, EStructuralFeature name) { - Objects.requireNonNull(type, EmfMessages.PlainEntityMetadata_e_null_eclass); - Objects.requireNonNull(id, EmfMessages.PlainEntityMetadata_e_null_identification); - Objects.requireNonNull(name, EmfMessages.PlainEntityMetadata_e_null_naming); + Objects.requireNonNull(type, "PlainEntityMetadata::eClass"); //$NON-NLS-1$ + Objects.requireNonNull(id, "PlainEntityMetadata::identification"); //$NON-NLS-1$ + Objects.requireNonNull(name, "PlainEntityMetadata::naimng"); //$NON-NLS-1$ this.eClass = type; this.identification = id; this.naming = name; diff --git a/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF index 80372b28f..7a93b108d 100644 --- a/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF @@ -13,12 +13,5 @@ Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0", Export-Package: org.eclipse.passage.lic.emf.ecore, org.eclipse.passage.lic.emf.ecore.util, org.eclipse.passage.lic.emf.edit, - org.eclipse.passage.lic.emf.meta; - x-friends:="org.eclipse.passage.lic.features.model, - org.eclipse.passage.loc.dashboard.ui, - org.eclipse.passage.loc.workbench, - org.eclipse.passage.lic.users.model, - org.eclipse.passage.lic.products.model, - org.eclipse.passage.lic.licenses.model", org.eclipse.passage.lic.internal.emf.i18n;x-internal:=true Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/internal/emf/i18n/EmfMessages.java b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/internal/emf/i18n/EmfMessages.java index 988677dd3..1ae7bf9de 100644 --- a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/internal/emf/i18n/EmfMessages.java +++ b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/internal/emf/i18n/EmfMessages.java @@ -19,13 +19,9 @@ public class EmfMessages extends NLS { public static String BaseDomainRegistry_e_load_failed; public static String BaseDomainRegistry_ok_load; public static String BaseDomainRegistry_ok_unload; - public static String ComposedClassMetadata_e_null_class_metadata; public static String LicensingEcore_inpur_header; public static String LicensingEcore_input_entry; public static String LicensingEcore_input_invalid; - public static String PlainEntityMetadata_e_null_eclass; - public static String PlainEntityMetadata_e_null_identification; - public static String PlainEntityMetadata_e_null_naming; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, EmfMessages.class); diff --git a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/internal/emf/i18n/EmfMessages.properties b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/internal/emf/i18n/EmfMessages.properties index c1be2dd7a..80753e748 100644 --- a/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/internal/emf/i18n/EmfMessages.properties +++ b/bundles/org.eclipse.passage.lic.emf/src/org/eclipse/passage/lic/internal/emf/i18n/EmfMessages.properties @@ -14,10 +14,6 @@ BaseDomainRegistry_ok_unload=Unloaded {0} ############################################################################### BaseDomainRegistry_e_load_failed=Failed to load {0} -ComposedClassMetadata_e_null_class_metadata=Class metadata must not be null LicensingEcore_inpur_header=%s error(s) occurred while analyzing your inputs: LicensingEcore_input_entry=%s. %s LicensingEcore_input_invalid=Input is invalid -PlainEntityMetadata_e_null_eclass=EClass must not be null -PlainEntityMetadata_e_null_identification=Identification must not be null -PlainEntityMetadata_e_null_naming=Naming must not be null diff --git a/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF index d323c8bef..4fa68b853 100644 --- a/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.features.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.features.model Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.features.model;singleton:=true -Bundle-Version: 0.5.200.qualifier +Bundle-Version: 0.5.300.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Copyright: %Bundle-Copyright @@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.features;bundle-version="0.0.0";visibility:=reexport, - org.eclipse.passage.lic.emf;bundle-version="0.6.0" + org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0" Export-Package: org.eclipse.passage.lic.features.model.api, org.eclipse.passage.lic.features.model.impl, org.eclipse.passage.lic.features.model.meta, diff --git a/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF index 54521294e..f26baddd7 100644 --- a/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.licenses.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.licenses.model Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.licenses.model;singleton:=true -Bundle-Version: 0.5.100.qualifier +Bundle-Version: 0.5.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Copyright: %Bundle-Copyright @@ -10,7 +10,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport, - org.eclipse.passage.lic.emf;bundle-version="0.6.0", + org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0", org.eclipse.passage.lic.licenses;bundle-version="0.0.0";visibility:=reexport Export-Package: org.eclipse.passage.lic.internal.licenses.model;x-friends:="org.eclipse.passage.loc.dashboard.ui", org.eclipse.passage.lic.licenses.model.api, diff --git a/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF index 2ae39eef0..6edf8ca53 100644 --- a/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.products.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.products.model Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.products.model;singleton:=true -Bundle-Version: 0.5.100.qualifier +Bundle-Version: 0.5.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Copyright: %Bundle-Copyright @@ -10,7 +10,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport, - org.eclipse.passage.lic.emf;bundle-version="0.6.0", + org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0", org.eclipse.passage.lic.products;bundle-version="0.0.0";visibility:=reexport Export-Package: org.eclipse.passage.lic.internal.products.model;x-friends:="org.eclipse.passage.loc.dashboard.ui", org.eclipse.passage.lic.products.model.api, diff --git a/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF index 1a21d8a1e..0f6014725 100644 --- a/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.lic.users.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.eclipse.passage.lic.users.model Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.passage.lic.users.model;singleton:=true -Bundle-Version: 0.5.100.qualifier +Bundle-Version: 0.5.200.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Copyright: %Bundle-Copyright @@ -10,7 +10,7 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy, org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport, - org.eclipse.passage.lic.emf;bundle-version="0.6.0", + org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0", org.eclipse.passage.lic.users;bundle-version="0.0.0";visibility:=reexport Export-Package: org.eclipse.passage.lic.internal.users.model;x-friends:="org.eclipse.passage.loc.dashboard.ui", org.eclipse.passage.lic.users.model.api, diff --git a/bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF index 9c22f7d1b..99928b48a 100644 --- a/bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.dashboard.ui/META-INF/MANIFEST.MF @@ -20,7 +20,8 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0", org.eclipse.e4.ui.model.workbench;bundle-version="0.0.0", org.eclipse.emf.ecp.ui.view.swt;bundle-version="0.0.0", org.eclipse.emfforms.setup.base;bundle-version="0.0.0", - org.eclipse.passage.lic.emf;bundle-version="0.0.0", + org.eclipse.passage.lic.emf;bundle-version="0.6.0", + org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0", org.eclipse.passage.lic.e4.core;bundle-version="0.0.0", org.eclipse.passage.lic.email;bundle-version="0.0.0", org.eclipse.passage.lic.features.model;bundle-version="0.0.0", diff --git a/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF index 0b8eb613c..12dae88f4 100644 --- a/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.passage.loc.workbench/META-INF/MANIFEST.MF @@ -23,6 +23,7 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0", org.eclipse.e4.ui.services;bundle-version="0.0.0", org.eclipse.e4.ui.di;bundle-version="0.0.0", org.eclipse.passage.lic.emf;bundle-version="0.0.0", + org.eclipse.passage.lic.emf.meta;bundle-version="0.0.0", org.eclipse.passage.lic.equinox;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.jface;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.products.model;bundle-version="0.0.0";visibility:=reexport, diff --git a/features/org.eclipse.passage.lic.emf.feature/feature.xml b/features/org.eclipse.passage.lic.emf.feature/feature.xml index 43c7fe952..e85edbeb7 100644 --- a/features/org.eclipse.passage.lic.emf.feature/feature.xml +++ b/features/org.eclipse.passage.lic.emf.feature/feature.xml @@ -43,4 +43,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/releng/org.eclipse.passage.lic.aggregator/pom.xml b/releng/org.eclipse.passage.lic.aggregator/pom.xml index 26e3c9f65..363f6c7e9 100644 --- a/releng/org.eclipse.passage.lic.aggregator/pom.xml +++ b/releng/org.eclipse.passage.lic.aggregator/pom.xml @@ -66,6 +66,7 @@ ../../tests/org.eclipse.passage.lic.oshi.tests ../../bundles/org.eclipse.passage.lic.emf + ../../bundles/org.eclipse.passage.lic.emf.meta ../../features/org.eclipse.passage.lic.emf.feature ../../tests/org.eclipse.passage.lic.emf.tests diff --git a/tests/org.eclipse.passage.lic.emf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.emf.tests/META-INF/MANIFEST.MF index 4c73c8ca5..cdfd9f76b 100644 --- a/tests/org.eclipse.passage.lic.emf.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.passage.lic.emf.tests/META-INF/MANIFEST.MF @@ -8,5 +8,6 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Fragment-Host: org.eclipse.passage.lic.emf -Require-Bundle: org.junit;bundle-version="0.0.0" +Require-Bundle: org.junit;bundle-version="0.0.0", + org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0" Export-Package: org.eclipse.passage.lic.emf.meta