From 475c4280d4b3ea6fb22504491212dec4ceeea782 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sun, 2 May 2021 12:28:49 +0300 Subject: [PATCH] Bug 573296 - [Passage] rework EMF migration facilities, part 7 Rework migration for products: use resource handler instead of external OSGi component Signed-off-by: Alexander Fedorov --- .../.classpath | 7 - .../.project | 39 ------ .../.settings/org.eclipse.jdt.core.prefs | 115 ----------------- .../.settings/org.eclipse.jdt.ui.prefs | 122 ------------------ .../org.eclipse.pde.ds.annotations.prefs | 8 -- .../.settings/org.eclipse.pde.prefs | 34 ----- .../META-INF/MANIFEST.MF | 14 -- .../OSGI-INF/l10n/bundle.properties | 23 ---- ...al.products.migration.ProductsMigrator.xml | 4 - .../about.html | 36 ------ .../build.properties | 19 --- .../.project | 5 + .../META-INF/MANIFEST.MF | 8 +- .../model/products.genmodel | 9 +- .../plugin.xml | 7 + .../util/ProductsResourceFactoryImpl.java | 52 ++++++++ .../model/util/ProductsResourceImpl.java | 49 +++++++ .../migration/ProductsResourceHandler.java} | 24 ++-- .../feature.xml | 9 +- .../pom.xml | 2 - .../.classpath | 11 -- .../.project | 34 ----- .../.settings/org.eclipse.jdt.core.prefs | 115 ----------------- .../.settings/org.eclipse.jdt.ui.prefs | 122 ------------------ .../org.eclipse.pde.ds.annotations.prefs | 8 -- .../.settings/org.eclipse.pde.prefs | 34 ----- .../META-INF/MANIFEST.MF | 13 -- .../OSGI-INF/l10n/bundle.properties | 23 ---- .../build.properties | 19 --- .../org.eclipse.passage.lic.lic_products | 0 .../migration/tests/ProductsMigratorTest.java | 12 +- 31 files changed, 145 insertions(+), 832 deletions(-) delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/.classpath delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/.project delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.jdt.core.prefs delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.pde.ds.annotations.prefs delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.pde.prefs delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/META-INF/MANIFEST.MF delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/OSGI-INF/l10n/bundle.properties delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/OSGI-INF/org.eclipse.passage.lic.internal.products.migration.ProductsMigrator.xml delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/about.html delete mode 100644 bundles/org.eclipse.passage.lic.products.migration/build.properties create mode 100644 bundles/org.eclipse.passage.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/util/ProductsResourceFactoryImpl.java create mode 100644 bundles/org.eclipse.passage.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/util/ProductsResourceImpl.java rename bundles/{org.eclipse.passage.lic.products.migration/src/org/eclipse/passage/lic/internal/products/migration/ProductsMigrator.java => org.eclipse.passage.lic.products.model/src/org/eclipse/passage/lic/internal/products/model/migration/ProductsResourceHandler.java} (71%) delete mode 100644 tests/org.eclipse.passage.lic.products.migration.tests/.classpath delete mode 100644 tests/org.eclipse.passage.lic.products.migration.tests/.project delete mode 100644 tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.jdt.core.prefs delete mode 100644 tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.pde.ds.annotations.prefs delete mode 100644 tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.pde.prefs delete mode 100644 tests/org.eclipse.passage.lic.products.migration.tests/META-INF/MANIFEST.MF delete mode 100644 tests/org.eclipse.passage.lic.products.migration.tests/OSGI-INF/l10n/bundle.properties delete mode 100644 tests/org.eclipse.passage.lic.products.migration.tests/build.properties rename tests/{org.eclipse.passage.lic.products.migration.tests => org.eclipse.passage.lic.products.model.tests}/model/org.eclipse.passage.lic.lic_products (100%) rename tests/{org.eclipse.passage.lic.products.migration.tests/src/org/eclipse/passage/lic/products => org.eclipse.passage.lic.products.model.tests/src/org/eclipse/passage/lic/products/model}/migration/tests/ProductsMigratorTest.java (93%) diff --git a/bundles/org.eclipse.passage.lic.products.migration/.classpath b/bundles/org.eclipse.passage.lic.products.migration/.classpath deleted file mode 100644 index eca7bdba8..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.eclipse.passage.lic.products.migration/.project b/bundles/org.eclipse.passage.lic.products.migration/.project deleted file mode 100644 index b0e6d2227..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/.project +++ /dev/null @@ -1,39 +0,0 @@ - - - org.eclipse.passage.lic.products.migration - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.ds.core.builder - - - - - org.eclipse.pde.api.tools.apiAnalysisBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.pde.api.tools.apiAnalysisNature - - diff --git a/bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c0a6a56ce..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,115 +0,0 @@ -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.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.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=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.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=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 -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 906381876..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,122 +0,0 @@ -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.products.migration/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.pde.ds.annotations.prefs deleted file mode 100644 index 73a356b6d..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.pde.ds.annotations.prefs +++ /dev/null @@ -1,8 +0,0 @@ -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.products.migration/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 47bd5bdfc..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,34 +0,0 @@ -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.products.migration/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.products.migration/META-INF/MANIFEST.MF deleted file mode 100644 index 2c9ed811b..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Automatic-Module-Name: org.eclipse.passage.lic.products.migration -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.passage.lic.products.migration;singleton:=true -Bundle-Version: 0.5.300.qualifier -Bundle-Name: %Bundle-Name -Bundle-Vendor: %Bundle-Vendor -Bundle-Copyright: %Bundle-Copyright -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0", - org.eclipse.passage.lic.emf;bundle-version="0.0.0", - org.eclipse.passage.lic.products.model;bundle-version="1.0.0" -Bundle-ActivationPolicy: lazy -Service-Component: OSGI-INF/*.xml diff --git a/bundles/org.eclipse.passage.lic.products.migration/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.passage.lic.products.migration/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index 967206c83..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,23 +0,0 @@ -#Properties file for org.eclipse.passage.lic.products.migration -############################################################################### -# Copyright (c) 2018, 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 Products Migration -Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2018, 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.products.migration/OSGI-INF/org.eclipse.passage.lic.internal.products.migration.ProductsMigrator.xml b/bundles/org.eclipse.passage.lic.products.migration/OSGI-INF/org.eclipse.passage.lic.internal.products.migration.ProductsMigrator.xml deleted file mode 100644 index 1c51ce544..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/OSGI-INF/org.eclipse.passage.lic.internal.products.migration.ProductsMigrator.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/bundles/org.eclipse.passage.lic.products.migration/about.html b/bundles/org.eclipse.passage.lic.products.migration/about.html deleted file mode 100644 index 164f781a8..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/about.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - -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.products.migration/build.properties b/bundles/org.eclipse.passage.lic.products.migration/build.properties deleted file mode 100644 index 341338601..000000000 --- a/bundles/org.eclipse.passage.lic.products.migration/build.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2018, 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.products.model/.project b/bundles/org.eclipse.passage.lic.products.model/.project index b3898ff73..0a5900352 100644 --- a/bundles/org.eclipse.passage.lic.products.model/.project +++ b/bundles/org.eclipse.passage.lic.products.model/.project @@ -25,6 +25,11 @@ + + org.eclipse.pde.ds.core.builder + + + org.eclipse.pde.PluginNature 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 daf974eda..b12ee27f1 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,17 +2,19 @@ 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: 1.0.300.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Copyright: %Bundle-Copyright Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy, +Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=greedy;resolution:=optional, org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="0.0.0";visibility:=reexport, org.eclipse.passage.lic.emf;bundle-version="2.0.0", org.eclipse.passage.lic.products;bundle-version="1.0.0";visibility:=reexport -Export-Package: org.eclipse.passage.lic.internal.products.model;x-friends:="org.eclipse.passage.loc.dashboard.ui", +Export-Package: org.eclipse.passage.lic.internal.products.model; + x-friends:="org.eclipse.passage.loc.dashboard.ui", org.eclipse.passage.lic.products.model.api, org.eclipse.passage.lic.products.model.impl, org.eclipse.passage.lic.products.model.meta, diff --git a/bundles/org.eclipse.passage.lic.products.model/model/products.genmodel b/bundles/org.eclipse.passage.lic.products.model/model/products.genmodel index 821c161db..9ce308393 100644 --- a/bundles/org.eclipse.passage.lic.products.model/model/products.genmodel +++ b/bundles/org.eclipse.passage.lic.products.model/model/products.genmodel @@ -13,10 +13,11 @@ language="" operationReflection="true" runtimePlatform="RCP" importOrganizing="true" cleanup="true" oSGiCompatible="true"> platform:/resource/org.eclipse.passage.lic.products.ecore/model/products.ecore - + diff --git a/bundles/org.eclipse.passage.lic.products.model/plugin.xml b/bundles/org.eclipse.passage.lic.products.model/plugin.xml index 2644207ad..ab50e7ca7 100644 --- a/bundles/org.eclipse.passage.lic.products.model/plugin.xml +++ b/bundles/org.eclipse.passage.lic.products.model/plugin.xml @@ -22,4 +22,11 @@ genModel="model/products.genmodel"/> + + + + + diff --git a/bundles/org.eclipse.passage.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/util/ProductsResourceFactoryImpl.java b/bundles/org.eclipse.passage.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/util/ProductsResourceFactoryImpl.java new file mode 100644 index 000000000..fd1bd4c66 --- /dev/null +++ b/bundles/org.eclipse.passage.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/util/ProductsResourceFactoryImpl.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2018, 2021 ArSysOp + * + * 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 + *******************************************************************************/ +package org.eclipse.passage.lic.products.model.util; + +import org.eclipse.emf.common.util.URI; + +import org.eclipse.emf.ecore.resource.Resource; + +import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; + +/** + * + * The Resource Factory associated with the package. + * + * @see org.eclipse.passage.lic.products.model.util.ProductsResourceImpl + * @generated + * @since 2.0 + */ +public class ProductsResourceFactoryImpl extends ResourceFactoryImpl { + /** + * Creates an instance of the resource factory. + * + * + * @generated + */ + public ProductsResourceFactoryImpl() { + super(); + } + + /** + * Creates an instance of the resource. + * + * + * @generated + */ + @Override + public Resource createResource(URI uri) { + Resource result = new ProductsResourceImpl(uri); + return result; + } + +} //ProductsResourceFactoryImpl diff --git a/bundles/org.eclipse.passage.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/util/ProductsResourceImpl.java b/bundles/org.eclipse.passage.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/util/ProductsResourceImpl.java new file mode 100644 index 000000000..5fb537cff --- /dev/null +++ b/bundles/org.eclipse.passage.lic.products.model/src-gen/org/eclipse/passage/lic/products/model/util/ProductsResourceImpl.java @@ -0,0 +1,49 @@ +/******************************************************************************* + * Copyright (c) 2018, 2021 ArSysOp + * + * 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 + *******************************************************************************/ +package org.eclipse.passage.lic.products.model.util; + +import java.util.Map; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; +import org.eclipse.passage.lic.internal.products.model.migration.ProductsResourceHandler; + +/** + * + * The Resource associated with the package. + * + * @see org.eclipse.passage.lic.products.model.util.ProductsResourceFactoryImpl + * @since 2.0 + * @generated + */ +public class ProductsResourceImpl extends XMIResourceImpl { + /** + * Creates an instance of the resource. + * + * + * @param uri the URI of the new resource. + * @generated + */ + public ProductsResourceImpl(URI uri) { + super(uri); + } + + @Override + protected void init() { + super.init(); + Map options = getDefaultLoadOptions(); + options.put(OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE); + options.put(OPTION_RESOURCE_HANDLER, new ProductsResourceHandler()); + } + +} //ProductsResourceImpl diff --git a/bundles/org.eclipse.passage.lic.products.migration/src/org/eclipse/passage/lic/internal/products/migration/ProductsMigrator.java b/bundles/org.eclipse.passage.lic.products.model/src/org/eclipse/passage/lic/internal/products/model/migration/ProductsResourceHandler.java similarity index 71% rename from bundles/org.eclipse.passage.lic.products.migration/src/org/eclipse/passage/lic/internal/products/migration/ProductsMigrator.java rename to bundles/org.eclipse.passage.lic.products.model/src/org/eclipse/passage/lic/internal/products/model/migration/ProductsResourceHandler.java index f8daa3276..e90419bb5 100644 --- a/bundles/org.eclipse.passage.lic.products.migration/src/org/eclipse/passage/lic/internal/products/migration/ProductsMigrator.java +++ b/bundles/org.eclipse.passage.lic.products.model/src/org/eclipse/passage/lic/internal/products/model/migration/ProductsResourceHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 ArSysOp + * Copyright (c) 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,26 +10,32 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.internal.products.migration; +package org.eclipse.passage.lic.internal.products.model.migration; import java.util.ArrayList; import java.util.List; +import java.util.Map.Entry; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.xml.type.AnyType; import org.eclipse.passage.lic.emf.ecore.util.DelegatingEPackage; +import org.eclipse.passage.lic.emf.xmi.MigratingResourceHandler; import org.eclipse.passage.lic.products.model.meta.ProductsPackage; -import org.osgi.service.component.annotations.Activate; -import org.osgi.service.component.annotations.Component; -@Component -public class ProductsMigrator { +public final class ProductsResourceHandler extends MigratingResourceHandler { - @Activate - public void activate() { + @Override + protected void ensureMigrations() { migrate030(); migrate040(); } + @Override + protected void convertEntry(Entry entry) { + // not yet needed + } + private void migrate030() { String nsUri = "http://www.eclipse.org/passage/lic/0.3.3"; //$NON-NLS-1$ ProductsPackage delegate = ProductsPackage.eINSTANCE; @@ -44,7 +50,7 @@ private void migrate030() { private void migrate040() { String nsUri = "http://www.eclipse.org/passage/lic/products/0.4.0"; //$NON-NLS-1$ ProductsPackage delegate = ProductsPackage.eINSTANCE; - EPackage.Registry.INSTANCE.put(nsUri, delegate); + EPackage.Registry.INSTANCE.computeIfAbsent(nsUri, ns -> delegate); } } diff --git a/features/org.eclipse.passage.lic.products.feature/feature.xml b/features/org.eclipse.passage.lic.products.feature/feature.xml index d4c0873b9..6cd6bb31f 100644 --- a/features/org.eclipse.passage.lic.products.feature/feature.xml +++ b/features/org.eclipse.passage.lic.products.feature/feature.xml @@ -14,7 +14,7 @@ - - ../../bundles/org.eclipse.passage.lic.products ../../bundles/org.eclipse.passage.lic.products.ecore ../../bundles/org.eclipse.passage.lic.products.model - ../../bundles/org.eclipse.passage.lic.products.migration ../../bundles/org.eclipse.passage.lic.products.edit ../../bundles/org.eclipse.passage.lic.products.e4.ui ../../features/org.eclipse.passage.lic.products.feature ../../tests/org.eclipse.passage.lic.products.model.tests - ../../tests/org.eclipse.passage.lic.products.migration.tests ../../bundles/org.eclipse.passage.lic.users diff --git a/tests/org.eclipse.passage.lic.products.migration.tests/.classpath b/tests/org.eclipse.passage.lic.products.migration.tests/.classpath deleted file mode 100644 index 3e5654f17..000000000 --- a/tests/org.eclipse.passage.lic.products.migration.tests/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/tests/org.eclipse.passage.lic.products.migration.tests/.project b/tests/org.eclipse.passage.lic.products.migration.tests/.project deleted file mode 100644 index 5dd90a2d0..000000000 --- a/tests/org.eclipse.passage.lic.products.migration.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.passage.lic.products.migration.tests - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.api.tools.apiAnalysisBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.pde.api.tools.apiAnalysisNature - - diff --git a/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c0a6a56ce..000000000 --- a/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,115 +0,0 @@ -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.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.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=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.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=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 -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 906381876..000000000 --- a/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,122 +0,0 @@ -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/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.pde.ds.annotations.prefs deleted file mode 100644 index 73a356b6d..000000000 --- a/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.pde.ds.annotations.prefs +++ /dev/null @@ -1,8 +0,0 @@ -classpath=true -dsVersion=V1_3 -eclipse.preferences.version=1 -enabled=true -generateBundleActivationPolicyLazy=true -path=OSGI-INF -validationErrorLevel=error -validationErrorLevel.missingImplicitUnbindMethod=error diff --git a/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 47bd5bdfc..000000000 --- a/tests/org.eclipse.passage.lic.products.migration.tests/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,34 +0,0 @@ -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/tests/org.eclipse.passage.lic.products.migration.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.passage.lic.products.migration.tests/META-INF/MANIFEST.MF deleted file mode 100644 index da6e88dd8..000000000 --- a/tests/org.eclipse.passage.lic.products.migration.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Automatic-Module-Name: org.eclipse.passage.lic.products.migration.tests -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.passage.lic.products.migration.tests -Bundle-Version: 0.5.0.qualifier -Bundle-Name: %Bundle-Name -Bundle-Vendor: %Bundle-Vendor -Bundle-Copyright: %Bundle-Copyright -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.junit;bundle-version="4.12.0", - org.eclipse.emf.ecore.xmi;bundle-version="0.0.0", - org.eclipse.passage.lic.products.model;bundle-version="1.0.0", - org.eclipse.passage.lic.products.migration;bundle-version="0.0.0" diff --git a/tests/org.eclipse.passage.lic.products.migration.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.passage.lic.products.migration.tests/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index 9aeffcf9c..000000000 --- a/tests/org.eclipse.passage.lic.products.migration.tests/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,23 +0,0 @@ -#Properties file for org.eclipse.passage.lic.products.migration.tests -############################################################################### -# Copyright (c) 2018, 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 Products Migration Tests -Bundle-Vendor = Eclipse Passage -Bundle-Copyright = Copyright (c) 2018, 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/tests/org.eclipse.passage.lic.products.migration.tests/build.properties b/tests/org.eclipse.passage.lic.products.migration.tests/build.properties deleted file mode 100644 index 4300dce6c..000000000 --- a/tests/org.eclipse.passage.lic.products.migration.tests/build.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2018, 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/,\ - model/ diff --git a/tests/org.eclipse.passage.lic.products.migration.tests/model/org.eclipse.passage.lic.lic_products b/tests/org.eclipse.passage.lic.products.model.tests/model/org.eclipse.passage.lic.lic_products similarity index 100% rename from tests/org.eclipse.passage.lic.products.migration.tests/model/org.eclipse.passage.lic.lic_products rename to tests/org.eclipse.passage.lic.products.model.tests/model/org.eclipse.passage.lic.lic_products diff --git a/tests/org.eclipse.passage.lic.products.migration.tests/src/org/eclipse/passage/lic/products/migration/tests/ProductsMigratorTest.java b/tests/org.eclipse.passage.lic.products.model.tests/src/org/eclipse/passage/lic/products/model/migration/tests/ProductsMigratorTest.java similarity index 93% rename from tests/org.eclipse.passage.lic.products.migration.tests/src/org/eclipse/passage/lic/products/migration/tests/ProductsMigratorTest.java rename to tests/org.eclipse.passage.lic.products.model.tests/src/org/eclipse/passage/lic/products/model/migration/tests/ProductsMigratorTest.java index c695dcd17..256d28d09 100644 --- a/tests/org.eclipse.passage.lic.products.migration.tests/src/org/eclipse/passage/lic/products/migration/tests/ProductsMigratorTest.java +++ b/tests/org.eclipse.passage.lic.products.model.tests/src/org/eclipse/passage/lic/products/model/migration/tests/ProductsMigratorTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 ArSysOp + * Copyright (c) 2018, 2021 ArSysOp * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at @@ -10,7 +10,7 @@ * Contributors: * ArSysOp - initial API and implementation *******************************************************************************/ -package org.eclipse.passage.lic.products.migration.tests; +package org.eclipse.passage.lic.products.model.migration.tests; import static org.junit.Assert.assertEquals; @@ -20,21 +20,21 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; import org.eclipse.passage.lic.products.model.api.Product; import org.eclipse.passage.lic.products.model.api.ProductLine; import org.eclipse.passage.lic.products.model.api.ProductVersion; import org.eclipse.passage.lic.products.model.api.ProductVersionFeature; +import org.eclipse.passage.lic.products.model.util.ProductsResourceImpl; import org.junit.Test; -public class ProductsMigratorTest { +public final class ProductsMigratorTest { @Test public void testMigratorPositive() throws Exception { File legacy = new File( System.getProperty("user.dir") + File.separator + "model/org.eclipse.passage.lic.lic_products"); //$NON-NLS-1$//$NON-NLS-2$ URI uri = URI.createFileURI(legacy.getPath()); - Resource resource = new XMIResourceImpl(uri); + Resource resource = new ProductsResourceImpl(uri); resource.load(null); EList contents = resource.getContents(); EObject eObject = contents.get(0); @@ -51,7 +51,7 @@ public void testMigratorPositive() throws Exception { assertEquals("org.eclipse.passage.lic.product", p0.getIdentifier()); //$NON-NLS-1$ assertEquals("Eclipse Passage LIC", p0.getName()); //$NON-NLS-1$ assertEquals("Eclipse Passage Licensing Integration Components product", p0.getDescription()); //$NON-NLS-1$ - + EList p0vs = p0.getProductVersions(); assertEquals(2, p0vs.size()); ProductVersion p0v0 = p0vs.get(0);